diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-08-25 13:33:40 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-11-26 13:51:06 +0000 |
| commit | c82575e660913d358714ab1a3123f497318b73a3 (patch) | |
| tree | ed823aaa22eec72369de4145efffecad3f10f46b | |
| parent | 1714a066d71dc00bc336aa1565ec86551e388704 (diff) | |
| download | linux-c82575e660913d358714ab1a3123f497318b73a3.tar.gz linux-c82575e660913d358714ab1a3123f497318b73a3.tar.bz2 linux-c82575e660913d358714ab1a3123f497318b73a3.zip | |
powerpc/44x: Fix mask and shift to zero bug
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>
| -rw-r--r-- | arch/powerpc/boot/4xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c index 9d3bd4c45a24..f7da65169124 100644 --- a/arch/powerpc/boot/4xx.c +++ b/arch/powerpc/boot/4xx.c @@ -564,7 +564,7 @@ void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk) 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; |