lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 107/306] MIPS: Malta: fix alignment of the devicetree buffer
    Date
    From: Oleksij Rempel <o.rempel@pengutronix.de>

    [ Upstream commit bea6a94a279bcbe6b2cde348782b28baf12255a5 ]

    Starting with following patch MIPS Malta is not able to boot:
    | commit 79edff12060fe7772af08607eff50c0e2486c5ba
    | Author: Rob Herring <robh@kernel.org>
    | scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9

    The reason is the alignment test added to the fdt_ro_probe_(). To fix
    this issue, we need to make sure that fdt_buf is aligned.

    Since the dtc patch was designed to uncover potential issue, I handle
    initial MIPS Malta patch as initial bug.

    Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
    Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/mti-malta/malta-dtshim.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
    index 0ddf03df6268..f451268f6c38 100644
    --- a/arch/mips/mti-malta/malta-dtshim.c
    +++ b/arch/mips/mti-malta/malta-dtshim.c
    @@ -22,7 +22,7 @@
    #define ROCIT_CONFIG_GEN1_MEMMAP_SHIFT 8
    #define ROCIT_CONFIG_GEN1_MEMMAP_MASK (0xf << 8)

    -static unsigned char fdt_buf[16 << 10] __initdata;
    +static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);

    /* determined physical memory size, not overridden by command line args */
    extern unsigned long physical_memsize;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-16 18:20    [W:4.060 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site