]> git.sur5r.net Git - u-boot/blobdiff - arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c
GCC4.6: Squash warnings in denali_spd_ddr2.c
[u-boot] / arch / powerpc / cpu / mpc85xx / fsl_corenet_serdes.c
index d39f96352ef9d9c839fc879d9ef41c7df0323035..89ed5b47fc9344bd5412a1e75036a8c1762e7c22 100644 (file)
 #include <asm/errno.h>
 #include "fsl_corenet_serdes.h"
 
+/*
+ * The work-arounds for erratum SERDES8 and SERDES-A001 are linked together.
+ * The code is already very complicated as it is, and separating the two
+ * completely would just make things worse.  We try to keep them as separate
+ * as possible, but for now we require SERDES8 if SERDES_A001 is defined.
+ */
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001
+#ifndef CONFIG_SYS_P4080_ERRATUM_SERDES8
+#error "CONFIG_SYS_P4080_ERRATUM_SERDES_A001 requires CONFIG_SYS_P4080_ERRATUM_SERDES8"
+#endif
+#endif
+
 static u32 serdes_prtcl_map;
 
 #define HWCONFIG_BUFFER_SIZE   128
@@ -259,9 +271,28 @@ void serdes_reset_rx(enum srds_prtcl device)
 #endif
 
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
+/*
+ * Enable a SERDES bank that was disabled via the RCW
+ *
+ * We only call this function for SERDES8 and SERDES-A001 in cases we really
+ * want to enable the bank, whether we actually want to use the lanes or not,
+ * so make sure at least one lane is enabled.  We're only enabling this one
+ * lane to satisfy errata requirements that the bank be enabled.
+ *
+ * We use a local variable instead of srds_lpd_b[] because we want drivers to
+ * think that the lanes actually are disabled.
+ */
 static void enable_bank(ccsr_gur_t *gur, int bank)
 {
        u32 rcw5;
+       u32 temp_lpd_b = srds_lpd_b[bank];
+
+       /*
+        * If we're asked to disable all lanes, just pretend we're doing
+        * that.
+        */
+       if (temp_lpd_b == 0xF)
+               temp_lpd_b = 0xE;
 
        /*
         * Enable the lanes SRDS_LPD_Bn.  The RCW bits are read-only in
@@ -270,10 +301,10 @@ static void enable_bank(ccsr_gur_t *gur, int bank)
        rcw5 = in_be32(gur->rcwsr + 5);
        if (bank == FSL_SRDS_BANK_2) {
                rcw5 &= ~FSL_CORENET_RCWSRn_SRDS_LPD_B2;
-               rcw5 |= srds_lpd_b[bank] << 26;
+               rcw5 |= temp_lpd_b << 26;
        } else if (bank == FSL_SRDS_BANK_3) {
                rcw5 &= ~FSL_CORENET_RCWSRn_SRDS_LPD_B3;
-               rcw5 |= srds_lpd_b[bank] << 18;
+               rcw5 |= temp_lpd_b << 18;
        } else {
                printf("SERDES: enable_bank: bad bank %d\n", bank + 1);
                return;
@@ -343,8 +374,6 @@ static void p4080_erratum_serdes8(serdes_corenet_t *regs, ccsr_gur_t *gur,
                 */
                setbits_be32(&regs->bank[FSL_SRDS_BANK_3].pllcr1,
                             SRDS_PLLCR1_PLL_BWSEL);
-
-               enable_bank(gur, FSL_SRDS_BANK_3);
                break;
 
        case 0x0f:
@@ -379,13 +408,87 @@ static void p4080_erratum_serdes8(serdes_corenet_t *regs, ccsr_gur_t *gur,
                                SRDS_PLLCR0_FRATE_SEL_MASK,
                                SRDS_PLLCR0_FRATE_SEL_6_25);
                break;
-       default:
-               enable_bank(gur, FSL_SRDS_BANK_3);
        }
 
