From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web09.19102.1583173850808790401 for ; Mon, 02 Mar 2020 10:30:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=cOpFMrcZ; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f66.google.com with SMTP id 6so102437wmi.5 for ; Mon, 02 Mar 2020 10:30:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=uPXmDFISskE8yBmJ+leKppnOhCqIux8oUJSPhoeoqzE=; b=cOpFMrcZ4BZVx6gEt6yhp7wO+iXb9hPwCwXIFGzDaAeCZ9mUk1gp1kEyB7dE/17yfk f8omqRtFRSN8gkC6Jv2E5FSIKwBtwUZXs4BAqFFKZpVtOjod2OHlNt1EHU2l8RmKwHxw rTopH7eWIyCohzYjGaGLm/E9/hK9HG+Irl2yTLouonxyznOsEydXsz5iYIEcLO8ZyISY NtFKeCjXvZ/InDKAwUfoikYGu9pFUUwetdNwye5pUDcra6aVtLZ8pFazwYQq9cjisM3B wl5+iv7UVkblG7IVVWUpxnK2zm8pHGzuyur4yOP34vh8rPwyt8aBFjrrq48QhkmZ8rgz ONZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uPXmDFISskE8yBmJ+leKppnOhCqIux8oUJSPhoeoqzE=; b=HNnFuYn1vUkBsv1kVUzjuer71dAxNHg1JM8pYRM2y1JhXBmCOYzWsornnjYH+rBp4R lKTseFlmJk/L82sBBzHz/NYEW4vK//uxro3cV2e72FMGw+LdNdSJm3yOj3yapZarGteo TbDp/8CPdaIwDIFgUsr5lEct2Yc12im8M+hVVuUj2skV/vatPOsq4s6cbjWlC8Jvi+WZ KimmNTgvh6HK8obfzt3PCgD07AGLnRUjMvwfZlNKUWPstMgi3EMu8KigBiGAnZyBIGvZ jav1dGeuwHY+0EkfJaHUEVp1MNpgfqSicwE/EsD51NFmHH4N+tfrE04fn9DtH9FUgg4n j6Jg== X-Gm-Message-State: ANhLgQ1dKMStGTKv9k08JpIXiey7plJskDGo3gVBm7NhpP9DIfddTlV4 sfJpKmBZ99m058xbz+/2kZM9bphPwFU+gNN/BQFcgA== X-Google-Smtp-Source: ADFU+vsO/ZaLhbcZ6XEt01U3sgOBAo1a5j3+EpRckGOZ6OwD3cxMPpVEuAc3yOLFY/xfFbvRayAs//lQT7uGugxvPXc= X-Received: by 2002:a1c:2d88:: with SMTP id t130mr386650wmt.68.1583173849289; Mon, 02 Mar 2020 10:30:49 -0800 (PST) MIME-Version: 1.0 References: <20200302172113.6260-1-pete@akeo.ie> In-Reply-To: <20200302172113.6260-1-pete@akeo.ie> From: "Ard Biesheuvel" Date: Mon, 2 Mar 2020 19:30:38 +0100 Message-ID: Subject: Re: [edk2-devel][PATCH 1/1] Platform/RPi: Move away from AcpiPlatformDxe for loading ACPI tables To: Pete Batard Cc: edk2-devel-groups-io , Leif Lindholm , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Andrei Warkentin Content-Type: text/plain; charset="UTF-8" On Mon, 2 Mar 2020 at 18:21, Pete Batard wrote: > > From: Andrei Warkentin > > Instead use ConfigDxe. This will allow selective loading/patching > to enable different SBBR/EBBR profiles. > For future patches, please don't break sentences in between the title and the commit log body. In my email window, this starts with 'Instead use ConfigDxe', and it takes me more cycles than necessary to figure out what this patch is about. The commit log should make sense by itself, and the title is just a summary of that. > Signed-off-by: Pete Batard > --- > Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c | 10 ++++++++++ > Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf | 2 ++ > Platform/RaspberryPi/RPi3/RPi3.dsc | 2 +- > Platform/RaspberryPi/RPi3/RPi3.fdf | 1 - > Platform/RaspberryPi/RPi4/RPi4.dsc | 2 +- > Platform/RaspberryPi/RPi4/RPi4.fdf | 1 - > 6 files changed, 14 insertions(+), 4 deletions(-) > > diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > index f92ac709a3d8..5c86b6dd12b1 100644 > --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include I know this is not ordered to begin with, but we usually try not to make things worse. I moved this include to the top. > #include > #include > #include > @@ -26,6 +27,12 @@ extern UINT8 ConfigDxeStrings[]; > > STATIC RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol; > > +/* > + * The GUID inside Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf and > + * Platform/RaspberryPi/RPi4/AcpiTables/AcpiTables.inf _must_ match below. > + */ > +STATIC CONST EFI_GUID mAcpiTableFile = { 0x7E374E25, 0x8E01, 0x4FEE, { 0x87, 0xf2, 0x39, 0x0C, 0x23, 0xC6, 0x06, 0xCD } }; This line is 122 characters long. I fixed that up for you. > + > typedef struct { > VENDOR_DEVICE_PATH VendorDevicePath; > EFI_DEVICE_PATH_PROTOCOL End; > @@ -408,5 +415,8 @@ ConfigInitialize ( > DEBUG ((DEBUG_ERROR, "Couldn't install ConfigDxe configuration pages: %r\n", Status)); > } > > + Status = LocateAndInstallAcpiFromFv (&mAcpiTableFile); > + ASSERT_EFI_ERROR (Status); > + > return EFI_SUCCESS; > } > diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > index 817cb98c1933..dc726cc6d934 100644 > --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf > @@ -35,6 +35,7 @@ [Packages] > MdeModulePkg/MdeModulePkg.dec > Silicon/Broadcom/Bcm283x/Bcm283x.dec > Platform/RaspberryPi/RaspberryPi.dec > + EmbeddedPkg/EmbeddedPkg.dec > > [LibraryClasses] > BaseLib > @@ -46,6 +47,7 @@ [LibraryClasses] > UefiDriverEntryPoint > HiiLib > GpioLib > + AcpiLib > > [Guids] > gConfigDxeFormSetGuid > diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc > index 304bc3dfeadf..df5b246af1f8 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.dsc > +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc > @@ -346,6 +346,7 @@ [LibraryClasses.common] > PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > + AcpiLib|EmbeddedPkg/Library/AcpiLib/AcpiLib.inf > > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > @@ -548,7 +549,6 @@ [Components.common] > # ACPI Support > # > MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > - MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > Platform/RaspberryPi/AcpiTables/AcpiTables.inf > > diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf > index ec3742c83729..66c2cbada59b 100644 > --- a/Platform/RaspberryPi/RPi3/RPi3.fdf > +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf > @@ -240,7 +240,6 @@ [FV.FvMain] > # ACPI Support > # > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > - INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > INF RuleOverride = ACPITABLE Platform/RaspberryPi/AcpiTables/AcpiTables.inf > > diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4/RPi4.dsc > index c039f6df2eb4..94e0d91ede2f 100644 > --- a/Platform/RaspberryPi/RPi4/RPi4.dsc > +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc > @@ -355,6 +355,7 @@ [LibraryClasses.common] > PlatformBootManagerLib|Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf > + AcpiLib|EmbeddedPkg/Library/AcpiLib/AcpiLib.inf > > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > @@ -574,7 +575,6 @@ [Components.common] > # ACPI Support > # > MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > - MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > Platform/RaspberryPi/AcpiTables/AcpiTables.inf > > diff --git a/Platform/RaspberryPi/RPi4/RPi4.fdf b/Platform/RaspberryPi/RPi4/RPi4.fdf > index b2a6ac9e6c66..ee57cc0dac89 100644 > --- a/Platform/RaspberryPi/RPi4/RPi4.fdf > +++ b/Platform/RaspberryPi/RPi4/RPi4.fdf > @@ -236,7 +236,6 @@ [FV.FvMain] > # ACPI Support > # > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > - INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > INF RuleOverride = ACPITABLE Platform/RaspberryPi/AcpiTables/AcpiTables.inf > Pushed as 07cc442f7212..cd6474cbed30 Thanks,