Merge tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "PCI changes for the v3.10 merge window:

  PCI device hotplug
   - Remove ACPI PCI subdrivers (Jiang Liu, Myron Stowe)
   - Make acpiphp builtin only, not modular (Jiang Liu)
   - Add acpiphp mutual exclusion (Jiang Liu)

  Power management
   - Skip "PME enabled/disabled" messages when not supported (Rafael
     Wysocki)
   - Fix fallback to PCI_D0 (Rafael Wysocki)

  Miscellaneous
   - Factor quirk_io_region (Yinghai Lu)
   - Cache MSI capability offsets & cleanup (Gavin Shan, Bjorn Helgaas)
   - Clean up EISA resource initialization and logging (Bjorn Helgaas)
   - Fix prototype warnings (Andy Shevchenko, Bjorn Helgaas)
   - MIPS: Initialize of_node before scanning bus (Gabor Juhos)
   - Fix pcibios_get_phb_of_node() declaration "weak" annotation (Gabor
     Juhos)
   - Add MSI INTX_DISABLE quirks for AR8161/AR8162/etc (Xiong Huang)
   - Fix aer_inject return values (Prarit Bhargava)
   - Remove PME/ACPI dependency (Andrew Murray)
   - Use shared PCI_BUS_NUM() and PCI_DEVID() (Shuah Khan)"

* tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (63 commits)
  vfio-pci: Use cached MSI/MSI-X capabilities
  vfio-pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
  PCI: Remove "extern" from function declarations
  PCI: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
  PCI: Drop msi_mask_reg() and remove drivers/pci/msi.h
  PCI: Use msix_table_size() directly, drop multi_msix_capable()
  PCI: Drop msix_table_offset_reg() and msix_pba_offset_reg() macros
  PCI: Drop is_64bit_address() and is_mask_bit_support() macros
  PCI: Drop msi_data_reg() macro
  PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros
  PCI: Drop msi_control_reg() macro and use PCI_MSI_FLAGS directly
  PCI: Use cached MSI/MSI-X offsets from dev, not from msi_desc
  PCI: Clean up MSI/MSI-X capability #defines
  PCI: Use cached MSI-X cap while enabling MSI-X
  PCI: Use cached MSI cap while enabling MSI interrupts
  PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()
  PCI: Cache MSI/MSI-X capability offsets in struct pci_dev
  PCI: Use u8, not int, for PM capability offset
  [SCSI] megaraid_sas: Use correct #define for MSI-X capability
  PCI: Remove "extern" from function declarations
  ...

3 files changed, 28 insertions, 37 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index b287ca33833d..830183737b0f 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -173,7 +173,7 @@ static inline u16 get_device_id(struct device *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
 
-        return calc_devid(pdev->bus->number, pdev->devfn);
+        return PCI_DEVID(pdev->bus->number, pdev->devfn);
 }
 
 static struct iommu_dev_data *get_dev_data(struct device *dev)
