From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.1192.1626727539413265441 for ; Mon, 19 Jul 2021 13:45:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: samer.el-haj-mahmoud@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E06766D; Mon, 19 Jul 2021 13:45:28 -0700 (PDT) Received: from U203705.Arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E5483F694; Mon, 19 Jul 2021 13:45:28 -0700 (PDT) From: "Samer El-Haj-Mahmoud" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Pete Batard , Andrei Warkentin , =?UTF-8?q?Mario=20B=C4=83l=C4=83nic=C4=83?= Subject: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix non-standard ACPI HIDs Date: Mon, 19 Jul 2021 16:45:20 -0400 Message-Id: <20210719204520.15870-1-Samer.El-Haj-Mahmoud@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Remove non-standard RPI ACPI _CIDs that are not needed.=0D This also fixes the FWTS failure reported in=0D https://github.com/pftf/RPi4/issues/67=0D =0D The windows drivers at https://github.com/raspberrypi/windows-drivers=0D are still able to match the ACPI objects using the HIDs which=0D are supported in the drivers, with these two recent changes needed:=0D 469702898789e555c6947e50216a3f79e0ddeb9=0D and=0D 5c5e2742b4c983b3001c473b168b0dae2fcba0c2=0D =0D Cc: Leif Lindholm =0D Cc: Ard Biesheuvel =0D Cc: Pete Batard =0D Cc: Andrei Warkentin =0D Cc: Mario B=C4=83l=C4=83nic=C4=83 =0D Signed-off-by: Samer El-Haj-Mahmoud =0D Tested-by: Mario B=C4=83l=C4=83nic=C4=83 =0D ---=0D Platform/RaspberryPi/AcpiTables/GpuDevs.asl | 26 +++++++++++---------=0D Platform/RaspberryPi/AcpiTables/Sdhc.asl | 4 +--=0D Platform/RaspberryPi/AcpiTables/Uart.asl | 2 +-=0D 3 files changed, 18 insertions(+), 14 deletions(-)=0D =0D diff --git a/Platform/RaspberryPi/AcpiTables/GpuDevs.asl b/Platform/Raspber= ryPi/AcpiTables/GpuDevs.asl=0D index 966a94cdb5b5..9750dc25c07c 100644=0D --- a/Platform/RaspberryPi/AcpiTables/GpuDevs.asl=0D +++ b/Platform/RaspberryPi/AcpiTables/GpuDevs.asl=0D @@ -13,7 +13,11 @@=0D Device (USB0)=0D {=0D Name (_HID, "BCM2848")=0D - Name (_CID, Package() { "DWC_OTG", "DWC2_OTG" })=0D +#if (RPI_MODEL =3D=3D 3)=0D + Name (_CID, "DWC_OTG")=0D +#elif (RPI_MODEL =3D=3D 4)=0D + Name (_CID, "BCM2848")=0D +#endif=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -36,7 +40,7 @@ Device (USB0)=0D Device (GPU0)=0D {=0D Name (_HID, "BCM2850")=0D - Name (_CID, "VC4")=0D + Name (_CID, "BCM2850")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -140,7 +144,7 @@ Device (GPU0)=0D Device (RPIQ)=0D {=0D Name (_HID, "BCM2849")=0D - Name (_CID, "RPIQ")=0D + Name (_CID, "BCM2849")=0D Name (_UID, 0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -164,7 +168,7 @@ Device (RPIQ)=0D Device (VCIQ)=0D {=0D Name (_HID, "BCM2835")=0D - Name (_CID, "VCIQ")=0D + Name (_CID, "BCM2835")=0D Name (_UID, 0)=0D Name (_CCA, 0x0)=0D Name (_DEP, Package() { \_SB.GDV0.RPIQ })=0D @@ -189,7 +193,7 @@ Device (VCIQ)=0D Device (VCSM)=0D {=0D Name (_HID, "BCM2856")=0D - Name (_CID, "VCSM")=0D + Name (_CID, "BCM2856")=0D Name (_UID, 0)=0D Name (_CCA, 0x0)=0D Name (_DEP, Package() { \_SB.GDV0.VCIQ })=0D @@ -203,7 +207,7 @@ Device (VCSM)=0D Device (GPI0)=0D {=0D Name (_HID, "BCM2845")=0D - Name (_CID, "BCMGPIO")=0D + Name (_CID, "BCM2845")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -230,7 +234,7 @@ Device (GPI0)=0D Device (I2C1)=0D {=0D Name (_HID, "BCM2841")=0D - Name (_CID, "BCMI2C")=0D + Name (_CID, "BCM2841")=0D Name (_UID, 0x1)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -254,7 +258,7 @@ Device (I2C1)=0D Device (I2C2)=0D {=0D Name (_HID, "BCM2841")=0D - Name (_CID, "BCMI2C")=0D + Name (_CID, "BCM2841")=0D Name (_UID, 0x2)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -278,7 +282,7 @@ Device (I2C2)=0D Device (SPI0)=0D {=0D Name (_HID, "BCM2838")=0D - Name (_CID, "BCMSPI0")=0D + Name (_CID, "BCM2838")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D @@ -304,7 +308,7 @@ Device (SPI0)=0D Device (SPI1)=0D {=0D Name (_HID, "BCM2839")=0D - Name (_CID, "BCMAUXSPI")=0D + Name (_CID, "BCM2839")=0D Name (_UID, 0x1)=0D Name (_CCA, 0x0)=0D Name (_DEP, Package() { \_SB.GDV0.RPIQ })=0D @@ -331,7 +335,7 @@ Device (SPI1)=0D // Device (SPI2)=0D // {=0D // Name (_HID, "BCM2839")=0D -// Name (_CID, "BCMAUXSPI")=0D +// Name (_CID, "BCM2839")=0D // Name (_UID, 0x2)=0D // Name (_CCA, 0x0)=0D // Name (_DEP, Package() { \_SB.GDV0.RPIQ })=0D diff --git a/Platform/RaspberryPi/AcpiTables/Sdhc.asl b/Platform/RaspberryP= i/AcpiTables/Sdhc.asl=0D index 42776e33bbc6..85d5053a338c 100644=0D --- a/Platform/RaspberryPi/AcpiTables/Sdhc.asl=0D +++ b/Platform/RaspberryPi/AcpiTables/Sdhc.asl=0D @@ -23,7 +23,7 @@=0D Device (SDC1)=0D {=0D Name (_HID, "BCM2847")=0D - Name (_CID, "ARASAN")=0D + Name (_CID, "BCM2847")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Name (_S1D, 0x1)=0D @@ -78,7 +78,7 @@ Device (SDC1)=0D Device (SDC2)=0D {=0D Name (_HID, "BCM2855")=0D - Name (_CID, "SDHST")=0D + Name (_CID, "BCM2855")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Name (_S1D, 0x1)=0D diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/RaspberryP= i/AcpiTables/Uart.asl=0D index 167f94e8892b..974f06d3bc3f 100644=0D --- a/Platform/RaspberryPi/AcpiTables/Uart.asl=0D +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl=0D @@ -59,7 +59,7 @@ Device (URT0)=0D Device (URTM)=0D {=0D Name (_HID, "BCM2836")=0D - Name (_CID, "MINIUART")=0D + Name (_CID, "BCM2836")=0D Name (_UID, 0x0)=0D Name (_CCA, 0x0)=0D Method (_STA)=0D -- =0D 2.25.1=0D =0D