| Message ID | 20160615155616.32658.17560.stgit@gimli.home (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 15, 2016 at 09:56:16AM -0600, Alex Williamson wrote: > We don't currently support the MemoryRegionIOMMUOps notifier, so throw > an error should a device require it. > > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/i386/intel_iommu.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 347718f..5eba704 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -24,6 +24,7 @@ > #include "exec/address-spaces.h" > #include "intel_iommu_internal.h" > #include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > > /*#define DEBUG_INTEL_IOMMU*/ > #ifdef DEBUG_INTEL_IOMMU > @@ -1871,6 +1872,16 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegion *iommu, hwaddr addr, > return ret; > } > > +static void vtd_iommu_notify_started(MemoryRegion *iommu) > +{ > + VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu); > + > + hw_error("Device at bus %s addr %02x.%d requires iommu notifier which " > + "is currently not supported by intel-iommu emulation", > + vtd_as->bus->qbus.name, PCI_SLOT(vtd_as->devfn), > + PCI_FUNC(vtd_as->devfn)); > +} > + > static const VMStateDescription vtd_vmstate = { > .name = "iommu-intel", > .unmigratable = 1, > @@ -1938,6 +1949,7 @@ static void vtd_init(IntelIOMMUState *s) > memset(s->womask, 0, DMAR_REG_SIZE); > > s->iommu_ops.translate = vtd_iommu_translate; > + s->iommu_ops.notify_started = vtd_iommu_notify_started; > s->root = 0; > s->root_extended = false; > s->dmar_enabled = false; >
On 06/15/2016 06:56 PM, Alex Williamson wrote: > We don't currently support the MemoryRegionIOMMUOps notifier, so throw > an error should a device require it. > > Signed-off-by: Alex Williamson <alex.williamson@redhat.com> > --- > hw/i386/intel_iommu.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > index 347718f..5eba704 100644 > --- a/hw/i386/intel_iommu.c > +++ b/hw/i386/intel_iommu.c > @@ -24,6 +24,7 @@ > #include "exec/address-spaces.h" > #include "intel_iommu_internal.h" > #include "hw/pci/pci.h" > +#include "hw/pci/pci_bus.h" > > /*#define DEBUG_INTEL_IOMMU*/ > #ifdef DEBUG_INTEL_IOMMU > @@ -1871,6 +1872,16 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegion *iommu, hwaddr addr, > return ret; > } > > +static void vtd_iommu_notify_started(MemoryRegion *iommu) > +{ > + VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu); > + > + hw_error("Device at bus %s addr %02x.%d requires iommu notifier which " > + "is currently not supported by intel-iommu emulation", > + vtd_as->bus->qbus.name, PCI_SLOT(vtd_as->devfn), > + PCI_FUNC(vtd_as->devfn)); > +} > + > static const VMStateDescription vtd_vmstate = { > .name = "iommu-intel", > .unmigratable = 1, > @@ -1938,6 +1949,7 @@ static void vtd_init(IntelIOMMUState *s) > memset(s->womask, 0, DMAR_REG_SIZE); > > s->iommu_ops.translate = vtd_iommu_translate; > + s->iommu_ops.notify_started = vtd_iommu_notify_started; > s->root = 0; > s->root_extended = false; > s->dmar_enabled = false; > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Thanks, Marcel
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 347718f..5eba704 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -24,6 +24,7 @@ #include "exec/address-spaces.h" #include "intel_iommu_internal.h" #include "hw/pci/pci.h" +#include "hw/pci/pci_bus.h" /*#define DEBUG_INTEL_IOMMU*/ #ifdef DEBUG_INTEL_IOMMU @@ -1871,6 +1872,16 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegion *iommu, hwaddr addr, return ret; } +static void vtd_iommu_notify_started(MemoryRegion *iommu) +{ + VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu); + + hw_error("Device at bus %s addr %02x.%d requires iommu notifier which " + "is currently not supported by intel-iommu emulation", + vtd_as->bus->qbus.name, PCI_SLOT(vtd_as->devfn), + PCI_FUNC(vtd_as->devfn)); +} + static const VMStateDescription vtd_vmstate = { .name = "iommu-intel", .unmigratable = 1, @@ -1938,6 +1949,7 @@ static void vtd_init(IntelIOMMUState *s) memset(s->womask, 0, DMAR_REG_SIZE); s->iommu_ops.translate = vtd_iommu_translate; + s->iommu_ops.notify_started = vtd_iommu_notify_started; s->root = 0; s->root_extended = false; s->dmar_enabled = false;
We don't currently support the MemoryRegionIOMMUOps notifier, so throw an error should a device require it. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> --- hw/i386/intel_iommu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)