- Asa-dev - op-lists.linaro.org

Re: [Asa-dev] [EXTERNAL] [PATCH 3/4] SbsaQemu: Add new ACPI driver and FDT parser to count CPU

by Graeme Gregory

On 04/08/2020 11:33, Tanmay Jagdale via Asa-dev wrote: > - Add a new ACPI driver for the SbsaQemu platform which would > handle any modifications needed for the static ACPI tables. > > - Added a parser function in this driver which parses the FDT > created by Qemu to determine the number of CPUs and hence > update the PcdCoreCount variable. > > Signed-off-by: Tanmay Jagdale <tanmay.jagdale(a)linaro.org> > --- > Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 9 ++- > Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 7 +- > Silicon/Qemu/SbsaQemu/Acpi.dsc.inc | 10 +-- > .../Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 2 - > Silicon/Qemu/SbsaQemu/AcpiTables/Madt.aslc | 4 +- > .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 72 +++++++++++++++++++ > .../SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf | 49 +++++++++++++ > .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 6 -- > .../SbsaQemuPlatformDxe.inf | 7 -- > Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 4 ++ > 10 files changed, 134 insertions(+), 36 deletions(-) > create mode 100644 Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c > create mode 100644 Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf > > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > index ac1398af8f..d42b9cd4de 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc > @@ -75,6 +75,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > > + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf > > @@ -217,7 +218,6 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > > PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf > > - FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > ArmPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf > > [LibraryClasses.common.DXE_CORE] > @@ -300,10 +300,6 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0 > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320 > > - # Core and Cluster Count > - gArmPlatformTokenSpaceGuid.PcdCoreCount|4 > - gArmPlatformTokenSpaceGuid.PcdClusterCount|1 > - > # DEBUG_ASSERT_ENABLED 0x01 > # DEBUG_PRINT_ENABLED 0x02 > # DEBUG_CODE_ENABLED 0x04 > @@ -480,6 +476,9 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE > [PcdsDynamicDefault.common] > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 > > + # Core and Cluster Count > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdCoreCount|1 > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdClusterCount|1 > > # System Memory Size -- 128 MB initially, actual size will be fetched from DT > # TODO as no DT will be used we should pass this by some other method > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > index 7f1a60e3ee..3bcf0bf004 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > @@ -232,6 +232,7 @@ READ_LOCK_STATUS = TRUE > # > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > + INF Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf > INF RuleOverride = ACPITABLE Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf > INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > > @@ -309,9 +310,3 @@ READ_LOCK_STATUS = TRUE > } > > !include ArmVirtPkg/ArmVirtRules.fdf.inc > - > -[Rule.Common.USER_DEFINED.ACPITABLE] > - FILE FREEFORM = $(NAMED_GUID) { > - RAW ACPI |.acpi > - RAW ASL |.aml > - } Unrelated change that has snuck in? > diff --git a/Silicon/Qemu/SbsaQemu/Acpi.dsc.inc b/Silicon/Qemu/SbsaQemu/Acpi.dsc.inc > index 76d0fac079..c3e910763c 100644 > --- a/Silicon/Qemu/SbsaQemu/Acpi.dsc.inc > +++ b/Silicon/Qemu/SbsaQemu/Acpi.dsc.inc > @@ -30,13 +30,7 @@ > # > # ACPI support > # > - MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf { > - <LibraryClasses> > - NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf > - > - <PcdsFixedAtBuild> > - # support ACPI v5.0 or later > - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20 > - } > + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf > Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf > + Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf > diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf > index 63d5754e16..9f8ced9db0 100644 > --- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf > +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf > @@ -33,8 +33,6 @@ > MdeModulePkg/MdeModulePkg.dec > > [FixedPcd] > - gArmPlatformTokenSpaceGuid.PcdClusterCount > - gArmPlatformTokenSpaceGuid.PcdCoreCount > gArmTokenSpaceGuid.PcdGicDistributorBase > gArmTokenSpaceGuid.PcdGicRedistributorsBase > > diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Madt.aslc b/Silicon/Qemu/SbsaQemu/AcpiTables/Madt.aslc > index 7bec2d4ef3..9e39e2e139 100644 > --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Madt.aslc > +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Madt.aslc > @@ -15,8 +15,8 @@ > > #include "AcpiTables.h" > > -#define CORES (FixedPcdGet32 (PcdClusterCount) * \ > - FixedPcdGet32 (PcdCoreCount)) > +#define CORES 4 > + > // > // Multiple APIC Description Table > // This seems to be purely needed because patch 1 created this file and as I commented in patch 1 I don't think we need it. Graeme > diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c > new file mode 100644 > index 0000000000..87f2c1aaec > --- /dev/null > +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c > @@ -0,0 +1,72 @@ > +/** @file > +* This file is an ACPI driver for the Qemu SBSA platform. > +* > +* Copyright (c) 2020, Linaro Ltd. All rights reserved. > +* > +* SPDX-License-Identifier: BSD-2-Clause-Patent > +* > +**/ > +#include <Library/DebugLib.h> > +#include <Library/PcdLib.h> > +#include <Library/UefiBootServicesTableLib.h> > +#include <Library/UefiDriverEntryPoint.h> > +#include <Library/UefiLib.h> > +#include <Protocol/FdtClient.h> > +#include <libfdt.h> > + > +/* > + * A function that walks through the Device Tree created > + * by Qemu and counts the number of CPUs present in it. > + */ > +VOID > +SbsaQemuCountCpusFromFdt( > + VOID > +) > +{ > + VOID *DeviceTreeBase; > + INT32 Node, Prev; > + RETURN_STATUS PcdStatus; > + INT32 CpuNode; > + INT32 CpuCount; > + > + DeviceTreeBase = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeBaseAddress); > + ASSERT (DeviceTreeBase != NULL); > + > + // Make sure we have a valid device tree blob > + ASSERT (fdt_check_header (DeviceTreeBase) == 0); > + > + CpuNode = fdt_path_offset (DeviceTreeBase, "/cpus"); > + if (CpuNode <= 0) { > + DEBUG((EFI_D_ERROR, "Unable to locate /cpus in device tree\n")); > + return; > + } > + > + CpuCount = 0; > + > + // Walk through /cpus node and count the number of subnodes. > + // The count of these subnodes corresponds to the numer of > + // CPUs created by Qemu. > + for (Prev = fdt_first_subnode(DeviceTreeBase, CpuNode);; Prev = Node) { > + CpuCount++; > + Node = fdt_next_subnode (DeviceTreeBase, Prev); > + if (Node < 0) { > + break; > + } > + } > + > + PcdStatus = PcdSet32S (PcdCoreCount, CpuCount); > + ASSERT_RETURN_ERROR (PcdStatus); > +} > + > +EFI_STATUS > +EFIAPI > +InitializeSbsaQemuAcpiDxe ( > + IN EFI_HANDLE ImageHandle, > + IN EFI_SYSTEM_TABLE *SystemTable > + ) > +{ > + // Parse the device tree and get the number of CPUs > + SbsaQemuCountCpusFromFdt(); > + > + return EFI_SUCCESS; > +} > diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf > new file mode 100644 > index 0000000000..efc4d295bf > --- /dev/null > +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf > @@ -0,0 +1,49 @@ > +## @file > +# This driver modifies ACPI tables for the Qemu SBSA platform > +# > +# Copyright (c) 2020, Linaro Ltd. All rights reserved. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > +## > + > +[Defines] > + INF_VERSION = 0x0001001d > + BASE_NAME = SbsaQemuAcpiDxe > + FILE_GUID = 6c592dc9-76c8-474f-93b2-bf1e8f15ae35 > + MODULE_TYPE = DXE_DRIVER > + VERSION_STRING = 1.0 > + > + ENTRY_POINT = InitializeSbsaQemuAcpiDxe > + > +[Sources] > + SbsaQemuAcpiDxe.c > + > +[Packages] > + ArmPkg/ArmPkg.dec > + ArmPlatformPkg/ArmPlatformPkg.dec > + ArmVirtPkg/ArmVirtPkg.dec > + EmbeddedPkg/EmbeddedPkg.dec > + MdeModulePkg/MdeModulePkg.dec > + MdePkg/MdePkg.dec > + Silicon/Qemu/SbsaQemu/SbsaQemu.dec > + > +[LibraryClasses] > + ArmLib > + BaseMemoryLib > + DebugLib > + BaseLib > + FdtLib > + DxeServicesLib > + PcdLib > + UefiDriverEntryPoint > + UefiLib > + UefiRuntimeServicesTableLib > + > +[Pcd] > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdCoreCount > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdClusterCount > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress > + > +[Depex] > + TRUE > diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c > index f55dbdb453..b7270a07ab 100644 > --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c > +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c > @@ -51,11 +51,5 @@ InitializeSbsaQemuPlatformDxe ( > return Status; > } > > - Status = gBS->InstallMultipleProtocolInterfaces (&ImageHandle, > - &gEdkiiPlatformHasAcpiGuid, NULL, NULL); > - if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "FAILED TO INSTALL gEDKIIPlatformHasAcpiGuid protocol\n")); > - } > - > return EFI_SUCCESS; > } > diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf > index a50d563782..6c9c28946e 100644 > --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf > +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf > @@ -39,13 +39,6 @@ > [Depex] > TRUE > > -[Guids] > - gEdkiiPlatformHasAcpiGuid > - > [Protocols] > gEdkiiNonDiscoverableDeviceProtocolGuid ## PRODUCES > - gEfiAcpiTableProtocolGuid ## CONSUMES > gEfiPciIoProtocolGuid ## CONSUMES > - > -[FixedPcd] > - gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision > diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec > index cd879f4dbd..6aca632996 100644 > --- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec > +++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec > @@ -35,3 +35,7 @@ > gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase|0|UINT64|0x00000003 > gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize|0x10000|UINT32|0x00000004 > gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x10000000000|UINT64|0x00000005 > + > +[PcdsDynamic.common] > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdCoreCount|0x1|UINT32|0x00000006 > + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdClusterCount|0x1|UINT32|0x00000007

