From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFoic-0001FK-03 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:25:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFoiW-0004JC-QW for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:25:48 -0400 Received: from mout.web.de ([212.227.17.11]:62001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFoiW-0004Is-E5 for qemu-devel@nongnu.org; Wed, 22 Jun 2016 16:25:44 -0400 References: <1465993312-18119-1-git-send-email-davidkiarie4@gmail.com> <1465993312-18119-5-git-send-email-davidkiarie4@gmail.com> From: Jan Kiszka Message-ID: <576AF442.4090601@web.de> Date: Wed, 22 Jun 2016 22:25:38 +0200 MIME-Version: 1.0 In-Reply-To: <1465993312-18119-5-git-send-email-davidkiarie4@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="uqWmA55VC2jde8Mea7AwhAcqBNTolAmBS" Subject: Re: [Qemu-devel] [V12 4/4] hw/i386: AMD IOMMU IVRS table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Kiarie , qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, valentine.sinitsyn@gmail.com, ehabkost@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --uqWmA55VC2jde8Mea7AwhAcqBNTolAmBS From: Jan Kiszka To: David Kiarie , qemu-devel@nongnu.org Cc: marcel@redhat.com, mst@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, valentine.sinitsyn@gmail.com, ehabkost@redhat.com Message-ID: <576AF442.4090601@web.de> Subject: Re: [V12 4/4] hw/i386: AMD IOMMU IVRS table References: <1465993312-18119-1-git-send-email-davidkiarie4@gmail.com> <1465993312-18119-5-git-send-email-davidkiarie4@gmail.com> In-Reply-To: <1465993312-18119-5-git-send-email-davidkiarie4@gmail.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 2016-06-15 14:21, David Kiarie wrote: > Add IVRS table for AMD IOMMU. Generate IVRS or DMAR > depending on emulated IOMMU. >=20 > Signed-off-by: David Kiarie > --- > hw/acpi/aml-build.c | 2 +- > hw/i386/acpi-build.c | 95 +++++++++++++++++++++++++++++++++++++= ++------ > include/hw/acpi/acpi-defs.h | 13 +++++++ > include/hw/acpi/aml-build.h | 1 + > 4 files changed, 99 insertions(+), 12 deletions(-) >=20 > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index 123160a..9ce10aa 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -226,7 +226,7 @@ static void build_extop_package(GArray *package, ui= nt8_t op) > build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ > } > =20 > -static void build_append_int_noprefix(GArray *table, uint64_t value, i= nt size) > +void build_append_int_noprefix(GArray *table, uint64_t value, int size= ) > { > int i; > =20 > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 8ca2032..ecdb15d 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -51,6 +51,7 @@ > #include "hw/pci/pci_bus.h" > #include "hw/pci-host/q35.h" > #include "hw/i386/intel_iommu.h" > +#include "hw/i386/amd_iommu.h" > #include "hw/timer/hpet.h" > =20 > #include "hw/acpi/aml-build.h" > @@ -116,6 +117,12 @@ typedef struct AcpiBuildPciBusHotplugState { > bool pcihp_bridge_en; > } AcpiBuildPciBusHotplugState; > =20 > +typedef enum IommuType { > + TYPE_INTEL, > + TYPE_AMD, > + TYPE_NONE > +} IommuType; > + > static void acpi_get_pm_info(AcpiPmInfo *pm) > { > Object *piix =3D piix4_pm_find(); > @@ -2439,6 +2446,77 @@ build_dmar_q35(GArray *table_data, BIOSLinker *l= inker) > "DMAR", table_data->len - dmar_start, 1, NULL, NULL);= > } > =20 > +static void > +build_amd_iommu(GArray *table_data, BIOSLinker *linker) > +{ > + int iommu_start =3D table_data->len; > + bool iommu_ambig; > + > + /* IVRS definition - table header has an extra 2-byte field */ > + acpi_data_push(table_data, sizeof(AcpiTableHeader)); > + /* common virtualization information */ > + build_append_int_noprefix(table_data, AMD_IOMMU_HOST_ADDRESS_WIDTH= << 8, 4); > + /* reserved */ > + build_append_int_noprefix(table_data, 0, 8); > + > + AMDVIState *s =3D (AMDVIState *)object_resolve_path_type("", > + TYPE_AMD_IOMMU_DEVICE, &iommu_ambig); > + > + /* IVDB definition - type 10h */ > + if (!iommu_ambig) { > + /* IVHD definition - type 10h */ > + build_append_int_noprefix(table_data, 0x10, 1); > + /* virtualization flags */ > + build_append_int_noprefix(table_data, (IVHD_HT_TUNEN | > + IVHD_PPRSUP | IVHD_IOTLBSUP | IVHD_PREFSUP), 1); > + /* ivhd length */ > + build_append_int_noprefix(table_data, 0x20, 2); > + /* iommu device id */ > + build_append_int_noprefix(table_data, s->devid, 2); > + /* offset of capability registers */ > + build_append_int_noprefix(table_data, s->capab_offset, 2); > + /* mmio base register */ > + build_append_int_noprefix(table_data, s->mmio.addr, 8); > + /* pci segment */ > + build_append_int_noprefix(table_data, 0, 2); > + /* interrupt numbers */ > + build_append_int_noprefix(table_data, 0, 2); > + /* feature reporting */ > + build_append_int_noprefix(table_data, (IVHD_EFR_GTSUP | > + IVHD_EFR_HATS | IVHD_EFR_GATS), 4); > + /* Add device flags here > + * These are 4-byte device entries currently reporting the r= ange of > + * devices 00h - ffffh; all devices > + * Device setting affecting all devices should be made here > + * > + * Refer to > + * (http://support.amd.com/TechDocs/48882_IOMMU.pdf) > + * Table 95 > + */ > + /* start of device range, 4-byte entries */ > + build_append_int_noprefix(table_data, 0x00000003, 4); > + /* end of device range */ > + build_append_int_noprefix(table_data, 0x00ffff04, 4); > + } > + > + build_header(linker, table_data, (void *)(table_data->data + iommu= _start), > + "IVRS", table_data->len - iommu_start, 1, NULL, NULL)= ; > +} > + > +static IommuType has_iommu(void) > +{ > + bool ambiguous; > + > + if (object_resolve_path_type("", TYPE_AMD_IOMMU_DEVICE, &ambiguous= ) > + && !ambiguous) > + return TYPE_AMD; > + else if (object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE, &am= biguous) > + && !ambiguous) > + return TYPE_INTEL; > + else > + return TYPE_NONE; Style: { } Jan --uqWmA55VC2jde8Mea7AwhAcqBNTolAmBS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAldq9EIACgkQitSsb3rl5xSl5gCgiauRVhFWfC7bFDRYBdb918SD lsgAniSCJKJGG9mkuNZer0NR/BTeW2xn =ATOR -----END PGP SIGNATURE----- --uqWmA55VC2jde8Mea7AwhAcqBNTolAmBS--