On Tue, 11 Sep 2018 11:49:47 -0500
Brijesh Singh <brijesh.si...@amd.com> wrote:
> When interrupt remapping is enabled, add a special IVHD device
> (type IOAPIC) -- which is typically PCI device 14:0.0. Linux IOMMU driver
> checks for this special device.
>
> Cc: "Michael S. Tsirkin" <m...@redhat.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: Richard Henderson <r...@twiddle.net>
> Cc: Eduardo Habkost <ehabk...@redhat.com>
> Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com>
> Cc: Tom Lendacky <thomas.lenda...@amd.com>
> Cc: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>
> Signed-off-by: Brijesh Singh <brijesh.si...@amd.com>
> ---
> hw/i386/acpi-build.c | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index e1ee8ae..5c2c638 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2519,6 +2519,7 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker)
> static void
> build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> {
> + int ivhd_table_len = 28;
> int iommu_start = table_data->len;
> AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default());
>
> @@ -2540,8 +2541,16 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> (1UL << 6) | /* PrefSup */
> (1UL << 7), /* PPRSup */
> 1);
> +
> + /*
> + * When interrupt remapping is enabled, we add a special IVHD device
> + * for type IO-APIC.
> + */
> + if (s->intr_enabled) {
> + ivhd_table_len += 8;
> + }
> /* IVHD length */
> - build_append_int_noprefix(table_data, 28, 2);
> + build_append_int_noprefix(table_data, ivhd_table_len, 2);
> /* DeviceID */
> build_append_int_noprefix(table_data, s->devid, 2);
> /* Capability offset */
> @@ -2565,6 +2574,15 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> */
> build_append_int_noprefix(table_data, 0x0000001, 4);
>
> + /*
> + * When interrupt remapping is enabled, Linux IOMMU driver also checks
> + * for special IVHD device (type IO-APIC), which is typically presented
> + * as PCI device 14:00.0.
Probably it shouldn't be a 'typically' device from somewhere but rather address
fetched from corresponding device model QEMU implements.
> + */
> + if (s->intr_enabled) {
> + build_append_int_noprefix(table_data, 0x0100a00000000048, 8);
^^ this is incomprehensible,
where does this magic number comes from and how was it calculated?
> + }
> +
> build_header(linker, table_data, (void *)(table_data->data +
> iommu_start),
> "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> }
