Revert "Fydetab Duo: fixes for SDcard"

With current change, SD card no longer appears in UEFI Boot Manager. Looking at commit history, the problem is already described and workaround: c02b333 (same as current change: bad) 416b2fa (actual solution) The Fydetab Duo motherboard has SDMMC_DET inverted, which is against Rockchip design. This is a hardware mistake that prevents the RK3588 MaskROM to boot from SD card when tray is fully closed. No software fix is possible because MaskROM is read-only. Therefore, in order to boot UEFI firmware and OS from SD card, the tray has to be left ajar and UEFI firmware must not invert the state once again. This allows UEFI firmware to detect the SD card no matter if tray is fully in or partially.
edk2-porting · Sep 9, 2024 · e7c4ff5 · e7c4ff5
1 parent e98af13
commit e7c4ff5
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/edk2-rockchip/Platform/FydeInnovations/FydetabDuo/FydetabDuo.dsc b/edk2-rockchip/Platform/FydeInnovations/FydetabDuo/FydetabDuo.dsc
@@ -98,7 +98,7 @@
   gRK3588TokenSpaceGuid.PcdI2S0Supported|TRUE
 
   # SD card detect signal is inverted
-  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectInverted|TRUE
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken|TRUE
 
 ################################################################################
 #

diff --git a/...hip/Platform/FydeInnovations/FydetabDuo/Library/RockchipPlatformLib/RockchipPlatformLib.c b/...hip/Platform/FydeInnovations/FydetabDuo/Library/RockchipPlatformLib/RockchipPlatformLib.c
@@ -51,8 +51,6 @@ SdmmcIoMux (
   BUS_IOC->GPIO4D_IOMUX_SEL_L = (0xFFFFUL << 16) | (0x1111); //SDMMC_D0,SDMMC_D1,SDMMC_D2,SDMMC_D3
   BUS_IOC->GPIO4D_IOMUX_SEL_H = (0x00FFUL << 16) | (0x0011); //SDMMC_CLK,SDMMC_CMD
   PMU1_IOC->GPIO0A_IOMUX_SEL_H = (0x000FUL << 16) | (0x0001); //SDMMC_DET
-  GpioPinSetDirection (4, GPIO_PIN_PB4, GPIO_PIN_OUTPUT);
-  GpioPinWrite (4, GPIO_PIN_PB4, TRUE);
 }
 
 VOID

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/RkSdmmcDxe/RkSdmmcDxe.c b/edk2-rockchip/Silicon/Rockchip/Drivers/RkSdmmcDxe/RkSdmmcDxe.c
@@ -128,11 +128,7 @@ RkSdmmcCardDetect (
     return TRUE; // let the driver do software detection
   }
 
-  if (FixedPcdGetBool (PcdRkSdmmcCardDetectInverted)) {
-    return PresenceState != RkSdmmcCardPresent;
-  } else {
-    return PresenceState == RkSdmmcCardPresent;
-  }
+  return PresenceState == RkSdmmcCardPresent;
 }
 
 STATIC PLATFORM_DW_MMC_PROTOCOL mDwMmcDeviceProtocol = {

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/RkSdmmcDxe/RkSdmmcDxe.inf b/edk2-rockchip/Silicon/Rockchip/Drivers/RkSdmmcDxe/RkSdmmcDxe.inf
@@ -44,7 +44,6 @@
 [Pcd]
   gRockchipTokenSpaceGuid.PcdRkSdmmcBaseAddress
   gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
-  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectInverted
 
 [Depex]
   TRUE
diff --git a/edk2-rockchip/Silicon/Rockchip/RockchipPkg.dec b/edk2-rockchip/Silicon/Rockchip/RockchipPkg.dec
@@ -63,7 +63,6 @@
 
   gRockchipTokenSpaceGuid.PcdRkSdmmcBaseAddress|0x0|UINT32|0x40000030
   gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken|FALSE|BOOLEAN|0x40000031
-  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectInverted|FALSE|BOOLEAN|0x40000032
 
   gRockchipTokenSpaceGuid.PcdDwcSdhciBaseAddress|0x0|UINT32|0x40000035
   gRockchipTokenSpaceGuid.PcdDwcSdhciForceHighSpeed|FALSE|BOOLEAN|0x40000036