ppc4xx: Fix 440EPx bug in reconfigure_pll()
PATCH 1/1 ppc4xx: Fix 440EPx bug in reconfigure_pll()
This patch fixes a bug in reconfigure_pll(), where the detection of the current bootstrap option is wrong. The ICS bits where incorrectly shifted. This bug was found on the lwmon5 board, which uses bootstrap option H (I2C bootstrap EEPROM).
Additionally a bit of code was moved into the if statement, since its only used after later on. No need to run this code all the time.
Also, a few empty lines are added to make the code better readable.
--- arch/powerpc/cpu/ppc4xx/cpu_init.c | 27 ++++++++++++++++++--------- include/ppc440.h | 1 + 2 files changed, 19 insertions(+), 9 deletions(-)
arch/powerpc/cpu/ppc4xx/cpu_init.c +18 -9
@@ -142,22 +142,28 @@ void reconfigure_pll(u32 new_cpu_freq)* modify it. */ if (temp ==1 ) { -mfcpr (CPR0_PLLD , reg); -/* Get current value of fbdv. */ - temp = (reg &PLLD_FBDV_MASK ) >>24 ; - fbdv = temp ? temp :32 ; -/* Get current value of lfbdv. */ - temp = (reg &PLLD_LFBDV_MASK ); - lfbdv = temp ? temp :64 ;/* * Load register that contains current boot strapping option. */ mfcpr (CPR0_ICFG , reg); -/* Shift strapping option into low 3 bits.*/ - reg = (reg >>28 ); +/* +* Strapping option bits (ICS) are already in correct position, +* only masking needed. +*/ + reg &=CPR0_ICFG_ICS_MASK ;if ((reg ==BOOT_STRAP_OPTION_A ) || (reg ==BOOT_STRAP_OPTION_B ) || (reg ==BOOT_STRAP_OPTION_D ) || (reg ==BOOT_STRAP_OPTION_E )) { +mfcpr (CPR0_PLLD , reg); + +/* Get current value of fbdv. */ + temp = (reg &PLLD_FBDV_MASK ) >>24 ; + fbdv = temp ? temp :32 ; + +/* Get current value of lfbdv. */ + temp = (reg &PLLD_LFBDV_MASK ); + lfbdv = temp ? temp :64 ; +/* * Get current value of FWDVA. Assign current FWDVA to * new FWDVB.
@@ -165,12 +171,14 @@ void reconfigure_pll(u32 new_cpu_freq)mfcpr (CPR0_PLLD , reg); target_fwdvb = (reg &PLLD_FWDVA_MASK ) >>16 ; fwdvb = target_fwdvb ? target_fwdvb :8 ; +/* * Get current value of FWDVB. Assign current FWDVB to * new FWDVA. */ target_fwdva = (reg &PLLD_FWDVB_MASK ) >>8 ; fwdva = target_fwdva ? target_fwdva :16 ; +/* * Update CPR0_PLLD with switched FWDVA and FWDVB. */
@@ -181,6 +189,7 @@ void reconfigure_pll(u32 new_cpu_freq) ((fbdv ==32 ?0 : fbdv) <<24 ) | (lfbdv ==64 ?0 : lfbdv);mtcpr (CPR0_PLLD , reg); +/* Acknowledge that a reset is required. */ reset_needed =1 ; }
include/ppc440.h +1 -0
@@ -1711,6 +1711,7 @@#if defined(CONFIG_440EP ) || defined(CONFIG_440GR ) || \ defined(CONFIG_440EPX ) || defined(CONFIG_440GRX )#define CPR0_ICFG_RLI_MASK 0x80000000 +#define CPR0_ICFG_ICS_MASK 0x00000007#define CPR0_SPCID_SPCIDV0_MASK 0x03000000#define CPR0_SPCID_SPCIDV0_DIV1 0x01000000#define CPR0_SPCID_SPCIDV0_DIV2 0x02000000
Signature · 1 line
1.7.2.2
PATCH 1/1 ppc4xx: Fix 440EPx bug in reconfigure_pll()
Hi Stefan,
Quoted 10 lines
This patch fixes a bug in
reconfigure_pll(), where the detection of the current bootstrap option is wrong. The ICS bits where incorrectly shifted. This bug was found on the lwmon5 board, which uses bootstrap option H (I2C bootstrap EEPROM).Additionally a bit of code was moved into the if statement, since its only used after later on. No need to run this code all the time.
Also, a few empty lines are added to make the code better readable.
Look good to me.
-Victor Gallardo
PATCH 1/1 ppc4xx: Fix 440EPx bug in reconfigure_pll()
In reply to Stefan RoeseQuoted 9 lines · On Thursday 26 August 2010 17:14:51 Stefan Roese wrote:
This patch fixes a bug in
reconfigure_pll(), where the detection of the current bootstrap option is wrong. The ICS bits where incorrectly shifted. This bug was found on the lwmon5 board, which uses bootstrap option H (I2C bootstrap EEPROM).Additionally a bit of code was moved into the if statement, since its only used after later on. No need to run this code all the time.
Also, a few empty lines are added to make the code better readable.
Applied to u-boot-ppc4xx/master. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de