lkml.org 
[lkml]   [2017]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 31/61] powerpc/44x: Fix mask and shift to zero bug
    3.2.96-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 8d046759f6ad75824fdf7b9c9a3da0272ea9ea92 upstream.

    My static checker complains that 0x00001800 >> 13 is zero. Looking at
    the context, it seems like a copy and paste bug from the line below
    and probably 0x3 << 13 or 0x00006000 was intended.

    Fixes: 2af59f7d5c3e ("[POWERPC] 4xx: Add 405GPr and 405EP support in boot wrapper")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/powerpc/boot/4xx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/powerpc/boot/4xx.c
    +++ b/arch/powerpc/boot/4xx.c
    @@ -564,7 +564,7 @@ void ibm405gp_fixup_clocks(unsigned int
    fbdv = 16;
    cbdv = ((pllmr & 0x00060000) >> 17) + 1; /* CPU:PLB */
    opdv = ((pllmr & 0x00018000) >> 15) + 1; /* PLB:OPB */
    - ppdv = ((pllmr & 0x00001800) >> 13) + 1; /* PLB:PCI */
    + ppdv = ((pllmr & 0x00006000) >> 13) + 1; /* PLB:PCI */
    epdv = ((pllmr & 0x00001800) >> 11) + 2; /* PLB:EBC */
    udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;

    \
     
     \ /
      Last update: 2017-11-22 03:55    [W:2.361 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site