boot-architecture September 2013

boot-architecture@lists.linaro.org

12 participants
20 discussions

by Leif Lindholm

On Mon, Sep 30, 2013 at 10:28:49PM +0100, Grant Likely wrote: > > > load image protocol. In that case the sub should override the setting in > the > > > FDT if the initrd argument is present. > > > > Hmm, well, it's slightly worse than that - it will have one; only it > > will be GRUB's command line. > > > > The way that can be resolved is: > > - FDT present? > > - Commandline present in FDT chosen node? > > - Yes > > - Use that. > > - No > > - EFI_LOADED_IMAGE command line present? > > - Yes > > - Use that. > > - No > > - Fail miserably. > That doesn't handle the case where firmware provides the fdt, but the kernel is > loaded via the UEFI shell or gummiboot. In that case the stub must process both > the loaded image arguments. Well, unless the firmware-provided device tree contains a kernel command line, that should work fine? If you mean that there are two command lines to parse for the EFI_LOADED_IMAGE (one for shell/gummiboot), surely there is a handle in there to identify the "current" one. / Leif

11 years, 2 months

Re: uefi stub + grub

by Leif Lindholm

On Mon, Sep 30, 2013 at 09:05:04PM +0100, Grant Likely wrote: > > Handling the 2 cases is not a problem. I just don't want to handle > > 'mixed' cases where > > a command line and an FDT are passed to the stub, and information from > > both is used. > > > > As I understand it, the two cases are: > > > > FDT_GUID present == GRUB case > > * GRUB loads initrd if present > > * GRUB provides complete FDT to stub (includes command line, hardware > > description, initrd entry, etc.) > > * EFI stub loads FDT using FDT_GUID, adds memory map and system table > > pointer to FDT, starts kernel. > > * (any command line present in EFI_LOADED_IMAGE is ignored.) > > > > FDT_GUID absent == current case > > * stub loads FDT and initrd from system partition > > * stub adds command line from EFI_LOADED_IMAGE to FDT > > * stub adds initrd entry to FDT > > * stub adds memory map and system table pointer to FDT, starts kernel. > > > > In the case of UEFI owning the FDT, and providing it to the stub, > > where does the initrd come from? I think this adds > > another case to handle... > The stub will still need to process a command line if it is given one via the > load image protocol. In that case the sub should override the setting in the > FDT if the initrd argument is present. Hmm, well, it's slightly worse than that - it will have one; only it will be GRUB's command line. The way that can be resolved is: - FDT present? - Commandline present in FDT chosen node? - Yes - Use that. - No - EFI_LOADED_IMAGE command line present? - Yes - Use that. - No - Fail miserably. / Leif

11 years, 2 months

Re: uefi stub + grub

by Roy Franz

On Mon, Sep 30, 2013 at 11:27 AM, Grant Likely <grant.likely(a)linaro.org> wrote: > On Mon, Sep 30, 2013 at 5:46 PM, Leif Lindholm <leif.lindholm(a)linaro.org> wrote: >> On Mon, Sep 30, 2013 at 08:05:59AM -0700, Roy Franz wrote: >>> > I was thinking that the stub would want to use the FDT passed by grub >>> > if one is passed, but I hadn't thought about the case where grub wants >>> > to pass information to the stub, but the stub still loads the FDT. The >>> > easiest thing would be to straight out say that if GRUB is loading the >>> > initrd, then it is mandatory for GRUB to also load the FDT. That >>> > eliminates the corner case and I can't think of any situation where >>> > we'd want GRUB loading the initrd, but use the stub to load the FDT. >>> >>> I'd also like to avoid having the stub merge FDT contents from different trees. >>> >>> If we add this table, then it seems this would be the right way to >>> handle passing >>> the FDT to the EFI stub, even without GRUB involved. Is there a reason not to >>> move to this method in general? >> >> Not really. >> So ... I guess that would modify the stub behaviour to: >> - Look for an FDT_GUID configuration table. >> - If there, use it. >> - If not there, require one to be loaded based on command line. > > Create a mostly empty one for passing freeform data to the kernel > proper; this is what it will look like on ACPI systems. So for ACPI systems the stub will package the ACPI data into the FDT? What would the stub be putting into the FDT that an ACPI/UEFI aware kernel couldn't get itself at runtime from UEFI? > >> And the GRUB behaviour to: >> - If no FDT_GUID, require FDT if initrd. >> - If FDT_GUID, copy FDT + add initrd information. >> >> The x86 code uses bootparam to pass the kernel command line. >> Could we use the FDT exists) for the kernel command line >> too? This would make more code shared between x86 and ARM*, since >> otherwise we would need to explicitly implement (UCS?) command line >> passing to stub? > > Yes, I think that makes sense. That also means GRUB will need to > always create an FDT, even if it is empty. I'm not following something here - why would GRUB create an empty FDT? Is GRUB going to be responsible for the complete FDT, or just passing the initrd and/or command line in an FDT? > > The other option would be to pass the command line via the LoadOptions > from the EFI_LOADED_IMAGE protocol. I believe that is what Roy's > patches currently rely on for getting a command line. Yes, both my implementation and the x86 implementation get the command line from the EFI_LOADED_IMAGE protocol, and do conversion from UCS-2 (I think) to ASCII/UTF-8 to pass to the kernel. The format of the command line does not seem to be specified by UEFI. > > g.

11 years, 2 months

Re: uefi stub + grub

by Leif Lindholm

