>>> On 08.10.11 at 04:09, "Kay, Allen M" <allen.m.kay@xxxxxxxxx> wrote:
>> For which I'd like to understand why this is being done in the places it is
> now
>>(not the least why this is done in VT-d specific code in the first place).
>
> The reason it is call by reassign_device_ownership() is because FLR clears
> ATS enabling bit on the device - I forgot about it when I wrote the last
> email
> so we still need to re-enable ATS on the device for each device assignment.
> To summarize:
>
> 1) Reason for difference in ATS and ACS handling
> a. ATS capability is in the PCIe endpoint - enabling bit is cleared by
> device FLR on the passthrough device.
> b. ACS capability is in the PCIe switch - not affected by FLR on the
> passthrough device.
>
> 2) ATS enabling requirement
> a. VT-d engine serving the device has to be ATS capable.
> b. device has to be ATS capable
Okay, so how about the below then (with an attached prerequisite
cleanup patch)?
Jan
--- 2011-09-20.orig/xen/drivers/passthrough/iommu.c
+++ 2011-09-20/xen/drivers/passthrough/iommu.c
@@ -150,6 +150,23 @@ int iommu_add_device(struct pci_dev *pde
return hd->platform_ops->add_device(pdev);
}
+int iommu_enable_device(struct pci_dev *pdev)
+{
+ struct hvm_iommu *hd;
+
+ if ( !pdev->domain )
+ return -EINVAL;
+
+ ASSERT(spin_is_locked(&pcidevs_lock));
+
+ hd = domain_hvm_iommu(pdev->domain);
+ if ( !iommu_enabled || !hd->platform_ops ||
+ !hd->platform_ops->enable_device )
+ return 0;
+
+ return hd->platform_ops->enable_device(pdev);
+}
+
int iommu_remove_device(struct pci_dev *pdev)
{
struct hvm_iommu *hd;
--- 2011-09-20.orig/xen/drivers/passthrough/pci.c
+++ 2011-09-20/xen/drivers/passthrough/pci.c
@@ -258,7 +258,7 @@ struct pci_dev *pci_get_pdev_by_domain(
* pci_enable_acs - enable ACS if hardware support it
* @dev: the PCI device
*/
-void pci_enable_acs(struct pci_dev *pdev)
+static void pci_enable_acs(struct pci_dev *pdev)
{
int pos;
u16 cap, ctrl, seg = pdev->seg;
@@ -409,8 +409,11 @@ int pci_add_device(u16 seg, u8 bus, u8 d
}
list_add(&pdev->domain_list, &dom0->arch.pdev_list);
- pci_enable_acs(pdev);
}
+ else
+ iommu_enable_device(pdev);
+
+ pci_enable_acs(pdev);
out:
spin_unlock(&pcidevs_lock);
--- 2011-09-20.orig/xen/drivers/passthrough/vtd/iommu.c
+++ 2011-09-20/xen/drivers/passthrough/vtd/iommu.c
@@ -1901,6 +1901,19 @@ static int intel_iommu_add_device(struct
return ret;
}
+static int intel_iommu_enable_device(struct pci_dev *pdev)
+{
+ struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev);
+ int ret = drhd ? ats_device(pdev, drhd) : -ENODEV;
+
+ if ( ret <= 0 )
+ return ret;
+
+ ret = enable_ats_device(pdev->seg, pdev->bus, pdev->devfn);
+
+ return ret >= 0 ? 0 : ret;
+}
+
static int intel_iommu_remove_device(struct pci_dev *pdev)
{
struct acpi_rmrr_unit *rmrr;
@@ -1931,7 +1944,6 @@ static int intel_iommu_remove_device(str
static void __init setup_dom0_device(struct pci_dev *pdev)
{
domain_context_mapping(pdev->domain, pdev->seg, pdev->bus, pdev->devfn);
- pci_enable_acs(pdev);
pci_vtd_quirk(pdev);
}
@@ -2302,6 +2314,7 @@ const struct iommu_ops intel_iommu_ops =
.init = intel_iommu_domain_init,
.dom0_init = intel_iommu_dom0_init,
.add_device = intel_iommu_add_device,
+ .enable_device = intel_iommu_enable_device,
.remove_device = intel_iommu_remove_device,
.assign_device = intel_iommu_assign_device,
.teardown = iommu_domain_teardown,
--- 2011-09-20.orig/xen/include/xen/iommu.h
+++ 2011-09-20/xen/include/xen/iommu.h
@@ -70,6 +70,7 @@ int iommu_enable_x2apic_IR(void);
void iommu_disable_x2apic_IR(void);
int iommu_add_device(struct pci_dev *pdev);
+int iommu_enable_device(struct pci_dev *pdev);
int iommu_remove_device(struct pci_dev *pdev);
int iommu_domain_init(struct domain *d);
void iommu_dom0_init(struct domain *d);
@@ -120,6 +121,7 @@ struct iommu_ops {
int (*init)(struct domain *d);
void (*dom0_init)(struct domain *d);
int (*add_device)(struct pci_dev *pdev);
+ int (*enable_device)(struct pci_dev *pdev);
int (*remove_device)(struct pci_dev *pdev);
int (*assign_device)(struct domain *d, u16 seg, u8 bus, u8 devfn);
void (*teardown)(struct domain *d);
--- 2011-09-20.orig/xen/include/xen/pci.h
+++ 2011-09-20/xen/include/xen/pci.h
@@ -134,6 +134,5 @@ struct pirq;
int msixtbl_pt_register(struct domain *, struct pirq *, uint64_t gtable);
void msixtbl_pt_unregister(struct domain *, struct pirq *);
void msixtbl_pt_cleanup(struct domain *d);
-void pci_enable_acs(struct pci_dev *pdev);
#endif /* __XEN_PCI_H__ */
vtd-ats-cleanup.patch
Description: Text document
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home