From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an2eC-0000XA-2u for qemu-devel@nongnu.org; Mon, 04 Apr 2016 07:26:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1an2e7-0004vt-Ug for qemu-devel@nongnu.org; Mon, 04 Apr 2016 07:26:19 -0400 Received: from mail-lb0-x244.google.com ([2a00:1450:4010:c04::244]:34652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1an2e7-0004vp-Ho for qemu-devel@nongnu.org; Mon, 04 Apr 2016 07:26:15 -0400 Received: by mail-lb0-x244.google.com with SMTP id vk4so21687849lbb.1 for ; Mon, 04 Apr 2016 04:26:15 -0700 (PDT) References: <1459535994-18523-1-git-send-email-davidkiarie4@gmail.com> <1459535994-18523-5-git-send-email-davidkiarie4@gmail.com> From: Marcel Apfelbaum Message-ID: <57024F4F.7030608@gmail.com> Date: Mon, 4 Apr 2016 14:26:07 +0300 MIME-Version: 1.0 In-Reply-To: <1459535994-18523-5-git-send-email-davidkiarie4@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [V8 4/4] hw/pci-host: Emulate AMD IOMMU Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Kiarie , qemu-devel@nongnu.org Cc: marcel@redhat.com, valentine.sinitsyn@gmail.com, jan.kizska@web.de, mst@redhat.com On 04/01/2016 09:39 PM, David Kiarie wrote: > Add AMD IOMMU emulation support to q35 chipset > > Signed-off-by: David Kiarie > --- > hw/pci-host/q35.c | 21 +++++++++++++++++++-- > include/hw/i386/intel_iommu.h | 1 + > 2 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 70f897e..37f8a84 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -32,6 +32,7 @@ > #include "hw/pci-host/q35.h" > #include "qapi/error.h" > #include "qapi/visitor.h" > +#include "hw/i386/amd_iommu.h" > > /**************************************************************************** > * Q35 host > @@ -448,6 +449,19 @@ static void mch_init_dmar(MCHPCIState *mch) > pci_setup_iommu(pci_bus, q35_host_dma_iommu, mch->iommu); > } > > +static void mch_init_amdvi(MCHPCIState *mch) > +{ > + AMDIOMMUState *iommu_state; > + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch))); > + PCIDevice *iommu; > + > + iommu = pci_create_simple(bus, 0x20, TYPE_AMD_IOMMU_DEVICE); > + > + iommu_state = AMD_IOMMU_DEVICE(iommu); > + > + pci_setup_iommu(bus, bridge_host_amd_iommu, iommu_state); > +} > + > static void mch_realize(PCIDevice *d, Error **errp) > { > int i; > @@ -506,8 +520,11 @@ static void mch_realize(PCIDevice *d, Error **errp) > mch->pci_address_space, &mch->pam_regions[i+1], > PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); > } > - /* Intel IOMMU (VT-d) */ > - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { > + > + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL) && > + MACHINE(qdev_get_machine())->x_iommu_type) { Here you don't need to check twice the iommu property, and even use the long object_property_get_bool. You can use something like : machine = MACHINE(qdev_get_machine()); if (machine->iommu) { if (machine->amd_iommu) { /* or use a switch if you opt for enum */ ... } else { /* intel */ ... } } Other than that the patch is ready. Thanks, Marcel > + mch_init_amdvi(mch); > + } else if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { > mch_init_dmar(mch); > } > } > diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h > index 7e511e1..5a520f3 100644 > --- a/include/hw/i386/intel_iommu.h > +++ b/include/hw/i386/intel_iommu.h > @@ -28,6 +28,7 @@ > #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" > #define INTEL_IOMMU_DEVICE(obj) \ > OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) > +#define INTEL_IOMMU_STR "intel" > > /* DMAR Hardware Unit Definition address (IOMMU unit) */ > #define Q35_HOST_BRIDGE_IOMMU_ADDR 0xfed90000ULL >