powerpc: eliminate DsaAddr from pci_dn

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

4 files changed, 23 insertions, 16 deletions

diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 533d9b467402..1db26d8be640 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -124,7 +124,7 @@ static void iommu_table_getparms(struct pci_dn *pdn,
 
         memset(parms, 0, sizeof(*parms));
 
-        parms->itc_busno = pdn->DsaAddr.Dsa.busNumber;
+        parms->itc_busno = pdn->busno;
         parms->itc_slotno = pdn->LogicalSlot;
         parms->itc_virtbus = 0;
 
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index fe34d1175818..d14e9d9d7797 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -223,13 +223,8 @@ static struct device_node *build_device_node(HvBusNumber Bus,
         node->data = pdn;
         pdn->node = node;
         list_add_tail(&pdn->Device_List, &iSeries_Global_Device_List);
-#if 0
-        pdn->DsaAddr = ((u64)Bus << 48) + ((u64)SubBus << 40) + ((u64)0x10 << 32);
-#endif
-        pdn->DsaAddr.DsaAddr = 0;
-        pdn->DsaAddr.Dsa.busNumber = Bus;
-        pdn->DsaAddr.Dsa.subBusNumber = SubBus;
-        pdn->DsaAddr.Dsa.deviceId = 0x10;
+        pdn->busno = Bus;
+        pdn->bussubno = SubBus;
         pdn->devfn = PCI_DEVFN(ISERIES_ENCODE_DEVICE(AgentId), Function);
         return node;
 }
@@ -554,8 +549,7 @@ static struct device_node *find_Device_Node(int bus, int devfn)
         struct pci_dn *pdn;
 
         list_for_each_entry(pdn, &iSeries_Global_Device_List, Device_List) {
-                if ((bus == pdn->DsaAddr.Dsa.busNumber) &&
-                                (devfn == pdn->devfn))
+                if ((bus == pdn->busno) && (devfn == pdn->devfn))
                         return pdn->node;
         }
         return NULL;
@@ -612,7 +606,7 @@ static int iSeries_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         }
 
         fn = hv_cfg_read_func[(size - 1) & 3];
-        HvCall3Ret16(fn, &ret, PCI_DN(node)->DsaAddr.DsaAddr, offset, 0);
+        HvCall3Ret16(fn, &ret, iseries_ds_addr(node), offset, 0);
 
         if (ret.rc != 0) {
                 *val = ~0;
@@ -640,7 +634,7 @@ static int iSeries_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                 return PCIBIOS_BAD_REGISTER_NUMBER;
 
         fn = hv_cfg_write_func[(size - 1) & 3];
-        ret = HvCall4(fn, PCI_DN(node)->DsaAddr.DsaAddr, offset, val, 0);
+        ret = HvCall4(fn, iseries_ds_addr(node), offset, val, 0);
 
         if (ret != 0)
                 return PCIBIOS_DEVICE_NOT_FOUND;
@@ -671,7 +665,7 @@ static int CheckReturnCode(char *TextHdr, struct device_node *DevNode,
                 ++Pci_Error_Count;
                 (*retry)++;
                 printk("PCI: %s: Device 0x%04X:%02X  I/O Error(%2d): 0x%04X\n",
-                                TextHdr, pdn->DsaAddr.Dsa.busNumber, pdn->devfn,
+                                TextHdr, pdn->busno, pdn->devfn,
                                 *retry, (int)ret);
                 /*
                  * Bump the retry and check for retry count exceeded.
@@ -712,7 +706,7 @@ static inline struct device_node *xlate_iomm_address(
 
         if (DevNode != NULL) {
                 int barnum = iobar_table[TableIndex];
-                *dsaptr = PCI_DN(DevNode)->DsaAddr.DsaAddr | (barnum << 24);
+                *dsaptr = iseries_ds_addr(DevNode) | (barnum << 24);
                 *BarOffsetPtr = BaseIoAddr % IOMM_TABLE_ENTRY_SIZE;
         } else
                 panic("PCI: Invalid PCI IoAddress detected!\n");
diff --git a/arch/powerpc/platforms/iseries/pci.h b/arch/powerpc/platforms/iseries/pci.h
index 94b4bfdceadf..33a8489fde54 100644
--- a/arch/powerpc/platforms/iseries/pci.h
+++ b/arch/powerpc/platforms/iseries/pci.h
@@ -30,6 +30,8 @@
  * End Change Activity
  */
 
+#include <asm/pci-bridge.h>
+
 struct pci_dev;                         /* For Forward Reference */
 
 /*
@@ -45,6 +47,17 @@ struct pci_dev;				/* For Forward Reference */
 #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus)          ((subbus >> 5) & 0x7)
 #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus)        ((subbus >> 2) & 0x7)
 
+/*
+ * Generate a Direct Select Address for the Hypervisor
+ */
+static inline u64 iseries_ds_addr(struct device_node *node)
+{
+        struct pci_dn *pdn = PCI_DN(node);
+
+        return ((u64)pdn->busno << 48) + ((u64)pdn->bussubno << 40)
+                        + ((u64)0x10 << 32);
+}
+
 extern void     iSeries_Device_Information(struct pci_dev*, int);
 
 #endif /* _PLATFORMS_ISERIES_PCI_H */
diff --git a/arch/powerpc/platforms/iseries/vpdinfo.c b/arch/powerpc/platforms/iseries/vpdinfo.c
index dcdac995565c..a03984e19c13 100644
--- a/arch/powerpc/platforms/iseries/vpdinfo.c
+++ b/arch/powerpc/platforms/iseries/vpdinfo.c
@@ -258,8 +258,8 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
         }
 
         pdn = PCI_DN(DevNode);
-        bus = pdn->DsaAddr.Dsa.busNumber;
-        subbus = pdn->DsaAddr.Dsa.subBusNumber;
+        bus = pdn->busno;
+        subbus = pdn->bussubno;
         agent = ISERIES_PCI_AGENTID(ISERIES_GET_DEVICE_FROM_SUBBUS(subbus),
                         ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus));
         iSeries_Get_Location_Code(bus, agent, &frame, card);