ACPI: Add broken-cd property for SDMMC

Missed this change. The Windows driver needs to be made aware that the internal card detect register cannot be trusted. But card detection still works there, because sdport keeps track of the state based on the GPIO interrupt. Signed-off-by: Mario Bălănică <[email protected]>
hrw · Jul 11, 2024 · 0d37e72 · 0d37e72
1 parent 416b2fa
commit 0d37e72
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 0 deletions.
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Firefly/AIO-3588Q/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Firefly/AIO-3588Q/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/FydeInnovations/FydetabDuo/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/FydeInnovations/FydetabDuo/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5ITX/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Radxa/ROCK5ITX/AcpiTables/AcpiTables.inf
@@ -55,3 +55,4 @@
   gRK3588TokenSpaceGuid.PcdI2S1Supported
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxBase
   gRockchipTokenSpaceGuid.PcdRkMtlMailBoxSize
+  gRockchipTokenSpaceGuid.PcdRkSdmmcCardDetectBroken
diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Sdhc.asl b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Sdhc.asl
@@ -54,6 +54,7 @@ Scope (\_SB_) {
         Package () { "sd-uhs-ddr50", SDMMC_CAP_DDR50 },
         Package () { "sd-uhs-sdr50", SDMMC_CAP_SDR50 },
         Package () { "sd-uhs-sdr104", SDMMC_CAP_SDR104 },
+        Package () { "broken-cd", FixedPcdGetBool (PcdRkSdmmcCardDetectBroken) },
       }
     })