Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5902f4ce0f2bd1411e40dc0ece3598a0fc19b2ae

Authored by Nishanth Menon
Committed by Tom Rini
1 parent b45c48a7c3
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: Introduce erratum workaround for 430973 

430973: Stale prediction on replaced inter working branch causes
	Cortex-A8 to execute in the wrong ARM/Thumb state
Impacts: Every Cortex-A8 processors with revision lower than r2p1
Work around: Set IBE to 1

Based on ARM errata Document revision 20.0 (13 Nov 2010)

Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Matt Porter <mporter@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 2 changed files with 14 additions and 0 deletions Side-by-side Diff

... ... @@ -693,6 +693,7 @@
693 693 NOTE: The following can be machine specific errata. These
694 694 do have ability to provide rudimentary version and machine
695 695 specific checks, but expect no product checks.
  696 + CONFIG_ARM_ERRATA_430973
696 697 CONFIG_ARM_ERRATA_454179
697 698 CONFIG_ARM_ERRATA_798870
698 699  
arch/arm/cpu/armv7/start.S
Diff comments   View file @ 5902f4c
... ... @@ -202,6 +202,19 @@
202 202 skip_errata_454179:
203 203 #endif
204 204  
  205 +#ifdef CONFIG_ARM_ERRATA_430973
  206 + cmp r2, #0x21 @ Only on < r2p1
  207 + bge skip_errata_430973
  208 +
  209 + mrc p15, 0, r0, c1, c0, 1 @ Read ACR
  210 + orr r0, r0, #(0x1 << 6) @ Set IBE bit
  211 + push {r1-r5} @ Save the cpu info registers
  212 + bl v7_arch_cp15_set_acr
  213 + pop {r1-r5} @ Restore the cpu info - fall through
  214 +
  215 +skip_errata_430973:
  216 +#endif
  217 +
205 218 mov pc, r5 @ back to my caller
206 219 ENDPROC(cpu_init_cp15)
207 220