From patchwork Fri May 13 19:09:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graham Fairweather X-Patchwork-Id: 622109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r5zx20fWMz9t5x for ; Sat, 14 May 2016 05:11:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=MJ7h6MvD; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b1ISz-0000e1-NO; Fri, 13 May 2016 19:09:41 +0000 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b1ISx-0000aR-0W for lede-dev@lists.infradead.org; Fri, 13 May 2016 19:09:39 +0000 Received: by mail-qg0-x22f.google.com with SMTP id f92so62766644qgf.0 for ; Fri, 13 May 2016 12:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to; bh=TRmzATRbFdz0ALQtVBQSub4FgKHRvEiDPl31EE4Eg4c=; b=MJ7h6MvDeZ+oEB/T+shIRdH8wfDGJjMS7rMj63LEsUF2Qo/o8TjrxvS2HrcRJY8z/U RwMRqHuBfRK0LOepbq4nuC9Ct7+yZp6XbgxqwVGa/0hKeuUeN33wx5kYtUHRJyEgqqcm yOoEd0/bFfONdZmvf/IG+pUFNuAtZa+zhWooAIx1d2/xQ0h+L8jFiHmf8mCkXLFic5vF 41qnUR5nJtQfKBikjU+g8X65JgzwxG4XWWM8VEwKZHQOZ8F3nftIVF9C+iLt2ieeac59 EDai3lkobg5z9rz8ph888yu9ntOADyjbuntqdXnkQswedHp/qibJv7LgRh35h07kP6a0 7DAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to; bh=TRmzATRbFdz0ALQtVBQSub4FgKHRvEiDPl31EE4Eg4c=; b=VjlVDxSIbOklctEihncs4KUTz9t6ZdUoUgHq/pfRa9BMCbKydNhLd9bjN7kc0834Vf wNC51h546QDUF4kiq4Bt/SyHRR5oV2emJ4+qHUO8xo/M2sh7sZKPOJjnQk/afvrYmGh9 mzmaUqql2WF8H5fZU/FzHjmBqbWwlNyymkzAaph3jLxXVIJ8J4vNZky5hkZde95iZepT qaqiF5KzPwObkLgeek8hPHwUNIZFullpj+xQUYrp7m3kGaj1bMBpY1BUn0CJK/uUWKlg 6qU4aUrHrbELGS611id9pzdZr25W41Hw5J1Ve+xz9hLYWLD8EWpPhfUi2Y1eoKL66vef VJRQ== X-Gm-Message-State: AOPr4FWHiA9glRsZPQaVmqqbDbWTMhkrEXUoqVi9NNSuiqwa1ZIFOOOSizbqYrMRK/BGC2ckSYB+fBXD3Hj3UQ== MIME-Version: 1.0 X-Received: by 10.140.159.143 with SMTP id f137mr18062352qhf.61.1463166557684; Fri, 13 May 2016 12:09:17 -0700 (PDT) Received: by 10.55.80.86 with HTTP; Fri, 13 May 2016 12:09:17 -0700 (PDT) Date: Fri, 13 May 2016 21:09:17 +0200 Message-ID: From: Graham Fairweather To: lede-dev@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160513_120939_168588_D3841F31 X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400d:c04:0:0:0:22f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (xotic750[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (xotic750[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 1/1] [brcm63xx] Display the correct detected CPU ID X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Graham Fairweather This patch fixes the logged detected CPU ID when an equivalent is used, like in the case where we have a bcm6369 and configuration for a bcm6368 is used. So, it will display 'Detected Broadcom 0x6369 CPU revision b2' instead of 'Detected Broadcom 0x6368 CPU revision b2'. More info can be found at: https://forum.openwrt.org/viewtopic.php?id=64621 https://github.com/Xotic750/openwrt/tree/fix_logged_cpu_id_bcm63xx Signed-off-by: Graham Fairweather --- target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch | 9 +++++++++ target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch | 9 +++++++++ 2 files changed, 18 insertions(+) @@ -19,6 +19,7 @@ diff --git a/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch index 661abf6..23491aa 100644 --- a/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch +++ b/target/linux/brcm63xx/patches-4.1/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch @@ -41,6 +41,15 @@ Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT; switch (bcm63xx_cpu_id) { +@@ -377,7 +387,7 @@ void __init bcm63xx_cpu_init(void) + bcm63xx_memory_size = detect_memory_size(); + + printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n", +- bcm63xx_cpu_id, bcm63xx_cpu_rev); ++ bcm63xx_cpu_variant, bcm63xx_cpu_rev); + printk(KERN_INFO "CPU frequency is %u MHz\n", + bcm63xx_cpu_freq / 1000000); + printk(KERN_INFO "%uMB of RAM installed\n", --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h @@ -19,6 +19,7 @@ diff --git a/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch index 661abf6..330a9e6 100644 --- a/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch +++ b/target/linux/brcm63xx/patches-4.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch @@ -41,6 +41,15 @@ Subject: [PATCH 40/53] MIPS: BCM63XX: add a new cpu variant helper bcm63xx_cpu_rev = (tmp & REV_REVID_MASK) >> REV_REVID_SHIFT; switch (bcm63xx_cpu_id) { +@@ -377,7 +387,7 @@ void __init bcm63xx_cpu_init(void) + bcm63xx_memory_size = detect_memory_size(); + + pr_info("Detected Broadcom 0x%04x CPU revision %02x\n", +- bcm63xx_cpu_id, bcm63xx_cpu_rev); ++ bcm63xx_cpu_variant, bcm63xx_cpu_rev); + pr_info("CPU frequency is %u MHz\n", + bcm63xx_cpu_freq / 1000000); + pr_info("%uMB of RAM installed\n", --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h