From b62f8fe30486612f01dd637ffdd33f9ba89a8ce8 Mon Sep 17 00:00:00 2001 From: Vijayenthiran Subramaniam Date: Tue, 26 Nov 2019 21:27:08 +0530 Subject: [HACK] RD-Daniel: Fix GICR base for GIC-Clayton MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RD-Daniel uses GIC-Clayton which has GIC-v4.1 support. GIC-v4.1 uses a different offset for GIC Redistributor base address: (4 + 4 × ITScount + 4 × RDnum) in contrast to: (4 + 2 × ITScount + 2 × RDnum). Change the base address of GIC Redistributor and increase the GICD MMU table size from 1MB to 2MB to accommodate the new GICR base address. Note: This patch will break other SGI and RD platforms. Signed-off-by: Vijayenthiran Subramaniam --- Platform/ARM/SgiPkg/Include/SgiPlatform.h | 4 ++-- Platform/ARM/SgiPkg/SgiPlatform.dsc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h index 822e4bf3..ed87151c 100644 --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h @@ -51,8 +51,8 @@ // Sub System Peripherals - GIC #define SGI_SUBSYS_GENERIC_GIC_BASE 0x30000000 -#define SGI_SUBSYS_GENERIC_GICR_BASE 0x300C0000 -#define SGI_SUBSYS_GENERIC_GIC_SZ SIZE_1MB +#define SGI_SUBSYS_GENERIC_GICR_BASE 0x30140000 +#define SGI_SUBSYS_GENERIC_GIC_SZ SIZE_2MB // Expansion AXI - Platform Peripherals - HDLCD1 #define SGI_EXP_PLAT_PERIPH_HDLCD1_BASE 0x7FF60000 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc index 38d227af..6d8be58a 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc @@ -141,7 +141,7 @@ # GIC Base Addresses gArmTokenSpaceGuid.PcdGicDistributorBase|0x30000000 - gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x300C0000 + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x30140000 # # PCIe -- cgit v1.2.3