On Mon, Sep 30, 2013 at 07:27:58PM +0100, Grant Likely wrote: > > So ... I guess that would modify the stub behaviour to: > > - Look for an FDT_GUID configuration table. > > - If there, use it. > > - If not there, require one to be loaded based on command line. > > Create a mostly empty one for passing freeform data to the kernel > proper; this is what it will look like on ACPI systems. OK. So we push the actual error condition of missing tree down to stub? Makes sense. > > The x86 code uses bootparam to pass the kernel command line. > > Could we use the FDT exists) for the kernel command line > > too? This would make more code shared between x86 and ARM*, since > > otherwise we would need to explicitly implement (UCS?) command line > > passing to stub? > > Yes, I think that makes sense. That also means GRUB will need to > always create an FDT, even if it is empty. Yes. This would be my preference. > The other option would be to pass the command line via the LoadOptions > from the EFI_LOADED_IMAGE protocol. I believe that is what Roy's > patches currently rely on for getting a command line. Since the current code doesn't UEFI-wise "load" the stub image, we'd effectively need to reverse-reconstruct GRUB's runtime environment, which I really wouldn't like. / Leif

11 years, 2 months

Re: uefi stub + grub

by Roy Franz

On Mon, Sep 30, 2013 at 7:51 AM, Grant Likely <grant.likely(a)linaro.org> wrote: > On Mon, Sep 30, 2013 at 2:59 PM, Leif Lindholm <leif.lindholm(a)linaro.org> wrote: >> Hi guys, >> >> I've been looking at the patches Matthew Garrett wrote for loading a >> UEFI stub kernel through GRUB, and noticed one thing that may require >> updates to the stub code: it uses GRUB to load the initrd. >> Doing this of course means the initrd does not need to go into the EFI >> System Partition, which is a lot nicer from the distros' position. >> >> Now, in x86 land GRUB just passes the stub a bootparam structure, and >> I assume it just keeps filling the same structure in before passing it >> on to the kernel . >> >> On ARM*, we would need to get this information over "some other way", >> where the obvious candidate would be FDT. >> >> GRUB could register an empty devicetree, with only the initrd >> information in it, as a UEFI configuration table. (Getting a UUID for >> this was discussed in New Orleans.) > > Right. It would be a trivial feature to have a UUID in the system > table pointing to an allocated block of memory containing an FDT. It > would also be nice to give the FDT some extra space when loaded so > that the libfdt functions can work in-place... but I digress; the flat > tree structure already contains enough information to do that. > >> Or, on systems using FDT for hardware description, once firmware >> becomes mature enough to do this themselves - add this information to >> the system-provided one. >> >> The stub would then need to look for this devicetree, and if present, >> copy the initrd nodes across into the one it loads itself. > > I was thinking that the stub would want to use the FDT passed by grub > if one is passed, but I hadn't thought about the case where grub wants > to pass information to the stub, but the stub still loads the FDT. The > easiest thing would be to straight out say that if GRUB is loading the > initrd, then it is mandatory for GRUB to also load the FDT. That > eliminates the corner case and I can't think of any situation where > we'd want GRUB loading the initrd, but use the stub to load the FDT. I'd also like to avoid having the stub merge FDT contents from different trees. If we add this table, then it seems this would be the right way to handle passing the FDT to the EFI stub, even without GRUB involved. Is there a reason not to move to this method in general? > >> Alternatively, we could define a special protocol for passing >> additional parameters to the stubbed kernel ... or a special protocol >> to pass a special FDT but I'm not sure we want yet another interface. > > Indeed. I definitely don't want to do this. Agreed... > > g.

11 years, 2 months

uefi stub + grub

by Leif Lindholm

Hi guys, I've been looking at the patches Matthew Garrett wrote for loading a UEFI stub kernel through GRUB, and noticed one thing that may require updates to the stub code: it uses GRUB to load the initrd. Doing this of course means the initrd does not need to go into the EFI System Partition, which is a lot nicer from the distros' position. Now, in x86 land GRUB just passes the stub a bootparam structure, and I assume it just keeps filling the same structure in before passing it on to the kernel . On ARM*, we would need to get this information over "some other way", where the obvious candidate would be FDT. GRUB could register an empty devicetree, with only the initrd information in it, as a UEFI configuration table. (Getting a UUID for this was discussed in New Orleans.) Or, on systems using FDT for hardware description, once firmware becomes mature enough to do this themselves - add this information to the system-provided one. The stub would then need to look for this devicetree, and if present, copy the initrd nodes across into the one it loads itself. Alternatively, we could define a special protocol for passing additional parameters to the stubbed kernel ... or a special protocol to pass a special FDT but I'm not sure we want yet another interface. Thoughts? / Leif

11 years, 2 months

Re: [linaro-uefi-internal] [PATCH] ARMVE:SMBIOS: Enable smbios support on all ARMVE platform

by Steven Kinney

