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.web09.6067.1626950414254796239 for ; Thu, 22 Jul 2021 03:40:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XnkiHiy0; spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org) Received: by mail.kernel.org (Postfix) with ESMTPSA id ACF0E61351 for ; Thu, 22 Jul 2021 10:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626950411; bh=L/4tLFOUD3fExwfSM1snq5WLMlWwqD6quAN+pj/JCO0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=XnkiHiy0jsWxEMd3kETMYM9eA5YuHiDPnD1K280NurKnoCyWlZQ+5zjC11359/xtO qXJkdLhEVjEmQjTswtPEv/0fJr+ZJkPKUpECMuT0OnIwrXDNwyO/ATqvhNdwUd59N1 fxEKSI+vqfxmzWGQ9MFJuXezAaJ15KNx7MZp4OUgQYModvP0uz1hrUyyDqoVqVLylo KnaUz2kw7hiS54fNySOg1gWu5fTW7BVm8yWhK9yr7nau4Yyyy99PLtgFRvtrZ6QbGL turrpBmx4o/W1AJXCQALAXvQlR/EEGYs74Upai4U/hpWdAywuaGH+u4JtFbw4hBRMD WFJx0tnAzNHYw== Received: by mail-oi1-f176.google.com with SMTP id a132so6070999oib.6 for ; Thu, 22 Jul 2021 03:40:11 -0700 (PDT) X-Gm-Message-State: AOAM533K/Daobh8wbGGUa0NlWi3E8RyBGmJZ4I1F3iDSLmlZbfU/4QnO at2HlLZLpAiLref8f8wP3A8Qf1pjlIF8BjXa2P0= X-Google-Smtp-Source: ABdhPJx31hZrQJvUB9WV8n8SE+1Fa7lXqrW+KDzh0qOMKS+RjIGWteSwCmd4B60lJPT/Vdf6/J+qDbjeKjMq1g7YbCE= X-Received: by 2002:aca:5a04:: with SMTP id o4mr27209714oib.33.1626950411047; Thu, 22 Jul 2021 03:40:11 -0700 (PDT) MIME-Version: 1.0 References: <20210719204520.15870-1-Samer.El-Haj-Mahmoud@arm.com> In-Reply-To: From: "Ard Biesheuvel" Date: Thu, 22 Jul 2021 12:39:56 +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: Andrei Warkentin Cc: Samer El-Haj-Mahmoud , edk2-devel-groups-io , Leif Lindholm , Ard Biesheuvel , Pete Batard , =?UTF-8?B?TWFyaW8gQsSDbMSDbmljxIM=?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 21 Jul 2021 at 22:39, Andrei Warkentin wrot= e: > > Reviewed-by: Andrei Warkentin Pushed as d549e39ca1a9..194269223294 Thanks all, > ________________________________ > From: Ard Biesheuvel > Sent: Tuesday, July 20, 2021 10:37 AM > To: Samer El-Haj-Mahmoud > Cc: edk2-devel-groups-io ; Leif Lindholm ; Ard Biesheuvel ; Pete Batard ; Andrei Warkentin ; Mario B=C4=83l=C4=83nic= =C4=83 > Subject: Re: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix= non-standard ACPI HIDs > > 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://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgit= hub.com%2Fpftf%2FRPi4%2Fissues%2F67&data=3D04%7C01%7Cawarkentin%40vmwar= e.com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0= %7C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiL= CJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DYO4V6pksRl= NqfPlMwO0VPKNVcp4npeP%2BN%2BpigTFfZnM%3D&reserved=3D0 > > > > The windows drivers at https://nam04.safelinks.protection.outlook.com/?= url=3Dhttps%3A%2F%2Fgithub.com%2Fraspberrypi%2Fwindows-drivers&data=3D0= 4%7C01%7Cawarkentin%40vmware.com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb3913= 8ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbG= Zsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C= 1000&sdata=3DPMkBX%2F6vHaAoUC5tkCA7aAldaYEKFgh9w3yFYsgNrPQ%3D&reser= ved=3D0 > > 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/Ras= pberryPi/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/Raspbe= rryPi/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/Raspbe= rryPi/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 > >