powerpc/mpc85xx: Add workaround for erratum A006379
PATCH v3 1/1 powerpc/mpc85xx: Add workaround for erratum A006379
Erratum A006379 says CPCHDBCR0 bit field [10:14] has incorrect default value after POR. The workaround is to set this field before enabling CPC to 0x1e.
Erratum A006379 applies to
T4240 rev 1.0 B4860 rev 1.0, 2.0
Signed-off-by York Sun <[email protected]>
---
Change log:
v3: Include <asm/processor.h> in fsl_errata.h
Even it is likely included in the callers' file, it is clear the needed macros are defined.
v2: Add a list of SoC impacted by this erratum
Add a function to detect whether workaround should be applied at runtime Add fsl_errata.h to host the prototype of the new function
arch/powerpc/cpu/mpc85xx/cmd_errata.c | 5 +++++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 7 +++++++ arch/powerpc/include/asm/config_mpc85xx.h | 2 ++ arch/powerpc/include/asm/fsl_errata.h | 25 +++++++++++++++++++++++++ arch/powerpc/include/asm/immap_85xx.h | 1 + 5 files changed, 40 insertions(+) create mode 100644 arch/powerpc/include/asm/fsl_errata.h
arch/powerpc/cpu/mpc85xx/cmd_errata.c +5 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> #include <linux/compiler.h> +#include <asm/fsl_errata.h> #include <asm/processor.h> #include "fsl_corenet_serdes.h"
@@ -245,6 +246,10 @@ static int do_errata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])#ifdef CONFIG_SYS_FSL_ERRATUM_A006593 puts ("Work-around for Erratum A006593 enabled\n" );#endif +#ifdef CONFIG_SYS_FSL_ERRATUM_A006379 +if (has_erratum_a006379 ()) +puts ("Work-around for Erratum A006379 enabled\n" ); +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_SEC_A003571 if (IS_SVR_REV (svr,1 ,0 ))puts ("Work-around for Erratum A003571 enabled\n" );
arch/powerpc/cpu/mpc85xx/cpu_init.c +7 -0
@@ -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>
@@ -160,6 +161,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 */
arch/powerpc/include/asm/config_mpc85xx.h +2 -0
@@ -593,6 +593,7 @@#define CONFIG_SYS_FSL_ERRATUM_A004468 #define CONFIG_SYS_FSL_ERRATUM_A_004934 #define CONFIG_SYS_FSL_ERRATUM_A005871 +#define CONFIG_SYS_FSL_ERRATUM_A006379 #define CONFIG_SYS_FSL_ERRATUM_A006593 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000#define CONFIG_SYS_FSL_PCI_VER_3_X
@@ -617,6 +618,7 @@#define CONFIG_SYS_FSL_USB1_PHY_ENABLE #define CONFIG_SYS_FSL_ERRATUM_A_004934 #define CONFIG_SYS_FSL_ERRATUM_A005871 +#define CONFIG_SYS_FSL_ERRATUM_A006379 #define CONFIG_SYS_FSL_ERRATUM_A006593 #define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
arch/powerpc/include/asm/fsl_errata.h new file +25 -0
@@ -0,0 +1,25 @@ +/* +* Copyright 2013 Freescale Semiconductor, Inc. +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _ASM_FSL_ERRATA_H +#define _ASM_FSL_ERRATA_H + +#include <common.h> +#include <asm/processor.h> + +#ifdef CONFIG_SYS_FSL_ERRATUM_A006379 +static inline bool has_erratum_a006379 (void ) +{ +u32 svr =get_svr (); +if (((SVR_SOC_VER (svr) ==SVR_T4240 ) &&SVR_MAJ (svr) <=1 ) || + ((SVR_SOC_VER (svr) ==SVR_B4860 ) &&SVR_MAJ (svr) <=2 )) +return true; + +return false; +} +#endif + +#endif
arch/powerpc/include/asm/immap_85xx.h +1 -0
@@ -1671,6 +1671,7 @@ typedef struct cpc_corenet {#define CPC_HDBCR0_CDQ_SPEC_DIS 0x08000000#define CPC_HDBCR0_TAG_ECC_SCRUB_DIS 0x01000000#define CPC_HDBCR0_DATA_ECC_SCRUB_DIS 0x00400000 +#define CPC_HDBCR0_SPLRU_LEVEL_EN 0x003c0000#endif /* CONFIG_SYS_FSL_CPC */ /* Global Utilities Block */
Signature · 1 line
1.7.9.5