+       enable_bank(gur, FSL_SRDS_BANK_3);
+}
+#endif
+
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A005
+/*
+ * If PCIe is not selected as a protocol for any lanes driven by a given PLL,
+ * that PLL should have SRDSBnPLLCR1[PLLBW_SEL] = 0.
+ */
+static void p4080_erratum_serdes_a005(serdes_corenet_t *regs, unsigned int cfg)
+{
+       enum srds_prtcl device;
+
+       switch (cfg) {
+       case 0x13:
+       case 0x16:
+               /*
+                * If SRDS_PRTCL = 0x13 or 0x16, set SRDSB1PLLCR1[PLLBW_SEL]
+                * to 0.
+                */
+               clrbits_be32(&regs->bank[FSL_SRDS_BANK_1].pllcr1,
+                            SRDS_PLLCR1_PLL_BWSEL);
+               break;
+       case 0x19:
+               /*
+                * If SRDS_PRTCL = 0x19, set SRDSB1PLLCR1[PLLBW_SEL] to 0 and
+                * SRDSB3PLLCR1[PLLBW_SEL] to 1.
+                */
+               clrbits_be32(&regs->bank[FSL_SRDS_BANK_1].pllcr1,
+                            SRDS_PLLCR1_PLL_BWSEL);
+               setbits_be32(&regs->bank[FSL_SRDS_BANK_3].pllcr1,
+                            SRDS_PLLCR1_PLL_BWSEL);
+               break;
+       }
+
+       /*
+        * Set SRDSBnPLLCR1[PLLBW_SEL] to 0 for each bank that selects XAUI
+        * before XAUI is initialized.
+        */
+       for (device = XAUI_FM1; device <= XAUI_FM2; device++) {
+               if (is_serdes_configured(device)) {
+                       int bank = serdes_get_bank_by_device(cfg, device);
+
+                       clrbits_be32(&regs->bank[bank].pllcr1,
+                                    SRDS_PLLCR1_PLL_BWSEL);
+               }
+       }
 }
 #endif
 
+/*
+ * Wait for the RSTDONE bit to get set, or a one-second timeout.
+ */
+static void wait_for_rstdone(unsigned int bank)
+{
+       serdes_corenet_t *srds_regs =
+               (void *)CONFIG_SYS_FSL_CORENET_SERDES_ADDR;
+       unsigned long long end_tick;
+       u32 rstctl;
+
+       /* wait for reset complete or 1-second timeout */
+       end_tick = usec2ticks(1000000) + get_ticks();
+       do {
+               rstctl = in_be32(&srds_regs->bank[bank].rstctl);
+               if (rstctl & SRDS_RSTCTL_RSTDONE)
+                       break;
+       } while (end_tick > get_ticks());
+
+       if (!(rstctl & SRDS_RSTCTL_RSTDONE))
+               printf("SERDES: timeout resetting bank %u\n", bank + 1);
+}
+
+
+void __soc_serdes_init(void)
+{
+       /* Allow for SoC-specific initialization in <SOC>_serdes.c  */
+};
+void soc_serdes_init(void) __attribute__((weak, alias("__soc_serdes_init")));
+
 void fsl_serdes_init(void)
 {
        ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
@@ -393,7 +496,6 @@ void fsl_serdes_init(void)
        serdes_corenet_t *srds_regs;
        int lane, bank, idx;
        enum srds_prtcl lane_prtcl;
-       long long end_tick;
        int have_bank[SRDS_MAX_BANK] = {};
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
        u32 serdes8_devdisr = 0;
@@ -402,8 +504,8 @@ void fsl_serdes_init(void)
        const char *srds_lpd_arg;
        size_t arglen;
 #endif
-#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES9
-       enum srds_prtcl device;
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001
+       int need_serdes_a001;   /* TRUE == need work-around for SERDES A001 */
 #endif
        char buffer[HWCONFIG_BUFFER_SIZE];
        char *buf = NULL;
@@ -429,6 +531,17 @@ void fsl_serdes_init(void)
        }
 
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
+       /*
+        * Display a warning if banks two and three are not disabled in the RCW,
+        * since our work-around for SERDES8 depends on these banks being
+        * disabled at power-on.
+        */
+#define B2_B3 (FSL_CORENET_RCWSRn_SRDS_LPD_B2 | FSL_CORENET_RCWSRn_SRDS_LPD_B3)
+       if ((in_be32(&gur->rcwsr[5]) & B2_B3) != B2_B3) {
+               printf("Warning: SERDES8 requires banks two and "
+                      "three to be disabled in the RCW\n");
+       }
+
        /*
         * Store the values of the fsl_srds_lpd_b2 and fsl_srds_lpd_b3
         * hwconfig options into the srds_lpd_b[] array.  See README.p4080ds
@@ -442,6 +555,14 @@ void fsl_serdes_init(void)
                        srds_lpd_b[bank] =
                                simple_strtoul(srds_lpd_arg, NULL, 0) & 0xf;
        }
+
+       if ((cfg == 0xf) || (cfg == 0x10)) {
+               /*
+                * For SERDES protocols 0xF and 0x10, force bank 3 to be
+                * disabled, because it is not supported.
+                */
+               srds_lpd_b[FSL_SRDS_BANK_3] = 0xF;
+       }
 #endif
 
        /* Look for banks with all lanes disabled, and power down the bank. */
