ARM: OMAP3-DRA7: CP15 erratum workarounds and improvements
Subsystems (2)
v2 cover ARM: OMAP3-DRA7: CP15 erratum workarounds and improvements
Hi,
uggh.. realized that u-boot mailing list does not like too many recipients.. So, just tom and list this time.. Sorry for the spam
V1: http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/212174
V2 of this series is a culmination of
a) bunch of refactoring to ensure common code in generic logic - cpuid mostly
b) split the arm generic patch (patch #4 out.. to allow independent review)
c) Saw a chance to incorporate OMAP3 into the same framework, and in fact can exactly allow exynos also do the job: https://patchwork.ozlabs.org/patch/440852/A
https://patchwork.ozlabs.org/patch/442646/
https://patchwork.ozlabs.org/patch/442297/
(obviously the code has changed since the original omap3 implementation)
Carrying on the blurb as posted previously :)
Triggered by a user report, it was seen that recommended errata workaround and performance trade-offs as recommended by TI architects for ARM configuration was not being followed in OMAP5+ ARM A15 platforms in u-boot configuration. Note OMAP5, DRA7 all share the same cortex A15 revision (ID=0x412fc0f2) and the workarounds and improvement configurations apply equally.
Certain errata workaround done in this series obviously have the controversy potential considering that each of the SoCs implement workaround based on secure monitor calls, but both the service requested and the parameters of secure monitor calls can be widely variant. Examples:
OMAP family of processors have quite the family of SMC calls:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-omap2/omap-smc.S
meanwhile Exynos has a much simpler invocation:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mach-exynos/exynos-smc.S
To maintain some resemblance of symmetry the following series introduces a arch/machine dependent errata macro which must be enabled prior to any of such workarounds can be implemented.
I am open to better ways of doing this which might benefit others in ARM community with similar needs. Lets discuss.
These patches are based on: v2015.04-rc1 but also apply on latest master.
Note:(OMAP3 is just build tested.. as I stated previously)
./MAKEALL -s omap3
v2015.04-rc1: http://pastebin.ubuntu.com/10397352/
v2015.04-rc1+ this series: http://pastebin.ubuntu.com/10397267/
(same sets of failures of build - no regressions introduced that I could see).
Angela Stegmaier (1):
configs: ti_omap5_common: Enable workaround for ARM errata 798870
Nishanth Menon (7):
ARM: OMAP: Change set_pl310_ctrl_reg to be generic
ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs
ARM: OMAP3: Get rid of omap3_gp_romcode_call and replace with
omap_smc1
ARM: Provide a mechanism to invoke SoC specific errata WA for CP15
ARM: OMAP3: Introduce OMAP3 Cortex-A8 revision specific errata
configs: ti_omap3_common: Enable workaround for ARM errata 454179,
430973, 621766
ARM: OMAP5 / DRA7: Setup L2 Aux Control Register with recommended
configuration
Praveen Rao (1):
ARM: DRA7 / OMAP5: Add workaround for ARM errata 798870
README | 9 ++++
arch/arm/cpu/armv7/omap-common/Makefile | 2 +-
arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 15 ++++--
arch/arm/cpu/armv7/omap3/board.c | 24 ++--------
arch/arm/cpu/armv7/omap3/lowlevel_init.S | 48 +++++++++++++++-----
arch/arm/cpu/armv7/omap4/hwinit.c | 4 +-
arch/arm/cpu/armv7/omap5/Makefile | 1 +
arch/arm/cpu/armv7/omap5/hwinit.c | 16 +++++++
arch/arm/cpu/armv7/omap5/lowlevel_init.S | 46 +++++++++++++++++++
arch/arm/cpu/armv7/start.S | 14 ++++++
.../arm/include/asm/arch-omap3/{omap3.h => omap.h} | 0
arch/arm/include/asm/arch-omap3/sys_proto.h | 3 +-
arch/arm/include/asm/arch-omap4/sys_proto.h | 5 +-
arch/arm/include/asm/arch-omap5/sys_proto.h | 4 ++
include/configs/am3517_crane.h | 2 +-
include/configs/am3517_evm.h | 2 +-
include/configs/cm_t35.h | 2 +-
include/configs/cm_t3517.h | 2 +-
include/configs/dig297.h | 2 +-
include/configs/mcx.h | 2 +-
include/configs/nokia_rx51.h | 2 +-
include/configs/omap3_evm.h | 2 +-
include/configs/omap3_evm_quick_mmc.h | 2 +-
include/configs/omap3_evm_quick_nand.h | 2 +-
include/configs/omap3_logic.h | 2 +-
include/configs/omap3_mvblx.h | 2 +-
include/configs/omap3_pandora.h | 2 +-
include/configs/omap3_sdp3430.h | 2 +-
include/configs/omap3_zoom1.h | 2 +-
include/configs/tam3517-common.h | 2 +-
include/configs/tao3530.h | 2 +-
include/configs/ti_omap3_common.h | 8 +++-
include/configs/ti_omap5_common.h | 4 ++
include/configs/tricorder.h | 2 +-
34 files changed, 178 insertions(+), 61 deletions(-)
create mode 100644 arch/arm/cpu/armv7/omap5/lowlevel_init.S
rename arch/arm/include/asm/arch-omap3/{omap3.h => omap.h} (100%)Regards,
Nishanth Menon
Signature · 1 line
1.7.9.5
PATCH v2 1/9 ARM: OMAP: Change set_pl310_ctrl_reg to be generic
set_pl310_ctrl_reg does use the Secure Monitor Call (SMC) to setup PL310 control register, however, that is something that is generic enough to be used for OMAP5 generation of processors as well. The only difference being the service being invoked for the function.
So, convert the service to a macro and use a generic name (same as that used in Linux for some consistency). While at that, also add a data barrier which is necessary as per recommendation.
--- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 13 ++++++++----- arch/arm/cpu/armv7/omap4/hwinit.c | 4 ++-- arch/arm/include/asm/arch-omap4/sys_proto.h | 5 ++++- 3 files changed, 14 insertions(+), 8 deletions(-)
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +8 -5
@@ -22,11 +22,14 @@ ENTRY(save_boot_params) bx lr ENDPROC(save_boot_params) -ENTRY(set_pl310_ctrl_reg) - PUSH {r4-r11, lr} @ save registers - ROM code may pollute +ENTRY(omap_smc1) + PUSH {r4-r12, lr} @ save registers - ROM code may pollute @ our registers - LDR r12, =0x102 @ Set PL310 control register - value in R0 + MOV r12, r0 @ Service + MOV r0, r1 @ Argument + DSB + DMB .word 0xe1600070 @ SMC #0 - hand assembled because -march=armv5 @ call ROM Code API to set control register - POP {r4-r11, pc} -ENDPROC(set_pl310_ctrl_reg) + POP {r4-r12, pc} +ENDPROC(omap_smc1)
arch/arm/cpu/armv7/omap4/hwinit.c +2 -2
@@ -159,11 +159,11 @@ void init_omap_revision(void)#ifndef CONFIG_SYS_L2CACHE_OFF void v7_outer_cache_enable (void ) { -set_pl310_ctrl_reg (1 ); +omap_smc1 (OMAP4_SERVICE_PL310_CONTROL_REG_SET ,1 ); }void v7_outer_cache_disable (void ) { -set_pl310_ctrl_reg (0 ); +omap_smc1 (OMAP4_SERVICE_PL310_CONTROL_REG_SET ,0 ); }#endif /* !CONFIG_SYS_L2CACHE_OFF */
arch/arm/include/asm/arch-omap4/sys_proto.h +4 -1
@@ -37,7 +37,7 @@ void do_set_mux(u32 base, struct pad_conf_entry const *array, int size);void set_muxconf_regs_essential (void );u32 wait_on_value (u32 ,u32 ,void *,u32 );void sdelay (unsigned long ); -void set_pl310_ctrl_reg (u32 val); +void omap_smc1 (u32 service,u32 val);void setup_clocks_for_console (void );void prcm_init (void );void bypass_dpll (u32 const base);
@@ -57,4 +57,7 @@ int omap_vc_bypass_send_value(u8 sa, u8 reg_addr, u8 reg_data);u32 warm_reset (void );void force_emif_self_refresh (void );void setup_warmreset_time (void ); + +#define OMAP4_SERVICE_PL310_CONTROL_REG_SET 0x102 +#endif
Signature · 1 line
1.7.9.5
PATCH v2 2/9 ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs
In reply to Nishanth MenonThis is in preperation of using generic cross OMAP code.
---
.../arm/include/asm/arch-omap3/{omap3.h => omap.h} | 0
include/configs/am3517_crane.h | 2 +-
include/configs/am3517_evm.h | 2 +-
include/configs/cm_t35.h | 2 +-
include/configs/cm_t3517.h | 2 +-
include/configs/dig297.h | 2 +-
include/configs/mcx.h | 2 +-
include/configs/nokia_rx51.h | 2 +-
include/configs/omap3_evm.h | 2 +-
include/configs/omap3_evm_quick_mmc.h | 2 +-
include/configs/omap3_evm_quick_nand.h | 2 +-
include/configs/omap3_logic.h | 2 +-
include/configs/omap3_mvblx.h | 2 +-
include/configs/omap3_pandora.h | 2 +-
include/configs/omap3_sdp3430.h | 2 +-
include/configs/omap3_zoom1.h | 2 +-
include/configs/tam3517-common.h | 2 +-
include/configs/tao3530.h | 2 +-
include/configs/ti_omap3_common.h | 2 +-
include/configs/tricorder.h | 2 +-
20 files changed, 19 insertions(+), 19 deletions(-)
rename arch/arm/include/asm/arch-omap3/{omap3.h => omap.h} (100%)arch/arm/include/asm/arch-omap3/omap.h renamed from arch/arm/include/asm/arch-omap3/omap3.h +0 -0
include/configs/am3517_crane.h +1 -1
@@ -23,7 +23,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/am3517_evm.h +1 -1
@@ -23,7 +23,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/cm_t35.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/cm_t3517.h +1 -1
@@ -30,7 +30,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/dig297.h +1 -1
@@ -36,7 +36,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/mcx.h +1 -1
@@ -26,7 +26,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #define CONFIG_OF_LIBFDT #define CONFIG_FIT
include/configs/nokia_rx51.h +1 -1
@@ -42,7 +42,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #include <asm/arch/mem.h> #include <linux/stringify.h>
include/configs/omap3_evm.h +1 -1
@@ -18,7 +18,7 @@#define __OMAP3EVM_CONFIG_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands
include/configs/omap3_evm_quick_mmc.h +1 -1
@@ -13,7 +13,7 @@#define __OMAP3_EVM_QUICK_MMC_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands
include/configs/omap3_evm_quick_nand.h +1 -1
@@ -13,7 +13,7 @@#define __OMAP3_EVM_QUICK_NAND_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands
include/configs/omap3_logic.h +1 -1
@@ -24,7 +24,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/omap3_mvblx.h +1 -1
@@ -27,7 +27,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/omap3_pandora.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/omap3_sdp3430.h +1 -1
@@ -27,7 +27,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * NOTE: these #defines presume standard SDP jumper settings.
include/configs/omap3_zoom1.h +1 -1
@@ -22,7 +22,7 @@#define CONFIG_NAND #define CONFIG_NR_DRAM_BANKS 2/* CS1 may or may not be populated */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #include <configs/ti_omap3_common.h> /* Remove SPL boot option - we do not support that on LDP yet */
include/configs/tam3517-common.h +1 -1
@@ -25,7 +25,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/tao3530.h +1 -1
@@ -27,7 +27,7 @@#define CONFIG_SDRC /* Has an SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information
include/configs/ti_omap3_common.h +1 -1
@@ -16,7 +16,7 @@#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #ifndef CONFIG_SPL_BUILD # define CONFIG_DM
include/configs/tricorder.h +1 -1
@@ -32,7 +32,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #define CONFIG_SYS_GENERIC_BOARD
Signature · 1 line
1.7.9.5
PATCH v2 2/9 ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 1 line
This is in preperation of using generic cross OMAP code.
I found it a bit confusing at first, since as far as I could see, this series does not introduce any cross-omap header (omap_smc1's prototype is being defined and duplicated in each arch-omap[345]/sys_proto.h, so there could be a need for one).
However, since this is the naming scheme using in arch-omap[45], I'm fine with the renaming just for the sake of consistency.
Do I get to add a Reviewed-By field?
Quoted 268 lines
Signed-off-by Nishanth Menon <[email protected]>--- .../arm/include/asm/arch-omap3/{omap3.h => omap.h} | 0 include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/cm_t3517.h | 2 +- include/configs/dig297.h | 2 +- include/configs/mcx.h | 2 +- include/configs/nokia_rx51.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/omap3_evm_quick_mmc.h | 2 +- include/configs/omap3_evm_quick_nand.h | 2 +- include/configs/omap3_logic.h | 2 +- include/configs/omap3_mvblx.h | 2 +- include/configs/omap3_pandora.h | 2 +- include/configs/omap3_sdp3430.h | 2 +- include/configs/omap3_zoom1.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/ti_omap3_common.h | 2 +- include/configs/tricorder.h | 2 +- 20 files changed, 19 insertions(+), 19 deletions(-) rename arch/arm/include/asm/arch-omap3/{omap3.h => omap.h} (100%)arch/arm/include/asm/arch-omap3/omap.h renamed from arch/arm/include/asm/arch-omap3/omap3.h +0
-0include/configs/am3517_crane.h +1
-1@@ -23,7 +23,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/am3517_evm.h +1
-1@@ -23,7 +23,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/cm_t35.h +1
-1@@ -30,7 +30,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/cm_t3517.h +1
-1@@ -30,7 +30,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/dig297.h +1
-1@@ -36,7 +36,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/mcx.h +1
-1@@ -26,7 +26,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #define CONFIG_OF_LIBFDT #define CONFIG_FIT include/configs/nokia_rx51.h +1
-1@@ -42,7 +42,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #include <asm/arch/mem.h> #include <linux/stringify.h> include/configs/omap3_evm.h +1
-1@@ -18,7 +18,7 @@#define __OMAP3EVM_CONFIG_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands include/configs/omap3_evm_quick_mmc.h +1
-1@@ -13,7 +13,7 @@#define __OMAP3_EVM_QUICK_MMC_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands include/configs/omap3_evm_quick_nand.h +1
-1@@ -13,7 +13,7 @@#define __OMAP3_EVM_QUICK_NAND_H#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* ---------------------------------------------------------------------------- * Supported U-boot commands include/configs/omap3_logic.h +1
-1@@ -24,7 +24,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/omap3_mvblx.h +1
-1@@ -27,7 +27,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/omap3_pandora.h +1
-1@@ -21,7 +21,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/omap3_sdp3430.h +1
-1@@ -27,7 +27,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * NOTE: these #defines presume standard SDP jumper settings. include/configs/omap3_zoom1.h +1
-1@@ -22,7 +22,7 @@#define CONFIG_NAND #define CONFIG_NR_DRAM_BANKS 2/* CS1 may or may not be populated */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #include <configs/ti_omap3_common.h> /* Remove SPL boot option - we do not support that on LDP yet */ include/configs/tam3517-common.h +1
-1@@ -25,7 +25,7 @@#define CONFIG_EMIF4 /* The chip has EMIF4 controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/tao3530.h +1
-1@@ -27,7 +27,7 @@#define CONFIG_SDRC /* Has an SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> /* * Display CPU and Board information include/configs/ti_omap3_common.h +1
-1@@ -16,7 +16,7 @@#include <asm/arch/cpu.h> -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #ifndef CONFIG_SPL_BUILD # define CONFIG_DM include/configs/tricorder.h +0
-0
include/configs/tricorder.h line 38
Quoted 8 lines
include/configs/tricorder.h +1
-1@@ -32,7 +32,7 @@#define CONFIG_SDRC /* The chip has SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ -#include <asm/arch/omap3.h> +#include <asm/arch/omap.h> #define CONFIG_SYS_GENERIC_BOARD
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/1e030c05/attachment.sig>
PATCH v2 2/9 ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs
Quoted 10 lines · Paul Kocialkowski
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 1 line
This is in preperation of using generic cross OMAP code.
I found it a bit confusing at first, since as far as I could see, this series does not introduce any cross-omap header (omap_smc1's prototype is being defined and duplicated in each arch-omap[345]/sys_proto.h, so there could be a need for one).
However, since this is the naming scheme using in arch-omap[45], I'm fine with the renaming just for the sake of consistency.
The consolidation path is a long way, I think.. lets do that in next stage?
Quoted 2 lines
Do I get to add a Reviewed-By field?
Lets get the discussions completed, then we can.. I think.
--
Regards,
Nishanth Menon
PATCH v2 3/9 ARM: OMAP3: Get rid of omap3_gp_romcode_call and replace with omap_smc1
In reply to Nishanth Menonomap_smc1 is now generic enough to remove duplicate omap3_gp_romcode_call logic that omap3 introduced.
As part of this change, move to using the generic lowlevel_init.S for omap3 as well.
--- arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 ++ arch/arm/cpu/armv7/omap3/board.c | 6 ++---- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 11 ----------- arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- 5 files changed, 6 insertions(+), 17 deletions(-)
arch/arm/cpu/armv7/omap-common/Makefile +1 -1
@@ -28,7 +28,7 @@ endif ifeq ($(CONFIG_OMAP34XX),) obj-y += boot-common.o -obj-y += lowlevel_init.o endif +obj-y += lowlevel_init.o obj-y += mem-common.o
arch/arm/cpu/armv7/omap-common/lowlevel_init.S +2 -0
@@ -16,11 +16,13 @@ #include <asm/arch/spl.h> #include <linux/linkage.h> +#ifndef CONFIG_OMAP34XX ENTRY(save_boot_params) ldr r1, =OMAP_SRAM_SCRATCH_BOOT_PARAMS str r0, [r1] bx lr ENDPROC(save_boot_params) +#endif ENTRY(omap_smc1) PUSH {r4-r12, lr} @ save registers - ROM code may pollute
arch/arm/cpu/armv7/omap3/board.c +2 -4
@@ -418,8 +418,7 @@ static void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) acr |= set_bits;if (get_device_type () ==GP_DEVICE ) { -omap3_gp_romcode_call (OMAP3_GP_ROMCODE_API_WRITE_ACR , - acr); +omap_smc1 (OMAP3_GP_ROMCODE_API_WRITE_ACR , acr); }else {struct emu_hal_params emu_romcode_params; emu_romcode_params.num_params =1 ;
@@ -459,8 +458,7 @@ static void omap3_update_aux_cr(u32 set_bits, u32 clear_bits)static void omap3_invalidate_l2_cache_secure (void ) {if (get_device_type () ==GP_DEVICE ) { -omap3_gp_romcode_call (OMAP3_GP_ROMCODE_API_L2_INVAL , -0 ); +omap_smc1 (OMAP3_GP_ROMCODE_API_L2_INVAL ,0 ); }else {struct emu_hal_params emu_romcode_params; emu_romcode_params.num_params =1 ;
arch/arm/cpu/armv7/omap3/lowlevel_init.S +0 -11
@@ -27,17 +27,6 @@ ENTRY(save_boot_params) ENDPROC(save_boot_params) #endif -ENTRY(omap3_gp_romcode_call) - PUSH {r4-r12, lr} @ Save all registers from ROM code! - MOV r12, r0 @ Copy the Service ID in R12 - MOV r0, r1 @ Copy parameter to R0 - mcr p15, 0, r0, c7, c10, 4 @ DSB - mcr p15, 0, r0, c7, c10, 5 @ DMB - .word 0xe1600070 @ SMC #0 to enter monitor - hand assembled - @ because we use -march=armv5 - POP {r4-r12, pc} -ENDPROC(omap3_gp_romcode_call) - /* * Funtion for making PPA HAL API calls in secure devices * Input:
arch/arm/include/asm/arch-omap3/sys_proto.h +1 -1
@@ -73,6 +73,6 @@ void power_init_r(void);void dieid_num_r (void );void get_dieid (u32 *id);void do_omap3_emu_romcode_call (u32 service_id,u32 parameters); -void omap3_gp_romcode_call (u32 service_id,u32 parameter); +void omap_smc1 (u32 service,u32 val);u32 warm_reset (void );#endif
Signature · 1 line
1.7.9.5
PATCH v2 3/9 ARM: OMAP3: Get rid of omap3_gp_romcode_call and replace with omap_smc1
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 2 lines
omap_smc1is now generic enough to remove duplicateomap3_gp_romcode_calllogic that omap3 introduced.
As far as I could see, this did not introduce any regression on my omap3630 device (omap_smc1 is used from omap3_invalidate_l2_cache_secure in my case). Looks good to me.
Quoted 94 lines
As part of this change, move to using the generic
lowlevel_init.Sfor omap3 as well.Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/lowlevel_init.S | 2 ++ arch/arm/cpu/armv7/omap3/board.c | 6 ++---- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 11 ----------- arch/arm/include/asm/arch-omap3/sys_proto.h | 2 +- 5 files changed, 6 insertions(+), 17 deletions(-)arch/arm/cpu/armv7/omap-common/Makefile +1
-1@@ -28,7 +28,7 @@ endif ifeq ($(CONFIG_OMAP34XX),) obj-y += boot-common.o -obj-y += lowlevel_init.o endif +obj-y += lowlevel_init.o obj-y += mem-common.oarch/arm/cpu/armv7/omap-common/lowlevel_init.S +2
-0@@ -16,11 +16,13 @@ #include <asm/arch/spl.h> #include <linux/linkage.h> +#ifndef CONFIG_OMAP34XX ENTRY(save_boot_params) ldr r1, =OMAP_SRAM_SCRATCH_BOOT_PARAMS str r0, [r1] bx lr ENDPROC(save_boot_params) +#endif ENTRY(omap_smc1) PUSH {r4-r12, lr} @ save registers - ROM code may pollutearch/arm/cpu/armv7/omap3/board.c +2
-4@@ -418,8 +418,7 @@ static void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) acr |= set_bits;if (get_device_type () ==GP_DEVICE ) { -omap3_gp_romcode_call (OMAP3_GP_ROMCODE_API_WRITE_ACR , - acr); +omap_smc1 (OMAP3_GP_ROMCODE_API_WRITE_ACR , acr); }else {struct emu_hal_params emu_romcode_params; emu_romcode_params.num_params =1 ;@@ -459,8 +458,7 @@ static void omap3_update_aux_cr(u32 set_bits, u32 clear_bits)static void omap3_invalidate_l2_cache_secure (void ) {if (get_device_type () ==GP_DEVICE ) { -omap3_gp_romcode_call (OMAP3_GP_ROMCODE_API_L2_INVAL , -0 ); +omap_smc1 (OMAP3_GP_ROMCODE_API_L2_INVAL ,0 ); }else {struct emu_hal_params emu_romcode_params; emu_romcode_params.num_params =1 ;arch/arm/cpu/armv7/omap3/lowlevel_init.S +0
-11@@ -27,17 +27,6 @@ ENTRY(save_boot_params) ENDPROC(save_boot_params) #endif -ENTRY(omap3_gp_romcode_call) - PUSH {r4-r12, lr} @ Save all registers from ROM code! - MOV r12, r0 @ Copy the Service ID in R12 - MOV r0, r1 @ Copy parameter to R0 - mcr p15, 0, r0, c7, c10, 4 @ DSB - mcr p15, 0, r0, c7, c10, 5 @ DMB - .word 0xe1600070 @ SMC #0 to enter monitor - hand assembled - @ because we use -march=armv5 - POP {r4-r12, pc} -ENDPROC(omap3_gp_romcode_call) - /* * Funtion for making PPA HAL API calls in secure devices * Input:arch/arm/include/asm/arch-omap3/sys_proto.h +0
-0
arch/arm/include/asm/arch-omap3/sys_proto.h void power_init_r(void); · line 78
Quoted 7 lines
arch/arm/include/asm/arch-omap3/sys_proto.h +1
-1@@ -73,6 +73,6 @@ void power_init_r(void);void dieid_num_r (void );void get_dieid (u32 *id);void do_omap3_emu_romcode_call (u32 service_id,u32 parameters); -void omap3_gp_romcode_call (u32 service_id,u32 parameter); +void omap_smc1 (u32 service,u32 val);u32 warm_reset (void );#endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/55198173/attachment.sig>
PATCH v2 4/9 ARM: Provide a mechanism to invoke SoC specific errata WA for CP15
In reply to Nishanth MenonEvery SoC has slightly different manner of setting up access to L2ACLR and similar registers since the Secure Monitor handling of Secure Monitor Call(smc) is diverse. Hence an ARCH specific macro is introduced to implement SoC specific errata workaround implementations.
--- README | 5 +++++ arch/arm/cpu/armv7/start.S | 14 ++++++++++++++ 2 files changed, 19 insertions(+)
README +5 -0
@@ -621,6 +621,11 @@ The following options need to be configured: exists, unlike the similar options in the Linux kernel. Do not set these options unless they apply! + NOTE: The following are machine specific errata that are enabled + with CONFIG_ARM_ARCH_CP15_ERRATA define. These need to have an + SoC specific implementation of the erratum workaround to + function. + - Driver Model Driver model is a new framework for devices in U-Boot introduced in early 2014. U-Boot is being progressively
arch/arm/cpu/armv7/start.S +14 -0
@@ -163,6 +163,20 @@ ENTRY(cpu_init_cp15) mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register #endif +#ifdef CONFIG_ARM_ARCH_CP15_ERRATA + mrc p15, 0, r0, c0, c0, 0 @ r0 has Read Main ID Register (MIDR) + mov r1, r0, lsr #20 @ get variant field + and r1, r1, #0xf @ r1 has CPU variant + and r2, r0, #0xf @ r2 has CPU revision + mov r3, r1, lsl #4 @ shift variant field for combined value + orr r3, r2, r3 @ r3 has combined CPU variant + revision + /* C Prototype: + * void arch_cp15_errata_workaround(u32 midr, u32 variant, + * u32 rev, u32 comb); + */ + b arch_cp15_errata_workaround @ Do Machine specific errata WAs +#endif + mov pc, lr @ back to my caller ENDPROC(cpu_init_cp15)
Signature · 1 line
1.7.9.5
PATCH v2 5/9 ARM: DRA7 / OMAP5: Add workaround for ARM errata 798870
In reply to Nishanth MenonFrom: Praveen Rao <[email protected]>
This patch adds workaround for ARM errata 798870 which says "If back-to-back speculative cache line fills (fill A and fill B) are issued from the L1 data cache of a CPU to the L2 cache, the second request (fill B) is then cancelled, and the second request would have detected a hazard against a recent write or eviction (write B) to the same cache line as fill B then the L2 logic might deadlock."
An implementation for OMAP5 and DRA7 is introduced here as well. Obviously, implementations for other SoC families such as Exynos etc will be widely different.
--- README | 1 + arch/arm/cpu/armv7/omap5/Makefile | 1 + arch/arm/cpu/armv7/omap5/lowlevel_init.S | 46 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap5/sys_proto.h | 1 + 4 files changed, 49 insertions(+) create mode 100644 arch/arm/cpu/armv7/omap5/lowlevel_init.S
README +1 -0
@@ -625,6 +625,7 @@ The following options need to be configured: with CONFIG_ARM_ARCH_CP15_ERRATA define. These need to have an SoC specific implementation of the erratum workaround to function. + CONFIG_ARM_ERRATA_798870 - Driver Model Driver model is a new framework for devices in U-Boot
arch/arm/cpu/armv7/omap5/Makefile +1 -0
@@ -11,3 +11,4 @@ obj-y += sdram.o obj-y += prcm-regs.o obj-y += hw_data.o obj-y += abb.o +obj-y += lowlevel_init.o
arch/arm/cpu/armv7/omap5/lowlevel_init.S new file +46 -0
46 lines not on this page · raw message
arch/arm/include/asm/arch-omap5/sys_proto.h +1 -0
@@ -56,6 +56,7 @@ void force_emif_self_refresh(void);void get_ioregs (const struct ctrl_ioregs **regs);void srcomp_enable (void );void setup_warmreset_time (void ); +void omap_smc1 (u32 service,u32 val);static inline u32 div_round_up (u32 num,u32 den) {
Signature · 1 line
1.7.9.5
PATCH v2 6/9 configs: ti_omap5_common: Enable workaround for ARM errata 798870
In reply to Nishanth MenonFrom: Angela Stegmaier <[email protected]>
Enable the workaround for ARM errata 798870 for OMAP5 and DRA7xx since they are Coretx-A15 r2.
--- include/configs/ti_omap5_common.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/ti_omap5_common.h +4 -0
@@ -21,6 +21,10 @@#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ARCH_CPU_INIT +/* Common ARM Erratas */ +#define CONFIG_ARM_ARCH_CP15_ERRATA +#define CONFIG_ARM_ERRATA_798870 +#define CONFIG_SYS_CACHELINE_SIZE 64/* Use General purpose timer 1 */
Signature · 1 line
1.7.9.5
PATCH v2 7/9 ARM: OMAP3: Introduce OMAP3 Cortex-A8 revision specific errata
In reply to Nishanth Menon430973: Stale prediction on replaced inter working branch causes
Cortex-A8 to execute in the wrong ARM/Thumb state
Impacts: Everything lower than r2p1
Work around: Set IBE to 1
454179: Stale prediction may inhibit target address misprediction on
next predicted taken branch
Impacts: Everything lower than r2p1
Work around: Set IBE and disable branch size mispredict to 1
621766: Under a specific set of conditions, executing a sequence of
NEON or vfp load instructions can cause processor deadlock
Impacts: Everything lower than r2p1
Work around: Set L1NEON to 1
Since the OMAP3 generation of processors have a wide variety of CPU revisions, it is more logical to enforce an implementation using revision checks.
--- README | 3 +++ arch/arm/cpu/armv7/omap3/board.c | 2 +- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 37 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap3/sys_proto.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-)
README +3 -0
@@ -625,6 +625,9 @@ The following options need to be configured: with CONFIG_ARM_ARCH_CP15_ERRATA define. These need to have an SoC specific implementation of the erratum workaround to function. + CONFIG_ARM_ERRATA_430973 + CONFIG_ARM_ERRATA_454179 + CONFIG_ARM_ERRATA_621766 CONFIG_ARM_ERRATA_798870 - Driver Model
arch/arm/cpu/armv7/omap3/board.c +1 -1
@@ -408,7 +408,7 @@ static void omap3_emu_romcode_call(u32 service_id, u32 *parameters)do_omap3_emu_romcode_call (service_id,OMAP3_PUBLIC_SRAM_SCRATCH_AREA ); } -static void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) {u32 acr;
arch/arm/cpu/armv7/omap3/lowlevel_init.S +37 -0
@@ -48,6 +48,43 @@ ENTRY(do_omap3_emu_romcode_call) POP {r4-r12, pc} ENDPROC(do_omap3_emu_romcode_call) +#ifdef CONFIG_ARM_ARCH_CP15_ERRATA + .globl arch_cp15_errata_workaround +/* + * R0 has MIDR + * R1 has CPU Variant (bits 20-23) + * R2 has CPU Revision (bits 0-3) + * R3 is compbined CPU variant << 4 + CPU revision + */ +ENTRY(arch_cp15_errata_workaround) + push {r4-r12, lr} @ save registers - ROM code may pollute + + mov r0, #0 @ Nothing to set in ACR + mov r1, #0 @ Nothing to clear in ACR + +#ifdef CONFIG_ARM_ERRATA_454179 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x3 << 6) @ Set DBSM(BIT7) and IBE(BIT6) bits +#endif + +#ifdef CONFIG_ARM_ERRATA_430973 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 6) @ Set IBE bit +#endif + +#ifdef CONFIG_ARM_ERRATA_621766 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 5) @ Set L1NEON bit +#endif + + add r2, r1, r0 + teq r2, #0 @ See if nothing to set or clear + bne omap3_update_aux_cr_secure @update as per ROM code configuration needs + + pop {r4-r12, pc} @restore the registers back. +ENDPROC(arch_cp15_errata_workaround) +#endif + #if !defined(CONFIG_SYS_NAND_BOOT) && !defined(CONFIG_SYS_NAND_BOOT) /************************************************************************** * cpy_clk_code: relocates clock code into SRAM where its safer to execute
arch/arm/include/asm/arch-omap3/sys_proto.h +1 -0
@@ -74,5 +74,6 @@ void dieid_num_r(void);void get_dieid (u32 *id);void do_omap3_emu_romcode_call (u32 service_id,u32 parameters);void omap_smc1 (u32 service,u32 val); +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits);u32 warm_reset (void );#endif
Signature · 1 line
1.7.9.5
PATCH v2 7/9 ARM: OMAP3: Introduce OMAP3 Cortex-A8 revision specific errata
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 4 lines
430973: Stale prediction on replaced inter working branch causes
Cortex-A8 to execute in the wrong ARM/Thumb state
Impacts: Everything lower than r2p1
Work around: Set IBE to 1
According to the Linux kernel source, this should only affect r1p* (hence, not r2p0):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mm/proc-v7.S#n321
Quoted 9 lines
454179: Stale prediction may inhibit target address misprediction on
next predicted taken branch
Impacts: Everything lower than r2p1
Work around: Set IBE and disable branch size mispredict to 1621766: Under a specific set of conditions, executing a sequence of
NEON or vfp load instructions can cause processor deadlock
Impacts: Everything lower than r2p1
Work around: Set L1NEON to 1
Erratum 458693 also sets L1NEON bit and is said to only affect r2p0 according to the Linux kernel source:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mm/proc-v7.S#n321
I'm not sure this is relevant (different erratum but similar workaround), but it seems odd to me.
Quoted 3 lines
Since the OMAP3 generation of processors have a wide variety of CPU revisions, it is more logical to enforce an implementation using revision checks.
Anyways, this worked just fine on my omap3630 device (> r2p1) and didn't trigger the errata workarounds. I reckon someone would have to test on a device that does require those workarounds (e.g. omap35xx).
Quoted 88 lines
Signed-off-by Nishanth Menon <[email protected]>--- README | 3 +++ arch/arm/cpu/armv7/omap3/board.c | 2 +- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 37 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap3/sys_proto.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-)README +3
-0@@ -625,6 +625,9 @@ The following options need to be configured: with CONFIG_ARM_ARCH_CP15_ERRATA define. These need to have an SoC specific implementation of the erratum workaround to function. + CONFIG_ARM_ERRATA_430973 + CONFIG_ARM_ERRATA_454179 + CONFIG_ARM_ERRATA_621766 CONFIG_ARM_ERRATA_798870 - Driver Modelarch/arm/cpu/armv7/omap3/board.c +1
-1@@ -408,7 +408,7 @@ static void omap3_emu_romcode_call(u32 service_id, u32 *parameters)do_omap3_emu_romcode_call (service_id,OMAP3_PUBLIC_SRAM_SCRATCH_AREA ); } -static void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) {u32 acr;arch/arm/cpu/armv7/omap3/lowlevel_init.S +37
-0@@ -48,6 +48,43 @@ ENTRY(do_omap3_emu_romcode_call) POP {r4-r12, pc} ENDPROC(do_omap3_emu_romcode_call) +#ifdef CONFIG_ARM_ARCH_CP15_ERRATA + .globl arch_cp15_errata_workaround +/* + * R0 has MIDR + * R1 has CPU Variant (bits 20-23) + * R2 has CPU Revision (bits 0-3) + * R3 is compbined CPU variant << 4 + CPU revision + */ +ENTRY(arch_cp15_errata_workaround) + push {r4-r12, lr} @ save registers - ROM code may pollute + + mov r0, #0 @ Nothing to set in ACR + mov r1, #0 @ Nothing to clear in ACR + +#ifdef CONFIG_ARM_ERRATA_454179 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x3 << 6) @ Set DBSM(BIT7) and IBE(BIT6) bits +#endif + +#ifdef CONFIG_ARM_ERRATA_430973 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 6) @ Set IBE bit +#endif + +#ifdef CONFIG_ARM_ERRATA_621766 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 5) @ Set L1NEON bit +#endif + + add r2, r1, r0 + teq r2, #0 @ See if nothing to set or clear + bne omap3_update_aux_cr_secure @update as per ROM code configuration needs + + pop {r4-r12, pc} @restore the registers back. +ENDPROC(arch_cp15_errata_workaround) +#endif + #if !defined(CONFIG_SYS_NAND_BOOT) && !defined(CONFIG_SYS_NAND_BOOT) /************************************************************************** * cpy_clk_code: relocates clock code into SRAM where its safer to executearch/arm/include/asm/arch-omap3/sys_proto.h +0
-0
arch/arm/include/asm/arch-omap3/sys_proto.h void dieid_num_r(void); · line 79
Quoted 6 lines
arch/arm/include/asm/arch-omap3/sys_proto.h +1
-0@@ -74,5 +74,6 @@ void dieid_num_r(void);void get_dieid (u32 *id);void do_omap3_emu_romcode_call (u32 service_id,u32 parameters);void omap_smc1 (u32 service,u32 val); +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits);u32 warm_reset (void );#endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/d74623c2/attachment.sig>
PATCH v2 7/9 ARM: OMAP3: Introduce OMAP3 Cortex-A8 revision specific errata
Quoted 9 lines · Paul Kocialkowski
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 4 lines
430973: Stale prediction on replaced inter working branch causes
Cortex-A8 to execute in the wrong ARM/Thumb state
Impacts: Everything lower than r2p1
Work around: Set IBE to 1According to the Linux kernel source, this should only affect r1p* (hence, not r2p0):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mm/proc-v7.S#n321
I did look at the official Cortex-A8 errata doc (I think this is under NDA at least under TI).. Doc revision 20.0
This has a "Errata Summary Table" where "X" indicates the revision impacted. As per that, I see:
r1p1, r1p2, r1p3, r1p7 impacted. the first not impacted is r2p1.
Hence the cmp r3, #0x21 (and orrlt).
Can someone from ARM ltd comment if there could be a better implementation? I will post a V3 based on latest documentation on my hand.
Quoted 121 lines
Quoted 10 lines
454179: Stale prediction may inhibit target address misprediction on
next predicted taken branch
Impacts: Everything lower than r2p1
Work around: Set IBE and disable branch size mispredict to 1621766: Under a specific set of conditions, executing a sequence of
NEON or vfp load instructions can cause processor deadlock
Impacts: Everything lower than r2p1
Work around: Set L1NEON to 1Erratum 458693 also sets L1NEON bit and is said to only affect r2p0 according to the Linux kernel source:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mm/proc-v7.S#n321I'm not sure this is relevant (different erratum but similar workaround), but it seems odd to me.
Quoted 3 lines
Since the OMAP3 generation of processors have a wide variety of CPU revisions, it is more logical to enforce an implementation using revision checks.
Anyways, this worked just fine on my omap3630 device (> r2p1) and didn't trigger the errata workarounds. I reckon someone would have to test on a device that does require those workarounds (e.g. omap35xx).
Quoted 94 lines
Signed-off-by Nishanth Menon <[email protected]>--- README | 3 +++ arch/arm/cpu/armv7/omap3/board.c | 2 +- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 37 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap3/sys_proto.h | 1 + 4 files changed, 42 insertions(+), 1 deletion(-)README +3
-0@@ -625,6 +625,9 @@ The following options need to be configured: with CONFIG_ARM_ARCH_CP15_ERRATA define. These need to have an SoC specific implementation of the erratum workaround to function. + CONFIG_ARM_ERRATA_430973 + CONFIG_ARM_ERRATA_454179 + CONFIG_ARM_ERRATA_621766 CONFIG_ARM_ERRATA_798870 - Driver Modelarch/arm/cpu/armv7/omap3/board.c +1
-1@@ -408,7 +408,7 @@ static void omap3_emu_romcode_call(u32 service_id, u32 *parameters)do_omap3_emu_romcode_call (service_id,OMAP3_PUBLIC_SRAM_SCRATCH_AREA ); } -static void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits) {u32 acr;arch/arm/cpu/armv7/omap3/lowlevel_init.S +37
-0@@ -48,6 +48,43 @@ ENTRY(do_omap3_emu_romcode_call) POP {r4-r12, pc} ENDPROC(do_omap3_emu_romcode_call) +#ifdef CONFIG_ARM_ARCH_CP15_ERRATA + .globl arch_cp15_errata_workaround +/* + * R0 has MIDR + * R1 has CPU Variant (bits 20-23) + * R2 has CPU Revision (bits 0-3) + * R3 is compbined CPU variant << 4 + CPU revision + */ +ENTRY(arch_cp15_errata_workaround) + push {r4-r12, lr} @ save registers - ROM code may pollute + + mov r0, #0 @ Nothing to set in ACR + mov r1, #0 @ Nothing to clear in ACR + +#ifdef CONFIG_ARM_ERRATA_454179 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x3 << 6) @ Set DBSM(BIT7) and IBE(BIT6) bits +#endif + +#ifdef CONFIG_ARM_ERRATA_430973 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 6) @ Set IBE bit +#endif + +#ifdef CONFIG_ARM_ERRATA_621766 + cmp r3, #0x21 @ Only on < r2p1 + orrlt r0, r0, #(0x1 << 5) @ Set L1NEON bit +#endif + + add r2, r1, r0 + teq r2, #0 @ See if nothing to set or clear + bne omap3_update_aux_cr_secure @update as per ROM code configuration needs + + pop {r4-r12, pc} @restore the registers back. +ENDPROC(arch_cp15_errata_workaround) +#endif + #if !defined(CONFIG_SYS_NAND_BOOT) && !defined(CONFIG_SYS_NAND_BOOT) /************************************************************************** * cpy_clk_code: relocates clock code into SRAM where its safer to executearch/arm/include/asm/arch-omap3/sys_proto.h +1
-0@@ -74,5 +74,6 @@ void dieid_num_r(void);void get_dieid (u32 *id);void do_omap3_emu_romcode_call (u32 service_id,u32 parameters);void omap_smc1 (u32 service,u32 val); +void omap3_update_aux_cr_secure (u32 set_bits,u32 clear_bits);u32 warm_reset (void );#endif
Signature · 2 lines
Regards, Nishanth Menon
PATCH v2 7/9 ARM: OMAP3: Introduce OMAP3 Cortex-A8 revision specific errata
Quoted 7 lines · On Wed, 25 Feb 2015 13:49:52 -0600 Nishanth Menon <[email protected]> wrote:
Quoted 6 lines · Paul Kocialkowski
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
Quoted 4 lines
430973: Stale prediction on replaced inter working branch causes
Cortex-A8 to execute in the wrong ARM/Thumb state
Impacts: Everything lower than r2p1
Work around: Set IBE to 1
Quoted 6 lines
Quoted 3 lines
According to the Linux kernel source, this should only affect r1p* (hence, not r2p0):
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/mm/proc-v7.S#n321I did look at the official Cortex-A8 errata doc (I think this is under NDA at least under TI).. Doc revision 20.0
The errata list is not that much secret. But more like all the documents that you get from your employer are just under NDA by default. Even though they might be also available from the other sources.
I had the same problem. And specifically requested and obtained my own personal copy of the Cortex-A8 errata list from ARM as a private individual (to my gmail address, and clearly stating that I wanted it for the purposes *not* related to my corporate job) :-)
I'm not allowed to share my copy with the other people though, so everyone has to get it directly from ARM. I believe that that this only requires filling in the registration form on the ARM website and agreeing with the conditions.
There are also PDF documents from Freescale in public access, which contain some Cortex-A8 errata information too:
http://cache.freescale.com/files/32bit/doc/errata/IMX50CE.pdf http://www.freescale.com/docs/pcn_attachments/15760_IMX53CE_Rev4.pdf
Signature · 2 lines
Best regards, Siarhei Siamashka
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
In reply to Nishanth MenonEnable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)
arch/arm/cpu/armv7/omap3/board.c +0 -16
@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif
@@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();
@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {
include/configs/ti_omap3_common.h +6 -0
@@ -27,6 +27,12 @@# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif +/* Common ARM Erratas */ +#define CONFIG_ARM_ARCH_CP15_ERRATA +#define CONFIG_ARM_ERRATA_454179 +#define CONFIG_ARM_ERRATA_430973 +#define CONFIG_ARM_ERRATA_621766 +/* The chip has SDRC controller */ #define CONFIG_SDRC
Signature · 1 line
1.7.9.5
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
include/configs/ti_omap3_common.h
Quoted 54 lines
Enable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)arch/arm/cpu/armv7/omap3/board.c +0
-16@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif @@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {include/configs/ti_omap3_common.h +0
-0
Only a couple of OMAP3 boards in U-Boot include ti_omap3_common.h. You can find a complete list of all the configs that need those options enabled from my first patch on that topic:
http://lists.denx.de/pipermail/u-boot/2015-February/205809.html
I guess it's better to enable those on all the currently-supported omap3
platforms: that's the way it was so far and it won't hurt in cases it's not needed thanks to the revision detection.
include/configs/ti_omap3_common.h line 38
Quoted 13 lines
include/configs/ti_omap3_common.h +6
-0@@ -27,6 +27,12 @@# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif +/* Common ARM Erratas */ +#define CONFIG_ARM_ARCH_CP15_ERRATA +#define CONFIG_ARM_ERRATA_454179 +#define CONFIG_ARM_ERRATA_430973 +#define CONFIG_ARM_ERRATA_621766 +/* The chip has SDRC controller */ #define CONFIG_SDRC
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/a5336e91/attachment.sig>
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 61 lines · Paul Kocialkowski
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
include/configs/ti_omap3_common.h
Quoted 54 lines
Enable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)arch/arm/cpu/armv7/omap3/board.c +0
-16@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif @@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {include/configs/ti_omap3_common.h +0
-0Only a couple of OMAP3 boards in U-Boot include
ti_omap3_common.h. You can find a complete list of all the configs that need those options enabled from my first patch on that topic:
http://lists.denx.de/pipermail/u-boot/2015-February/205809.html
Quoted 3 lines
I guess it's better to enable those on all the currently-supported omap3
platforms: that's the way it was so far and it won't hurt in cases it's not needed thanks to the revision detection.
Or...
I think this patch might be a good enough argument to request people switch to include ti_omap3_common.h instead of duplicating it in private configs...
Don't you think?
Quoted 5 lines
Quoted 5 lines
include/configs/ti_omap3_common.h +0
-0@@ -27,6 +27,12 @@# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif
Quoted 17 lines
include/configs/ti_omap3_common.h line 38
Quoted 9 lines
include/configs/ti_omap3_common.h +6
-0+/* Common ARM Erratas */ +#define CONFIG_ARM_ARCH_CP15_ERRATA +#define CONFIG_ARM_ERRATA_454179 +#define CONFIG_ARM_ERRATA_430973 +#define CONFIG_ARM_ERRATA_621766 +/* The chip has SDRC controller */ #define CONFIG_SDRC _______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
- --
Regards,
Igor.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJU7bKeAAoJEBDE8YO64Efa/FUP/03ShzfpDHCl4aaSSoY8zLgl K/C3eeK2EFKxS/CDCQCV4KGk/lXdIbmx2BHH9ErKXwUmMp63QZUo6EzLjks9CeKl HZ9yBVxr9e3X2ztvZUpBWc5C6YpFxRfO9f5Q3GeLsv+217dccLRiomTVYlKLXQmJ VUHofOfKlF5b0sQxcAI+wONNkhsSX5rVHmcm6NziC4w8ZedJy5zer6rTfMY54WPx Z3jDKkvWK5DWOXNEpu0OVRC1RlKB6kqgedyaQTqwDLpL6Hz7oF3KeVJTKxbQgOPy 8vh2PeLX0AERL1hz6fEaG6pFnAT/V/4uEmczBAgAnCTr6NiCpC2QtlC1PAWTkg/c 4NPz/z5HM4o2cTpqI9Yc6oWExqZzANQLBJYtm8bD2pkUMA/RbVuLugnOka9trVFw MHRqOBlAtq2tchvLZIhzQrh+bb5KsKWNFdoIkCFXUwYdqasMhxoW2G/4fDsf0oeL q1vQV0LJp/qysLzz8u5603cFR7IvFKWSr4wP95YvlEhx6BGsKPXu0QeTVfpsPHZX L4tP1X/wM10XGN2HGenz2FimtaUUJZTxHzj18ucMfyLs0hAfT981auyvyMLR5Up2 bFlB6b93y1BpM0DxpmgcuA77gLQL9jNKTyH76W/AQysOikSQ8JrSZg52zS3X0m6Q QJ4jdRF+EAY/Eh/fIni0
=q25V
-----END PGP SIGNATURE-----
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Le mercredi 25 f?vrier 2015 ? 13:31 +0200, Igor Grinberg a ?crit :
Quoted 66 lines · Paul Kocialkowski
Quoted 61 lines
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
include/configs/ti_omap3_common.h
Quoted 54 lines
Enable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)arch/arm/cpu/armv7/omap3/board.c +0
-16@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif @@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {include/configs/ti_omap3_common.h +0
-0Only a couple of OMAP3 boards in U-Boot include
ti_omap3_common.h. You can find a complete list of all the configs that need those options enabled from my first patch on that topic:
http://lists.denx.de/pipermail/u-boot/2015-February/205809.htmlQuoted 3 lines
I guess it's better to enable those on all the currently-supported omap3
platforms: that's the way it was so far and it won't hurt in cases it's not needed thanks to the revision detection.
Quoted 6 lines
Or...
I think this patch might be a good enough argument to request people switch to includeti_omap3_common.hinstead of duplicating it in private configs...Don't you think?
The way I see it, ti_omap3_common.h is common for OMAP3 boards made by TI. A few things there are not generic to omap3 in general (e.g. not every board uses the U-Boot SPL, or UART3 for console).
However, I agree it would be beneficial to have an omap3_common.h config with the options that are expected to be shared accross every possible omap3 device (and with a few clever ifdef so that the minimum has to be set in the including board configs).
I could try to come up with such a config if you wish, but I'm afraid I'm not the most qualified person to do this (I only have a single omap3 device).
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
include/configs/ti_omap3_common.h +6
-0@@ -27,6 +27,12 @@# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif +/* Common ARM Erratas */ +#define CONFIG_ARM_ARCH_CP15_ERRATA +#define CONFIG_ARM_ERRATA_454179 +#define CONFIG_ARM_ERRATA_430973 +#define CONFIG_ARM_ERRATA_621766 +/* The chip has SDRC controller */ #define CONFIG_SDRC
Quoted 9 lines
Quoted 8 lines
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/b65a7973/attachment.sig>
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Quoted 78 lines · Paul Kocialkowski
Le mercredi 25 f?vrier 2015 ? 13:31 +0200, Igor Grinberg a ?crit :
Quoted 66 lines · Paul Kocialkowski
Quoted 61 lines
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
include/configs/ti_omap3_common.h
Quoted 54 lines
Enable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)arch/arm/cpu/armv7/omap3/board.c +0
-16@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif @@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {include/configs/ti_omap3_common.h +0
-0Only a couple of OMAP3 boards in U-Boot include
ti_omap3_common.h. You can find a complete list of all the configs that need those options enabled from my first patch on that topic:
http://lists.denx.de/pipermail/u-boot/2015-February/205809.htmlQuoted 3 lines
I guess it's better to enable those on all the currently-supported omap3
platforms: that's the way it was so far and it won't hurt in cases it's not needed thanks to the revision detection.Quoted 6 lines
Or...
I think this patch might be a good enough argument to request people switch to includeti_omap3_common.hinstead of duplicating it in private configs...Don't you think?
The way I see it,
ti_omap3_common.his common for OMAP3 boards made by TI. A few things there are not generic to omap3 in general (e.g. not every board uses the U-Boot SPL, or UART3 for console).
Quoted 9 lines
However, I agree it would be beneficial to have an
omap3_common.hconfig with the options that are expected to be shared accross every possible omap3 device (and with a few clever ifdef so that the minimum has to be set in the including board configs).I could try to come up with such a config if you wish, but I'm afraid I'm not the most qualified person to do this (I only have a single omap3 device).
I am planning on a V3 based on trying to converge exynos and TI platforms into a common code base. I will stick with ti_*_common.h headers for now, we will keep all the other headers updated for the moment. I do stand with the opinion that we should all be using the same ti_omap3_common header for all platforms using the same SoC... but that could be done as follow on patches.
That said, Paul, if you could contribute patches to the effect of integrating all these platforms to ti_*_common.h, that'd be great.
--
Regards,
Nishanth Menon
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Le mercredi 25 f?vrier 2015 ? 08:32 -0600, menon.nishanth at gmail.com a ?crit :
Quoted 95 lines · Paul Kocialkowski
Quoted 78 lines
Le mercredi 25 f?vrier 2015 ? 13:31 +0200, Igor Grinberg a ?crit :
Quoted 66 lines · Paul Kocialkowski
Quoted 61 lines
Le mardi 24 f?vrier 2015 ? 16:57 -0600, Nishanth Menon a ?crit :
include/configs/ti_omap3_common.h
Quoted 54 lines
Enable the OMAP3 specific errata code for 454179, 430973, 621766 and while at it, remove legacy non-revision checked errata logic.
Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/cpu/armv7/omap3/board.c | 16 ---------------- include/configs/ti_omap3_common.h | 6 ++++++ 2 files changed, 6 insertions(+), 16 deletions(-)arch/arm/cpu/armv7/omap3/board.c +0
-16@@ -35,7 +35,6 @@ DECLARE_GLOBAL_DATA_PTR;/* Declarations */ extern omap3_sysinfo sysinfo; -static void omap3_setup_aux_cr (void );#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_invalidate_l2_cache_secure (void );#endif @@ -246,9 +245,6 @@ void s_init(void)try_unlock_memory (); -/* Errata workarounds */ -omap3_setup_aux_cr (); -#ifndef CONFIG_SYS_L2CACHE_OFF /* Invalidate L2-cache from secure mode */ omap3_invalidate_l2_cache_secure ();@@ -428,18 +424,6 @@ void omap3_update_aux_cr_secure(u32 set_bits, u32 clear_bits) } } -static void omap3_setup_aux_cr (void ) -{ -/* Workaround for Cortex-A8 errata: #454179 #430973 -* Set "IBE" bit -* Set "Disable Branch Size Mispredicts" bit -* Workaround for erratum #621766 -* Enable L1NEON bit -* ACR |= (IBE | DBSM | L1NEON) => ACR |= 0xE0 -*/ -omap3_update_aux_cr_secure (0xE0 ,0 ); -} -#ifndef CONFIG_SYS_L2CACHE_OFF static void omap3_update_aux_cr (u32 set_bits,u32 clear_bits) {include/configs/ti_omap3_common.h +0
-0Only a couple of OMAP3 boards in U-Boot include
ti_omap3_common.h. You can find a complete list of all the configs that need those options enabled from my first patch on that topic:
http://lists.denx.de/pipermail/u-boot/2015-February/205809.htmlQuoted 3 lines
I guess it's better to enable those on all the currently-supported omap3
platforms: that's the way it was so far and it won't hurt in cases it's not needed thanks to the revision detection.Quoted 6 lines
Or...
I think this patch might be a good enough argument to request people switch to includeti_omap3_common.hinstead of duplicating it in private configs...Don't you think?
The way I see it,
ti_omap3_common.his common for OMAP3 boards made by TI. A few things there are not generic to omap3 in general (e.g. not every board uses the U-Boot SPL, or UART3 for console).Quoted 8 lines
However, I agree it would be beneficial to have an
omap3_common.hconfig with the options that are expected to be shared accross every possible omap3 device (and with a few clever ifdef so that the minimum has to be set in the including board configs).I could try to come up with such a config if you wish, but I'm afraid I'm not the most qualified person to do this (I only have a single omap3 device).
I am planning on a V3 based on trying to converge exynos and TI platforms into a common code base. I will stick with ti_*_common.h headers for now, we will keep all the other headers updated for the moment. I do stand with the opinion that we should all be using the same
ti_omap3_commonheader for all platforms using the same SoC... but that could be done as follow on patches.
Quoted 2 lines
That said, Paul, if you could contribute patches to the effect of integrating all these platforms to ti_*_common.h, that'd be great.
I will try to come up with a common configuration for omap3 (and possibly omap4 and omap5 too). Do you mind if I drop the ti_ prefix? I don't feel it's relevant to mention the chip manufacturer there, especially when it's not used anywhere else in the tree (except for the boards that are actually procuced by TI such as the evms, etc).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150225/42863f0e/attachment.sig>
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Quoted 1 line · Paul Kocialkowski
Le mercredi 25 f?vrier 2015 ? 08:32 -0600, menon.nishanth at gmail.com a
[...]
Quoted 9 lines
Quoted 2 lines
That said, Paul, if you could contribute patches to the effect of integrating all these platforms to ti_*_common.h, that'd be great.
I will try to come up with a common configuration for omap3 (and possibly omap4 and omap5 too). Do you mind if I drop the
ti_prefix? I don't feel it's relevant to mention the chip manufacturer there, especially when it's not used anywhere else in the tree (except for the boards that are actually procuced by TI such as the evms, etc).
I think we have maintained ti_ prefix for omap3,4,5 etc.. might make sense to retain that.. but then, I am no decision maker in that regards, I suggest posting a proposal and seeing feedback folks have w.r.t.
--
Regards,
Nishanth Menon
PATCH v2 8/9 configs: ti_omap3_common: Enable workaround for ARM errata 454179, 430973, 621766
Le mercredi 25 f?vrier 2015 ? 23:11 -0600, Nishanth Menon a ?crit :
Quoted 12 lines · Paul Kocialkowski
Quoted 1 line
Le mercredi 25 f?vrier 2015 ? 08:32 -0600, menon.nishanth at gmail.com a
[...]
Quoted 9 lines
Quoted 2 lines
That said, Paul, if you could contribute patches to the effect of integrating all these platforms to ti_*_common.h, that'd be great.
I will try to come up with a common configuration for omap3 (and possibly omap4 and omap5 too). Do you mind if I drop the
ti_prefix? I don't feel it's relevant to mention the chip manufacturer there, especially when it's not used anywhere else in the tree (except for the boards that are actually procuced by TI such as the evms, etc).
Quoted 3 lines
I think we have maintained
ti_prefix for omap3,4,5 etc.. might make sense to retain that.. but then, I am no decision maker in that regards, I suggest posting a proposal and seeing feedback folks have w.r.t.
I have started looking at the situation for am33xx, omap3, omap4 and omap5 and I'll post a RFC at some point in the near future. I'm a bit busy right now and this is not high priority since your latest series includes all the configs for the affected omap3 boards.
Signature · 16 lines
Paul Kocialkowski, Replicant developer Replicant is a fully free Android distribution running on several devices, a free software mobile operating system putting the emphasis on freedom and privacy/security. Website: http://www.replicant.us/ Blog: http://blog.replicant.us/ Wiki/tracker/forums: http://redmine.replicant.us/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150227/45e1fb92/attachment.sig>
PATCH v2 9/9 ARM: OMAP5 / DRA7: Setup L2 Aux Control Register with recommended configuration
In reply to Nishanth MenonUpdate to existing recommendation for L2ACTLR configuration to prevent system instability and optimize performance.
These apply to both OMAP5 and DRA7.
--- arch/arm/cpu/armv7/omap5/hwinit.c | 16 ++++++++++++++++ arch/arm/include/asm/arch-omap5/sys_proto.h | 3 +++ 2 files changed, 19 insertions(+)
arch/arm/cpu/armv7/omap5/hwinit.c +16 -0
@@ -304,6 +304,21 @@ void config_data_eye_leveling_samples(u32 emif_base) (*ctrl)->control_emif2_sdram_config_ext); } +void init_cpu_configuration (void ) +{ +u32 l2actlr; + + asmvolatile ("mrc p15, 1, %0, c15, c0, 0" :"=r" (l2actlr)); +/* +* L2ACTLR: Ensure to enable the following: +* 3: Disable clean/evict push to external +* 4: Disable WriteUnique and WriteLineUnique transactions from master +* 8: Disable DVM/CMO message broadcast +*/ + l2actlr |=0x118 ; +omap_smc1 (OMAP5_SERVICE_L2ACTLR_SET , l2actlr); +} +void init_omap_revision (void ) {/*
@@ -342,6 +357,7 @@ void init_omap_revision(void)default : *omap_si_rev =OMAP5430_SILICON_ID_INVALID ; } +init_cpu_configuration (); }void reset_cpu (ulong ignored)
arch/arm/include/asm/arch-omap5/sys_proto.h +3 -0
@@ -67,4 +67,7 @@ static inline u32 usec_to_32k(u32 usec) {return div_round_up (32768 * usec,1000000 ); } + +#define OMAP5_SERVICE_L2ACTLR_SET 0x104 +#endif
Signature · 1 line
1.7.9.5