Hi Yi, One comment regarding the patch and non-existing files (*dsc) and the like, targeted by this patch, relative to the current tianocore-edk2 and resulting uefi-next codebase. I don't think patches targeting future file(s) benefit us prior to their inclusion within either tianocore-edk2 or direct addition into uefi-next via topic branch patch. There are a number of ways this could create undue stress, in the future, when the patch has a sane codebase. IMHO, we should only create patches for current source in either existing uefi-next or tianocore-edk2 source code, not future source code that may change significantly between patch generation and its eventual application. I am using you previous patch, which does not include the future source code, not present in the current tianocore-edk2. I see no value in creating patches based on a possible source code revision; to many permutations possible prior to the patches application. Thanks, Steve On 12 September 2013 10:09, Yi Li <yi.li(a)linaro.org> wrote: > From: liyi <yi.li(a)linaro.org> > > Enable the smbios support for all ARMVE platforms. > > SMBIOS driver will fill real h/w informations into UEFI image,and > report them to OS,like x86 system. > > Signed-off-by: liyi <yi.li(a)linaro.org> > --- > ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.c | 841 > ++++++++++++++++++++ > ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.h | 53 ++ > ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf | 64 ++ > .../ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA15x2.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA15x2.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA5s.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA5s.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc | 8 +- > .../ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf | 6 + > .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc | 6 + > .../ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf | 6 + > 17 files changed, 1043 insertions(+), 1 deletion(-) > create mode 100644 ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.c > create mode 100644 ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.h > create mode 100644 ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > diff --git a/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.c > b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.c > new file mode 100644 > index 0000000..84a8acd > --- /dev/null > +++ b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.c > @@ -0,0 +1,841 @@ > +/** @file > + This code responsible for constructing and updating SMBIOS table into > system table. > +Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR> > +This program and the accompanying materials > +are licensed and made available under the terms and conditions of the BSD > License > +which accompanies this distribution. The full text of the license may be > found at > +http://opensource.org/licenses/bsd-license.php > + > +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > + > +SMBIOS Driver. > + > +yi.li(a)linaro.org > +Copyright (c) 2013 Linaro.org > + > + This program and the accompanying materials are licensed and > +made available under the terms and conditions of the BSD License > +which accompanies this distribution. The full text of the license > +may be found at: http://opensource.org/licenses/bsd-license.php > + > + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > +**/ > + > +#include "UpdateSmbios.h" > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE0 BIOS Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE0 mBIOSInfoType0 = { > + { EFI_SMBIOS_TYPE_BIOS_INFORMATION, sizeof (SMBIOS_TABLE_TYPE0), 0 }, > + 1, // Vendor String > + 2, // BiosVersion String > + 0xE000, // BiosSegment > + 3, // BiosReleaseDate String > + 0x7F, // BiosSize > + { // BiosCharacteristics > + 0, // Reserved :2; ///< Bits 0-1. > + 0, // Unknown :1; > + 0, // BiosCharacteristicsNotSupported :1; > + 0, // IsaIsSupported :1; > + 0, // McaIsSupported :1; > + 0, // EisaIsSupported :1; > + 1, // PciIsSupported :1; > + 0, // PcmciaIsSupported :1; > + 0, // PlugAndPlayIsSupported :1; > + 0, // ApmIsSupported :1; > + 1, // BiosIsUpgradable :1; > + 1, // BiosShadowingAllowed :1; > + 0, // VlVesaIsSupported :1; > + 0, // EscdSupportIsAvailable :1; > + 0, // BootFromCdIsSupported :1; > + 1, // SelectableBootIsSupported :1; > + 0, // RomBiosIsSocketed :1; > + 0, // BootFromPcmciaIsSupported :1; > + 0, // EDDSpecificationIsSupported :1; > + 0, // JapaneseNecFloppyIsSupported :1; > + 0, // JapaneseToshibaFloppyIsSupported :1; > + 0, // Floppy525_360IsSupported :1; > + 0, // Floppy525_12IsSupported :1; > + 0, // Floppy35_720IsSupported :1; > + 0, // Floppy35_288IsSupported :1; > + 0, // PrintScreenIsSupported :1; > + 0, // Keyboard8042IsSupported :1; > + 0, // SerialIsSupported :1; > + 0, // PrinterIsSupported :1; > + 0, // CgaMonoIsSupported :1; > + 0, // NecPc98 :1; > + 0 // ReservedForVendor :32; ///< Bits 32-63. > Bits 32-47 reserved for BIOS vendor > + ///< and bits 48-63 > reserved for System Vendor. > + }, > + { // BIOSCharacteristicsExtensionBytes[] > + 0x81, // AcpiIsSupported :1; > + // UsbLegacyIsSupported :1; > + // AgpIsSupported :1; > + // I2OBootIsSupported :1; > + // Ls120BootIsSupported :1; > + // AtapiZipDriveBootIsSupported :1; > + // Boot1394IsSupported :1; > + // SmartBatteryIsSupported :1; > + // BIOSCharacteristicsExtensionBytes[1] > + 0x0a, // BiosBootSpecIsSupported :1; > + // FunctionKeyNetworkBootIsSupported :1; > + // TargetContentDistributionEnabled :1; > + // UefiSpecificationSupported :1; > + // VirtualMachineSupported :1; > + // ExtensionByte2Reserved :3; > + }, > + 0x00, // SystemBiosMajorRelease > + 0x01, // SystemBiosMinorRelease > + 0xFF, // EmbeddedControllerFirmwareMajorRelease > + 0xFF, // EmbeddedControllerFirmwareMinorRelease > +}; > + > + > +CHAR8 *mBIOSInfoType0Strings[] = { > + "edk2.sourceforge.net", // Vendor String > + __TIME__, // BiosVersion String > + __DATE__, // BiosReleaseDate String > + NULL > +}; > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE1 System Information > +************************************************************************/ > +SMBIOS_TABLE_TYPE1 mSysInfoType1 = { > + { EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, sizeof (SMBIOS_TABLE_TYPE1), 0 }, > + 1, // Manufacturer String > + 2, // ProductName String > + 3, // Version String > + 4, // SerialNumber String > + { 0x25EF0280, 0xEC82, 0x42B0, { 0x8F, 0xB6, 0x10, 0xAD, 0xCC, 0xC6, > 0x7C, 0x02 } }, > + SystemWakeupTypePowerSwitch, > + 5, // SKUNumber String > + 6, // Family String > +}; > +CHAR8 *mSysInfoType1Strings[] = { > + "edk2.sourceforge.net", > + "EmulatorPkg", > + "1.0", > + "System Serial#", > + "System SKU#", > + "edk2", > + NULL > +}; > + > +/*********************************************************************** > + SMBIOS data definition TYPE2 Board Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE2 mBoardInfoType2 = { > + { EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION, sizeof (SMBIOS_TABLE_TYPE2), 0 > }, > + 1, // Manufacturer String > + 2, // ProductName String > + 3, // Version String > + 4, // SerialNumber String > + 5, // AssetTag String > + { // FeatureFlag > + 1, // Motherboard :1; > + 0, // RequiresDaughterCard :1; > + 0, // Removable :1; > + 0, // Replaceable :1; > + 0, // HotSwappable :1; > + 0, // Reserved :3; > + }, > + 6, // LocationInChassis String > + 0, // ChassisHandle; > + BaseBoardTypeMotherBoard, // BoardType; > + 0, // NumberOfContainedObjectHandles; > + { 0 } // ContainedObjectHandles[1]; > +}; > +CHAR8 *mBoardInfoType2Strings[] = { > + "edk2.sourceforge.net", > + "EmulatorPkg", > + "1.0", > + "Base Board Serial#", > + "Base Board Asset Tag#", > + "Part Component", > + NULL > +}; > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE3 Enclosure Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE3 mEnclosureInfoType3 = { > + { EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, sizeof (SMBIOS_TABLE_TYPE3), 0 }, > + 1, // Manufacturer String > + MiscChassisTypeLapTop, // Type; > + 2, // Version String > + 3, // SerialNumber String > + 4, // AssetTag String > + ChassisStateSafe, // BootupState; > + ChassisStateSafe, // PowerSupplyState; > + ChassisStateSafe, // ThermalState; > + ChassisSecurityStatusNone,// SecurityStatus; > + { 0, 0, 0, 0 }, // OemDefined[4]; > + 0, // Height; > + 0, // NumberofPowerCords; > + 0, // ContainedElementCount; > + 0, // ContainedElementRecordLength; > + { 0 }, // ContainedElements[1]; > +}; > +CHAR8 *mEnclosureInfoType3Strings[] = { > + "edk2.sourceforge.net", > + "EmulatorPkg", > + "Chassis Board Serial#", > + "Chassis Board Asset Tag#", > + NULL > +}; > + > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE4 Processor Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE4 mProcessorInfoType4 = { > + > + { EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, sizeof (SMBIOS_TABLE_TYPE4), > 0}, > + > + 1, // Socket String > + ProcessorOther, // ProcessorType; ///< The enumeration > value from PROCESSOR_TYPE_DATA. > + ProcessorFamilyOther, // ProcessorFamily; ///< The enumeration > value from PROCESSOR_FAMILY_DATA. > + 2, // ProcessorManufacture String; > + { // ProcessorId; > + { // PROCESSOR_SIGNATURE > + 0, // ProcessorSteppingId:4; > + 0, // ProcessorModel: 4; > + 0, // ProcessorFamily: 4; > + 0, // ProcessorType: 2; > + 0, // ProcessorReserved1: 2; > + 0, // ProcessorXModel: 4; > + 0, // ProcessorXFamily: 8; > + 0, // ProcessorReserved2: 4; > + }, > + > + { // PROCESSOR_FEATURE_FLAGS > + 0, // ProcessorFpu :1; > + 0, // ProcessorVme :1; > + 0, // ProcessorDe :1; > + 0, // ProcessorPse :1; > + 0, // ProcessorTsc :1; > + 0, // ProcessorMsr :1; > + 0, // ProcessorPae :1; > + 0, // ProcessorMce :1; > + 0, // ProcessorCx8 :1; > + 0, // ProcessorApic :1; > + 0, // ProcessorReserved1 :1; > + 0, // ProcessorSep :1; > + 0, // ProcessorMtrr :1; > + 0, // ProcessorPge :1; > + 0, // ProcessorMca :1; > + 0, // ProcessorCmov :1; > + 0, // ProcessorPat :1; > + 0, // ProcessorPse36 :1; > + 0, // ProcessorPsn :1; > + 0, // ProcessorClfsh :1; > + 0, // ProcessorReserved2 :1; > + 0, // ProcessorDs :1; > + 0, // ProcessorAcpi :1; > + 0, // ProcessorMmx :1; > + 0, // ProcessorFxsr :1; > + 0, // ProcessorSse :1; > + 0, // ProcessorSse2 :1; > + 0, // ProcessorSs :1; > + 0, // ProcessorReserved3 :1; > + 0, // ProcessorTm :1; > + 0, // ProcessorReserved4 :2; > + } > + }, > + 3, // ProcessorVersion String; > + { // Voltage; > + 1, // ProcessorVoltageCapability5V :1; > + 1, // ProcessorVoltageCapability3_3V :1; > + 1, // ProcessorVoltageCapability2_9V :1; > + 0, // ProcessorVoltageCapabilityReserved :1; ///< Bit 3, must be > zero. > + 0, // ProcessorVoltageReserved :3; ///< Bits 4-6, must be > zero. > + 0 // ProcessorVoltageIndicateLegacy :1; > + }, > + 0, // ExternalClock; > + 0, // MaxSpeed; > + 0, // CurrentSpeed; > + 0x41, // Status; > + ProcessorUpgradeOther, // ProcessorUpgrade; ///< The enumeration > value from PROCESSOR_UPGRADE. > + 0, // L1CacheHandle; > + 0, // L2CacheHandle; > + 0, // L3CacheHandle; > + 4, // SerialNumber; > + 5, // AssetTag; > + 6, // PartNumber; > + 0, // CoreCount; > + 0, // EnabledCoreCount; > + 0, // ThreadCount; > + 0, // ProcessorCharacteristics; > + 0, // ProcessorFamily2; > +}; > + > + > +CHAR8 *mProcessorInfoType4Strings[] = { > + "Socket", > + "edk2.svn.sourceforge.net", > + "Emulated Processor", > + "1.0", > + "1.0", > + "1.0", > + NULL > +}; > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE7 Cache Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE7 mCacheInfoType7 = { > + { EFI_SMBIOS_TYPE_CACHE_INFORMATION, sizeof (SMBIOS_TABLE_TYPE7), 0 }, > + 1, // SocketDesignation String > + 0x018A, // Cache Configuration > + 0x00FF, // Maximum Size 256k > + 0x00FF, // Install Size 256k > + { // Supported SRAM Type > + 0, //Other :1 > + 0, //Unknown :1 > + 0, //NonBurst :1 > + 1, //Burst :1 > + 0, //PiplelineBurst :1 > + 1, //Synchronous :1 > + 0, //Asynchronous :1 > + 0 //Reserved :9 > + }, > + { // Current SRAM Type > + 0, //Other :1 > + 0, //Unknown :1 > + 0, //NonBurst :1 > + 1, //Burst :1 > + 0, //PiplelineBurst :1 > + 1, //Synchronous :1 > + 0, //Asynchronous :1 > + 0 //Reserved :9 > + }, > + 0, // Cache Speed unknown > + CacheErrorMultiBit, // Error Correction Multi > + CacheTypeUnknown, // System Cache Type > + CacheAssociativity2Way // Associativity > +}; > +CHAR8 *mCacheInfoType7Strings[] = { > + "Cache1", > + NULL > +}; > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE9 System Slot Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE9 mSysSlotInfoType9 = { > + { EFI_SMBIOS_TYPE_SYSTEM_SLOTS, sizeof (SMBIOS_TABLE_TYPE9), 0 }, > + 1, // SlotDesignation String > + SlotTypeOther, // SlotType; ///< The > enumeration value from MISC_SLOT_TYPE. > + SlotDataBusWidthOther, // SlotDataBusWidth; ///< The > enumeration value from MISC_SLOT_DATA_BUS_WIDTH. > + SlotUsageAvailable, // CurrentUsage; ///< The > enumeration value from MISC_SLOT_USAGE. > + SlotLengthOther, // SlotLength; ///< The enumeration > value from MISC_SLOT_LENGTH. > + 0, // SlotID; > + { // SlotCharacteristics1; > + 1, // CharacteristicsUnknown :1; > + 0, // Provides50Volts :1; > + 0, // Provides33Volts :1; > + 0, // SharedSlot :1; > + 0, // PcCard16Supported :1; > + 0, // CardBusSupported :1; > + 0, // ZoomVideoSupported :1; > + 0, // ModemRingResumeSupported:1; > + }, > + { // SlotCharacteristics2; > + 0, // PmeSignalSupported :1; > + 0, // HotPlugDevicesSupported :1; > + 0, // SmbusSignalSupported :1; > + 0, // Reserved :5; ///< Set to 0. > + }, > + 0, // SegmentGroupNum; > + 0, // BusNum; > + 0, // DevFuncNum; > +}; > +CHAR8 *mSysSlotInfoType9Strings[] = { > + "SD Card", > + NULL > +}; > + > +/*********************************************************************** > + SMBIOS data definition TYPE16 Physical Memory ArrayInformation > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE16 mPhyMemArrayInfoType16 = { > + { EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, sizeof (SMBIOS_TABLE_TYPE16), > 0 }, > + MemoryArrayLocationSystemBoard, // Location; ///< > The enumeration value from MEMORY_ARRAY_LOCATION. > + MemoryArrayUseSystemMemory, // Use; ///< > The enumeration value from MEMORY_ARRAY_USE. > + MemoryErrorCorrectionUnknown, // MemoryErrorCorrection; ///< > The enumeration value from MEMORY_ERROR_CORRECTION. > + 0x80000000, // MaximumCapacity; > + 0xFFFE, // MemoryErrorInformationHandle; > + 1, // NumberOfMemoryDevices; > + 0x3fffffffffffffffULL, // ExtendedMaximumCapacity; > +}; > +CHAR8 *mPhyMemArrayInfoType16Strings[] = { > + NULL > +}; > + > +/*********************************************************************** > + SMBIOS data definition TYPE17 Memory Device Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE17 mMemDevInfoType17 = { > + { EFI_SMBIOS_TYPE_MEMORY_DEVICE, sizeof (SMBIOS_TABLE_TYPE17), 0 }, > + 0, // MemoryArrayHandle; > + 0xFFFE, // MemoryErrorInformationHandle; > + 0xFFFF, // TotalWidth; > + 0xFFFF, // DataWidth; > + 0xFFFF, // Size; > + MemoryFormFactorUnknown, // FormFactor; ///< The > enumeration value from MEMORY_FORM_FACTOR. > + 0xff, // DeviceSet; > + 1, // DeviceLocator String > + 2, // BankLocator String > + MemoryTypeDram, // MemoryType; ///< The > enumeration value from MEMORY_DEVICE_TYPE. > + { // TypeDetail; > + 0, // Reserved :1; > + 0, // Other :1; > + 1, // Unknown :1; > + 0, // FastPaged :1; > + 0, // StaticColumn :1; > + 0, // PseudoStatic :1; > + 0, // Rambus :1; > + 0, // Synchronous :1; > + 0, // Cmos :1; > + 0, // Edo :1; > + 0, // WindowDram :1; > + 0, // CacheDram :1; > + 0, // Nonvolatile :1; > + 0, // Registered :1; > + 0, // Unbuffered :1; > + 0, // Reserved1 :1; > + }, > + 0, // Speed; > + 3, // Manufacturer String > + 0, // SerialNumber String > + 0, // AssetTag String > + 0, // PartNumber String > + 0, // Attributes; > + 0, // ExtendedSize; > + 0, // ConfiguredMemoryClockSpeed; > +}; > +CHAR8 *mMemDevInfoType17Strings[] = { > + "OS Virtual Memory", > + "malloc", > + "OSV", > + NULL > +}; > + > +/*********************************************************************** > + SMBIOS data definition TYPE19 Memory Array Mapped Address > Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE19 mMemArrMapInfoType19 = { > + { EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, sizeof > (SMBIOS_TABLE_TYPE19), 0 }, > + 0x80000000, // StartingAddress; > + 0xbfffffff, // EndingAddress; > + 0, // MemoryArrayHandle; > + 1, // PartitionWidth; > + 0, // ExtendedStartingAddress; > + 0, // ExtendedEndingAddress; > +}; > +CHAR8 *mMemArrMapInfoType19Strings[] = { > + NULL > +}; > + > + > + > + > +/*********************************************************************** > + SMBIOS data definition TYPE32 Boot Information > +************************************************************************/ > + > +SMBIOS_TABLE_TYPE32 mBootInfoType32 = { > + { EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, sizeof > (SMBIOS_TABLE_TYPE32), 0 }, > + { 0, 0, 0, 0, 0, 0 }, // Reserved[6]; > + BootInformationStatusNoError // BootStatus > +}; > + > +CHAR8 *mBootInfoType32Strings[] = { > + NULL > +}; > + > + > +/** > + > + Create SMBIOS record. > + > + Converts a fixed SMBIOS structure and an array of pointers to strings > into > + an SMBIOS record where the strings are cat'ed on the end of the fixed > record > + and terminated via a double NULL and add to SMBIOS table. > + > + SMBIOS_TABLE_TYPE32 gSmbiosType12 = { > + { EFI_SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS, sizeof > (SMBIOS_TABLE_TYPE12), 0 }, > + 1 // StringCount > + }; > + > + CHAR8 *gSmbiosType12Strings[] = { > + "Not Found", > + NULL > + }; > + > + ... > + > + LogSmbiosData ( > + (EFI_SMBIOS_TABLE_HEADER*)&gSmbiosType12, > + gSmbiosType12Strings > + ); > + > + @param Template Fixed SMBIOS structure, required. > + @param StringArray Array of strings to convert to an SMBIOS string > pack. > + NULL is OK. > +**/ > + > + > +EFI_STATUS > +EFIAPI > +LogSmbiosData ( > + IN EFI_SMBIOS_TABLE_HEADER *Template, > + IN CHAR8 **StringPack > + ) > +{ > + > + EFI_STATUS Status; > + EFI_SMBIOS_PROTOCOL *Smbios; > + EFI_SMBIOS_HANDLE SmbiosHandle; > + EFI_SMBIOS_TABLE_HEADER *Record; > + UINTN Index; > + UINTN StringSize; > + UINTN Size; > + CHAR8 *Str; > + > + // > + // Locate Smbios protocol. > + // > + > + Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID > **)&Smbios); > + > + if (EFI_ERROR (Status)) { > + > + return Status; > + > + } > + > + > + // Calculate the size of the fixed record and optional string pack > + > + Size = Template->Length; > + > + if (StringPack == NULL) { > + > + // At least a double null is required > + > + Size += 2; > + > + } else { > + > + for (Index = 0; StringPack[Index] != NULL; Index++) { > + > + StringSize = AsciiStrSize (StringPack[Index]); > + > + Size += StringSize; > + > + } > + > + if (StringPack[0] == NULL) { > + > + // At least a double null is required > + > + Size += 1; > + > + } > + > + // Don't forget the terminating double null > + > + Size += 1; > + > + } > + > + > + > + // Copy over Template > + Record = (EFI_SMBIOS_TABLE_HEADER *)AllocateZeroPool (Size); > + > + if (Record == NULL) { > + > + return EFI_OUT_OF_RESOURCES; > + > + } > + > + CopyMem (Record, Template, Template->Length); > + > + > + > + // Append string pack > + > + Str = ((CHAR8 *)Record) + Record->Length; > + > + > + > + for (Index = 0; StringPack[Index] != NULL; Index++) { > + > + StringSize = AsciiStrSize (StringPack[Index]); > + > + CopyMem (Str, StringPack[Index], StringSize); > + > + Str += StringSize; > + > + } > + > + *Str = 0; > + > + SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; > + > + Status = Smbios->Add ( > + Smbios, > + gImageHandle, > + &SmbiosHandle, > + Record > + ); > + > + ASSERT_EFI_ERROR (Status); > + > + FreePool (Record); > + > + return Status; > + > +} > + > + > + > +/*********************************************************************** > + SMBIOS data update TYPE0 BIOS Information > +************************************************************************/ > + > + > +VOID > +BIOSInfoUpdateSmbiosType0 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mBIOSInfoType0, > mBIOSInfoType0Strings); > + > +} > + > + > + > +/*********************************************************************** > + SMBIOS data update TYPE1 System Information > +************************************************************************/ > +VOID > +SysInfoUpdateSmbiosType1 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mSysInfoType1, > mSysInfoType1Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE2 Board Information > +************************************************************************/ > +VOID > +BoardInfoUpdateSmbiosType2 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mBoardInfoType2, > mBoardInfoType2Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE3 Enclosure Information > +************************************************************************/ > +VOID > +EnclosureInfoUpdateSmbiosType3 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mEnclosureInfoType3, > mEnclosureInfoType3Strings); > + > +} > + > + > +/*********************************************************************** > + SMBIOS data update TYPE4 Processor Information > +************************************************************************/ > + > + > +VOID > + > +ProcessorInfoUpdateSmbiosType4 ( > + > + IN UINTN MaxCpus > + > + ) > + > +{ > + > + mProcessorInfoType4.CoreCount = (UINT8) MaxCpus; > + > + mProcessorInfoType4.EnabledCoreCount = (UINT8) MaxCpus; > + > + mProcessorInfoType4.ThreadCount = (UINT8) MaxCpus; > + > + > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mProcessorInfoType4, > mProcessorInfoType4Strings); > + > +} > + > + > +/*********************************************************************** > + SMBIOS data update TYPE7 Cache Information > +************************************************************************/ > +VOID > +CacheInfoUpdateSmbiosType7 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mCacheInfoType7, > mCacheInfoType7Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE9 System Slot Information > +************************************************************************/ > +VOID > +SysSlotInfoUpdateSmbiosType9 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mSysSlotInfoType9, > mSysSlotInfoType9Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE16 Physical Memory Array Information > +************************************************************************/ > +VOID > +PhyMemArrayInfoUpdateSmbiosType16 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mPhyMemArrayInfoType16, > mPhyMemArrayInfoType16Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE17 Memory Device Information > +************************************************************************/ > +VOID > +MemDevInfoUpdateSmbiosType17 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mMemDevInfoType17, > mMemDevInfoType17Strings); > + > +} > + > +/*********************************************************************** > + SMBIOS data update TYPE19 Memory Array Map Information > +************************************************************************/ > +VOID > +MemArrMapInfoUpdateSmbiosType19 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mMemArrMapInfoType19, > mMemArrMapInfoType19Strings); > + > +} > + > + > +/*********************************************************************** > + SMBIOS data update TYPE32 Boot Information > +************************************************************************/ > +VOID > +BootInfoUpdateSmbiosType32 ( > + VOID > + ) > + > +{ > + > + LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER *)&mBootInfoType32, > mBootInfoType32Strings); > + > +} > + > + > +/*********************************************************************** > + Driver Entry > +************************************************************************/ > + > +EFI_STATUS > + > +EFIAPI > + > +UpdateSmbios ( > + > + IN EFI_HANDLE ImageHandle, > + > + IN EFI_SYSTEM_TABLE *SystemTable > + > + ) > + > +{ > + > + BIOSInfoUpdateSmbiosType0(); > + > + SysInfoUpdateSmbiosType1(); > + > + BoardInfoUpdateSmbiosType2(); > + > + EnclosureInfoUpdateSmbiosType3(); > + > + ProcessorInfoUpdateSmbiosType4 (2); > + > + CacheInfoUpdateSmbiosType7(); > + > + SysSlotInfoUpdateSmbiosType9(); > + > + PhyMemArrayInfoUpdateSmbiosType16(); > + > + MemDevInfoUpdateSmbiosType17(); > + > + MemArrMapInfoUpdateSmbiosType19(); > + > + BootInfoUpdateSmbiosType32(); > + > + return EFI_SUCCESS; > + > +} > diff --git a/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.h > b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.h > new file mode 100644 > index 0000000..5757dc7 > --- /dev/null > +++ b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.h > @@ -0,0 +1,53 @@ > +/** @file > +Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR> > +This program and the accompanying materials > +are licensed and made available under the terms and conditions of the BSD > License > +which accompanies this distribution. The full text of the license may be > found at > +http://opensource.org/licenses/bsd-license.php > + > + > +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > + > +SMBIOS Driver. > + > +yi.li(a)linaro.org > +Copyright (c) 2013 Linaro.org > + > + This program and the accompanying materials are licensed and > +made available under the terms and conditions of the BSD License > +which accompanies this distribution. The full text of the license > +may be found at: http://opensource.org/licenses/bsd-license.php > + > + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > +**/ > + > + > + > +#ifndef _UPDATE_SMBIOS_DRIVER_H_ > +#define _UPDATE_SMBIOS_DRIVER_H_ > + > + > +#include <PiDxe.h> > +#include <Protocol/Smbios.h> > +#include <IndustryStandard/SmBios.h> > +#include <Guid/SmBios.h> > +#include <Library/DebugLib.h> > +#include <Library/UefiDriverEntryPoint.h> > +#include <Library/UefiLib.h> > +#include <Library/BaseLib.h> > +#include <Library/BaseMemoryLib.h> > +#include <Library/MemoryAllocationLib.h> > +#include <Library/UefiBootServicesTableLib.h> > +#include <Library/PcdLib.h> > + > + > +EFI_STATUS > +EFIAPI > +UpdateSmbios ( > + IN EFI_HANDLE ImageHandle, > + IN EFI_SYSTEM_TABLE *SystemTable > + ); > +#endif > + > diff --git a/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > new file mode 100644 > index 0000000..9f8b994 > --- /dev/null > +++ b/ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > @@ -0,0 +1,64 @@ > +## @file > +# > +# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> > +# > +# This program and the accompanying materials > +# are licensed and made available under the terms and conditions of the > BSD License > +# which accompanies this distribution. The full text of the license may > be found at > +# http://opensource.org/licenses/bsd-license.php > +# > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > +# > +## > + > +# SMBIOS Driver. > +# > +# yi.li(a)linaro.org > +# Copyright (c) 2013 Linaro.org > +# > +# This program and the accompanying materials are licensed and > +# made available under the terms and conditions of the BSD License > +# which accompanies this distribution. The full text of the license > +# may be found at: http://opensource.org/licenses/bsd-license.php > + > +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > +# BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > +# EXPRESS OR IMPLIED. > + > + > +[Defines] > + INF_VERSION = 0x00010005 > + BASE_NAME = UpdateSmbios > + FILE_GUID = 3847D23F-1D95-4772-B60C-4BBFBC4D532F > + MODULE_TYPE = DXE_DRIVER > + VERSION_STRING = 1.0 > + ENTRY_POINT = UpdateSmbios > + > +[Sources] > + UpdateSmbios.c > + UpdateSmbios.h > + > +[Packages] > + MdePkg/MdePkg.dec > + MdeModulePkg/MdeModulePkg.dec > + ArmPlatformPkg/ArmPlatformPkg.dec > + > +[LibraryClasses] > + UefiBootServicesTableLib > + MemoryAllocationLib > + BaseMemoryLib > + BaseLib > + UefiLib > + UefiDriverEntryPoint > + DebugLib > + PcdLib > + > +[Protocols] > + gEfiSmbiosProtocolGuid # PROTOCOL > SOMETIMES_CONSUMED > + > +[Guids] > + > +[Depex] > + gEfiSmbiosProtocolGuid > + > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc > index 6237e16..aa09ac7 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -253,6 +253,12 @@ > EmbeddedPkg/SerialDxe/SerialDxe.inf > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf > index a7cc384..a21afb4 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf > @@ -82,6 +82,12 @@ READ_LOCK_STATUS = TRUE > INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > # > # Multiple Console IO support > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc > index 37765e9..382fdd6 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.dsc > @@ -276,6 +276,12 @@ > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.fdf > index c3e5a90..1fa1d67 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15x2.fdf > @@ -141,6 +141,12 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc > index b4ce234..fd98a4a 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.dsc > @@ -270,6 +270,12 @@ > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.fdf > index c3e5a90..1fa1d67 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA5s.fdf > @@ -141,6 +141,12 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > index 10e58b7..d11f87e 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc > @@ -284,6 +284,12 @@ > EmbeddedPkg/SerialDxe/SerialDxe.inf > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > index d94a721..523c364 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf > @@ -186,6 +186,12 @@ READ_LOCK_STATUS = TRUE > INF EmbeddedPkg/SerialDxe/SerialDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > index 0920313..04aefb0 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc > @@ -245,6 +245,12 @@ > EmbeddedPkg/SerialDxe/SerialDxe.inf > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > index 71c66b8..8ec50f9 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf > @@ -128,6 +128,12 @@ READ_LOCK_STATUS = TRUE > INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > # > # Networking stack > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > index bb74bdc..751508e 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc > @@ -247,7 +247,13 @@ > EmbeddedPkg/SerialDxe/SerialDxe.inf > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > - > + > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > ArmPkg/Drivers/TimerDxe/TimerDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > index c1d8f31..91b2f8f 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf > @@ -146,6 +146,12 @@ READ_LOCK_STATUS = TRUE > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > INF ArmPlatformPkg/Drivers/LAN91xDxe/LAN91xDxe.inf > > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > # > # Multiple Console IO support > # > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > index df17f64..6f2e5f2 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc > @@ -257,6 +257,12 @@ > > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > > + # > + # SMBIOS Support > + # > + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > + > ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf > ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf > diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > index a8e99fd..ba3bf8f 100644 > --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf > @@ -127,6 +127,12 @@ READ_LOCK_STATUS = TRUE > INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf > > INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > + > + # > + # SMBIOS Support > + # > + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > + INF ArmPkg/Drivers/UpdateSmbios/UpdateSmbios.inf > > # > # Networking stack > -- > 1.7.9.5 > >

11 years, 2 months

linaro uefi-next 13.09-rc1

by Ryan Harkin

Hi all, The uefi-next.git tree [1] has been updated for the 13.09 cycle. We're at -rc1, but the code freeze is today, so probably not enough time for any changes before the release. Snapshot binaries are available now [2] What's included? Well, not as much as I hoped because I've run out of time. So no ethernet and no SMBIOS patches just yet. Current topic branches: linaro-topic-a5 linaro-topic-a9 linaro-topic-arndale linaro-topic-bds linaro-topic-fvp linaro-topic-misc linaro-topic-origen linaro-topic-panda linaro-topic-tc1 linaro-topic-tc2 As always, you should probably pull and build the "linaro-tracking" branch, not one of the topic branches. The main addition for this release is the (now) upstream aarch64 support. The uefi_rtsm-ve-aemv8.bin snapshot binary will boot on the Aarch64 VE model that is currently available to Linaro internal people from the usual place [4] I've tested A9, TC2, FVP on the snapshot binaries. I tested RTSMs, aarch64 VE model and Arndale on my own build of the code and Dave Long has tested Panda on his own build of the same code. One problem I note for aarch64 is that we don't have a similar fix to this for native building: 4511a19 2012-12-12 BaseTools: allow native building [Leif Lindholm] Probably not a big issue, who would want to compile aarch64 inside a model?? Regards, Ryan. [1] https://git.linaro.org/gitweb?p=arm/uefi/uefi-next.git;a=summary [2] https://snapshots.linaro.org/components/kernel/uefi-next/152 [3] https://snapshots.linaro.org/components/kernel/uefi-next/152/uefi_rtsm-ve-a… [4] https://collaborate.linaro.org/display/ITS/FlexLM+and+Fast+Models

11 years, 3 months

[PATCH] Only warn when freeing NULL pointer

by David Long

From: "David A. Long" <dave.long(a)linaro.org> Freeing a NULL pointer does not really have to be considered a fatal error. Signed-off-by: David A. Long <dave.long(a)linaro.org> --- MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c index 0ccb524..3333bc7 100644 --- a/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c +++ b/MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c @@ -811,7 +811,10 @@ FreePool ( { EFI_STATUS Status; - Status = gBS->FreePool (Buffer); - ASSERT_EFI_ERROR (Status); + if (Buffer == NULL) { + DEBUG((EFI_D_WARN, "FreePool: attempt to free NULL pointer\n")); + } else { + Status = gBS->FreePool (Buffer); + ASSERT_EFI_ERROR (Status); + } } - -- 1.8.1.2

11 years, 3 months

[PATCH] Add new helper functions for Panda

by David Long

From: "David A. Long" <dave.long(a)linaro.org> Signed-off-by: David A. Long <dave.long(a)linaro.org> --- PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S index 6405d16..49fcf53 100644 --- a/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S +++ b/PandaBoardPkg/Library/PandaBoardLib/PandaBoardHelper.S @@ -23,6 +23,9 @@ GCC_ASM_EXPORT(ArmPlatformPrePiBootAction) GCC_ASM_EXPORT(ArmPlatformGetCorePosition) +GCC_ASM_EXPORT(ArmPlatformIsPrimaryCore) +GCC_ASM_EXPORT(ArmPlatformPeiBootAction) + /** ArmPlatformPrePiBootAction @@ -99,4 +102,18 @@ relocator_end: ASM_PFX(ArmPlatformGetCorePosition): bx lr +ASM_PFX(ArmPlatformIsPrimaryCore): + #Bits 8 through 11 are CPU ID + ldr r1, =0xf00 + and r0, r0, r1 + #id for core0 should be 0 + ldr r1, =0x0 + cmp r0, r1 + moveq r0, #1 + movne r0, #0 + mov pc, lr + +ASM_PFX(ArmPlatformPeiBootAction): + mov pc, lr + ASM_FUNCTION_REMOVE_IF_UNREFERENCED -- 1.8.1.2

11 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

boot-architecture September 2013