[BUG] Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs

[BUG] Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs

[Jeremy Linton]

From: Jeremy Linton <jeremy.linton@arm.com>

The new emmc2 device adds a container with a _UID of 0
which duplicates an existing ACPI container.

This causes windows to fail to boot with a Stop ACPI_BIOS_ERROR.
The workaround without this fix is to go into the BDS menus and
set the SD routing to the Arasan.

Fixes: 311ed3c790 ("Platform/RaspberryPi/Acpitables: Add eMMC2 device and
tweak Arasan")
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 Platform/RaspberryPi/AcpiTables/Emmc.asl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/AcpiTables/Emmc.asl b/Platform/RaspberryPi/AcpiTables/Emmc.asl
index 984db4eaa9..179dd3ecdb 100644
--- a/Platform/RaspberryPi/AcpiTables/Emmc.asl
+++ b/Platform/RaspberryPi/AcpiTables/Emmc.asl
@@ -18,7 +18,7 @@ DefinitionBlock (__FILE__, "SSDT", 5, "RPIFDN", "RPI4EMMC", 2)
 #if (RPI_MODEL == 4)
     Device (GDV1) {
       Name (_HID, "ACPI0004")
-      Name (_UID, 0x0)
+      Name (_UID, 0x2)
       Name (_CCA, 0x0)
 
       Name (RBUF, ResourceTemplate ()
-- 
2.13.7

Re: [BUG] Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs

[Ard Biesheuvel]

On Fri, 26 Feb 2021 at 19:25, jlinton <jeremy.linton@arm.com> wrote:
>
> From: Jeremy Linton <jeremy.linton@arm.com>
>
> The new emmc2 device adds a container with a _UID of 0
> which duplicates an existing ACPI container.
>
> This causes windows to fail to boot with a Stop ACPI_BIOS_ERROR.
> The workaround without this fix is to go into the BDS menus and
> set the SD routing to the Arasan.
>
> Fixes: 311ed3c790 ("Platform/RaspberryPi/Acpitables: Add eMMC2 device and
> tweak Arasan")
> Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>

Patch is still white space impaired, so I had to reconstruct it by
hand, which is is obviously not the end of the world in this case.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

Pushed as de806bdb506f..d22356576053

thanks,

> ---
>  Platform/RaspberryPi/AcpiTables/Emmc.asl | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Platform/RaspberryPi/AcpiTables/Emmc.asl b/Platform/RaspberryPi/AcpiTables/Emmc.asl
> index 984db4eaa9..179dd3ecdb 100644
> --- a/Platform/RaspberryPi/AcpiTables/Emmc.asl
> +++ b/Platform/RaspberryPi/AcpiTables/Emmc.asl
> @@ -18,7 +18,7 @@ DefinitionBlock (__FILE__, "SSDT", 5, "RPIFDN", "RPI4EMMC", 2)
>  #if (RPI_MODEL == 4)
>      Device (GDV1) {
>        Name (_HID, "ACPI0004")
> -      Name (_UID, 0x0)
> +      Name (_UID, 0x2)
>        Name (_CCA, 0x0)
>
>        Name (RBUF, ResourceTemplate ()
> --
> 2.13.7
>