powerpc/usb: Workaround for erratum-A006261

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc85xx / cpu_init.c

diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 6036333eaa72fba3ac3e3378d42abb06dce12d6e..81aeadd363feade245665a6cf98f94ec378d0594 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -19,6 +19,7 @@
 #include <asm/io.h>
 #include <asm/cache.h>
 #include <asm/mmu.h>
+#include <asm/fsl_errata.h>
 #include <asm/fsl_law.h>
 #include <asm/fsl_serdes.h>
 #include <asm/fsl_srio.h>
@@ -35,6 +36,54 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_SYS_FSL_ERRATUM_A006261
+void fsl_erratum_a006261_workaround(struct ccsr_usb_phy __iomem *usb_phy)
+{
+#ifdef CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE
+       u32 xcvrprg = in_be32(&usb_phy->port1.xcvrprg);
+
+       /* Increase Disconnect Threshold by 50mV */
+       xcvrprg &= ~CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_MASK |
+                                               INC_DCNT_THRESHOLD_50MV;
+       /* Enable programming of USB High speed Disconnect threshold */
+       xcvrprg |= CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_EN;
+       out_be32(&usb_phy->port1.xcvrprg, xcvrprg);
+
+       xcvrprg = in_be32(&usb_phy->port2.xcvrprg);
+       /* Increase Disconnect Threshold by 50mV */
+       xcvrprg &= ~CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_MASK |
+                                               INC_DCNT_THRESHOLD_50MV;
+       /* Enable programming of USB High speed Disconnect threshold */
+       xcvrprg |= CONFIG_SYS_FSL_USB_XCVRPRG_HS_DCNT_PROG_EN;
+       out_be32(&usb_phy->port2.xcvrprg, xcvrprg);
+#else
+
+       u32 temp = 0;
+       u32 status = in_be32(&usb_phy->status1);
+
+       u32 squelch_prog_rd_0_2 =
+               (status >> CONFIG_SYS_FSL_USB_SQUELCH_PROG_RD_0)
+                       & CONFIG_SYS_FSL_USB_SQUELCH_PROG_MASK;
+
+       u32 squelch_prog_rd_3_5 =
+               (status >> CONFIG_SYS_FSL_USB_SQUELCH_PROG_RD_3)
+                       & CONFIG_SYS_FSL_USB_SQUELCH_PROG_MASK;
+
+       setbits_be32(&usb_phy->config1,
+                    CONFIG_SYS_FSL_USB_HS_DISCNCT_INC);
+       setbits_be32(&usb_phy->config2,
+                    CONFIG_SYS_FSL_USB_RX_AUTO_CAL_RD_WR_SEL);
+
+       temp = squelch_prog_rd_0_2 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_0;
+       out_be32(&usb_phy->config2, in_be32(&usb_phy->config2) | temp);
+
+       temp = squelch_prog_rd_3_5 << CONFIG_SYS_FSL_USB_SQUELCH_PROG_WR_3;
+       out_be32(&usb_phy->config2, in_be32(&usb_phy->config2) | temp);
+#endif
+}
+#endif
+
+
 #ifdef CONFIG_QE
 extern qe_iop_conf_t qe_iop_conf_tab[];
 extern void qe_config_iopin(u8 port, u8 pin, int dir,
@@ -160,6 +209,12 @@ static void enable_cpc(void)
 #ifdef CONFIG_SYS_FSL_ERRATUM_A006593
                setbits_be32(&cpc->cpchdbcr0, 1 << (31 - 21));
 #endif
+#ifdef CONFIG_SYS_FSL_ERRATUM_A006379
+               if (has_erratum_a006379()) {
+                       setbits_be32(&cpc->cpchdbcr0,
+                                    CPC_HDBCR0_SPLRU_LEVEL_EN);
+               }
+#endif
 
                out_be32(&cpc->cpccsr0, CPC_CSR0_CE | CPC_CSR0_PE);
                /* Read back to sync write */
@@ -284,7 +339,7 @@ static void __fsl_serdes__init(void)
 }
 __attribute__((weak, alias("__fsl_serdes__init"))) void fsl_serdes_init(void);
 
-#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2
+#if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
 int enable_cluster_l2(void)
 {
        int i = 0;
@@ -350,7 +405,7 @@ int cpu_init_r(void)
 #endif
 #ifdef CONFIG_L2_CACHE
        ccsr_l2cache_t *l2cache = (void __iomem *)CONFIG_SYS_MPC85xx_L2_ADDR;
-#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
+#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
        struct ccsr_cluster_l2 * l2cache = (void __iomem *)CONFIG_SYS_FSL_CLUSTER_1_L2;
 #endif
 #if defined(CONFIG_PPC_SPINTABLE_COMPATIBLE) && defined(CONFIG_MP)
@@ -533,7 +588,7 @@ int cpu_init_r(void)
        }
 
 skip_l2:
-#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
+#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && defined(CONFIG_E6500)
        if (l2cache->l2csr0 & L2CSR0_L2E)
                print_size((l2cache->l2cfg0 & 0x3fff) * 64 * 1024,
                           " enabled\n");
@@ -618,6 +673,10 @@ skip_l2:
        {
                struct ccsr_usb_phy __iomem *usb_phy1 =
                        (void *)CONFIG_SYS_MPC85xx_USB1_PHY_ADDR;
+#ifdef CONFIG_SYS_FSL_ERRATUM_A006261
+               if (has_erratum_a006261())
+                       fsl_erratum_a006261_workaround(usb_phy1);
+#endif
                out_be32(&usb_phy1->usb_enable_override,
                                CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
        }
@@ -626,6 +685,10 @@ skip_l2:
        {
                struct ccsr_usb_phy __iomem *usb_phy2 =
                        (void *)CONFIG_SYS_MPC85xx_USB2_PHY_ADDR;
+#ifdef CONFIG_SYS_FSL_ERRATUM_A006261
+               if (has_erratum_a006261())
+                       fsl_erratum_a006261_workaround(usb_phy2);
+#endif
                out_be32(&usb_phy2->usb_enable_override,
                                CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
        }
@@ -665,8 +728,14 @@ skip_l2:
                             CONFIG_SYS_FSL_USB_DRVVBUS_CR_EN);
                setbits_be32(&usb_phy->port2.pwrfltcfg,
                             CONFIG_SYS_FSL_USB_PWRFLT_CR_EN);
+
+#ifdef CONFIG_SYS_FSL_ERRATUM_A006261
+               if (has_erratum_a006261())
+                       fsl_erratum_a006261_workaround(usb_phy);
 #endif
 
+#endif /* CONFIG_SYS_FSL_USB_DUAL_PHY_ENABLE */
+
 #ifdef CONFIG_FMAN_ENET
        fman_enet_init();
 #endif