<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <div style="font-family: Consolas, Courier, monospace; font-size: 12pt; color: rgb(0, 0, 0);"> <div style="margin:0px;font-size:12pt">LGTM. This is the same approach I took last time I looked at this (unsuccessfully...) </div> <div style="margin:0px;font-size:12pt"> </div> <div style="margin:0px;font-size:12pt">Reviewed-by: Andrei Warkentin <awarkentin@vmware.com></div> </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Jeremy Linton via groups.io <jeremy.linton=arm.com@groups.io> Sent: Monday, December 14, 2020 5:23 PM To: devel@edk2.groups.io <devel@edk2.groups.io> Cc: ard.biesheuvel@arm.com <ard.biesheuvel@arm.com>; leif@nuviainc.com <leif@nuviainc.com>; pete@akeo.ie <pete@akeo.ie>; andrey.warkentin@gmail.com <andrey.warkentin@gmail.com>; samer.el-haj-mahmoud@arm.com <samer.el-haj-mahmoud@arm.com>; Jeremy Linton <jeremy.linton@arm.com> Subject: [edk2-devel] [PATCH 3/7] Platform/RaspberryPi: Split MMC register defintions <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">The current MMC (really SDHCI) defintions 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> --- .../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..0cb7e85b38 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 MMCHS_BASE; /** 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")); + MMCHS_BASE = MMCHS1_BASE; + } else if (RPI_MODEL == 4) { + DEBUG ((DEBUG_INFO, "SD is routed to emmc2\n")); + MMCHS_BASE = 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..e6892d36cf 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 (MMCHS_BASE + 0x4) #define BLEN_512BYTES (0x200UL << 0) -#define MMCHS_ARG (MMCHS1_BASE + 0x8) +#define MMCHS_ARG (MMCHS_BASE + 0x8) -#define MMCHS_CMD (MMCHS1_BASE + 0xC) +#define MMCHS_CMD (MMCHS_BASE + 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 (MMCHS_BASE + 0x10) +#define MMCHS_RSP32 (MMCHS_BASE + 0x14) +#define MMCHS_RSP54 (MMCHS_BASE + 0x18) +#define MMCHS_RSP76 (MMCHS_BASE + 0x1C) +#define MMCHS_DATA (MMCHS_BASE + 0x20) -#define MMCHS_PRES_STATE (MMCHS1_BASE + 0x24) +#define MMCHS_PRES_STATE (MMCHS_BASE + 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 (MMCHS_BASE + 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 (MMCHS_BASE + 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 (MMCHS_BASE + 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 (MMCHS_BASE + 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 (MMCHS_BASE + 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 (MMCHS_BASE + 0x3C) +#define MMCHS_HC2R (MMCHS_BASE + 0x3E) -#define MMCHS_CAPA (MMCHS1_BASE + 0x40) +#define MMCHS_CAPA (MMCHS_BASE + 0x40) #define VS30 BIT25 #define VS18 BIT26 -#define MMCHS_CUR_CAPA (MMCHS1_BASE + 0x48) -#define MMCHS_REV (MMCHS1_BASE + 0xFC) +#define MMCHS_CUR_CAPA (MMCHS_BASE + 0x48) +#define MMCHS_REV (MMCHS_BASE + 0xFC) #define BLOCK_COUNT_SHIFT 16 #define RCA_SHIFT 16 -- 2.13.7 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68815): <a href="https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Fmessage%2F68815&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=jL1YSExGluO9mVGDOhCOVddnA2U8GpSSZYAnuKZ9wBE%3D&reserved=0"> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Fmessage%2F68815&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=jL1YSExGluO9mVGDOhCOVddnA2U8GpSSZYAnuKZ9wBE%3D&reserved=0</a> Mute This Topic: <a href="https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.io%2Fmt%2F78964892%2F4387333&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=2AKbHlKdA4vorB%2BEogxgg21AAABKc7pPEcm1dazIVbM%3D&reserved=0"> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgroups.io%2Fmt%2F78964892%2F4387333&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=2AKbHlKdA4vorB%2BEogxgg21AAABKc7pPEcm1dazIVbM%3D&reserved=0</a> Group Owner: devel+owner@edk2.groups.io Unsubscribe: <a href="https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Funsub&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=fd9yYeQqrJsDzUFeEoC%2Fh9JAfk1lwVDQSRPC5ZcOYj8%3D&reserved=0"> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fedk2.groups.io%2Fg%2Fdevel%2Funsub&data=04%7C01%7Cawarkentin%40vmware.com%7Cc9a59eeb9e614e62b75708d8a08756b5%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637435850422525834%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=fd9yYeQqrJsDzUFeEoC%2Fh9JAfk1lwVDQSRPC5ZcOYj8%3D&reserved=0</a> [awarkentin@vmware.com] -=-=-=-=-=-= </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/68872">View/Reply Online (#68872)</a> | | <a target="_blank" href="https://groups.io/mt/78964892/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>