plat: marvell: armada: add ccu window for workaround errata-id 3033912

Added ccu window to allow access to addresses
in the range [0xf100_0000, 0xf1ff_ffff].

Change-Id: I63ee68338d674114d01cd627198dc907653493e8
Signed-off-by: Alex Leibovich <alexl@marvell.com>

diff --git a/drivers/marvell/ccu.c b/drivers/marvell/ccu.c
index ecf5091b48018c866570dc6e848e6d9c74ce14fb..b4251f49bd67c052219902636221bca653af98df 100644 (file)
--- a/drivers/marvell/ccu.c
+++ b/drivers/marvell/ccu.c
@@ -26,11 +26,38 @@
 #define ADDRESS_MASK                   (0xFFFFFFF0)
 #define CCU_WIN_ALIGNMENT              (0x100000)
 
+/*
+ * Physical address of the highest address of window bits[31:19] = 0x6FF
+ * Physical address of the lowest address of window bits[18:6] = 0x6E0
+ * Unit Id bits [5:2] = 2
+ * RGF Window Enable bit[0] = 1
+ * 0x37f9b809 - 11011111111 0011011100000 0010 0 1
+ */
+#define ERRATA_WA_CCU_WIN4     0x37f9b809U
+
+/*
+ * Physical address of the highest address of window bits[31:19] = 0xFFF
+ * Physical address of the lowest address of window bits[18:6] = 0x800
+ * Unit Id bits [5:2] = 2
+ * RGF Window Enable bit[0] = 1
+ * 0x7ffa0009 - 111111111111 0100000000000 0010 0 1
+ */
+#define ERRATA_WA_CCU_WIN5     0x7ffa0009U
+
+/*
+ * Physical address of the highest address of window bits[31:19] = 0x1FFF
+ * Physical address of the lowest address of window bits[18:6] = 0x1000
+ * Unit Id bits [5:2] = 2
+ * RGF Window Enable bit[0] = 1
+ * 0xfffc000d - 1111111111111 1000000000000 0011 0 1
+ */
+#define ERRATA_WA_CCU_WIN6     0xfffc000dU
+
 #define IS_DRAM_TARGET(tgt)            ((((tgt) == DRAM_0_TID) || \
                                        ((tgt) == DRAM_1_TID) || \
                                        ((tgt) == RAR_TID)) ? 1 : 0)
 
-#define CCU_RGF(win)                   (MVEBU_CCU_BASE(MVEBU_AP0) +    \
+#define CCU_RGF(win)                   (MVEBU_CCU_BASE(MVEBU_AP0) + \
                                         0x90 + 4 * (win))
 
 /* For storage of CR, SCR, ALR, AHR abd GCR */
@@ -376,10 +403,12 @@ void errata_wa_init(void)
         * EERATA 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.
+        * split [0x6e_0000, 0x1ff_ffff] to values [0x6e_0000, 0x6f_ffff] and
+        * [0x80_0000, 0xff_ffff] and [0x100_0000, 0x1ff_ffff],that cause
+        * accesses to the segment of [0xf070_0000, 0xf1ff_ffff]
+        * to act as RAZWI.
         */
-       mmio_write_32(CCU_RGF(4), 0x37f9b809);
-       mmio_write_32(CCU_RGF(5), 0x7ffa0009);
+       mmio_write_32(CCU_RGF(4), ERRATA_WA_CCU_WIN4);
+       mmio_write_32(CCU_RGF(5), ERRATA_WA_CCU_WIN5);
+       mmio_write_32(CCU_RGF(6), ERRATA_WA_CCU_WIN6);
 }