GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include/arch/acpi.h: change IVRS efr field to iommu_feature_info 

The field that was previously named 'efr' is actually the iommu feature
info field.  The efr field is a 64-bit field that is only present in
type 11h or type 40h headers that follows the iommu feature info field.

Change-Id: I62c158a258d43bf1912fedd63cc31b80321a27c6
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/16508
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Martin Roth 2016-09-06 10:28:22 -06:00
parent a66df49e15
commit d4aa2c4348
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/include/arch/acpi.h
View File

@ -225,7 +225,7 @@ typedef struct acpi_madt {
typedef struct acpi_ivrs_info { typedef struct acpi_ivrs_info {
} __attribute__ ((packed)) acpi_ivrs_info_t; } __attribute__ ((packed)) acpi_ivrs_info_t;
/* IVRS IVHD (I/O Virtualization Hardware Definition Block) */ /* IVRS IVHD (I/O Virtualization Hardware Definition Block) Type 10h */
typedef struct acpi_ivrs_ivhd { typedef struct acpi_ivrs_ivhd {
uint8_t type; uint8_t type;
uint8_t flags; uint8_t flags;
@ -236,11 +236,11 @@ typedef struct acpi_ivrs_ivhd {
uint32_t iommu_base_high; uint32_t iommu_base_high;
uint16_t pci_segment_group; uint16_t pci_segment_group;
uint16_t iommu_info; uint16_t iommu_info;
uint32_t efr; uint32_t iommu_feature_info;
uint8_t entry[0]; uint8_t entry[0];
} __attribute__ ((packed)) acpi_ivrs_ivhd_t; } __attribute__ ((packed)) acpi_ivrs_ivhd_t;
/* IVRS (I/O Virtualization Reporting Structure) */ /* IVRS (I/O Virtualization Reporting Structure) Type 10h */
typedef struct acpi_ivrs { typedef struct acpi_ivrs {
struct acpi_table_header header; struct acpi_table_header header;
uint32_t iv_info; uint32_t iv_info;

2
src/southbridge/amd/sr5650/sr5650.c
View File

@ -860,7 +860,7 @@ static unsigned long acpi_fill_ivrs(acpi_ivrs_t* ivrs, unsigned long current)
ivrs->ivhd.pci_segment_group = 0x0; ivrs->ivhd.pci_segment_group = 0x0;
ivrs->ivhd.iommu_info = 0x0; ivrs->ivhd.iommu_info = 0x0;
ivrs->ivhd.iommu_info |= (0x14 << 8); ivrs->ivhd.iommu_info |= (0x14 << 8);
ivrs->ivhd.efr = 0x0; ivrs->ivhd.iommu_feature_info = 0x0;
/* Describe HPET */ /* Describe HPET */
p = (uint8_t *)current; p = (uint8_t *)current;