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.web11.13828.1614364828565866793
 for <devel@edk2.groups.io>;
 Fri, 26 Feb 2021 10:40:28 -0800
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tkysC9fo;
 spf=pass (domain: kernel.org, ip: 198.145.29.99, mailfrom: ardb@kernel.org)
Received: by mail.kernel.org (Postfix) with ESMTPSA id B7EDF64DF2
	for <devel@edk2.groups.io>; Fri, 26 Feb 2021 18:40:27 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1614364827;
	bh=NuUhryLU5XU/2d28OOlEbUjaypBtfaCT6QuUJngKNkM=;
	h=References:In-Reply-To:From:Date:Subject:To:Cc:From;
	b=tkysC9foYCmsPtmbO4R+aIgkyGG94OnpcIdgOTm2Q5xU6Qr6lL5RlIvnIfQZd5HVE
	 7CbaCqq39fxub9Fj/oic+efkSfF1JjrwvUkrdZRoFJnGM6QmMFt1dkB+ZS4M0N2luo
	 7UWdXUXhft6fGpl1tMO61GG+3Lissa3iOV0XWMDGi14YcdrFjb1WOVTCxgCxMQN9Tn
	 z0fqxVBwcIccpR2DNj+Vj39kHJr1FAXGA8nKx3+rvBy+kKbEJ9nYlaoWj+lX4sVzqQ
	 vkRLm+f82iKp6lidz5gTP2rkmWIlhh8gAfKXocSl/eiXM13gCK8g1wbETKBYnfFdzS
	 q+t93j52dnR4Q==
Received: by mail-ot1-f47.google.com with SMTP id v12so8843850ott.10
        for <devel@edk2.groups.io>; Fri, 26 Feb 2021 10:40:27 -0800 (PST)
X-Gm-Message-State: AOAM532NOd3v3fjtsXjLqmxcrlS9Kj5x11dhZ2yltzWR+jHTr5uRXl2e
	2AlhTi7f2taGvxsfy5H8MhHbbF6gY2rl3eVuLwc=
X-Google-Smtp-Source: ABdhPJxidhNX9FE+OBfueK96qJAuZOm9kZh1UHaivKGEvRZKmhv+Y06DyStAZ+nvYJxIw8OXk27R+Vu59c5+hJqf/pM=
X-Received: by 2002:a05:6830:135a:: with SMTP id r26mr3310187otq.77.1614364826898;
 Fri, 26 Feb 2021 10:40:26 -0800 (PST)
MIME-Version: 1.0
References: <20210226182458.398136-1-jeremy.linton@arm.com>
In-Reply-To: <20210226182458.398136-1-jeremy.linton@arm.com>
From: "Ard Biesheuvel" <ardb@kernel.org>
Date: Fri, 26 Feb 2021 19:40:15 +0100
X-Gmail-Original-Message-ID: <CAMj1kXGvSkC16KS1p_Fzm1c4k=NBPXoFbtdVyS-66Q1ymvNDaw@mail.gmail.com>
Message-ID: <CAMj1kXGvSkC16KS1p_Fzm1c4k=NBPXoFbtdVyS-66Q1ymvNDaw@mail.gmail.com>
Subject: Re: [BUG] Platform/RaspberryPi/Acpitables: Correct duplicate _UIDs
To: jlinton <jeremy.linton@arm.com>
Cc: devel@edk2.groups.io, Peter Batard <pete@akeo.ie>, 
	Andrei Warkentin <awarkentin@vmware.com>, Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>, 
	Leif Lindholm <leif@nuviainc.com>, Ard Biesheuvel <ardb+tianocore@kernel.org>
Content-Type: text/plain; charset="UTF-8"

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
>