@@ -649,26 +649,26 @@ retry:
         case EVENT_TYPE_ILL_DEV:
                 printk("ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 dump_dte_entry(devid);
                 break;
         case EVENT_TYPE_IO_FAULT:
                 printk("IO_PAGE_FAULT device=%02x:%02x.%x "
                        "domain=0x%04x address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        domid, address, flags);
                 break;
         case EVENT_TYPE_DEV_TAB_ERR:
                 printk("DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 break;
         case EVENT_TYPE_PAGE_TAB_ERR:
                 printk("PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
                        "domain=0x%04x address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        domid, address, flags);
                 break;
         case EVENT_TYPE_ILL_CMD:
@@ -682,13 +682,13 @@ retry:
         case EVENT_TYPE_IOTLB_INV_TO:
                 printk("IOTLB_INV_TIMEOUT device=%02x:%02x.%x "
                        "address=0x%016llx]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address);
                 break;
         case EVENT_TYPE_INV_DEV_REQ:
                 printk("INVALID_DEVICE_REQUEST device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 break;
         default:
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index e3c2d74b7684..2f46881256a2 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -406,7 +406,7 @@ static int __init find_last_devid_on_pci(int bus, int dev, int fn, int cap_ptr)
         u32 cap;
 
         cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);
-        update_last_devid(calc_devid(MMIO_GET_BUS(cap), MMIO_GET_LD(cap)));
+        update_last_devid(PCI_DEVID(MMIO_GET_BUS(cap), MMIO_GET_LD(cap)));
 
         return 0;
 }
@@ -423,7 +423,7 @@ static int __init find_last_devid_from_ivhd(struct ivhd_header *h)
         p += sizeof(*h);
         end += h->length;
 
-        find_last_devid_on_pci(PCI_BUS(h->devid),
+        find_last_devid_on_pci(PCI_BUS_NUM(h->devid),
                         PCI_SLOT(h->devid),
                         PCI_FUNC(h->devid),
                         h->cap_ptr);
@@ -784,10 +784,10 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_ALL\t\t\t first devid: %02x:%02x.%x"
                                     " last device %02x:%02x.%x flags: %02x\n",
-                                    PCI_BUS(iommu->first_device),
+                                    PCI_BUS_NUM(iommu->first_device),
                                     PCI_SLOT(iommu->first_device),
                                     PCI_FUNC(iommu->first_device),
-                                    PCI_BUS(iommu->last_device),
+                                    PCI_BUS_NUM(iommu->last_device),
                                     PCI_SLOT(iommu->last_device),
                                     PCI_FUNC(iommu->last_device),
                                     e->flags);
@@ -801,7 +801,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_SELECT\t\t\t devid: %02x:%02x.%x "
                                     "flags: %02x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags);
@@ -813,7 +813,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_SELECT_RANGE_START\t "
                                     "devid: %02x:%02x.%x flags: %02x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags);
@@ -827,11 +827,11 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_ALIAS\t\t\t devid: %02x:%02x.%x "
                                     "flags: %02x devid_to: %02x:%02x.%x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags,
-                                    PCI_BUS(e->ext >> 8),
+                                    PCI_BUS_NUM(e->ext >> 8),
                                     PCI_SLOT(e->ext >> 8),
                                     PCI_FUNC(e->ext >> 8));
 
@@ -846,11 +846,11 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
                         DUMP_printk("  DEV_ALIAS_RANGE\t\t "
                                     "devid: %02x:%02x.%x flags: %02x "
                                     "devid_to: %02x:%02x.%x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags,
-                                    PCI_BUS(e->ext >> 8),
+                                    PCI_BUS_NUM(e->ext >> 8),
                                     PCI_SLOT(e->ext >> 8),
                                     PCI_FUNC(e->ext >> 8));
 
@@ -864,7 +864,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_EXT_SELECT\t\t devid: %02x:%02x.%x "
                                     "flags: %02x ext: %08x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags, e->ext);
@@ -877,7 +877,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_EXT_SELECT_RANGE\t devid: "
                                     "%02x:%02x.%x flags: %02x ext: %08x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid),
                                     e->flags, e->ext);
@@ -890,7 +890,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
                 case IVHD_DEV_RANGE_END:
 
                         DUMP_printk("  DEV_RANGE_END\t\t devid: %02x:%02x.%x\n",
-                                    PCI_BUS(e->devid),
+                                    PCI_BUS_NUM(e->devid),
                                     PCI_SLOT(e->devid),
                                     PCI_FUNC(e->devid));
 
@@ -924,7 +924,7 @@ static int __init init_iommu_from_acpi(struct amd_iommu *iommu,
 
                         DUMP_printk("  DEV_SPECIAL(%s[%d])\t\tdevid: %02x:%02x.%x\n",
                                     var, (int)handle,
-                                    PCI_BUS(devid),
+                                    PCI_BUS_NUM(devid),
                                     PCI_SLOT(devid),
                                     PCI_FUNC(devid));
 
@@ -1086,7 +1086,7 @@ static int __init init_iommu_all(struct acpi_table_header *table)
 
                         DUMP_printk("device: %02x:%02x.%01x cap: %04x "
                                     "seg: %d flags: %01x info %04x\n",
-                                    PCI_BUS(h->devid), PCI_SLOT(h->devid),
+                                    PCI_BUS_NUM(h->devid), PCI_SLOT(h->devid),
                                     PCI_FUNC(h->devid), h->cap_ptr,
                                     h->pci_seg, h->flags, h->info);
                         DUMP_printk("       mmio-addr: %016llx\n",
@@ -1116,7 +1116,7 @@ static int iommu_init_pci(struct amd_iommu *iommu)
         int cap_ptr = iommu->cap_ptr;
         u32 range, misc, low, high;
 
-        iommu->dev = pci_get_bus_and_slot(PCI_BUS(iommu->devid),
+        iommu->dev = pci_get_bus_and_slot(PCI_BUS_NUM(iommu->devid),
                                           iommu->devid & 0xff);
         if (!iommu->dev)
                 return -ENODEV;
@@ -1128,9 +1128,9 @@ static int iommu_init_pci(struct amd_iommu *iommu)
         pci_read_config_dword(iommu->dev, cap_ptr + MMIO_MISC_OFFSET,
                               &misc);
 
-        iommu->first_device = calc_devid(MMIO_GET_BUS(range),
+        iommu->first_device = PCI_DEVID(MMIO_GET_BUS(range),
                                          MMIO_GET_FD(range));
-        iommu->last_device = calc_devid(MMIO_GET_BUS(range),
+        iommu->last_device = PCI_DEVID(MMIO_GET_BUS(range),
                                         MMIO_GET_LD(range));
 
         if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB)))
@@ -1388,8 +1388,8 @@ static int __init init_unity_map_range(struct ivmd_header *m)
 
         DUMP_printk("%s devid_start: %02x:%02x.%x devid_end: %02x:%02x.%x"
                     " range_start: %016llx range_end: %016llx flags: %x\n", s,
-                    PCI_BUS(e->devid_start), PCI_SLOT(e->devid_start),
-                    PCI_FUNC(e->devid_start), PCI_BUS(e->devid_end),
+                    PCI_BUS_NUM(e->devid_start), PCI_SLOT(e->devid_start),
+                    PCI_FUNC(e->devid_start), PCI_BUS_NUM(e->devid_end),
                     PCI_SLOT(e->devid_end), PCI_FUNC(e->devid_end),
                     e->address_start, e->address_end, m->flags);
 
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index e38ab438bb34..ec36cf63e0ca 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -24,6 +24,7 @@
 #include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
+#include <linux/pci.h>
 
 /*
  * Maximum number of IOMMUs supported
@@ -315,9 +316,6 @@
 
 #define MAX_DOMAIN_ID 65536
 
-/* FIXME: move this macro to <linux/pci.h> */
-#define PCI_BUS(x) (((x) >> 8) & 0xff)
-
 /* Protection domain flags */
 #define PD_DMA_OPS_MASK         (1UL << 0) /* domain used for dma_ops */
 #define PD_DEFAULT_MASK         (1UL << 1) /* domain is a default dma_ops
@@ -703,13 +701,6 @@ extern int amd_iommu_max_glx_val;
  */
 extern void iommu_flush_all_caches(struct amd_iommu *iommu);
 
-/* takes bus and device/function and returns the device id
- * FIXME: should that be in generic PCI code? */
-static inline u16 calc_devid(u8 bus, u8 devfn)
-{
-        return (((u16)bus) << 8) | devfn;
-}
-
 static inline int get_ioapic_devid(int id)
 {
         struct devid_map *entry;