[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/4] hw/pci-host: Add AMD IOMMU to PIIX and Q35
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH 2/4] hw/pci-host: Add AMD IOMMU to PIIX and Q35 pcs |
Date: |
Thu, 8 Oct 2015 15:11:01 +0300 |
On Fri, Oct 09, 2015 at 05:53:55AM +0300, David Kiarie wrote:
> From: David <address@hidden>
>
> Emulate AMD IOMMU on PIIX and Q35 controlled by a command line
> switch
>
> Signed-off-by: David Kiarie <address@hidden>
Please run scripts/checkpatch.pl and fix the errors
that it reports.
> ---
> hw/pci-host/piix.c | 10 ++++++++++
> hw/pci-host/q35.c | 10 ++++++++++
> 2 files changed, 20 insertions(+)
>
> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
> index 1fb71c8..a4b07d2 100644
> --- a/hw/pci-host/piix.c
> +++ b/hw/pci-host/piix.c
> @@ -31,6 +31,7 @@
> #include "qemu/range.h"
> #include "hw/xen/xen.h"
> #include "hw/pci-host/pam.h"
> +#include "hw/i386/amd_iommu.h"
> #include "sysemu/sysemu.h"
> #include "hw/i386/ioapic.h"
> #include "qapi/visitor.h"
> @@ -290,12 +291,21 @@ static void i440fx_pcihost_realize(DeviceState *dev,
> Error **errp)
> {
> PCIHostState *s = PCI_HOST_BRIDGE(dev);
> SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> + AMDIOMMUState *iommu_state;
> + PCIDevice *iommu;
>
> sysbus_add_io(sbd, 0xcf8, &s->conf_mem);
> sysbus_init_ioports(sbd, 0xcf8, 4);
>
> sysbus_add_io(sbd, 0xcfc, &s->data_mem);
> sysbus_init_ioports(sbd, 0xcfc, 4);
> +
> + /* AMD IOMMU (AMD-Vi) */
> + if(machine_amd_iommu(current_machine)){
> + iommu = pci_create_simple(s->bus, 0x20, TYPE_AMD_IOMMU_DEVICE);
> + iommu_state = AMD_IOMMU_DEVICE(iommu);
> + pci_setup_iommu(s->bus, bridge_host_amd_iommu, iommu_state);
> + }
> }
>
> static void i440fx_realize(PCIDevice *dev, Error **errp)
> diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
> index bd74094..cef84ff 100644
> --- a/hw/pci-host/q35.c
> +++ b/hw/pci-host/q35.c
> @@ -30,6 +30,7 @@
> #include "hw/hw.h"
> #include "hw/pci-host/q35.h"
> #include "qapi/visitor.h"
> +#include "hw/i386/amd_iommu.h"
>
> /****************************************************************************
> * Q35 host
> @@ -470,6 +471,8 @@ static void mch_realize(PCIDevice *d, Error **errp)
> {
> int i;
> MCHPCIState *mch = MCH_PCI_DEVICE(d);
> + AMDIOMMUState *iommu_state;
> + PCIDevice *iommu;
>
> /* setup pci memory mapping */
> pc_pci_as_mapping_init(OBJECT(mch), mch->system_memory,
> @@ -528,6 +531,13 @@ static void mch_realize(PCIDevice *d, Error **errp)
> if (machine_iommu(current_machine)) {
> mch_init_dmar(mch);
> }
> + /* AMD IOMMU (AMD-Vi) */
> + if (machine_amd_iommu(current_machine)){
> + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch)));
> + 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);
> + }
> }
>
> uint64_t mch_mcfg_base(void)
> --
> 2.1.4
[Qemu-devel] [PATCH 3/4] hw/i386: Introduce AMD IOMMU, David Kiarie, 2015/10/09