@@ -453,6 +574,8 @@ void fsl_serdes_init(void)
                }
        }
 
+       soc_serdes_init();
+
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
        /*
         * Bank two uses the clock from bank three, so if bank two is enabled,
@@ -462,11 +585,35 @@ void fsl_serdes_init(void)
                have_bank[FSL_SRDS_BANK_3] = 1;
 #endif
 
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001
+       /*
+        * The work-aroud for erratum SERDES-A001 is needed only if bank two
+        * is disabled and bank three is enabled.  The converse is also true,
+        * but SERDES8 ensures that bank 3 is always enabled if bank 2 is
+        * enabled, so there's no point in complicating the code to handle
+        * that situation.
+        */
+       need_serdes_a001 =
+               !have_bank[FSL_SRDS_BANK_2] && have_bank[FSL_SRDS_BANK_3];
+#endif
+
+       /* Power down the banks we're not interested in */
        for (bank = 0; bank < SRDS_MAX_BANK; bank++) {
                if (!have_bank[bank]) {
                        printf("SERDES: bank %d disabled\n", bank + 1);
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001
+                       /*
+                        * Erratum SERDES-A001 says bank two needs to be powered
+                        * down after bank three is powered up, so don't power
+                        * down bank two here.
+                        */
+                       if (!need_serdes_a001 || (bank != FSL_SRDS_BANK_2))
+                               setbits_be32(&srds_regs->bank[bank].rstctl,
+                                            SRDS_RSTCTL_SDPD);
+#else
                        setbits_be32(&srds_regs->bank[bank].rstctl,
                                     SRDS_RSTCTL_SDPD);
+#endif
                }
        }
 