4 years, 1 month

1
0
0 0

Re: [Asa-dev] [EXTERNAL] [PATCH 2/4] SbsaQemu: Use macros for the PCI entries in DSDT

by Graeme Gregory

On 04/08/2020 11:33, Tanmay Jagdale via Asa-dev wrote: > Signed-off-by: Tanmay Jagdale <tanmay.jagdale(a)linaro.org> > --- > Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl | 1294 +++------------------ > 1 file changed, 180 insertions(+), 1114 deletions(-) > > diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl > index d63e22dd6b..0323657512 100644 > --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl > +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl > @@ -10,6 +10,23 @@ > > #include "AcpiTables.h" > > +#define LINK_DEVICE(Uid, LinkName, Irq) \ > + Device(LinkName) { \ > + Name(_HID, EISAID("PNP0C0F")) \ > + Name(_UID, Uid) \ > + Name(_PRS, ResourceTemplate() { \ > + Interrupt(ResourceProducer, Level, ActiveHigh, Exclusive) { Irq } \ > + }) \ > + Method (_CRS, 0) { Return (_PRS) } \ > + Method (_SRS, 1) { } \ > + Method (_DIS) { } \ > + } > + > +#define PRT_ENTRY(Address, Pin, Link) \ > + Package (4) { \ > + Address, Pin, Link, Zero \ > + } > + > DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "LNRO", "SBSA", > EFI_ACPI_OEM_REVISION) { > Scope (_SB) { > @@ -158,1123 +175,172 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "LNRO", "SBSA", > return (0xf0000000) > } > > - Device (GSI0) > - { > - Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID > - Name (_UID, Zero) // _UID: Unique ID > - Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000023, > - } > - }) > - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000023, > - } > - }) > - Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings > - { > - } > - } > - > - Device (GSI1) > - { > - Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID > - Name (_UID, Zero) // _UID: Unique ID > - Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000024, > - } > - }) > - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000024, > - } > - }) > - Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings > - { > - } > - } > - > - Device (GSI2) > - { > - Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID > - Name (_UID, Zero) // _UID: Unique ID > - Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000025, > - } > - }) > - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000025, > - } > - }) > - Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings > - { > - } > - } > - > - Device (GSI3) > - { > - Name (_HID, "PNP0C0F" /* PCI Interrupt Link Device */) // _HID: Hardware ID > - Name (_UID, Zero) // _UID: Unique ID > - Name (_PRS, ResourceTemplate () // _PRS: Possible Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000026, > - } > - }) > - Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings > - { > - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, ) > - { > - 0x00000026, > - } > - }) > - Method (_SRS, 1, NotSerialized) // _SRS: Set Resource Settings > - { > - } > - } > + LINK_DEVICE(0, GSI0, 0x23) > + LINK_DEVICE(1, GSI1, 0x24) > + LINK_DEVICE(2, GSI2, 0x25) > + LINK_DEVICE(3, GSI3, 0x26) This is much better, but rather than deleting from DSDT added in patch 1, just remove the old PCI from patch 1 DSDT and just make this patch add the new stuff. This comment for below too. Graeme > > Name (_PRT, Package () // _PRT: PCI Routing Table > { > - Package () > - { > - 0x0000FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package () > - { > - 0x0000FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package () > - { > - 0x0000FFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package () > - { > - 0x0000FFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0001FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0001FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0001FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0001FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0002FFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0002FFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0002FFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0002FFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0003FFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0003FFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0003FFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0003FFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0004FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0004FFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0004FFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0004FFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0005FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0005FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0005FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0005FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0006FFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0006FFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0006FFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0006FFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0007FFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0007FFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0007FFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0007FFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0008FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0008FFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0008FFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0008FFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0009FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0009FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0009FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0009FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000AFFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000AFFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000AFFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000AFFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000BFFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000BFFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000BFFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000BFFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000CFFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000CFFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000CFFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000CFFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000DFFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000DFFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000DFFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000DFFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000EFFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000EFFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000EFFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000EFFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000FFFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000FFFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000FFFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x000FFFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0010FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0010FFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0010FFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0010FFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0011FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0011FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0011FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0011FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0012FFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0012FFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0012FFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0012FFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0013FFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0013FFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0013FFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0013FFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0014FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0014FFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0014FFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0014FFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0015FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0015FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0015FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0015FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0016FFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0016FFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0016FFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0016FFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0017FFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0017FFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0017FFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0017FFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0018FFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0018FFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0018FFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0018FFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0019FFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0019FFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0019FFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x0019FFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001AFFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001AFFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001AFFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001AFFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001BFFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001BFFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001BFFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001BFFFF, > - 0x03, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001CFFFF, > - Zero, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001CFFFF, > - One, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001CFFFF, > - 0x02, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001CFFFF, > - 0x03, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001DFFFF, > - Zero, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001DFFFF, > - One, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001DFFFF, > - 0x02, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001DFFFF, > - 0x03, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001EFFFF, > - Zero, > - GSI2, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001EFFFF, > - One, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001EFFFF, > - 0x02, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001EFFFF, > - 0x03, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001FFFFF, > - Zero, > - GSI3, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001FFFFF, > - One, > - GSI0, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001FFFFF, > - 0x02, > - GSI1, > - Zero > - }, > - > - Package (0x04) > - { > - 0x001FFFFF, > - 0x03, > - GSI2, > - Zero > - }, > + PRT_ENTRY(0x0000FFFF, 0, GSI0), > + PRT_ENTRY(0x0000FFFF, 0, GSI1), > + PRT_ENTRY(0x0000FFFF, 0, GSI2), > + PRT_ENTRY(0x0000FFFF, 0, GSI3), > + > + PRT_ENTRY(0x0001FFFF, 0, GSI1), > + PRT_ENTRY(0x0001FFFF, 1, GSI2), > + PRT_ENTRY(0x0001FFFF, 2, GSI3), > + PRT_ENTRY(0x0001FFFF, 3, GSI0), > + > + PRT_ENTRY(0x0002FFFF, 0, GSI2), > + PRT_ENTRY(0x0002FFFF, 1, GSI3), > + PRT_ENTRY(0x0002FFFF, 2, GSI0), > + PRT_ENTRY(0x0002FFFF, 3, GSI1), > + > + PRT_ENTRY(0x0003FFFF, 0, GSI3), > + PRT_ENTRY(0x0003FFFF, 1, GSI0), > + PRT_ENTRY(0x0003FFFF, 2, GSI1), > + PRT_ENTRY(0x0003FFFF, 3, GSI2), > + > + PRT_ENTRY(0x0004FFFF, 0, GSI0), > + PRT_ENTRY(0x0004FFFF, 1, GSI1), > + PRT_ENTRY(0x0004FFFF, 2, GSI2), > + PRT_ENTRY(0x0004FFFF, 3, GSI3), > + > + PRT_ENTRY(0x0005FFFF, 0, GSI1), > + PRT_ENTRY(0x0005FFFF, 1, GSI2), > + PRT_ENTRY(0x0005FFFF, 2, GSI3), > + PRT_ENTRY(0x0005FFFF, 3, GSI0), > + > + PRT_ENTRY(0x0006FFFF, 0, GSI2), > + PRT_ENTRY(0x0006FFFF, 1, GSI3), > + PRT_ENTRY(0x0006FFFF, 2, GSI0), > + PRT_ENTRY(0x0006FFFF, 3, GSI1), > + > + PRT_ENTRY(0x0007FFFF, 0, GSI3), > + PRT_ENTRY(0x0007FFFF, 1, GSI0), > + PRT_ENTRY(0x0007FFFF, 2, GSI1), > + PRT_ENTRY(0x0007FFFF, 3, GSI2), > + > + PRT_ENTRY(0x0008FFFF, 0, GSI0), > + PRT_ENTRY(0x0008FFFF, 1, GSI1), > + PRT_ENTRY(0x0008FFFF, 2, GSI2), > + PRT_ENTRY(0x0008FFFF, 3, GSI3), > + > + PRT_ENTRY(0x0009FFFF, 0, GSI1), > + PRT_ENTRY(0x0009FFFF, 1, GSI2), > + PRT_ENTRY(0x0009FFFF, 2, GSI3), > + PRT_ENTRY(0x0009FFFF, 3, GSI0), > + > + PRT_ENTRY(0x000AFFFF, 0, GSI2), > + PRT_ENTRY(0x000AFFFF, 1, GSI3), > + PRT_ENTRY(0x000AFFFF, 2, GSI0), > + PRT_ENTRY(0x000AFFFF, 3, GSI1), > + > + PRT_ENTRY(0x000BFFFF, 0, GSI3), > + PRT_ENTRY(0x000BFFFF, 1, GSI0), > + PRT_ENTRY(0x000BFFFF, 2, GSI1), > + PRT_ENTRY(0x000BFFFF, 3, GSI2), > + > + PRT_ENTRY(0x000CFFFF, 0, GSI0), > + PRT_ENTRY(0x000CFFFF, 1, GSI1), > + PRT_ENTRY(0x000CFFFF, 2, GSI2), > + PRT_ENTRY(0x000CFFFF, 3, GSI3), > + > + PRT_ENTRY(0x000DFFFF, 0, GSI1), > + PRT_ENTRY(0x000DFFFF, 1, GSI2), > + PRT_ENTRY(0x000DFFFF, 2, GSI3), > + PRT_ENTRY(0x000DFFFF, 3, GSI0), > + > + PRT_ENTRY(0x000EFFFF, 0, GSI2), > + PRT_ENTRY(0x000EFFFF, 1, GSI3), > + PRT_ENTRY(0x000EFFFF, 2, GSI0), > + PRT_ENTRY(0x000EFFFF, 3, GSI1), > + > + PRT_ENTRY(0x000FFFFF, 0, GSI3), > + PRT_ENTRY(0x000FFFFF, 1, GSI0), > + PRT_ENTRY(0x000FFFFF, 2, GSI1), > + PRT_ENTRY(0x000FFFFF, 3, GSI2), > + > + PRT_ENTRY(0x0010FFFF, 0, GSI0), > + PRT_ENTRY(0x0010FFFF, 1, GSI1), > + PRT_ENTRY(0x0010FFFF, 2, GSI2), > + PRT_ENTRY(0x0010FFFF, 3, GSI3), > + > + PRT_ENTRY(0x0011FFFF, 0, GSI1), > + PRT_ENTRY(0x0011FFFF, 1, GSI2), > + PRT_ENTRY(0x0011FFFF, 2, GSI3), > + PRT_ENTRY(0x0011FFFF, 3, GSI0), > + > + PRT_ENTRY(0x0012FFFF, 0, GSI2), > + PRT_ENTRY(0x0012FFFF, 1, GSI3), > + PRT_ENTRY(0x0012FFFF, 2, GSI0), > + PRT_ENTRY(0x0012FFFF, 3, GSI1), > + > + PRT_ENTRY(0x0013FFFF, 0, GSI3), > + PRT_ENTRY(0x0013FFFF, 1, GSI0), > + PRT_ENTRY(0x0013FFFF, 2, GSI1), > + PRT_ENTRY(0x0013FFFF, 3, GSI2), > + > + PRT_ENTRY(0x0014FFFF, 0, GSI0), > + PRT_ENTRY(0x0014FFFF, 1, GSI1), > + PRT_ENTRY(0x0014FFFF, 2, GSI2), > + PRT_ENTRY(0x0014FFFF, 3, GSI3), > + > + PRT_ENTRY(0x0015FFFF, 0, GSI1), > + PRT_ENTRY(0x0015FFFF, 1, GSI2), > + PRT_ENTRY(0x0015FFFF, 2, GSI3), > + PRT_ENTRY(0x0015FFFF, 3, GSI0), > + > + PRT_ENTRY(0x0016FFFF, 0, GSI2), > + PRT_ENTRY(0x0016FFFF, 1, GSI3), > + PRT_ENTRY(0x0016FFFF, 2, GSI0), > + PRT_ENTRY(0x0016FFFF, 3, GSI1), > + > + PRT_ENTRY(0x0017FFFF, 0, GSI3), > + PRT_ENTRY(0x0017FFFF, 1, GSI0), > + PRT_ENTRY(0x0017FFFF, 2, GSI1), > + PRT_ENTRY(0x0017FFFF, 3, GSI2), > + > + PRT_ENTRY(0x0018FFFF, 0, GSI0), > + PRT_ENTRY(0x0018FFFF, 1, GSI1), > + PRT_ENTRY(0x0018FFFF, 2, GSI2), > + PRT_ENTRY(0x0018FFFF, 3, GSI3), > + > + PRT_ENTRY(0x0019FFFF, 0, GSI1), > + PRT_ENTRY(0x0019FFFF, 1, GSI2), > + PRT_ENTRY(0x0019FFFF, 2, GSI3), > + PRT_ENTRY(0x0019FFFF, 3, GSI0), > + > + PRT_ENTRY(0x001AFFFF, 0, GSI2), > + PRT_ENTRY(0x001AFFFF, 1, GSI3), > + PRT_ENTRY(0x001AFFFF, 2, GSI0), > + PRT_ENTRY(0x001AFFFF, 3, GSI1), > + > + PRT_ENTRY(0x001BFFFF, 0, GSI3), > + PRT_ENTRY(0x001BFFFF, 1, GSI0), > + PRT_ENTRY(0x001BFFFF, 2, GSI1), > + PRT_ENTRY(0x001BFFFF, 3, GSI2), > + > + PRT_ENTRY(0x001CFFFF, 0, GSI0), > + PRT_ENTRY(0x001CFFFF, 1, GSI1), > + PRT_ENTRY(0x001CFFFF, 2, GSI2), > + PRT_ENTRY(0x001CFFFF, 3, GSI3), > + > + PRT_ENTRY(0x001DFFFF, 0, GSI1), > + PRT_ENTRY(0x001DFFFF, 1, GSI2), > + PRT_ENTRY(0x001DFFFF, 2, GSI3), > + PRT_ENTRY(0x001DFFFF, 3, GSI0), > + > + PRT_ENTRY(0x001EFFFF, 0, GSI2), > + PRT_ENTRY(0x001EFFFF, 1, GSI3), > + PRT_ENTRY(0x001EFFFF, 2, GSI0), > + PRT_ENTRY(0x001EFFFF, 3, GSI1), > + > + PRT_ENTRY(0x001FFFFF, 0, GSI3), > + PRT_ENTRY(0x001FFFFF, 1, GSI0), > + PRT_ENTRY(0x001FFFFF, 2, GSI1), > + PRT_ENTRY(0x001FFFFF, 3, GSI2), > }) > > // Root complex resources

