[PATCH v4 3/7] Platform/RaspberryPi: Split MMC register definitions

["Jeremy Linton" <jeremy.linton@arm.com>]

The current MMC (really SDHCI) definitions are tied to the
Arasan controller. As we intend to reuse the definitions lets
make the base address configurable when the driver loads.

This assumes we won't ever want to run both the eMMC2
and Arasan SDHCI controller at the same time.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Reviewed-by: Andrei Warkentin <awarkentin@vmware.com>
---
 .../Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c    |  9 ++++-
 .../Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h | 42 ++++++++++++----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
index 88e9126e35..c8fdfc193b 100644
--- a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
+++ b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
@@ -16,6 +16,7 @@ STATIC CARD_DETECT_STATE mCardDetectState = CardDetectRequired;
 UINT32 LastExecutedCommand = (UINT32) -1;
 
 STATIC RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol;
+STATIC UINTN MmcHsBase;
 
 /**
    These SD commands are optional, according to the SD Spec
@@ -763,7 +764,13 @@ MMCInitialize (
 
   DEBUG ((DEBUG_MMCHOST_SD, "ArasanMMCHost: MMCInitialize()\n"));
 
-  if (!PcdGet32 (PcdSdIsArasan)) {
+  if (PcdGet32 (PcdSdIsArasan)) {
+    DEBUG ((DEBUG_INFO, "SD is routed to Arasan\n"));
+    MmcHsBase = MMCHS1_BASE;
+  } else if (RPI_MODEL == 4) {
+    DEBUG ((DEBUG_INFO, "SD is routed to emmc2\n"));
+    MmcHsBase = MMCHS2_BASE;
+  } else {
     DEBUG ((DEBUG_INFO, "SD is not routed to Arasan\n"));
     return EFI_REQUEST_UNLOAD_IMAGE;
   }
diff --git a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
index fd07b47170..1d38cb3d3f 100644
--- a/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
+++ b/Silicon/Broadcom/Bcm283x/Include/IndustryStandard/Bcm2836Sdio.h
@@ -13,15 +13,18 @@
 
 // MMC/SD/SDIO1 register definitions.
 #define MMCHS1_OFFSET     0x00300000
+#define MMCHS2_OFFSET     0x00340000
 #define MMCHS1_BASE       (BCM2836_SOC_REGISTERS + MMCHS1_OFFSET)
+#define MMCHS2_BASE       (BCM2836_SOC_REGISTERS + MMCHS2_OFFSET)
 #define MMCHS1_LENGTH     0x00000100
+#define MMCHS2_LENGTH     0x00000100
 
-#define MMCHS_BLK         (MMCHS1_BASE + 0x4)
+#define MMCHS_BLK         (MmcHsBase + 0x4)
 #define BLEN_512BYTES     (0x200UL << 0)
 
-#define MMCHS_ARG         (MMCHS1_BASE + 0x8)
+#define MMCHS_ARG         (MmcHsBase + 0x8)
 
-#define MMCHS_CMD         (MMCHS1_BASE + 0xC)
+#define MMCHS_CMD         (MmcHsBase + 0xC)
 #define BCE_ENABLE        BIT1
 #define DDIR_READ         BIT4
 #define DDIR_WRITE        (0x0UL << 4)
@@ -43,13 +46,13 @@
 #define INDX(CMD_INDX)       (TYPE(CMD_TYPE_NORMAL) | _INDX(CMD_INDX))
 #define INDX_ABORT(CMD_INDX) (TYPE(CMD_TYPE_ABORT) | _INDX(CMD_INDX))
 
-#define MMCHS_RSP10       (MMCHS1_BASE + 0x10)
-#define MMCHS_RSP32       (MMCHS1_BASE + 0x14)
-#define MMCHS_RSP54       (MMCHS1_BASE + 0x18)
-#define MMCHS_RSP76       (MMCHS1_BASE + 0x1C)
-#define MMCHS_DATA        (MMCHS1_BASE + 0x20)
+#define MMCHS_RSP10       (MmcHsBase + 0x10)
+#define MMCHS_RSP32       (MmcHsBase + 0x14)
+#define MMCHS_RSP54       (MmcHsBase + 0x18)
+#define MMCHS_RSP76       (MmcHsBase + 0x1C)
+#define MMCHS_DATA        (MmcHsBase + 0x20)
 
-#define MMCHS_PRES_STATE  (MMCHS1_BASE + 0x24)
+#define MMCHS_PRES_STATE  (MmcHsBase + 0x24)
 #define CMDI_MASK         BIT0
 #define CMDI_ALLOWED      (0x0UL << 0)
 #define CMDI_NOT_ALLOWED  BIT0
@@ -58,17 +61,19 @@
 #define DATI_NOT_ALLOWED  BIT1
 #define WRITE_PROTECT_OFF BIT19
 
-#define MMCHS_HCTL        (MMCHS1_BASE + 0x28)
+#define MMCHS_HCTL        (MmcHsBase + 0x28)
 #define DTW_1_BIT         (0x0UL << 1)
 #define DTW_4_BIT         BIT1
 #define SDBP_MASK         BIT8
 #define SDBP_OFF          (0x0UL << 8)
 #define SDBP_ON           BIT8
+#define SDVS_MASK         (0x7UL << 9)
 #define SDVS_1_8_V        (0x5UL << 9)
 #define SDVS_3_0_V        (0x6UL << 9)
+#define SDVS_3_3_V        (0x7UL << 9)
 #define IWE               BIT24
 
-#define MMCHS_SYSCTL      (MMCHS1_BASE + 0x2C)
+#define MMCHS_SYSCTL      (MmcHsBase + 0x2C)
 #define ICE               BIT0
 #define ICS_MASK          BIT1
 #define ICS               BIT1
@@ -84,7 +89,7 @@
 #define SRC               BIT25
 #define SRD               BIT26
 
-#define MMCHS_INT_STAT    (MMCHS1_BASE + 0x30)
+#define MMCHS_INT_STAT    (MmcHsBase + 0x30)
 #define CC                BIT0
 #define TC                BIT1
 #define BWR               BIT4
@@ -96,7 +101,7 @@
 #define DCRC              BIT21
 #define DEB               BIT22
 
-#define MMCHS_IE          (MMCHS1_BASE + 0x34)
+#define MMCHS_IE          (MmcHsBase + 0x34)
 #define CC_EN             BIT0
 #define TC_EN             BIT1
 #define BWR_EN            BIT4
@@ -112,7 +117,7 @@
 #define BADA_EN           BIT29
 #define ALL_EN            0xFFFFFFFF
 
-#define MMCHS_ISE         (MMCHS1_BASE + 0x38)
+#define MMCHS_ISE         (MmcHsBase + 0x38)
 #define CC_SIGEN          BIT0
 #define TC_SIGEN          BIT1
 #define BWR_SIGEN         BIT4
@@ -127,14 +132,15 @@
 #define CERR_SIGEN        BIT28
 #define BADA_SIGEN        BIT29
 
-#define MMCHS_AC12        (MMCHS1_BASE + 0x3C)
+#define MMCHS_AC12        (MmcHsBase + 0x3C)
+#define MMCHS_HC2R        (MmcHsBase + 0x3E)
 
-#define MMCHS_CAPA        (MMCHS1_BASE + 0x40)
+#define MMCHS_CAPA        (MmcHsBase + 0x40)
 #define VS30              BIT25
 #define VS18              BIT26
 
-#define MMCHS_CUR_CAPA    (MMCHS1_BASE + 0x48)
-#define MMCHS_REV         (MMCHS1_BASE + 0xFC)
+#define MMCHS_CUR_CAPA    (MmcHsBase + 0x48)
+#define MMCHS_REV         (MmcHsBase + 0xFC)
 
 #define BLOCK_COUNT_SHIFT 16
 #define RCA_SHIFT         16
-- 
2.13.7