amd_iommu: report x2APIC support to the operating system
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id. Additionally, this commit exports IVHD type 0x11 besides the old IVHD type 0x10 in ACPI table. IVHD type 0x10 does not report full set of IOMMU features only the legacy ones, so operating system (e.g. Linux) may only detects x2APIC support if IVHD type 0x11 is available. The IVHD type 0x10 is kept so that old operating system that only parses type 0x10 can detect the IOMMU device. Besides, an amd_iommu-stub.c file is created to provide the definition for amdvi_extended_feature_register when CONFIG_AMD_IOMMU=n. This function is used by acpi-build.c to get the extended feature register value for building the ACPI table. When CONFIG_AMD_IOMMU=y, this function is defined in amd_iommu.c. Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com> Message-Id: <20240111154404.5333-7-minhquangbui99@gmail.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bui Quang Minh
Michael S. Tsirkin
parent
595cd6fd9d
commit
328a11a08a
@ -2333,30 +2333,23 @@ static void
|
||||
build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
||||
const char *oem_table_id)
|
||||
{
|
||||
int ivhd_table_len = 24;
|
||||
AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default());
|
||||
GArray *ivhd_blob = g_array_new(false, true, 1);
|
||||
AcpiTable table = { .sig = "IVRS", .rev = 1, .oem_id = oem_id,
|
||||
.oem_table_id = oem_table_id };
|
||||
uint64_t feature_report;
|
||||
|
||||
acpi_table_begin(&table, table_data);
|
||||
/* IVinfo - IO virtualization information common to all
|
||||
* IOMMU units in a system
|
||||
*/
|
||||
build_append_int_noprefix(table_data, 40UL << 8/* PASize */, 4);
|
||||
build_append_int_noprefix(table_data,
|
||||
(1UL << 0) | /* EFRSup */
|
||||
(40UL << 8), /* PASize */
|
||||
4);
|
||||
/* reserved */
|
||||
build_append_int_noprefix(table_data, 0, 8);
|
||||
|
||||
/* IVHD definition - type 10h */
|
||||
build_append_int_noprefix(table_data, 0x10, 1);
|
||||
/* virtualization flags */
|
||||
build_append_int_noprefix(table_data,
|
||||
(1UL << 0) | /* HtTunEn */
|
||||
(1UL << 4) | /* iotblSup */
|
||||
(1UL << 6) | /* PrefSup */
|
||||
(1UL << 7), /* PPRSup */
|
||||
1);
|
||||
|
||||
/*
|
||||
* A PCI bus walk, for each PCI host bridge, is necessary to create a
|
||||
* complete set of IVHD entries. Do this into a separate blob so that we
|
||||
@ -2376,18 +2369,34 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
||||
build_append_int_noprefix(ivhd_blob, 0x0000001, 4);
|
||||
}
|
||||
|
||||
ivhd_table_len += ivhd_blob->len;
|
||||
|
||||
/*
|
||||
* When interrupt remapping is supported, we add a special IVHD device
|
||||
* for type IO-APIC.
|
||||
* for type IO-APIC
|
||||
* Refer to spec - Table 95: IVHD device entry type codes
|
||||
*
|
||||
* Linux IOMMU driver checks for the special IVHD device (type IO-APIC).
|
||||
* See Linux kernel commit 'c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059'
|
||||
*/
|
||||
if (x86_iommu_ir_supported(x86_iommu_get_default())) {
|
||||
ivhd_table_len += 8;
|
||||
build_append_int_noprefix(ivhd_blob,
|
||||
(0x1ull << 56) | /* type IOAPIC */
|
||||
(IOAPIC_SB_DEVID << 40) | /* IOAPIC devid */
|
||||
0x48, /* special device */
|
||||
8);
|
||||
}
|
||||
|
||||
/* IVHD definition - type 10h */
|
||||
build_append_int_noprefix(table_data, 0x10, 1);
|
||||
/* virtualization flags */
|
||||
build_append_int_noprefix(table_data,
|
||||
(1UL << 0) | /* HtTunEn */
|
||||
(1UL << 4) | /* iotblSup */
|
||||
(1UL << 6) | /* PrefSup */
|
||||
(1UL << 7), /* PPRSup */
|
||||
1);
|
||||
|
||||
/* IVHD length */
|
||||
build_append_int_noprefix(table_data, ivhd_table_len, 2);
|
||||
build_append_int_noprefix(table_data, ivhd_blob->len + 24, 2);
|
||||
/* DeviceID */
|
||||
build_append_int_noprefix(table_data,
|
||||
object_property_get_int(OBJECT(&s->pci), "addr",
|
||||
@ -2401,31 +2410,53 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
||||
/* IOMMU info */
|
||||
build_append_int_noprefix(table_data, 0, 2);
|
||||
/* IOMMU Feature Reporting */
|
||||
build_append_int_noprefix(table_data,
|
||||
(48UL << 30) | /* HATS */
|
||||
(48UL << 28) | /* GATS */
|
||||
(1UL << 2) | /* GTSup */
|
||||
(1UL << 6), /* GASup */
|
||||
4);
|
||||
feature_report = (48UL << 30) | /* HATS */
|
||||
(48UL << 28) | /* GATS */
|
||||
(1UL << 2) | /* GTSup */
|
||||
(1UL << 6); /* GASup */
|
||||
if (s->xtsup) {
|
||||
feature_report |= (1UL << 0); /* XTSup */
|
||||
}
|
||||
build_append_int_noprefix(table_data, feature_report, 4);
|
||||
|
||||
/* IVHD entries as found above */
|
||||
g_array_append_vals(table_data, ivhd_blob->data, ivhd_blob->len);
|
||||
g_array_free(ivhd_blob, TRUE);
|
||||
|
||||
/*
|
||||
* Add a special IVHD device type.
|
||||
* Refer to spec - Table 95: IVHD device entry type codes
|
||||
*
|
||||
* Linux IOMMU driver checks for the special IVHD device (type IO-APIC).
|
||||
* See Linux kernel commit 'c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059'
|
||||
*/
|
||||
if (x86_iommu_ir_supported(x86_iommu_get_default())) {
|
||||
build_append_int_noprefix(table_data,
|
||||
(0x1ull << 56) | /* type IOAPIC */
|
||||
(IOAPIC_SB_DEVID << 40) | /* IOAPIC devid */
|
||||
0x48, /* special device */
|
||||
8);
|
||||
}
|
||||
/* IVHD definition - type 11h */
|
||||
build_append_int_noprefix(table_data, 0x11, 1);
|
||||
/* virtualization flags */
|
||||
build_append_int_noprefix(table_data,
|
||||
(1UL << 0) | /* HtTunEn */
|
||||
(1UL << 4), /* iotblSup */
|
||||
1);
|
||||
|
||||
/* IVHD length */
|
||||
build_append_int_noprefix(table_data, ivhd_blob->len + 40, 2);
|
||||
/* DeviceID */
|
||||
build_append_int_noprefix(table_data,
|
||||
object_property_get_int(OBJECT(&s->pci), "addr",
|
||||
&error_abort), 2);
|
||||
/* Capability offset */
|
||||
build_append_int_noprefix(table_data, s->pci.capab_offset, 2);
|
||||
/* IOMMU base address */
|
||||
build_append_int_noprefix(table_data, s->mmio.addr, 8);
|
||||
/* PCI Segment Group */
|
||||
build_append_int_noprefix(table_data, 0, 2);
|
||||
/* IOMMU info */
|
||||
build_append_int_noprefix(table_data, 0, 2);
|
||||
/* IOMMU Attributes */
|
||||
build_append_int_noprefix(table_data, 0, 4);
|
||||
/* EFR Register Image */
|
||||
build_append_int_noprefix(table_data,
|
||||
amdvi_extended_feature_register(s),
|
||||
8);
|
||||
/* EFR Register Image 2 */
|
||||
build_append_int_noprefix(table_data, 0, 8);
|
||||
|
||||
/* IVHD entries as found above */
|
||||
g_array_append_vals(table_data, ivhd_blob->data, ivhd_blob->len);
|
||||
|
||||
g_array_free(ivhd_blob, TRUE);
|
||||
acpi_table_end(linker, &table);
|
||||
}
|
||||
|
||||
|
||||
26
hw/i386/amd_iommu-stub.c
Normal file
26
hw/i386/amd_iommu-stub.c
Normal file
@ -0,0 +1,26 @@
|
||||
/*
|
||||
* Stubs for AMD IOMMU emulation
|
||||
*
|
||||
* Copyright (C) 2023 Bui Quang Minh <minhquangbui99@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "amd_iommu.h"
|
||||
|
||||
uint64_t amdvi_extended_feature_register(AMDVIState *s)
|
||||
{
|
||||
return AMDVI_DEFAULT_EXT_FEATURES;
|
||||
}
|
||||
@ -31,6 +31,7 @@
|
||||
#include "hw/i386/apic_internal.h"
|
||||
#include "trace.h"
|
||||
#include "hw/i386/apic-msidef.h"
|
||||
#include "hw/qdev-properties.h"
|
||||
|
||||
/* used AMD-Vi MMIO registers */
|
||||
const char *amdvi_mmio_low[] = {
|
||||
@ -74,6 +75,16 @@ typedef struct AMDVIIOTLBEntry {
|
||||
uint64_t page_mask; /* physical page size */
|
||||
} AMDVIIOTLBEntry;
|
||||
|
||||
uint64_t amdvi_extended_feature_register(AMDVIState *s)
|
||||
{
|
||||
uint64_t feature = AMDVI_DEFAULT_EXT_FEATURES;
|
||||
if (s->xtsup) {
|
||||
feature |= AMDVI_FEATURE_XT;
|
||||
}
|
||||
|
||||
return feature;
|
||||
}
|
||||
|
||||
/* configure MMIO registers at startup/reset */
|
||||
static void amdvi_set_quad(AMDVIState *s, hwaddr addr, uint64_t val,
|
||||
uint64_t romask, uint64_t w1cmask)
|
||||
@ -1155,7 +1166,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu,
|
||||
irq->vector = irte.hi.fields.vector;
|
||||
irq->dest_mode = irte.lo.fields_remap.dm;
|
||||
irq->redir_hint = irte.lo.fields_remap.rq_eoi;
|
||||
irq->dest = irte.lo.fields_remap.destination;
|
||||
if (iommu->xtsup) {
|
||||
irq->dest = irte.lo.fields_remap.destination |
|
||||
(irte.hi.fields.destination_hi << 24);
|
||||
} else {
|
||||
irq->dest = irte.lo.fields_remap.destination & 0xff;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1505,8 +1521,9 @@ static void amdvi_init(AMDVIState *s)
|
||||
|
||||
/* reset MMIO */
|
||||
memset(s->mmior, 0, AMDVI_MMIO_SIZE);
|
||||
amdvi_set_quad(s, AMDVI_MMIO_EXT_FEATURES, AMDVI_EXT_FEATURES,
|
||||
0xffffffffffffffef, 0);
|
||||
amdvi_set_quad(s, AMDVI_MMIO_EXT_FEATURES,
|
||||
amdvi_extended_feature_register(s),
|
||||
0xffffffffffffffef, 0);
|
||||
amdvi_set_quad(s, AMDVI_MMIO_STATUS, 0, 0x98, 0x67);
|
||||
}
|
||||
|
||||
@ -1589,6 +1606,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)
|
||||
amdvi_init(s);
|
||||
}
|
||||
|
||||
static Property amdvi_properties[] = {
|
||||
DEFINE_PROP_BOOL("xtsup", AMDVIState, xtsup, false),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_amdvi_sysbus = {
|
||||
.name = "amd-iommu",
|
||||
.unmigratable = 1
|
||||
@ -1615,6 +1637,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data)
|
||||
dc->user_creatable = true;
|
||||
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
||||
dc->desc = "AMD IOMMU (AMD-Vi) DMA Remapping device";
|
||||
device_class_set_props(dc, amdvi_properties);
|
||||
}
|
||||
|
||||
static const TypeInfo amdvi_sysbus = {
|
||||
|
||||
@ -154,6 +154,7 @@
|
||||
|
||||
#define AMDVI_FEATURE_PREFETCH (1ULL << 0) /* page prefetch */
|
||||
#define AMDVI_FEATURE_PPR (1ULL << 1) /* PPR Support */
|
||||
#define AMDVI_FEATURE_XT (1ULL << 2) /* x2APIC Support */
|
||||
#define AMDVI_FEATURE_GT (1ULL << 4) /* Guest Translation */
|
||||
#define AMDVI_FEATURE_IA (1ULL << 6) /* inval all support */
|
||||
#define AMDVI_FEATURE_GA (1ULL << 7) /* guest VAPIC support */
|
||||
@ -173,8 +174,9 @@
|
||||
#define AMDVI_IOTLB_MAX_SIZE 1024
|
||||
#define AMDVI_DEVID_SHIFT 36
|
||||
|
||||
/* extended feature support */
|
||||
#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \
|
||||
/* default extended feature */
|
||||
#define AMDVI_DEFAULT_EXT_FEATURES \
|
||||
(AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \
|
||||
AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \
|
||||
AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)
|
||||
|
||||
@ -276,8 +278,8 @@ union irte_ga_lo {
|
||||
dm:1,
|
||||
/* ------ */
|
||||
guest_mode:1,
|
||||
destination:8,
|
||||
rsvd_1:48;
|
||||
destination:24,
|
||||
rsvd_1:32;
|
||||
} fields_remap;
|
||||
};
|
||||
|
||||
@ -285,7 +287,8 @@ union irte_ga_hi {
|
||||
uint64_t val;
|
||||
struct {
|
||||
uint64_t vector:8,
|
||||
rsvd_2:56;
|
||||
rsvd_2:48,
|
||||
destination_hi:8;
|
||||
} fields;
|
||||
};
|
||||
|
||||
@ -364,6 +367,9 @@ struct AMDVIState {
|
||||
|
||||
/* Interrupt remapping */
|
||||
bool ga_enabled;
|
||||
bool xtsup;
|
||||
};
|
||||
|
||||
uint64_t amdvi_extended_feature_register(AMDVIState *s);
|
||||
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,8 @@ i386_ss.add(files(
|
||||
|
||||
i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'),
|
||||
if_false: files('x86-iommu-stub.c'))
|
||||
i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'))
|
||||
i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'),
|
||||
if_false: files('amd_iommu-stub.c'))
|
||||
i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c'))
|
||||
i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('microvm.c', 'acpi-microvm.c', 'microvm-dt.c'))
|
||||
i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c'))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user