powerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.c

[karo-tx-linux.git] / include / asm-ppc64 / iSeries / HvCallXm.h

diff --git a/include/asm-ppc64/iSeries/HvCallXm.h b/include/asm-ppc64/iSeries/HvCallXm.h
index a99f29b93611f6040d1ba03ac649db7181930846..8b9ba608daafe7cf28578c50f073a9eec1f82540 100644 (file)
--- a/include/asm-ppc64/iSeries/HvCallXm.h
+++ b/include/asm-ppc64/iSeries/HvCallXm.h
@@ -16,61 +16,63 @@
 #define HvCallXmSetTce                 HvCallXm + 11
 #define HvCallXmSetTces                        HvCallXm + 13
 
+/*
+ * Structure passed to HvCallXm_getTceTableParms
+ */
+struct iommu_table_cb {
+       unsigned long   itc_busno;      /* Bus number for this tce table */
+       unsigned long   itc_start;      /* Will be NULL for secondary */
+       unsigned long   itc_totalsize;  /* Size (in pages) of whole table */
+       unsigned long   itc_offset;     /* Index into real tce table of the
+                                          start of our section */
+       unsigned long   itc_size;       /* Size (in pages) of our section */
+       unsigned long   itc_index;      /* Index of this tce table */
+       unsigned short  itc_maxtables;  /* Max num of tables for partition */
+       unsigned char   itc_virtbus;    /* Flag to indicate virtual bus */
+       unsigned char   itc_slotno;     /* IOA Tce Slot Index */
+       unsigned char   itc_rsvd[4];
+};
+
 static inline void HvCallXm_getTceTableParms(u64 cb)
 {
        HvCall1(HvCallXmGetTceTableParms, cb);
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
 }
 
 static inline u64 HvCallXm_setTce(u64 tceTableToken, u64 tceOffset, u64 tce)
 {
-       u64 retval = HvCall3(HvCallXmSetTce, tceTableToken, tceOffset, tce );
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retval;
+       return HvCall3(HvCallXmSetTce, tceTableToken, tceOffset, tce);
 }
 
 static inline u64 HvCallXm_setTces(u64 tceTableToken, u64 tceOffset,
                u64 numTces, u64 tce1, u64 tce2, u64 tce3, u64 tce4)
 {
-       u64 retval = HvCall7(HvCallXmSetTces, tceTableToken, tceOffset, numTces,
-                            tce1, tce2, tce3, tce4 );
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retval;
+       return HvCall7(HvCallXmSetTces, tceTableToken, tceOffset, numTces,
+                            tce1, tce2, tce3, tce4);
 }
 
 static inline u64 HvCallXm_testBus(u16 busNumber)
 {
-       u64 retVal = HvCall1(HvCallXmTestBus, busNumber);
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retVal;
+       return HvCall1(HvCallXmTestBus, busNumber);
 }
 
 static inline u64 HvCallXm_testBusUnit(u16 busNumber, u8 subBusNumber,
                u8 deviceId)
 {
-       u64 busUnitNumber = (subBusNumber << 8) | deviceId;
-       u64 retVal = HvCall2(HvCallXmTestBusUnit, busNumber, busUnitNumber);
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retVal;
+       return HvCall2(HvCallXmTestBusUnit, busNumber,
+                       (subBusNumber << 8) | deviceId);
 }
 
 static inline u64 HvCallXm_connectBusUnit(u16 busNumber, u8 subBusNumber,
                u8 deviceId, u64 interruptToken)
 {
-       u64 busUnitNumber = (subBusNumber << 8) | deviceId;
-       u64 queueIndex = 0; // HvLpConfig::mapDsaToQueueIndex(HvLpDSA(busNumber, xBoard, xCard));  
-
-       u64 retVal = HvCall5(HvCallXmConnectBusUnit, busNumber, busUnitNumber,
-                            interruptToken, 0, queueIndex);
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retVal;
+       return HvCall5(HvCallXmConnectBusUnit, busNumber,
+                       (subBusNumber << 8) | deviceId, interruptToken, 0,
+                       0 /* HvLpConfig::mapDsaToQueueIndex(HvLpDSA(busNumber, xBoard, xCard)) */);
 }
 
 static inline u64 HvCallXm_loadTod(void)
 {
-       u64 retVal = HvCall0(HvCallXmLoadTod);
-       // getPaca()->adjustHmtForNoOfSpinLocksHeld();
-       return retVal;
+       return HvCall0(HvCallXmLoadTod);
 }
 
 #endif /* _HVCALLXM_H */