Skip to contentSkip to conversation

ppc440SPe: PCIe PLL lock error

PATCH New Rupjyoti Sarmah 2 participants 2 messages Jul 24, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc440SPe: PCIe PLL lock error

u-boot reports a PCIE PLL lock error at boot time on Yucca board, and left PCIe nonfunctional. This is fixed by making u-boot function ppc4xx_init_pcie() to wait 300 uS after negating reset before the first check of PLL lock.

This fix touches only one file 4xx_pcie.c

Signed off by Rupjyoti Sarmah < [email protected] > from Applied Micro

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

(quoted diff) +0 -0

b/b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c
old mode 100644
new mode 100755
index 07fbb0e..ce95abc

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +3 -1
@@ -369,33 +369,40 @@ static int check_error(void)
  */
 int ppc4xx_init_pcie(void)
 {
-	int time_out = 20;
+	int time_out = 20;	/* PCIe PLL lock retry count */
 
 	/* Set PLL clock receiver to LVPECL */
 	SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) | 1 << 28);
 
 	if (check_error())
+	{
+		printf("ERROR: ppc4xx_init_pcie(): PCIe setting

reference clock receiver failed: PESDR0_PLLLCT1 = (0x%08x)\n",
+ SDR_READ(PESDR0_PLLLCT1));
return -1;
+ }

+ /* Did resistance calibration work? */
if (!(SDR_READ(PESDR0_PLLLCT2) & 0x10000))
{
- printf("PCIE: PESDR_PLLCT2 resistance calibration failed
(0x%08x)\n",
+ printf("ERROR: ppc4xx_init_pcie(): PCIe resistance
calibration failed (bit 15=0): PESDR0_PLLLCT2 = (0x%08x)\n",
SDR_READ(PESDR0_PLLLCT2));
return -1;
}
- /* De-assert reset of PCIe PLL, wait for lock */
+
+ /* Take PCIe PLL out of reset, wait for lock */
SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) & ~(1 <<
24));
- udelay(3);
+ udelay(300); /* 300 uS is maximum time lock should take, per
440SPe user's manual */

while (time_out) {
- if (!(SDR_READ(PESDR0_PLLLCT3) & 0x10000000)) {
+ if (!(SDR_READ(PESDR0_PLLLCT3) & 0x10000000)) {
/* Read PLL lock status register PLLLCTS in user's manual */
time_out--;
- udelay(1);
+ udelay(20); /* Wait 20 uS more if needed */
} else
break;
}
if (!time_out) {
- printf("PCIE: VCO output not locked\n");
+ printf("ERROR: ppc4xx_init_pcie(): PCIe - PCIe PLL VCO
output not locked to reference clock (bit 3=0): PESDR0_PLLLCTS = (0x%08x)\n",
+ SDR_READ(PESDR0_PLLLCT3));
return -1;
}
return 0;
@@ -1169,3 +1176,4 @@ int ppc4xx_setup_pcie_endpoint(struct pci_controller *hose, int port)
return 0;
}
#endif /* CONFIG_440SPE && CONFIG_PCI */
+

#1 lore raw

PATCH 1/1 ppc440SPe: PCIe PLL lock error

Hi Rup,

Quoted 6 lines · On Friday 24 July 2009 08:01:14 Rupjyoti Sarmah wrote:

u-boot reports a PCIE PLL lock error at boot time on Yucca board, and left PCIe nonfunctional. This is fixed by making u-boot function ppc4xx_init_pcie() to wait 300 uS after negating reset before the first check of PLL lock.

This fix touches only one file 4xx_pcie.c

Please drop this last line. You don't have to mentions this.

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c

Quoted 8 lines

Signed off by Rupjyoti Sarmah < [email protected] > from Applied Micro

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

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +0 -0
old mode 100644
new mode 100755

No. Please don't change file modes.

Quoted 5 lines

index 07fbb0e..ce95abc

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +0 -0
@@ -369,33 +369,40 @@ static int check_error(void)
  */

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c static int check_error(void) · line 378

Quoted 10 lines
b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +2 -1
 int ppc4xx_init_pcie(void)
 {
-	int time_out = 20;
+	int time_out = 20;	/* PCIe PLL lock retry count */
 
 	/* Set PLL clock receiver to LVPECL */
 	SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) | 1 << 28);
 
 	if (check_error())
+	{

Incorrect coding-style. This should be:

  	if (check_error()) {

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c static int check_error(void) · line 380

Quoted 2 lines
b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +1 -0
+		printf("ERROR: ppc4xx_init_pcie(): PCIe setting
 reference clock receiver failed: PESDR0_PLLLCT1 = (0x%08x)\n",

Your patch is line wrapped. So it can't be applied. Also I suggest to use the __func__ macro and don't hardcode the function name:

		printf("ERROR: %s(): PCIe setting ...", __func__, ...);
Quoted 43 lines
b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +7 -3
+		       SDR_READ(PESDR0_PLLLCT1));
 		return -1;
+	}
 
+	/* Did resistance calibration work? */
 	if (!(SDR_READ(PESDR0_PLLLCT2) & 0x10000))
 	{
-		printf("PCIE: PESDR_PLLCT2 resistance calibration failed
 (0x%08x)\n",
+		printf("ERROR: ppc4xx_init_pcie(): PCIe resistance
 calibration failed (bit 15=0): PESDR0_PLLLCT2 = (0x%08x)\n",
 		       SDR_READ(PESDR0_PLLLCT2));
 		return -1;
 	}
-	/* De-assert reset of PCIe PLL, wait for lock */
+
+	/* Take PCIe PLL out of reset, wait for lock */
 	SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) & ~(1 <<
 24));
-	udelay(3);
+	udelay(300);	/* 300 uS is maximum time lock should take, per

440SPe user's manual */

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +1 -1
 	while (time_out) {
-		if (!(SDR_READ(PESDR0_PLLLCT3) & 0x10000000)) {
+		if (!(SDR_READ(PESDR0_PLLLCT3) & 0x10000000)) {

/* Read PLL lock status register PLLLCTS in user's manual */

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +2 -2
 			time_out--;
-			udelay(1);
+			udelay(20);	/* Wait 20 uS more if needed */
 		} else
 			break;
 	}
 	if (!time_out) {
-		printf("PCIE: VCO output not locked\n");
+		printf("ERROR: ppc4xx_init_pcie(): PCIe - PCIe PLL VCO

output not locked to reference clock (bit 3=0): PESDR0_PLLLCTS = (0x%08x)\n",

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +1 -0
+			SDR_READ(PESDR0_PLLLCT3));
 		return -1;
 	}
 	return 0;

b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c int ppc4xx_setup_pcie_endpoint(struct

Quoted 5 lines
b/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c renamed from a/u-boot-2009.06/cpu/ppc4xx/4xx_pcie.c +1 -0
@@ -1169,3 +1176,4 @@ int ppc4xx_setup_pcie_endpoint(struct
 pci_controller *hose, int port)
 	return 0;
 }
 #endif /* CONFIG_440SPE && CONFIG_PCI */
+

Please don't add empty lines.

Please fix and resubmit. Thanks.

Best regards,
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
=====================================================================