@@ -492,6 +639,35 @@ void fsl_serdes_init(void)
                printf("%s ", serdes_prtcl_str[lane_prtcl]);
 #endif
 
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES9
+               /*
+                * Set BnTTLCRy0[FLT_SEL] = 000011 and set BnTTLCRy0[17] = 1 for
+                * each of the SerDes lanes selected as SGMII, XAUI, SRIO, or
+                * AURORA before the device is initialized.
+                */
+               switch (lane_prtcl) {
+               case SGMII_FM1_DTSEC1:
+               case SGMII_FM1_DTSEC2:
+               case SGMII_FM1_DTSEC3:
+               case SGMII_FM1_DTSEC4:
+               case SGMII_FM2_DTSEC1:
+               case SGMII_FM2_DTSEC2:
+               case SGMII_FM2_DTSEC3:
+               case SGMII_FM2_DTSEC4:
+               case XAUI_FM1:
+               case XAUI_FM2:
+               case SRIO1:
+               case SRIO2:
+               case AURORA:
+                       clrsetbits_be32(&srds_regs->lane[idx].ttlcr0,
+                                       SRDS_TTLCR0_FLT_SEL_MASK,
+                                       SRDS_TTLCR0_FLT_SEL_750PPM |
+                                       SRDS_TTLCR0_PM_DIS);
+               default:
+                       break;
+               }
+#endif
+
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
                switch (lane_prtcl) {
                case PCIE1:
@@ -538,24 +714,12 @@ void fsl_serdes_init(void)
                                            FSL_CORENET_DEVDISR2_DTSEC2_4;
                        break;
                case XAUI_FM1:
+                       serdes8_devdisr2 |= FSL_CORENET_DEVDISR2_FM1    |
+                                           FSL_CORENET_DEVDISR2_10GEC1;
+                       break;
                case XAUI_FM2:
-#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES9
-                       /*
-                        * Set BnTTLCRy0[FLT_SEL] = 000011 and set
-                        * BnTTLCRy0[17] = 1 for each of the SerDes lanes
-                        * selected as XAUI on each bank before XAUI is
-                        * initialized.
-                        */
-                       clrsetbits_be32(&srds_regs->lane[idx].ttlcr0,
-                                       SRDS_TTLCR0_FLT_SEL_MASK,
-                                       0x03000000 | SRDS_TTLCR0_PM_DIS);
-#endif
-                       if (lane_prtcl == XAUI_FM1)
-                               serdes8_devdisr2 |= FSL_CORENET_DEVDISR2_FM1    |
-                                                   FSL_CORENET_DEVDISR2_10GEC1;
-                       else
-                               serdes8_devdisr2 |= FSL_CORENET_DEVDISR2_FM2    |
-                                                   FSL_CORENET_DEVDISR2_10GEC2;
+                       serdes8_devdisr2 |= FSL_CORENET_DEVDISR2_FM2    |
+                                           FSL_CORENET_DEVDISR2_10GEC2;
                        break;
                case AURORA:
                        break;
@@ -570,11 +734,11 @@ void fsl_serdes_init(void)
        puts("\n");
 #endif
 
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A005
+       p4080_erratum_serdes_a005(srds_regs, cfg);
 #endif
 
        for (idx = 0; idx < SRDS_MAX_BANK; idx++) {
-               u32 rstctl;
-
                bank = idx;
 
 #ifdef CONFIG_SYS_P4080_ERRATUM_SERDES8
@@ -605,33 +769,19 @@ void fsl_serdes_init(void)
                        p4080_erratum_serdes8(srds_regs, gur, serdes8_devdisr,
                                              serdes8_devdisr2, cfg);
                } else if (idx == 2) {
-                       /* Eable bank two now that bank three is enabled. */
+                       /* Enable bank two now that bank three is enabled. */
                        enable_bank(gur, FSL_SRDS_BANK_2);
                }
 #endif
 
-               /* reset banks for errata */
-               setbits_be32(&srds_regs->bank[bank].rstctl, SRDS_RSTCTL_RST);
-
-               /* wait for reset complete or 1-second timeout */
-               end_tick = usec2ticks(1000000) + get_ticks();
-               do {
-                       rstctl = in_be32(&srds_regs->bank[bank].rstctl);
-                       if (rstctl & SRDS_RSTCTL_RSTDONE)
-                               break;
-               } while (end_tick > get_ticks());
-
-               if (!(rstctl & SRDS_RSTCTL_RSTDONE)) {
-                       printf("SERDES: timeout resetting bank %d\n",
-                              bank + 1);
-                       continue;
-               }
+               wait_for_rstdone(bank);
        }
 
-#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES9
-       for (device = XAUI_FM1; device <= XAUI_FM2; device++) {
-               if (is_serdes_configured(device))
-                       __serdes_reset_rx(srds_regs, cfg, device);
+#ifdef CONFIG_SYS_P4080_ERRATUM_SERDES_A001
+       if (need_serdes_a001) {
+               /* Bank 3 has been enabled, so now we can disable bank 2 */
+               setbits_be32(&srds_regs->bank[FSL_SRDS_BANK_2].rstctl,
+                            SRDS_RSTCTL_SDPD);
        }
 #endif
 }