diff options
Diffstat (limited to 'include/asm-ppc64/iSeries/iSeries_pci.h')
-rw-r--r-- | include/asm-ppc64/iSeries/iSeries_pci.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-ppc64/iSeries/iSeries_pci.h b/include/asm-ppc64/iSeries/iSeries_pci.h index 4313a6684023..5d127cf29bf5 100644 --- a/include/asm-ppc64/iSeries/iSeries_pci.h +++ b/include/asm-ppc64/iSeries/iSeries_pci.h | |||
@@ -44,8 +44,7 @@ struct iSeries_Device_Node; | |||
44 | #define ISERIES_SUBBUS(DevPtr) DevPtr->DsaAddr.Dsa.subBusNumber | 44 | #define ISERIES_SUBBUS(DevPtr) DevPtr->DsaAddr.Dsa.subBusNumber |
45 | #define ISERIES_DEVICE(DevPtr) DevPtr->DsaAddr.Dsa.deviceId | 45 | #define ISERIES_DEVICE(DevPtr) DevPtr->DsaAddr.Dsa.deviceId |
46 | #define ISERIES_DSA(DevPtr) DevPtr->DsaAddr.DsaAddr | 46 | #define ISERIES_DSA(DevPtr) DevPtr->DsaAddr.DsaAddr |
47 | #define ISERIES_DEVFUN(DevPtr) DevPtr->DevFn | 47 | #define ISERIES_DEVNODE(PciDev) ((struct iSeries_Device_Node *)PciDev->sysdata) |
48 | #define ISERIES_DEVNODE(PciDev) ((struct iSeries_Device_Node*)PciDev->sysdata) | ||
49 | 48 | ||
50 | #define EADsMaxAgents 7 | 49 | #define EADsMaxAgents 7 |
51 | 50 | ||
@@ -63,17 +62,6 @@ struct iSeries_Device_Node; | |||
63 | #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 0x7) | 62 | #define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 0x7) |
64 | 63 | ||
65 | /* | 64 | /* |
66 | * N.B. the ISERIES_DECODE_* macros are not used anywhere, and I think | ||
67 | * the 0x71 (at least) must be wrong - 0x78 maybe? -- paulus. | ||
68 | */ | ||
69 | #define ISERIES_DECODE_DEVFN(linuxdevfn) \ | ||
70 | (((linuxdevfn & 0x71) << 1) | (linuxdevfn & 0x07)) | ||
71 | #define ISERIES_DECODE_DEVICE(linuxdevfn) \ | ||
72 | (((linuxdevfn & 0x38) >> 3) | (((linuxdevfn & 0x40) >> 2) + 0x10)) | ||
73 | #define ISERIES_DECODE_FUNCTION(linuxdevfn) \ | ||
74 | (linuxdevfn & 0x07) | ||
75 | |||
76 | /* | ||
77 | * Converts Virtual Address to Real Address for Hypervisor calls | 65 | * Converts Virtual Address to Real Address for Hypervisor calls |
78 | */ | 66 | */ |
79 | #define ISERIES_HV_ADDR(virtaddr) \ | 67 | #define ISERIES_HV_ADDR(virtaddr) \ |
@@ -90,15 +78,12 @@ struct iSeries_Device_Node { | |||
90 | /* deviceId, barNumber */ | 78 | /* deviceId, barNumber */ |
91 | HvAgentId AgentId; /* Hypervisor DevFn */ | 79 | HvAgentId AgentId; /* Hypervisor DevFn */ |
92 | int DevFn; /* Linux devfn */ | 80 | int DevFn; /* Linux devfn */ |
93 | int BarOffset; | ||
94 | int Irq; /* Assigned IRQ */ | 81 | int Irq; /* Assigned IRQ */ |
95 | int IoRetry; /* Current Retry Count */ | 82 | int IoRetry; /* Current Retry Count */ |
96 | int Flags; /* Possible flags(disable/bist)*/ | 83 | int Flags; /* Possible flags(disable/bist)*/ |
97 | u16 Vendor; /* Vendor ID */ | ||
98 | u8 LogicalSlot; /* Hv Slot Index for Tces */ | 84 | u8 LogicalSlot; /* Hv Slot Index for Tces */ |
99 | struct iommu_table *iommu_table;/* Device TCE Table */ | 85 | struct iommu_table *iommu_table;/* Device TCE Table */ |
100 | u8 PhbId; /* Phb Card is on. */ | 86 | u8 PhbId; /* Phb Card is on. */ |
101 | u16 Board; /* Board Number */ | ||
102 | u8 FrameId; /* iSeries spcn Frame Id */ | 87 | u8 FrameId; /* iSeries spcn Frame Id */ |
103 | char CardLocation[4];/* Char format of planar vpd */ | 88 | char CardLocation[4];/* Char format of planar vpd */ |
104 | char Location[20]; /* Frame 1, Card C10 */ | 89 | char Location[20]; /* Frame 1, Card C10 */ |