Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SbsaQemu: fix FWTS errors #222

Merged
merged 3 commits into from
Oct 9, 2024
Merged

SbsaQemu: fix FWTS errors #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
674e5fa
SbsaQemu: indicate IO coherency support
hrw Oct 9, 2024
f3044bf
SbsaQemu: update IORT to E.f specification
hrw Oct 9, 2024
60e800b
SbsaQemu: update to SMBIOS 3.7
hrw Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Platform/Qemu/SbsaQemu/SbsaQemu.dsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
#
# SMBIOS entry point version
#
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0304
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0307
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0

gArmTokenSpaceGuid.PcdSystemBiosRelease|0x0100
Expand Down
18 changes: 10 additions & 8 deletions Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ AddIortTable (
SBSAQEMU_ACPI_HEADER (
EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
SBSA_IO_REMAPPING_STRUCTURE,
EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00
EFI_ACPI_IO_REMAPPING_TABLE_REVISION_06
),
3,
sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE), // NodeOffset
Expand All @@ -89,8 +89,8 @@ AddIortTable (
{
EFI_ACPI_IORT_TYPE_SMMUv3,
sizeof (SBSA_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE),
2, // Revision
0, // Reserved
5, // Revision
0, // Identifier
1, // NumIdMapping
OFFSET_OF (SBSA_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE, SmmuIdMap) // IdReference
},
Expand All @@ -115,24 +115,26 @@ AddIortTable (
}
};

// NOTE(hrw): update to IORT E.e?
SBSA_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE Rc = {
{
{
EFI_ACPI_IORT_TYPE_ROOT_COMPLEX, // Type
sizeof (SBSA_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE), // Length
0, // Revision
0, // Reserved
0, // Identifier
1, // NumIdMappings
OFFSET_OF (SBSA_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE, RcIdMap) // IdReference
},
1, // CacheCoherent
1, // CacheCoherentAttribute
0, // AllocationHints
0, // Reserved
0, // MemoryAccessFlags
1, // MemoryAccessFlags
leiflindholm marked this conversation as resolved.
Show resolved Hide resolved
EFI_ACPI_IORT_ROOT_COMPLEX_ATS_UNSUPPORTED, // AtsAttribute
0x0, // PciSegmentNumber
// 0, //MemoryAddressSizeLimit
0, // MemoryAddressSize
0, // PasidCapabilities
{ 0 }, // Reserved1[1]
0, // Flags
},
{
0x0000, // InputBase
Expand Down
26 changes: 15 additions & 11 deletions Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuSmbiosDxe/SbsaQemuSmbiosDxe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,21 @@ SMBIOS_TABLE_TYPE17 mMemDevInfoType17 = {
0 // Reserved :10;
}
},
0, // FirwareVersion
0, // ModuleManufacturerID (unknown)
0, // ModuleProductID (unknown)
0, // MemorySubsystemControllerManufacturerID (unknown)
0, // MemorySubsystemControllerProductID (unknown)
0, // NonVolatileSize
0, // VolatileSize; initialized at runtime, refer to MemDevInfoUpdateSmbiosType17
0, // CacheSize
0, // LogicalSize (since MemoryType is not MemoryTypeLogicalNonVolatileDevice)
0, // ExtendedSpeed
0 // ExtendedConfiguredMemorySpeed
0, // FirwareVersion
0, // ModuleManufacturerID (unknown)
0, // ModuleProductID (unknown)
0, // MemorySubsystemControllerManufacturerID (unknown)
0, // MemorySubsystemControllerProductID (unknown)
0, // NonVolatileSize
0, // VolatileSize; initialized at runtime, refer to MemDevInfoUpdateSmbiosType17
0, // CacheSize
0, // LogicalSize (since MemoryType is not MemoryTypeLogicalNonVolatileDevice)
0, // ExtendedSpeed
0, // ExtendedConfiguredMemorySpeed
0, // Pmic0ManufacturerID
leiflindholm marked this conversation as resolved.
Show resolved Hide resolved
0, // Pmic0RevisionNumber
0, // RcdManufacturerID
0, // RcdRevisionNumber
};
CHAR8 *mMemDevInfoType17Strings[] = {
NULL
Expand Down
Loading