From patchwork Wed May 4 15:40:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graham Fairweather X-Patchwork-Id: 618513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r0MgS1sYdz9sf9 for ; Thu, 5 May 2016 01:40:20 +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=kFx2wLTT; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D9C02B80191; Wed, 4 May 2016 17:40:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Wed, 4 May 2016 17:40:12 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EB556B80181 for ; Wed, 4 May 2016 17:40:10 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-qk0-f195.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7 Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 4 May 2016 17:40:09 +0200 (CEST) Received: by mail-qk0-f195.google.com with SMTP id z3so3040869qkb.2 for ; Wed, 04 May 2016 08:40:09 -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=DBrghU0QJk340eh6hl87QS2Q686TkrsD2mfDe2yN6lk=; b=kFx2wLTTbpf2KHipyjqSlvc2RhZ/Az5C7q0NXVgehuv+48LkCYqFyeeLGb12IhkQU6 zlnGDIUlSqJlbWbQGHSne39JgSuovPb6PIO84P/PBsPvXaptEg0cheg+4c+L5nksz0un b31dtHXuGbAb4Wg3vGwQaoG9+V2YZH7kxxBJZ/X/xOB24521TSke3DBIvzXbt+FvBJjH mHvb65ePhSiBdlH7FNLMm8KSUnk9qhI4LGS1K+yak718qJ74aNEdsI3TIUHCc3WlHq+h Z6PS5cdLqlwSQIIySeS7o0NRctnkaRQaYx+t9erYFYxgFkz8e+cIaObHnVmvGU4laELf MTqw== 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=DBrghU0QJk340eh6hl87QS2Q686TkrsD2mfDe2yN6lk=; b=dCs7l+pomdGy6r4R9bEBABscplgULD8cSXebHC8VN9Jj6UzrAl8SY1qhzkrJrX5qzf WDQOW1yiOcE0qlMcmC2E9/MW1fdfqg/AIrBmB7o+NrkIoBze15t1IDa4VPZ2g39HYdJs G9GdaB/lr9gpsxXcEWyS9K0wB/ijLeK4WCPSS9iJHNsmuJnU7pLDZaUQxn+9+Vc47qnS xjf6El4eM6P21jIfsrgqmwsBQ6FSkbscjl8cJ+VCxpmbm1BvZoHm0XE4x3D0XAfpWz+6 EWxFKYSpzMRSjmPrvQEwosWc7Qe9Mdpl91wtCR8WzYPiFQz1PcEcGeXw47KAHaSQDYyz 248w== X-Gm-Message-State: AOPr4FVpf61Cw0p4YL9bjME+R9KhAjci+WSTQucof0zS0jTJpotiYm03eR09x+n3XFhvg+NsR/Xes+QRCwrfjQ== MIME-Version: 1.0 X-Received: by 10.55.1.81 with SMTP id 78mr9482410qkb.60.1462376408040; Wed, 04 May 2016 08:40:08 -0700 (PDT) Received: by 10.55.80.86 with HTTP; Wed, 4 May 2016 08:40:08 -0700 (PDT) Date: Wed, 4 May 2016 17:40:08 +0200 Message-ID: From: Graham Fairweather To: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH 001/001] [brcm63xx] Display the correct detected CPU ID X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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. More info can be found at:https://forum.openwrt.org/viewtopic.php?id=64621https://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..23491aa 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(); + + 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