Re: [PATCH 11 of 16] amd iommu: Add a new flag to indication iommuv2 feature enabled or not

[Wei Wang2 <wei.wang2@amd.com>]

On Thursday 15 December 2011 14:39:15 Tim Deegan wrote:
> At 16:29 +0100 on 14 Dec (1323880172), Wei Wang wrote:
> > # HG changeset patch
> > # User Wei Wang <wei.wang2@amd.com>
> > # Date 1323875776 -3600
> > # Node ID 9a93e064dd3c467ce4b87ddef8739a3573ef547c
> > # Parent  001681ff1a0c09c4d04fd8bd45e8d26805686246
> > amd iommu: Add a new flag to indication iommuv2 feature enabled or not.
> > Hypercalls should return early on non-iommuv2 systems.
> >
> > Signed-off-by: Wei Wang <wei.wang2@amd.com>
> >
> > diff -r 001681ff1a0c -r 9a93e064dd3c
> > xen/drivers/passthrough/amd/iommu_guest.c ---
> > a/xen/drivers/passthrough/amd/iommu_guest.c	Wed Dec 14 16:16:15 2011
> > +0100 +++ b/xen/drivers/passthrough/amd/iommu_guest.c	Wed Dec 14 16:16:16
> > 2011 +0100 @@ -48,6 +48,8 @@
> >          (reg)->hi = (val >> 32) & 0xFFFFFFFF; \
> >      } while(0)
> >
> > +extern bool_t iommuv2_enabled;
> > +
> >  static unsigned int machine_bdf(struct domain *d, uint16_t guest_bdf)
> >  {
> >      struct pci_dev *pdev;
> > @@ -839,6 +841,9 @@ int guest_iommu_set_base(struct domain *
> >      p2m_type_t t;
> >      struct guest_iommu *iommu = domain_iommu(d);
> >
> > +    if ( !is_hvm_domain(d) && !iommuv2_enabled )
> > +        return 1;
>
> Shouldn't that that be || ? (And likewise below)
Oops... I will fix that.

Thanks.
Wei

> Cheers,
>
> Tim.
>
> > +
> >      iommu->mmio_base = base;
> >      base >>= PAGE_SHIFT;
> >
> > @@ -898,7 +903,7 @@ int guest_iommu_init(struct domain* d)
> >      struct guest_iommu *iommu;
> >      struct hvm_iommu *hd  = domain_hvm_iommu(d);
> >
> > -    if ( !is_hvm_domain(d) )
> > +    if ( !is_hvm_domain(d) && !iommuv2_enabled )
> >          return 0;
> >
> >      iommu = xzalloc(struct guest_iommu);
> > @@ -940,7 +945,7 @@ void guest_iommu_destroy(struct domain *
> >  {
> >      struct guest_iommu *iommu;
> >
> > -    if ( !is_hvm_domain(d) )
> > +    if ( !is_hvm_domain(d) && !iommuv2_enabled )
> >          return;
> >
> >      iommu = domain_iommu(d);
> > @@ -973,7 +978,7 @@ int iommu_bind_bdf(struct domain* d, uin
> >      struct pci_dev *pdev;
> >      int ret = -ENODEV;
> >
> > -    if ( !iommu_found() )
> > +    if ( !iommu_found() || !iommuv2_enabled )
> >          return 0;
> >
> >      spin_lock(&pcidevs_lock);
> > @@ -998,7 +1003,7 @@ void iommu_set_msi(struct domain* d, uin
> >  {
> >      struct guest_iommu *iommu = domain_iommu(d);
> >
> > -    if ( !iommu_found() )
> > +    if ( !iommu_found() || !iommuv2_enabled )
> >          return;
> >
> >      iommu->msi.vector = vector;
> > diff -r 001681ff1a0c -r 9a93e064dd3c
> > xen/drivers/passthrough/amd/iommu_init.c ---
> > a/xen/drivers/passthrough/amd/iommu_init.c	Wed Dec 14 16:16:15 2011 +0100
> > +++ b/xen/drivers/passthrough/amd/iommu_init.c	Wed Dec 14 16:16:16 2011
> > +0100 @@ -36,6 +36,7 @@ unsigned short ivrs_bdf_entries;
> >  static struct radix_tree_root ivrs_maps;
> >  struct list_head amd_iommu_head;
> >  struct table_struct device_table;
> > +bool_t iommuv2_enabled;
> >
> >  static int iommu_has_ht_flag(struct amd_iommu *iommu, u8 mask)
> >  {
> > @@ -759,6 +760,10 @@ static void enable_iommu(struct amd_iomm
> >          amd_iommu_flush_all_caches(iommu);
> >
> >      iommu->enabled = 1;
> > +
> > +    if ( iommu->features )
> > +        iommuv2_enabled = 1;
> > +
> >      spin_unlock_irqrestore(&iommu->lock, flags);
> >
> >  }
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xensource.com
> > http://lists.xensource.com/xen-devel