From 0d37e7250ee4df9ebc961cb4db8d249108affb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20B=C4=83l=C4=83nic=C4=83?= Date: Thu, 11 Jul 2024 04:03:19 +0300 Subject: [PATCH] ACPI: Add broken-cd property for SDMMC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ă --- .../Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf | 1 + .../Platform/Firefly/AIO-3588Q/AcpiTables/AcpiTables.inf | 1 + .../Platform/Firefly/ITX-3588J/AcpiTables/AcpiTables.inf | 1 + .../Platform/Firefly/ROC-RK3588S-PC/AcpiTables/AcpiTables.inf | 1 + .../Platform/FriendlyElec/NanoPC-T6/AcpiTables/AcpiTables.inf | 1 + .../Platform/FriendlyElec/NanoPi-R6C/AcpiTables/AcpiTables.inf | 1 + .../Platform/FriendlyElec/NanoPi-R6S/AcpiTables/AcpiTables.inf | 1 + .../FydeInnovations/FydetabDuo/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/AcpiTables.inf | 1 + .../Platform/Mekotronics/R58-Mini/AcpiTables/AcpiTables.inf | 1 + .../Platform/Mekotronics/R58X/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/AcpiTables.inf | 1 + .../Platform/OrangePi/OrangePi5/AcpiTables/AcpiTables.inf | 1 + .../Platform/OrangePi/OrangePi5Plus/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Platform/Radxa/ROCK5ITX/AcpiTables/AcpiTables.inf | 1 + edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Sdhc.asl | 1 + 19 files changed, 19 insertions(+) diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/AcpiTables.inf index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 10ea2d44..1a55cb5c 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 93e052e1..35d333b0 100644 --- 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 index 058e8e94..e66d4796 100644 --- 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) }, } })