From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g086q-0005vf-GB for qemu-devel@nongnu.org; Wed, 12 Sep 2018 12:35:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g086l-0003MU-V3 for qemu-devel@nongnu.org; Wed, 12 Sep 2018 12:35:20 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34330 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g086l-0003MF-Ok for qemu-devel@nongnu.org; Wed, 12 Sep 2018 12:35:15 -0400 Date: Wed, 12 Sep 2018 18:35:10 +0200 From: Igor Mammedov Message-ID: <20180912183510.1fe2c3b8@redhat.com> In-Reply-To: <1536684589-11718-5-git-send-email-brijesh.singh@amd.com> References: <1536684589-11718-1-git-send-email-brijesh.singh@amd.com> <1536684589-11718-5-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/6] i386: acpi: add IVHD device entry for IOAPIC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Brijesh Singh Cc: qemu-devel@nongnu.org, Tom Lendacky , Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Suravee Suthikulpanit , Richard Henderson On Tue, 11 Sep 2018 11:49:47 -0500 Brijesh Singh 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" > Cc: Paolo Bonzini > Cc: Richard Henderson > Cc: Eduardo Habkost > Cc: Marcel Apfelbaum > Cc: Tom Lendacky > Cc: Suravee Suthikulpanit > Signed-off-by: Brijesh Singh > --- > 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); > }