From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mx.groups.io with SMTP id smtpd.web08.4684.1626766672853098162 for ; Tue, 20 Jul 2021 00:37:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lQRzzkrt; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id 11205610C7 for ; Tue, 20 Jul 2021 07:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626766672; bh=QoK8kqtghH9VNhc/u7HEX+mqnRaPKuYDdB47UeFhbpU=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=lQRzzkrtjBX7Jhp8H/cCNPwO8bqPAe7CDGLR73myekxMDYNhKsQPcv/z9Yjc3xb9C zxMYHIyJDLhxH52eR4yRq3a2APSZmoKUiqvCbl9/XougakmzfoRSqHtnziYfyBW/W8 7j+QnoxPdYC5tJxDoMey4VW5tUkm6IdvE7lk445ztL05B8w078svu01XG386dOlxeb iNJI65d4W4zohGzqsvxhrpIH7w/Qib58/9nhxLnxicxH4KdGVJE0vNeW976DMXpAa0 BhUMEumm+Nm/0LozLp38BHvar3yjGqVYPlPCqC2+FS1oE26qJqQLrK32UxWFFZKPIj B+OwnQ7G3knjw== Received: by mail-oi1-f180.google.com with SMTP id w194so23640725oie.5 for ; Tue, 20 Jul 2021 00:37:52 -0700 (PDT) X-Gm-Message-State: AOAM532nWKpLqfzMffsT8D+iA5BgRssFE4GiAEenPaK7CN2snr3wf6Rh EfdhsytdCBMDcN6GM41GdwQYT4SxGeZqPpPV8cU= X-Google-Smtp-Source: ABdhPJw8479GDFEgOOVeKjH/jTM6LAAsml3X3xRFuvy1tMddilFKr9GCOh3Vw7DPJcT5CjxEcQL8amm8LCR5iU68RHw= X-Received: by 2002:aca:5a04:: with SMTP id o4mr19923174oib.33.1626766671464; Tue, 20 Jul 2021 00:37:51 -0700 (PDT) MIME-Version: 1.0 References: <20210719204520.15870-1-Samer.El-Haj-Mahmoud@arm.com> In-Reply-To: <20210719204520.15870-1-Samer.El-Haj-Mahmoud@arm.com> From: "Ard Biesheuvel" Date: Tue, 20 Jul 2021 09:37:40 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix non-standard ACPI HIDs To: Samer El-Haj-Mahmoud Cc: edk2-devel-groups-io , Leif Lindholm , Ard Biesheuvel , Pete Batard , Andrei Warkentin , =?UTF-8?B?TWFyaW8gQsSDbMSDbmljxIM=?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 19 Jul 2021 at 22:45, Samer El-Haj-Mahmoud wrote: > > Remove non-standard RPI ACPI _CIDs that are not needed. > This also fixes the FWTS failure reported in > https://github.com/pftf/RPi4/issues/67 > > The windows drivers at https://github.com/raspberrypi/windows-drivers > are still able to match the ACPI objects using the HIDs which > are supported in the drivers, with these two recent changes needed: > 469702898789e555c6947e50216a3f79e0ddeb9 > and > 5c5e2742b4c983b3001c473b168b0dae2fcba0c2 > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Pete Batard > Cc: Andrei Warkentin > Cc: Mario B=C4=83l=C4=83nic=C4=83 > Signed-off-by: Samer El-Haj-Mahmoud > Tested-by: Mario B=C4=83l=C4=83nic=C4=83 Glad to see this getting cleaned up. Anyone care to ack? > --- > Platform/RaspberryPi/AcpiTables/GpuDevs.asl | 26 +++++++++++--------- > Platform/RaspberryPi/AcpiTables/Sdhc.asl | 4 +-- > Platform/RaspberryPi/AcpiTables/Uart.asl | 2 +- > 3 files changed, 18 insertions(+), 14 deletions(-) > > diff --git a/Platform/RaspberryPi/AcpiTables/GpuDevs.asl b/Platform/Raspb= erryPi/AcpiTables/GpuDevs.asl > index 966a94cdb5b5..9750dc25c07c 100644 > --- a/Platform/RaspberryPi/AcpiTables/GpuDevs.asl > +++ b/Platform/RaspberryPi/AcpiTables/GpuDevs.asl > @@ -13,7 +13,11 @@ > Device (USB0) > { > Name (_HID, "BCM2848") > - Name (_CID, Package() { "DWC_OTG", "DWC2_OTG" }) > +#if (RPI_MODEL =3D=3D 3) > + Name (_CID, "DWC_OTG") > +#elif (RPI_MODEL =3D=3D 4) > + Name (_CID, "BCM2848") > +#endif > Name (_UID, 0x0) > Name (_CCA, 0x0) > Method (_STA) > @@ -36,7 +40,7 @@ Device (USB0) > Device (GPU0) > { > Name (_HID, "BCM2850") > - Name (_CID, "VC4") > + Name (_CID, "BCM2850") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Method (_STA) > @@ -140,7 +144,7 @@ Device (GPU0) > Device (RPIQ) > { > Name (_HID, "BCM2849") > - Name (_CID, "RPIQ") > + Name (_CID, "BCM2849") > Name (_UID, 0) > Name (_CCA, 0x0) > Method (_STA) > @@ -164,7 +168,7 @@ Device (RPIQ) > Device (VCIQ) > { > Name (_HID, "BCM2835") > - Name (_CID, "VCIQ") > + Name (_CID, "BCM2835") > Name (_UID, 0) > Name (_CCA, 0x0) > Name (_DEP, Package() { \_SB.GDV0.RPIQ }) > @@ -189,7 +193,7 @@ Device (VCIQ) > Device (VCSM) > { > Name (_HID, "BCM2856") > - Name (_CID, "VCSM") > + Name (_CID, "BCM2856") > Name (_UID, 0) > Name (_CCA, 0x0) > Name (_DEP, Package() { \_SB.GDV0.VCIQ }) > @@ -203,7 +207,7 @@ Device (VCSM) > Device (GPI0) > { > Name (_HID, "BCM2845") > - Name (_CID, "BCMGPIO") > + Name (_CID, "BCM2845") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Method (_STA) > @@ -230,7 +234,7 @@ Device (GPI0) > Device (I2C1) > { > Name (_HID, "BCM2841") > - Name (_CID, "BCMI2C") > + Name (_CID, "BCM2841") > Name (_UID, 0x1) > Name (_CCA, 0x0) > Method (_STA) > @@ -254,7 +258,7 @@ Device (I2C1) > Device (I2C2) > { > Name (_HID, "BCM2841") > - Name (_CID, "BCMI2C") > + Name (_CID, "BCM2841") > Name (_UID, 0x2) > Name (_CCA, 0x0) > Method (_STA) > @@ -278,7 +282,7 @@ Device (I2C2) > Device (SPI0) > { > Name (_HID, "BCM2838") > - Name (_CID, "BCMSPI0") > + Name (_CID, "BCM2838") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Method (_STA) > @@ -304,7 +308,7 @@ Device (SPI0) > Device (SPI1) > { > Name (_HID, "BCM2839") > - Name (_CID, "BCMAUXSPI") > + Name (_CID, "BCM2839") > Name (_UID, 0x1) > Name (_CCA, 0x0) > Name (_DEP, Package() { \_SB.GDV0.RPIQ }) > @@ -331,7 +335,7 @@ Device (SPI1) > // Device (SPI2) > // { > // Name (_HID, "BCM2839") > -// Name (_CID, "BCMAUXSPI") > +// Name (_CID, "BCM2839") > // Name (_UID, 0x2) > // Name (_CCA, 0x0) > // Name (_DEP, Package() { \_SB.GDV0.RPIQ }) > diff --git a/Platform/RaspberryPi/AcpiTables/Sdhc.asl b/Platform/Raspberr= yPi/AcpiTables/Sdhc.asl > index 42776e33bbc6..85d5053a338c 100644 > --- a/Platform/RaspberryPi/AcpiTables/Sdhc.asl > +++ b/Platform/RaspberryPi/AcpiTables/Sdhc.asl > @@ -23,7 +23,7 @@ > Device (SDC1) > { > Name (_HID, "BCM2847") > - Name (_CID, "ARASAN") > + Name (_CID, "BCM2847") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Name (_S1D, 0x1) > @@ -78,7 +78,7 @@ Device (SDC1) > Device (SDC2) > { > Name (_HID, "BCM2855") > - Name (_CID, "SDHST") > + Name (_CID, "BCM2855") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Name (_S1D, 0x1) > diff --git a/Platform/RaspberryPi/AcpiTables/Uart.asl b/Platform/Raspberr= yPi/AcpiTables/Uart.asl > index 167f94e8892b..974f06d3bc3f 100644 > --- a/Platform/RaspberryPi/AcpiTables/Uart.asl > +++ b/Platform/RaspberryPi/AcpiTables/Uart.asl > @@ -59,7 +59,7 @@ Device (URT0) > Device (URTM) > { > Name (_HID, "BCM2836") > - Name (_CID, "MINIUART") > + Name (_CID, "BCM2836") > Name (_UID, 0x0) > Name (_CCA, 0x0) > Method (_STA) > -- > 2.25.1 >