4 years, 1 month

1
0
0 0

Re: [Asa-dev] Pseudo Static ACPI tables for Qemu Sbsa platform

by Graeme Gregory

On 29/07/2020 21:35, Tanmay Jagdale via Asa-dev wrote: > Hi Leif, Graeme, > > I have pushed the following branch that adds support for the > pseudo static approach of modifying the ACPI tables. > http://git.linaro.org/people/tanmay.jagdale/edk2-platforms.git/log/?h=qemu_… > > With this we can boot Linux with any number of CPUs and the > ACPI tables will get configured at runtime based on the CPU > count. > > I have separated them into 4 commits and a patch with all the > changes consolidated into one is in the attached file. > > There are a few issues > 1. We have to pass acpi_apic_instance=2 bootarg to Linux because > 2 APIC tables are getting created we have to use the 2nd instance > which gets created at runtime. > I'm working on a fix for this issue. I think if you just rename the madt.aslc to madt.c this will fix that. The aslc extension means that version of the table automatically gets installed. Thanks Graeme > 2. The SSDT table does not have entries for all CPUs and I'm working > on updating that table too. > > Can you please review this patchset and see if these changes are > okay ? > > With Regards, > Tanmay

4 years, 1 month

2
3
0 0

Pseudo Static ACPI tables for Qemu Sbsa platform

