aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai <yinghai.lu@oracle.com>2010-04-08 20:07:55 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-04-09 12:00:00 -0400
commitdda565492776b7dff5f8507298d868745e734aab (patch)
tree0e93c6d3cad304b860fa8b8715a3dbd03832b2ae
parent680a7524622356f5476e8fad2fe32b2b68b432c0 (diff)
intel-iommu: use physfn to search drhd for VF
When virtfn is used, we should use physfn to find correct drhd -v2: add pci_physfn() Suggested by Roland Dreier <rdreier@cisco.com> do can remove ifdef in dmar.c -v3: Chris pointed out we need that for dma_find_matched_atsr_unit too also change dmar_pci_device_match() static Signed-off-by: Yinghai Lu <yinghai@kernel.org> Acked-by: Roland Dreier <rdreier@cisco.com> Acked-by: Chris Wright <chrisw@sous-sol.org> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/pci/dmar.c6
-rw-r--r--include/linux/pci.h10
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index d439917f37a9..edc5f002e055 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -309,6 +309,8 @@ int dmar_find_matched_atsr_unit(struct pci_dev *dev)
309 struct acpi_dmar_atsr *atsr; 309 struct acpi_dmar_atsr *atsr;
310 struct dmar_atsr_unit *atsru; 310 struct dmar_atsr_unit *atsru;
311 311
312 dev = pci_physfn(dev);
313
312 list_for_each_entry(atsru, &dmar_atsr_units, list) { 314 list_for_each_entry(atsru, &dmar_atsr_units, list) {
313 atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header); 315 atsr = container_of(atsru->hdr, struct acpi_dmar_atsr, header);
314 if (atsr->segment == pci_domain_nr(dev->bus)) 316 if (atsr->segment == pci_domain_nr(dev->bus))
@@ -507,7 +509,7 @@ parse_dmar_table(void)
507 return ret; 509 return ret;
508} 510}
509 511
510int dmar_pci_device_match(struct pci_dev *devices[], int cnt, 512static int dmar_pci_device_match(struct pci_dev *devices[], int cnt,
511 struct pci_dev *dev) 513 struct pci_dev *dev)
512{ 514{
513 int index; 515 int index;
@@ -530,6 +532,8 @@ dmar_find_matched_drhd_unit(struct pci_dev *dev)
530 struct dmar_drhd_unit *dmaru = NULL; 532 struct dmar_drhd_unit *dmaru = NULL;
531 struct acpi_dmar_hardware_unit *drhd; 533 struct acpi_dmar_hardware_unit *drhd;
532 534
535 dev = pci_physfn(dev);
536
533 list_for_each_entry(dmaru, &dmar_drhd_units, list) { 537 list_for_each_entry(dmaru, &dmar_drhd_units, list) {
534 drhd = container_of(dmaru->hdr, 538 drhd = container_of(dmaru->hdr,
535 struct acpi_dmar_hardware_unit, 539 struct acpi_dmar_hardware_unit,
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a788fa12ff31..a327322a33ab 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -334,6 +334,16 @@ struct pci_dev {
334#endif 334#endif
335}; 335};
336 336
337static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
338{
339#ifdef CONFIG_PCI_IOV
340 if (dev->is_virtfn)
341 dev = dev->physfn;
342#endif
343
344 return dev;
345}
346
337extern struct pci_dev *alloc_pci_dev(void); 347extern struct pci_dev *alloc_pci_dev(void);
338 348
339#define pci_dev_b(n) list_entry(n, struct pci_dev, bus_list) 349#define pci_dev_b(n) list_entry(n, struct pci_dev, bus_list)