From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (NAM02-BN1-obe.outbound.protection.outlook.com [40.107.212.53]) by mx.groups.io with SMTP id smtpd.web09.128.1626899968842656896 for ; Wed, 21 Jul 2021 13:39:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@vmware.com header.s=selector2 header.b=HSzPn0DS; spf=pass (domain: vmware.com, ip: 40.107.212.53, mailfrom: awarkentin@vmware.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zjf0ZvbZX+jFOEZGHmmGme4Dl3YPwynswzdMwzNVdM278w/9qdMLffjyEd9qrDAXuvx5d5d6zNMX6UPKdGVGTy3V5rh6pax72TjuG1K5XQaqmmqrESlUX2hOe3porLjw/SxtHV4JW2D6wioluAI4LDUVmGuHPZzTkZqQCJlrepfc45d5R9M0TJANzN47h4OuW5cDTqjZdm5F42ztk+JgNfemjSbXgNYwB8h1MurzuxYoTbkdzo62K3o3U3wMKiRzmQqp8AnTitmLWBQsStNzZhAzHcsGuZwmlL5j8ZYH+LcdZLTlycDzcTWlSx7geRcQQCLOzWlURExmAqenirD92Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jebhhX7PL/5F1AZlMwLkTT0/rOAulxXRSXkQ6CZk2Ok=; b=AvdGDH0+Rx9YMpTUIQoNE45gWXQA7yH0F4x7z2JXSKhwX8YpY5ASa50wGY1ebfPK3CWF4L1f3vPFL5YI4QO/1BlnUrAwO3CSmId2Z0ovfGqhL7ZLbpdK5ezsDrZDH40j0rt9yJrsPc8rJOBgzaGttesYO3YgJK3n4pIs13BOlIafv8zoVmM8q07vxF2+L0KcN1YssUbSTrRT/bowFFVTbADJgPsZA4RqsvWfgt2TqmBe77j3KypYAop6h9Ml9rVDqWvH/dNYXZ4DhQM3Nri9OAVwl61utHKTxsuXDDhnFQHfT9vFi2yy6C6jmGnqzkOx5jf1q4WRVG6BRNAQRQI45Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jebhhX7PL/5F1AZlMwLkTT0/rOAulxXRSXkQ6CZk2Ok=; b=HSzPn0DS66Zr0SzoB23tFfs/xq8uBSmc0OjqFXP+/fFkRdqe1bR/U191Y5iYPwHLsKt8X0V6FbKVwMTUvbln71NxCs1eK/Cyul9diXDMfbbcd2BnpnCVQ4/ElNuDzyfolpV3RcnIWKW0gWnkpMBsLAJyFMw3KIN58ec/wTGfJcI= Received: from PH0PR05MB8702.namprd05.prod.outlook.com (2603:10b6:510:b2::21) by PH0PR05MB7995.namprd05.prod.outlook.com (2603:10b6:510:97::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.11; Wed, 21 Jul 2021 20:39:27 +0000 Received: from PH0PR05MB8702.namprd05.prod.outlook.com ([fe80::2566:a48:8045:d0fa]) by PH0PR05MB8702.namprd05.prod.outlook.com ([fe80::2566:a48:8045:d0fa%7]) with mapi id 15.20.4373.007; Wed, 21 Jul 2021 20:39:27 +0000 From: "Andrei Warkentin" To: Ard Biesheuvel , Samer El-Haj-Mahmoud CC: edk2-devel-groups-io , Leif Lindholm , Ard Biesheuvel , Pete Batard , =?iso-8859-2?Q?Mario_B=E3l=E3nic=E3?= Subject: Re: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix non-standard ACPI HIDs Thread-Topic: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix non-standard ACPI HIDs Thread-Index: AQHXfTonD8CK8z4cdkOE32jwZjQ9LatN5mRd Date: Wed, 21 Jul 2021 20:39:27 +0000 Message-ID: References: <20210719204520.15870-1-Samer.El-Haj-Mahmoud@arm.com>, In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=vmware.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 09255fe0-e4e4-4a46-e28f-08d94c87a203 x-ms-traffictypediagnostic: PH0PR05MB7995: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Su4emtw+lmpXa1vRONcQDfRshc46wY9GbDhSUmKnXltVlGG5jQtR8AXdM3BD9f0nW/JO2pVa6pcqXly7deU3chdcODcPYa5hsP7Dmv7bro8OMZzyD7/WPOiR9P9C+utAx8pJWw23VfKNe0Fl39Gc/xLeM4yAHhAdb4Yg6w99wKbluK9xJ5RXiMPwuy3BnH4andy/uDx0tHVUoigoMKpKK/KtqQdj+ct4wx8CxE60totYsauOQGyUC/yDl/2K6Jwkkn3KDzshCQ64TYNnZLdvkWekFveSHHxxh5TGC1gLGAqE/As0U1R2ZKY2Fp5FrxDIsWY122nVdiMcj59Hnz9ih1zZ4OURXMKpBqV1nkb068hQcd/vWFVufzXjn6KIdph+OAHnD9Vukq92lOeRkOb4gHPczBEmwiJxvGEXhTOYqcyuPen7ySls+CRHP5hX2CZLIArfmMzBBcVTAjrGeV70L/FN4fiBhSexVSxYxjftK4AQahTgnnaNaFRkt57Kpe2a52WgTMlbyKgx7hhg9VbbnWXwyr4qWEomdd1UYc2p7eV8KckaPTt72Y4yvaxoTMM/c5DpOXpdut8eY36FgGD3oCl1B8UugSV+yzEBbHOCZPkDmWmLLcL1W4cHfazCn1/j2JQzu07ol1BbBjR+onHy8XpaJDamwEf+IWyGa6ThpMaXzNOA3vOLjcdBkDRkcs3GLxCaJw1JGyHEy8CDOWYLOBiRpGcd0w+LczBJ+abfF6pE11lcESJMMO2PrmHi2le7gTF9A2NF+agk+Mr28BKJVoYUBBorZsQKGnTNB3vOBW0aV2+a7mke2hSszLvHaooW5vUm2k5S0pWhuS8YTU6xQw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR05MB8702.namprd05.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(66556008)(9686003)(76116006)(91956017)(26005)(6506007)(55016002)(45080400002)(508600001)(110136005)(316002)(66476007)(66946007)(66446008)(64756008)(8676002)(2906002)(54906003)(8936002)(53546011)(186003)(52536014)(71200400001)(86362001)(4326008)(33656002)(7696005)(66574015)(19627405001)(83380400001)(966005)(5660300002)(122000001)(166002)(38100700002)(38070700004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-2?Q?alR9l2LAGhpKMq2P9IkRRvDIP0tpo5FnqAb3S2udto9GzIroDZvTIUtzZ7?= =?iso-8859-2?Q?s56MIYswd5d/VMpYxN8L9fisTJQdyc2h9lNmO+W0yIaWn2onax+ZMQb/U3?= =?iso-8859-2?Q?LzWAc1j4Nyf3uXW/GP4Uuh7MQz584exGHPNcgfKFV5IVXjx1QXGXYy+6V2?= =?iso-8859-2?Q?HSaWUBe6yWK+neIitFJNFzeYf4UxxTpeEXu/89A1C7trcF/F2+4Tct/Hp7?= =?iso-8859-2?Q?DWjFfzk5tV9JzUb10qDcW6lIssk3V/wphtQeDgr4LvXdzJ2Z1Hb0Ltdax9?= =?iso-8859-2?Q?UfYhwrEOPuRDx9BThDMs3lhYHUn4MSbnSaTdGXjA2Acp1fYfVpmTDs64KV?= =?iso-8859-2?Q?1+EhD7lzfqNom/nf77SqQPM/uaxiGHLOABwhrDfBn+k/tTTywpkXRGBnSn?= =?iso-8859-2?Q?/oPrLkIEXCKgiVev0iX018oCx+PKxmmevpnz+bT4PdbQcgM9eqLJj77IV7?= =?iso-8859-2?Q?MkwyfnUQtxrJfX8eVBfKTXsyc/QoBo96iKpsEUmbXgKipKGuphsaxxCG9b?= =?iso-8859-2?Q?ktCLQSYXoXxleDBIDjVXlAeoJyRYsb5j4gDWNGJ7a17CeYVzOSlaWeyT72?= =?iso-8859-2?Q?ZeIzNcYD81sS4dEbLhjNm0U4cSVNyzHThbn1nXALWcDWOXjUUgIscIDfQd?= =?iso-8859-2?Q?R3JI/0qAtk30YvDCErgZiUtU+nPSuHqUhxH0CPHJ6Kj8Iy5fDnl8AYhjHk?= =?iso-8859-2?Q?+gyEPTHNl1/IOJPfpWPSdbrAgag6rs+JfGKBNoq5+4XW/2ggIU85P69rWk?= =?iso-8859-2?Q?2uNNEPuWO/17Cw/se+o++vwvOynM1uHepXQPeq21jaVwSBGThvIhNqqiek?= =?iso-8859-2?Q?XqDH0I0CVOVDhzcO7EsAidjH8xfGDpBYWE3/nRc9hfzqRuvFfQLHNZdxWj?= =?iso-8859-2?Q?oWFEZgZ7UzfCSgK9tr762RUAEd0i+u0YyjxSKXmOP4N1zxm6+5njcAkCk9?= =?iso-8859-2?Q?cq+kZK63WxJxI/cvJblxMakauh89m1KfBofV2b458mD9l4wj8AvC1DbGOS?= =?iso-8859-2?Q?jL2PFBrGKCJwWjnFaQJ7hT56fjLz7JOyU6MpmBr6rjFfzRRH9kqa+fMLqI?= =?iso-8859-2?Q?blXafbQatbfLmHUhEhj+oPeSNSL6p7ACka7t8u+t3j5QhKTGoBiRVa0Cj2?= =?iso-8859-2?Q?V5cNMlpWhecVJDUZhL1INm8dzRu1vLIJSP2HOzWyWsAfKjsguzkFbAcvpc?= =?iso-8859-2?Q?NZIiEkyUzTA/BweyDDpJUE3Zm1iUSXq3LGNA3EcYMTURjcd4RmU+Di5Uhy?= =?iso-8859-2?Q?SQtqFn4Og02RXelQseol9N7FiDcIYNKFXBnKibm++X2zokuRDhE4BHjk6Q?= =?iso-8859-2?Q?TWPxXgR0GoGdr+IN3tMJSqJVxTE+fJ95RYTDipvIrpuFNtY=3D?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR05MB8702.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09255fe0-e4e4-4a46-e28f-08d94c87a203 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2021 20:39:27.0980 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MV5dTNbM9lBq7xK/p7gJQC4P9LTrBCTs9oDh/aOxIQXZQRIQTFMQiBdVAmuB5zp1keY3xZwZe77FexvfxgNb3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR05MB7995 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_PH0PR05MB87024260CCE98A25CBC4F44BB9E39PH0PR05MB8702namp_" --_000_PH0PR05MB87024260CCE98A25CBC4F44BB9E39PH0PR05MB8702namp_ Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable Reviewed-by: Andrei Warkentin ________________________________ 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=E3l=E3nic=E3 Subject: Re: [edk2-platform][PATCH v1 1/1] Platform/RaspberryPi/RPi4: Fix n= on-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%2Fgithu= b.com%2Fpftf%2FRPi4%2Fissues%2F67&data=3D04%7C01%7Cawarkentin%40vmware.= com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7= C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJ= QIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=3DYO4V6pksRlNq= fPlMwO0VPKNVcp4npeP%2BN%2BpigTFfZnM%3D&reserved=3D0 > > The windows drivers at https://nam04.safelinks.protection.outlook.com/?ur= l=3Dhttps%3A%2F%2Fgithub.com%2Fraspberrypi%2Fwindows-drivers&data=3D04%= 7C01%7Cawarkentin%40vmware.com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb39138c= a3cee4b4aa4d6cd83d9dd62f0%7C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbGZs= b3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C10= 00&sdata=3DPMkBX%2F6vHaAoUC5tkCA7aAldaYEKFgh9w3yFYsgNrPQ%3D&reserve= d=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=E3l=E3nic=E3 > Signed-off-by: Samer El-Haj-Mahmoud > Tested-by: Mario B=E3l=E3nic=E3 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 > --_000_PH0PR05MB87024260CCE98A25CBC4F44BB9E39PH0PR05MB8702namp_ Content-Type: text/html; charset="iso-8859-2" Content-Transfer-Encoding: quoted-printable
Reviewed-by: Andrei Warkentin <awarkentin@vmware.com>
From: Ard Biesheuvel <ar= db@kernel.org>
Sent: Tuesday, July 20, 2021 10:37 AM
To: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>; Leif Lindholm= <leif@nuviainc.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>= ;; Pete Batard <pete@akeo.ie>; Andrei Warkentin <awarkentin@vmware= .com>; Mario B=E3l=E3nic=E3 <mariobalanica02@gmail.com>
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=
<Samer.El-Haj-Mahmoud@arm.com> 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%2Fgithub.= com%2Fpftf%2FRPi4%2Fissues%2F67&amp;data=3D04%7C01%7Cawarkentin%40vmwar= e.com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0= %7C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiL= CJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3DYO4V6p= ksRlNqfPlMwO0VPKNVcp4npeP%2BN%2BpigTFfZnM%3D&amp;reserved=3D0
>
> The windows drivers at https://nam04.safelinks.protection.outlook.com/?url=3Dhttps%3A%2F%2Fgithub.= com%2Fraspberrypi%2Fwindows-drivers&amp;data=3D04%7C01%7Cawarkentin%40v= mware.com%7Cbfd9e47da54c40ef9c5408d94b51486a%7Cb39138ca3cee4b4aa4d6cd83d9dd= 62f0%7C0%7C0%7C637623634750321947%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM= DAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=3DPM= kBX%2F6vHaAoUC5tkCA7aAldaYEKFgh9w3yFYsgNrPQ%3D&amp;reserved=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 <leif@nuviainc.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Pete Batard <pete@akeo.ie>
> Cc: Andrei Warkentin <awarkentin@vmware.com>
> Cc: Mario B=E3l=E3nic=E3 <mariobalanica02@gmail.com>
> Signed-off-by: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com&g= t;
> Tested-by: Mario B=E3l=E3nic=E3 <mariobalanica02@gmail.com>

Glad to see this getting cleaned up.

Anyone care to ack?


> ---
>  Platform/RaspberryPi/AcpiTables/GpuDevs.asl | 26 +++++++++++----= -----
>  Platform/RaspberryPi/AcpiTables/Sdhc.asl    |&nbs= p; 4 +--
>  Platform/RaspberryPi/AcpiTables/Uart.asl    |&nbs= p; 2 +-
>  3 files changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/Platform/RaspberryPi/AcpiTables/GpuDevs.asl b/Platform/Ra= spberryPi/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&qu= ot; })
> +#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/Raspb= erryPi/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/Raspb= erryPi/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
>
--_000_PH0PR05MB87024260CCE98A25CBC4F44BB9E39PH0PR05MB8702namp_--