aboutsummaryrefslogtreecommitdiff
path: root/drivers/marvell/mochi/apn806_setup.c
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-09-22 10:55:51 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-09-22 10:55:51 +0000
commit73740d98d99cb740ff67e188b6a7c1db816bf9f4 (patch)
tree12e2ce85185a00f966000a3b76fe44377bfa6df4 /drivers/marvell/mochi/apn806_setup.c
parent5c5d82848d74e68e435d9627a38b60a4764beac1 (diff)
parent5e4c97d035a92302f8bce9cec29676306af560a6 (diff)
downloadtrusted-firmware-a-73740d98d99cb740ff67e188b6a7c1db816bf9f4.tar.gz
Merge "plat: marvell: ap807: implement workaround for errata-id 3033912" into integration
Diffstat (limited to 'drivers/marvell/mochi/apn806_setup.c')
-rw-r--r--drivers/marvell/mochi/apn806_setup.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/marvell/mochi/apn806_setup.c b/drivers/marvell/mochi/apn806_setup.c
index 1a02bd4ef1..b8925d9f23 100644
--- a/drivers/marvell/mochi/apn806_setup.c
+++ b/drivers/marvell/mochi/apn806_setup.c
@@ -28,9 +28,6 @@
0x200)
#define CCU_SET_POC_OFFSET 5
-#define CCU_RGF(win) (MVEBU_CCU_BASE(MVEBU_AP0) + \
- 0x90 + 4 * (win))
-
#define DSS_CR0 (MVEBU_RFU_BASE + 0x100)
#define DVM_48BIT_VA_ENABLE (1 << 21)
@@ -95,20 +92,6 @@ static void setup_smmu(void)
mmio_write_32(SMMU_sACR, reg);
}
-static void apn806_errata_wa_init(void)
-{
- /*
- * ERRATA ID: RES-3033912 - Internal Address Space Init state causes
- * a hang upon accesses to [0xf070_0000, 0xf07f_ffff]
- * Workaround: Boot Firmware (ATF) should configure CCU_RGF_WIN(4) to
- * split [0x6e_0000, 0xff_ffff] to values [0x6e_0000, 0x6f_ffff] and
- * [0x80_0000, 0xff_ffff] that cause accesses to the
- * segment of [0xf070_0000, 0xf07f_ffff] to act as RAZWI.
- */
- mmio_write_32(CCU_RGF(4), 0x37f9b809);
- mmio_write_32(CCU_RGF(5), 0x7ffa0009);
-}
-
static void init_aurora2(void)
{
uint32_t reg;
@@ -131,7 +114,7 @@ static void init_aurora2(void)
mmio_write_32(CCU_HTC_CR, reg);
#endif /* LLC_ENABLE */
- apn806_errata_wa_init();
+ errata_wa_init();
}