by Tanmay Jagdale

Hi Leif, Graeme, I have pushed the following branch that adds support for the pseudo static approach of modifying the ACPI tables. http://git.linaro.org/people/tanmay.jagdale/edk2-platforms.git/log/?h=qemu_… With this we can boot Linux with any number of CPUs and the ACPI tables will get configured at runtime based on the CPU count. I have separated them into 4 commits and a patch with all the changes consolidated into one is in the attached file. There are a few issues 1. We have to pass acpi_apic_instance=2 bootarg to Linux because 2 APIC tables are getting created we have to use the 2nd instance which gets created at runtime. I'm working on a fix for this issue. 2. The SSDT table does not have entries for all CPUs and I'm working on updating that table too. Can you please review this patchset and see if these changes are okay ? With Regards, Tanmay

4 years, 1 month

1
0
0 0

Updated TF-A binaries in edk2-non-osi

by Tanmay Jagdale

Hi Graeme and Masahisa, I updated the TF-A binaries in edk2-non-osi (with Masahisa's fix) and pushed to the following branch: http://git.linaro.org/people/tanmay.jagdale/edk2-non-osi.git/commit/?id=aa1… I have tested this by booting on Qemu SBSA and verified that the device tree error is not showing up. Can you please review the patch if it is okay ? If okay then I'll send it out the edk2-non-osi mailing list. With Regards, Tanmay

4 years, 2 months

2
1
0 0

Script for building UEFI

by Graeme Gregory

Hi Tanmay, As asked in the meeting here is the script I use to build with the important but being only updating the 1st 2M of flash between runs so variable area is preserved. #! /bin/bash export WORKSPACE=`pwd` export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-platforms:$WORKSPACE/edk2-non-osi make -C edk2/BaseTools . edk2/edksetup.sh GCC5_AARCH64_PREFIX=aarch64-linux-gnu- build -b DEBUG -a AARCH64 -t GCC5 -p edk2-platforms/Platform/Qemu/SbsaQemu/SbsaQemu.dsc dd if=./Build/SbsaQemu/DEBUG_GCC5/FV/SBSA_FLASH0.fd of=qemu-run/SBSA_FLASH0.fd conv=notrunc dd if=./Build/SbsaQemu/DEBUG_GCC5/FV/SBSA_FLASH1.fd of=qemu-run/SBSA_FLASH1.fd conv=notrunc bs=2M count=1 Thanks Graeme

4 years, 3 months

1
0
0 0

Re: [Asa-dev] SbsaQemu Variable Problem

by Tanmay Jagdale

Hi Graeme, The issue lies in the way the Flash1 is laid out. At offset 0x0 - UEFI Compact binary At offset 0x40000 - NorFlash Variable storage with EFI_VOLUME_HEADER So the Arm NorFlash driver looks for EFI_VOLUME_HEADER at 0x0 offset but we have the UEFI binary present hence it couldn't find it and proceeded to reinitialize the flash region at 0x40000, hence all the EFI variables were lost. I have created the following patch in edk2: (This is a hack to get it to work, would need to find a way a more generic way to fix this issue) diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c index e248fdf6db..d8cee8ca24 100644 --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvbDxe.c @@ -134,7 +134,8 @@ ValidateFvHeader ( UINTN VariableStoreLength; UINTN FvLength; - FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress; + FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)(Instance->RegionBaseAddress + + (Instance->StartLba * Instance->Media.BlockSize)); FvLength = PcdGet32(PcdFlashNvStorageVariableSize) + PcdGet32(PcdFlashNvStorageFtwWorkingSize) + PcdGet32(PcdFlashNvStorageFtwSpareSize); This patch makes the header checking code to look at the right offset. Also the following patch in edk2-platforms (This patch is just to make it match the ArmVirt Flash layout) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf index 7f1a60e3ee..9ccfe7f1fa 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf @@ -58,10 +58,10 @@ FILE = Platform/Qemu/Sbsa/fip.bin [FD.SBSA_FLASH1] BaseAddress = 0x10000000|gArmTokenSpaceGuid.PcdFdBaseAddress -Size = 0x002C0000|gArmTokenSpaceGuid.PcdFdSize +Size = 0x00300000|gArmTokenSpaceGuid.PcdFdSize ErasePolarity = 1 -BlockSize = 0x00001000 -NumBlocks = 0x2C0 +BlockSize = 0x00040000 +NumBlocks = 0xB ## Place for EFI (BL33) # This offset (if any as it is 0x0 currently) + BaseAddress (0x10000000) must be set in PRELOADED_BL33_BASE at ATF @@ -90,8 +90,8 @@ DATA = { 0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00, # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision 0x48, 0x00, 0x28, 0x09, 0x00, 0x00, 0x00, 0x02, - # Blockmap[0]: 0x3 Blocks * 0x40000 Bytes / Block - 0x3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, + # Blockmap[0]: 0x4 Blocks * 0x40000 Bytes / Block + 0x4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, # Blockmap[1]: End 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ## This is the VARIABLE_STORE_HEADER With the above 2 patches, I'm able to store the EFI variables persistently. Can you please let me know what you think about these patches ? With Regards, Tanmay On Thu, 11 Jun 2020 at 16:55, Graeme Gregory via Asa-dev < asa-dev(a)op-lists.linaro.org> wrote: > Hi Tanmay, > > I was doing some checking and we are causing these errors in log. > > ValidateFvHeader: No Firmware Volume header present > NorFlashFvbInitialize: The FVB Header is not valid. > NorFlashFvbInitialize: Installing a correct one for this volume. > Which is resetting all the variables > > Graeme > -- > Asa-dev mailing list > Asa-dev(a)op-lists.linaro.org > https://op-lists.linaro.org/mailman/listinfo/asa-dev >

4 years, 3 months

1
0
0 0

SbsaQemu Variable Problem

by Graeme Gregory

Hi Tanmay, I was doing some checking and we are causing these errors in log. ValidateFvHeader: No Firmware Volume header present NorFlashFvbInitialize: The FVB Header is not valid. NorFlashFvbInitialize: Installing a correct one for this volume. Which is resetting all the variables Graeme

4 years, 3 months

1
0
0 0

Unable to attend today's team meeting

by Masato Fukumori

Hi Graeme-san, guys I’m sorry, I’m unable to attend team meeting due to other meeting. Let me report my status at next week. Best Regards, Masato Fukumori

4 years, 3 months

1
0
0 0

2024

2023

2022

2021

2020

Asa-dev