lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 133/162] mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ Upstream commit 5eeaafc8d69373c095e461bdb39e5c9b62228ac5 ]

    Several header files need info on CONFIG_32BIT or CONFIG_64BIT,
    but kconfig symbol BCM63XX does not provide that info. This leads
    to many build errors, e.g.:

    arch/mips/include/asm/page.h:196:13: error: use of undeclared identifier 'CAC_BASE'
    return x - PAGE_OFFSET + PHYS_OFFSET;
    arch/mips/include/asm/mach-generic/spaces.h:91:23: note: expanded from macro 'PAGE_OFFSET'
    #define PAGE_OFFSET (CAC_BASE + PHYS_OFFSET)
    arch/mips/include/asm/io.h:134:28: error: use of undeclared identifier 'CAC_BASE'
    return (void *)(address + PAGE_OFFSET - PHYS_OFFSET);
    arch/mips/include/asm/mach-generic/spaces.h:91:23: note: expanded from macro 'PAGE_OFFSET'
    #define PAGE_OFFSET (CAC_BASE + PHYS_OFFSET)

    arch/mips/include/asm/uaccess.h:82:10: error: use of undeclared identifier '__UA_LIMIT'
    return (__UA_LIMIT & (addr | (addr + size) | __ua_size(size))) == 0;

    Selecting the SYS_HAS_CPU_BMIPS* symbols causes SYS_HAS_CPU_BMIPS to be
    set, which then selects CPU_SUPPORT_32BIT_KERNEL, which causes
    CONFIG_32BIT to be set. (a bit more indirect than v1 [RFC].)

    Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
    Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
    Reported-by: kernel test robot <lkp@intel.com>
    Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Cc: Florian Fainelli <f.fainelli@gmail.com>
    Cc: bcm-kernel-feedback-list@broadcom.com
    Cc: linux-mips@vger.kernel.org
    Cc: Paul Burton <paulburton@kernel.org>
    Cc: Maxime Bizon <mbizon@freebox.fr>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
    Acked-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/Kconfig | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index 9f1376788820e..98312d3e4f414 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -211,6 +211,9 @@ config BCM63XX
    select SYS_SUPPORTS_32BIT_KERNEL
    select SYS_SUPPORTS_BIG_ENDIAN
    select SYS_HAS_EARLY_PRINTK
    + select SYS_HAS_CPU_BMIPS32_3300
    + select SYS_HAS_CPU_BMIPS4350
    + select SYS_HAS_CPU_BMIPS4380
    select SWAP_IO_SPACE
    select ARCH_REQUIRE_GPIOLIB
    select HAVE_CLK
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 13:12    [W:4.146 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site