Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7feecb authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] ppc64 iSeries: obvious code simplifications 



This patch does some obvious code cleanups in the iSeries headers files.
	- simplifies the bodies of lots of inline functions
	- parenthesises a macros result
	- removes C++ wrapping
	- adds "extern" to some function declarations
There are no semantic changes.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fcee3895

include/asm-ppc64/iSeries/HvCallCfg.h

+16 −45
Original line number Diff line number Diff line
@@ -69,37 +69,27 @@ enum HvCallCfg_ReqQual { 


static inline HvLpIndex	HvCallCfg_getLps(void)

{

	HvLpIndex retVal = HvCall0(HvCallCfgGetLps);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall0(HvCallCfgGetLps);

}



static inline int HvCallCfg_isBusDedicated(u64 busIndex)

{

	int retVal = HvCall1(HvCallCfgIsBusDedicated,busIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallCfgIsBusDedicated, busIndex);

}



static inline HvLpIndex	HvCallCfg_getBusOwner(u64 busIndex)

{

	HvLpIndex retVal = HvCall1(HvCallCfgGetBusOwner,busIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallCfgGetBusOwner, busIndex);

}



static inline HvLpIndexMap HvCallCfg_getBusAllocation(u64 busIndex)

{

	HvLpIndexMap retVal = HvCall1(HvCallCfgGetBusAllocation,busIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallCfgGetBusAllocation, busIndex);

}



static inline HvLpIndexMap HvCallCfg_getActiveLpMap(void)

{

	HvLpIndexMap retVal = HvCall0(HvCallCfgGetActiveLpMap);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall0(HvCallCfgGetActiveLpMap);

}



static inline HvLpVirtualLanIndexMap HvCallCfg_getVirtualLanIndexMap(
@@ -112,23 +102,18 @@ static inline HvLpVirtualLanIndexMap HvCallCfg_getVirtualLanIndexMap( 
	u64 retVal = HvCall1(HvCallCfgGetVirtualLanIndexMap, lp);

	if (retVal == -1)

		retVal = 0;

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

}



static inline u64 HvCallCfg_getSystemMsChunks(void)

{

	u64 retVal = HvCall0(HvCallCfgGetSystemMsChunks);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall0(HvCallCfgGetSystemMsChunks);

}



static inline u64 HvCallCfg_getMsChunks(HvLpIndex lp,

		enum HvCallCfg_ReqQual qual)

{

	u64 retVal = HvCall2(HvCallCfgGetMsChunks,lp,qual);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallCfgGetMsChunks, lp, qual);

}



static inline u64 HvCallCfg_getMinRuntimeMsChunks(HvLpIndex lp)
@@ -142,57 +127,44 @@ static inline u64 HvCallCfg_getMinRuntimeMsChunks(HvLpIndex lp) 


static inline u64 HvCallCfg_setMinRuntimeMsChunks(u64 chunks)

{

	u64 retVal = HvCall1(HvCallCfgSetMinRuntimeMsChunks,chunks);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallCfgSetMinRuntimeMsChunks, chunks);

}



static inline u64 HvCallCfg_getSystemPhysicalProcessors(void)

{

	u64 retVal = HvCall0(HvCallCfgGetSystemPhysicalProcessors);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall0(HvCallCfgGetSystemPhysicalProcessors);

}



static inline u64 HvCallCfg_getPhysicalProcessors(HvLpIndex lp,

		enum HvCallCfg_ReqQual qual)

{

	u64 retVal = HvCall2(HvCallCfgGetPhysicalProcessors,lp,qual);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallCfgGetPhysicalProcessors, lp, qual);

}



static inline u64 HvCallCfg_getConfiguredBusUnitsForInterruptProc(HvLpIndex lp,

		u16 hvLogicalProcIndex)

{

	u64 retVal = HvCall2(HvCallCfgGetConfiguredBusUnitsForIntProc,lp,hvLogicalProcIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallCfgGetConfiguredBusUnitsForIntProc, lp,

			hvLogicalProcIndex);



}



static inline HvLpSharedPoolIndex HvCallCfg_getSharedPoolIndex(HvLpIndex lp)

{

	HvLpSharedPoolIndex retVal =

		HvCall1(HvCallCfgGetSharedPoolIndex,lp);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallCfgGetSharedPoolIndex, lp);



}



static inline u64 HvCallCfg_getSharedProcUnits(HvLpIndex lp,

		enum HvCallCfg_ReqQual qual)

{

	u64 retVal = HvCall2(HvCallCfgGetSharedProcUnits,lp,qual);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallCfgGetSharedProcUnits, lp, qual);



}



static inline u64 HvCallCfg_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI)

{

	u16 retVal = HvCall1(HvCallCfgGetNumProcsInSharedPool, sPI);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;



}
@@ -200,7 +172,6 @@ static inline u64 HvCallCfg_getNumProcsInSharedPool(HvLpSharedPoolIndex sPI) 
static inline HvLpIndex	HvCallCfg_getHostingLpIndex(HvLpIndex lp)

{

	u64 retVal = HvCall1(HvCallCfgGetHostingLpIndex, lp);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

}

include/asm-ppc64/iSeries/HvCallEvent.h

+13 −52
Original line number Diff line number Diff line
@@ -82,13 +82,11 @@ typedef u64 HvLpDma_Rc; 
static inline void HvCallEvent_getOverflowLpEvents(u8 queueIndex)

{

	HvCall1(HvCallEventGetOverflowLpEvents, queueIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallEvent_setInterLpQueueIndex(u8 queueIndex)

{

	HvCall1(HvCallEventSetInterLpQueueIndex, queueIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallEvent_setLpEventStack(u8 queueIndex,
@@ -99,7 +97,6 @@ static inline void HvCallEvent_setLpEventStack(u8 queueIndex, 
	abs_addr = virt_to_abs(eventStackAddr);

	HvCall3(HvCallEventSetLpEventStack, queueIndex, abs_addr,

			eventStackSize);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallEvent_setLpEventQueueInterruptProc(u8 queueIndex,
@@ -107,22 +104,18 @@ static inline void HvCallEvent_setLpEventQueueInterruptProc(u8 queueIndex, 
{

	HvCall2(HvCallEventSetLpEventQueueInterruptProc, queueIndex,

			lpLogicalProcIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline HvLpEvent_Rc HvCallEvent_signalLpEvent(struct HvLpEvent *event)

{

	u64 abs_addr;

	HvLpEvent_Rc retVal;



#ifdef DEBUG_SENDEVENT

	printk("HvCallEvent_signalLpEvent: *event = %016lx\n ",

			(unsigned long)event);

#endif

	abs_addr = virt_to_abs(event);

	retVal = (HvLpEvent_Rc)HvCall1(HvCallEventSignalLpEvent, abs_addr);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallEventSignalLpEvent, abs_addr);

}



static inline HvLpEvent_Rc HvCallEvent_signalLpEventFast(HvLpIndex targetLp,
@@ -132,8 +125,6 @@ static inline HvLpEvent_Rc HvCallEvent_signalLpEventFast(HvLpIndex targetLp, 
		u64 eventData1, u64 eventData2, u64 eventData3,

		u64 eventData4, u64 eventData5)

{

	HvLpEvent_Rc retVal;



	/* Pack the misc bits into a single Dword to pass to PLIC */

	union {

		struct HvCallEvent_PackedParms	parms;
@@ -148,67 +139,49 @@ static inline HvLpEvent_Rc HvCallEvent_signalLpEventFast(HvLpIndex targetLp, 
	packed.parms.xSourceInstId	= sourceInstanceId;

	packed.parms.xTargetInstId	= targetInstanceId;



	retVal = (HvLpEvent_Rc)HvCall7(HvCallEventSignalLpEventParms,

			packed.dword, correlationToken, eventData1,eventData2,

	return HvCall7(HvCallEventSignalLpEventParms, packed.dword,

			correlationToken, eventData1, eventData2,

			eventData3, eventData4, eventData5);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

}



static inline HvLpEvent_Rc HvCallEvent_ackLpEvent(struct HvLpEvent *event)

{

	u64 abs_addr;

	HvLpEvent_Rc retVal;



	abs_addr = virt_to_abs(event);

	retVal = (HvLpEvent_Rc)HvCall1(HvCallEventAckLpEvent, abs_addr);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallEventAckLpEvent, abs_addr);

}



static inline HvLpEvent_Rc HvCallEvent_cancelLpEvent(struct HvLpEvent *event)

{

	u64 abs_addr;

	HvLpEvent_Rc retVal;



	abs_addr = virt_to_abs(event);

	retVal = (HvLpEvent_Rc)HvCall1(HvCallEventCancelLpEvent, abs_addr);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall1(HvCallEventCancelLpEvent, abs_addr);

}



static inline HvLpInstanceId HvCallEvent_getSourceLpInstanceId(

		HvLpIndex targetLp, HvLpEvent_Type type)

{

	HvLpInstanceId retVal;	



	retVal = HvCall2(HvCallEventGetSourceLpInstanceId, targetLp, type);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallEventGetSourceLpInstanceId, targetLp, type);

}



static inline HvLpInstanceId HvCallEvent_getTargetLpInstanceId(

		HvLpIndex targetLp, HvLpEvent_Type type)

{

	HvLpInstanceId retVal;	



	retVal = HvCall2(HvCallEventGetTargetLpInstanceId, targetLp, type);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall2(HvCallEventGetTargetLpInstanceId, targetLp, type);

}



static inline void HvCallEvent_openLpEventPath(HvLpIndex targetLp,

		HvLpEvent_Type type)

{

	HvCall2(HvCallEventOpenLpEventPath, targetLp, type);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallEvent_closeLpEventPath(HvLpIndex targetLp,

		HvLpEvent_Type type)

{

	HvCall2(HvCallEventCloseLpEventPath, targetLp, type);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline HvLpDma_Rc HvCallEvent_dmaBufList(HvLpEvent_Type type,
@@ -220,7 +193,6 @@ static inline HvLpDma_Rc HvCallEvent_dmaBufList(HvLpEvent_Type type, 
		/* Do these need to be converted to absolute addresses? */

		u64 localBufList, u64 remoteBufList, u32 transferLength)

{

	HvLpDma_Rc retVal;

	/* Pack the misc bits into a single Dword to pass to PLIC */

	union {

		struct HvCallEvent_PackedDmaParms	parms;
@@ -237,11 +209,8 @@ static inline HvLpDma_Rc HvCallEvent_dmaBufList(HvLpEvent_Type type, 
	packed.parms.xLocalInstId	= localInstanceId;

	packed.parms.xRemoteInstId	= remoteInstanceId;



	retVal = (HvLpDma_Rc)HvCall4(HvCallEventDmaBufList,

			packed.dword, localBufList, remoteBufList,

			transferLength);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall4(HvCallEventDmaBufList, packed.dword, localBufList,

			remoteBufList, transferLength);

}



static inline HvLpDma_Rc HvCallEvent_dmaSingle(HvLpEvent_Type type,
@@ -252,7 +221,6 @@ static inline HvLpDma_Rc HvCallEvent_dmaSingle(HvLpEvent_Type type, 
		HvLpDma_AddressType remoteAddressType,

		u64 localAddrOrTce, u64 remoteAddrOrTce, u32 transferLength)

{

	HvLpDma_Rc retVal;

	/* Pack the misc bits into a single Dword to pass to PLIC */

	union {

		struct HvCallEvent_PackedDmaParms	parms;
@@ -269,24 +237,17 @@ static inline HvLpDma_Rc HvCallEvent_dmaSingle(HvLpEvent_Type type, 
	packed.parms.xLocalInstId	= localInstanceId;

	packed.parms.xRemoteInstId	= remoteInstanceId;



	retVal = (HvLpDma_Rc)HvCall4(HvCallEventDmaSingle,

			packed.dword, localAddrOrTce, remoteAddrOrTce,

			transferLength);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return (HvLpDma_Rc)HvCall4(HvCallEventDmaSingle, packed.dword,

			localAddrOrTce, remoteAddrOrTce, transferLength);

}



static inline HvLpDma_Rc HvCallEvent_dmaToSp(void *local, u32 remote,

		u32 length, HvLpDma_Direction dir)

{

	u64 abs_addr;

	HvLpDma_Rc retVal;



	abs_addr = virt_to_abs(local);

	retVal = (HvLpDma_Rc)HvCall4(HvCallEventDmaToSp, abs_addr, remote,

			length, dir);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retVal;

	return HvCall4(HvCallEventDmaToSp, abs_addr, remote, length, dir);

}



#endif /* _HVCALLEVENT_H */

include/asm-ppc64/iSeries/HvCallHpt.h

+5 −18
Original line number Diff line number Diff line
@@ -43,34 +43,27 @@ 


static inline u64 HvCallHpt_getHptAddress(void)

{

	u64 retval = HvCall0(HvCallHptGetHptAddress);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retval;

	return HvCall0(HvCallHptGetHptAddress);

}



static inline u64 HvCallHpt_getHptPages(void)

{

	u64 retval = HvCall0(HvCallHptGetHptPages);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retval;

	return HvCall0(HvCallHptGetHptPages);

}



static inline void HvCallHpt_setPp(u32 hpteIndex, u8 value)

{

	HvCall2(HvCallHptSetPp, hpteIndex, value);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallHpt_setSwBits(u32 hpteIndex, u8 bitson, u8 bitsoff)

{

	HvCall3(HvCallHptSetSwBits, hpteIndex, bitson, bitsoff);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallHpt_invalidateNoSyncICache(u32 hpteIndex)

{

	HvCall1(HvCallHptInvalidateNoSyncICache, hpteIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline u64 HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson,
@@ -81,36 +74,30 @@ static inline u64 HvCallHpt_invalidateSetSwBitsGet(u32 hpteIndex, u8 bitson, 
	compressedStatus = HvCall4(HvCallHptInvalidateSetSwBitsGet,

			hpteIndex, bitson, bitsoff, 1);

	HvCall1(HvCallHptInvalidateNoSyncICache, hpteIndex);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return compressedStatus;

}



static inline u64 HvCallHpt_findValid(HPTE *hpte, u64 vpn)

{

	u64 retIndex = HvCall3Ret16( HvCallHptFindValid, hpte, vpn, 0, 0 );

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retIndex;

	return HvCall3Ret16(HvCallHptFindValid, hpte, vpn, 0, 0);

}



static inline u64 HvCallHpt_findNextValid(HPTE *hpte, u32 hpteIndex,

		u8 bitson, u8 bitsoff)

{

	u64 retIndex = HvCall3Ret16( HvCallHptFindNextValid, hpte, hpteIndex, bitson, bitsoff );

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retIndex;

	return HvCall3Ret16(HvCallHptFindNextValid, hpte, hpteIndex,

			bitson, bitsoff);

}



static inline void HvCallHpt_get(HPTE *hpte, u32 hpteIndex)

{

	HvCall2Ret16(HvCallHptGet, hpte, hpteIndex, 0);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



static inline void HvCallHpt_addValidate(u32 hpteIndex, u32 hBit, HPTE *hpte)

{

	HvCall4(HvCallHptAddValidate, hpteIndex, hBit, (*((u64 *)hpte)),

			(*(((u64 *)hpte)+1)));

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

}



#endif /* _HVCALLHPT_H */

include/asm-ppc64/iSeries/HvCallPci.h

+28 −118
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ static inline u64 HvCallPci_configLoad8(u16 busNumber, u8 subBusNumber, 


	HvCall3Ret16(HvCallPciConfigLoad8, &retVal, *(u64 *)&dsa, offset, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*value = retVal.value;



	return retVal.rc;
@@ -161,8 +159,6 @@ static inline u64 HvCallPci_configLoad16(u16 busNumber, u8 subBusNumber, 


	HvCall3Ret16(HvCallPciConfigLoad16, &retVal, *(u64 *)&dsa, offset, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*value = retVal.value;



	return retVal.rc;
@@ -182,8 +178,6 @@ static inline u64 HvCallPci_configLoad32(u16 busNumber, u8 subBusNumber, 


	HvCall3Ret16(HvCallPciConfigLoad32, &retVal, *(u64 *)&dsa, offset, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*value = retVal.value;



	return retVal.rc;
@@ -193,7 +187,6 @@ static inline u64 HvCallPci_configStore8(u16 busNumber, u8 subBusNumber, 
		u8 deviceId, u32 offset, u8 value)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -201,18 +194,13 @@ static inline u64 HvCallPci_configStore8(u16 busNumber, u8 subBusNumber, 
	dsa.subBusNumber = subBusNumber;

	dsa.deviceId = deviceId;



	retVal = HvCall4(HvCallPciConfigStore8, *(u64 *)&dsa, offset, value, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciConfigStore8, *(u64 *)&dsa, offset, value, 0);

}



static inline u64 HvCallPci_configStore16(u16 busNumber, u8 subBusNumber,

		u8 deviceId, u32 offset, u16 value)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -220,18 +208,13 @@ static inline u64 HvCallPci_configStore16(u16 busNumber, u8 subBusNumber, 
	dsa.subBusNumber = subBusNumber;

	dsa.deviceId = deviceId;



	retVal = HvCall4(HvCallPciConfigStore16, *(u64 *)&dsa, offset, value, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciConfigStore16, *(u64 *)&dsa, offset, value, 0);

}



static inline u64 HvCallPci_configStore32(u16 busNumber, u8 subBusNumber,

		u8 deviceId, u32 offset, u32 value)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -239,11 +222,7 @@ static inline u64 HvCallPci_configStore32(u16 busNumber, u8 subBusNumber, 
	dsa.subBusNumber = subBusNumber;

	dsa.deviceId = deviceId;



	retVal = HvCall4(HvCallPciConfigStore32, *(u64 *)&dsa, offset, value, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciConfigStore32, *(u64 *)&dsa, offset, value, 0);

}



static inline u64 HvCallPci_barLoad8(u16 busNumberParm, u8 subBusParm,
@@ -262,8 +241,6 @@ static inline u64 HvCallPci_barLoad8(u16 busNumberParm, u8 subBusParm, 


	HvCall3Ret16(HvCallPciBarLoad8, &retVal, *(u64 *)&dsa, offsetParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*valueParm = retVal.value;



	return retVal.rc;
@@ -285,8 +262,6 @@ static inline u64 HvCallPci_barLoad16(u16 busNumberParm, u8 subBusParm, 


	HvCall3Ret16(HvCallPciBarLoad16, &retVal, *(u64 *)&dsa, offsetParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*valueParm = retVal.value;



	return retVal.rc;
@@ -308,8 +283,6 @@ static inline u64 HvCallPci_barLoad32(u16 busNumberParm, u8 subBusParm, 


	HvCall3Ret16(HvCallPciBarLoad32, &retVal, *(u64 *)&dsa, offsetParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*valueParm = retVal.value;



	return retVal.rc;
@@ -331,8 +304,6 @@ static inline u64 HvCallPci_barLoad64(u16 busNumberParm, u8 subBusParm, 


	HvCall3Ret16(HvCallPciBarLoad64, &retVal, *(u64 *)&dsa, offsetParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	*valueParm = retVal.value;



	return retVal.rc;
@@ -343,7 +314,6 @@ static inline u64 HvCallPci_barStore8(u16 busNumberParm, u8 subBusParm, 
		u8 valueParm)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -352,11 +322,8 @@ static inline u64 HvCallPci_barStore8(u16 busNumberParm, u8 subBusParm, 
	dsa.deviceId = deviceIdParm;

	dsa.barNumber = barNumberParm;



	retVal = HvCall4(HvCallPciBarStore8, *(u64 *)&dsa, offsetParm, valueParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciBarStore8, *(u64 *)&dsa, offsetParm,

			valueParm, 0);

}



static inline u64 HvCallPci_barStore16(u16 busNumberParm, u8 subBusParm,
@@ -364,7 +331,6 @@ static inline u64 HvCallPci_barStore16(u16 busNumberParm, u8 subBusParm, 
		u16 valueParm)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -373,11 +339,8 @@ static inline u64 HvCallPci_barStore16(u16 busNumberParm, u8 subBusParm, 
	dsa.deviceId = deviceIdParm;

	dsa.barNumber = barNumberParm;



	retVal = HvCall4(HvCallPciBarStore16, *(u64 *)&dsa, offsetParm, valueParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciBarStore16, *(u64 *)&dsa, offsetParm,

			valueParm, 0);

}



static inline u64 HvCallPci_barStore32(u16 busNumberParm, u8 subBusParm,
@@ -385,7 +348,6 @@ static inline u64 HvCallPci_barStore32(u16 busNumberParm, u8 subBusParm, 
		u32 valueParm)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -394,11 +356,8 @@ static inline u64 HvCallPci_barStore32(u16 busNumberParm, u8 subBusParm, 
	dsa.deviceId = deviceIdParm;

	dsa.barNumber = barNumberParm;



	retVal = HvCall4(HvCallPciBarStore32, *(u64 *)&dsa, offsetParm, valueParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciBarStore32, *(u64 *)&dsa, offsetParm,

			valueParm, 0);

}



static inline u64 HvCallPci_barStore64(u16 busNumberParm, u8 subBusParm,
@@ -406,7 +365,6 @@ static inline u64 HvCallPci_barStore64(u16 busNumberParm, u8 subBusParm, 
		u64 valueParm)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -415,11 +373,8 @@ static inline u64 HvCallPci_barStore64(u16 busNumberParm, u8 subBusParm, 
	dsa.deviceId = deviceIdParm;

	dsa.barNumber = barNumberParm;



	retVal = HvCall4(HvCallPciBarStore64, *(u64 *)&dsa, offsetParm, valueParm, 0);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall4(HvCallPciBarStore64, *(u64 *)&dsa, offsetParm,

			valueParm, 0);

}



static inline u64 HvCallPci_eoi(u16 busNumberParm, u8 subBusParm,
@@ -436,8 +391,6 @@ static inline u64 HvCallPci_eoi(u16 busNumberParm, u8 subBusParm, 


	HvCall1Ret16(HvCallPciEoi, &retVal, *(u64*)&dsa);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal.rc;

}
@@ -445,7 +398,6 @@ static inline u64 HvCallPci_getBarParms(u16 busNumberParm, u8 subBusParm, 
		u8 deviceIdParm, u8 barNumberParm, u64 parms, u32 sizeofParms)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -454,18 +406,13 @@ static inline u64 HvCallPci_getBarParms(u16 busNumberParm, u8 subBusParm, 
	dsa.deviceId = deviceIdParm;

	dsa.barNumber = barNumberParm;



	retVal = HvCall3(HvCallPciGetBarParms, *(u64*)&dsa, parms, sizeofParms);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall3(HvCallPciGetBarParms, *(u64*)&dsa, parms, sizeofParms);

}



static inline u64 HvCallPci_maskFisr(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 fisrMask)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -473,18 +420,13 @@ static inline u64 HvCallPci_maskFisr(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall2(HvCallPciMaskFisr, *(u64*)&dsa, fisrMask);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall2(HvCallPciMaskFisr, *(u64*)&dsa, fisrMask);

}



static inline u64 HvCallPci_unmaskFisr(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 fisrMask)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -492,18 +434,13 @@ static inline u64 HvCallPci_unmaskFisr(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall2(HvCallPciUnmaskFisr, *(u64*)&dsa, fisrMask);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall2(HvCallPciUnmaskFisr, *(u64*)&dsa, fisrMask);

}



static inline u64 HvCallPci_setSlotReset(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 onNotOff)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -511,18 +448,13 @@ static inline u64 HvCallPci_setSlotReset(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall2(HvCallPciSetSlotReset, *(u64*)&dsa, onNotOff);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall2(HvCallPciSetSlotReset, *(u64*)&dsa, onNotOff);

}



static inline u64 HvCallPci_getDeviceInfo(u16 busNumberParm, u8 subBusParm,

		u8 deviceNumberParm, u64 parms, u32 sizeofParms)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -530,18 +462,13 @@ static inline u64 HvCallPci_getDeviceInfo(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceNumberParm << 4;



	retVal = HvCall3(HvCallPciGetDeviceInfo, *(u64*)&dsa, parms, sizeofParms);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall3(HvCallPciGetDeviceInfo, *(u64*)&dsa, parms, sizeofParms);

}



static inline u64 HvCallPci_maskInterrupts(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 interruptMask)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -549,18 +476,13 @@ static inline u64 HvCallPci_maskInterrupts(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall2(HvCallPciMaskInterrupts, *(u64*)&dsa, interruptMask);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall2(HvCallPciMaskInterrupts, *(u64*)&dsa, interruptMask);

}



static inline u64 HvCallPci_unmaskInterrupts(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 interruptMask)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -568,18 +490,13 @@ static inline u64 HvCallPci_unmaskInterrupts(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall2(HvCallPciUnmaskInterrupts, *(u64*)&dsa, interruptMask);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall2(HvCallPciUnmaskInterrupts, *(u64*)&dsa, interruptMask);

}



static inline u64 HvCallPci_getBusUnitInfo(u16 busNumberParm, u8 subBusParm,

		u8 deviceIdParm, u64 parms, u32 sizeofParms)

{

	struct HvCallPci_DsaAddr dsa;

	u64 retVal;



	*((u64*)&dsa) = 0;
@@ -587,37 +504,30 @@ static inline u64 HvCallPci_getBusUnitInfo(u16 busNumberParm, u8 subBusParm, 
	dsa.subBusNumber = subBusParm;

	dsa.deviceId = deviceIdParm;



	retVal = HvCall3(HvCallPciGetBusUnitInfo, *(u64*)&dsa, parms, sizeofParms);



	// getPaca()->adjustHmtForNoOfSpinLocksHeld();



	return retVal;

	return HvCall3(HvCallPciGetBusUnitInfo, *(u64*)&dsa, parms,

			sizeofParms);

}



static inline int HvCallPci_getBusVpd(u16 busNumParm, u64 destParm,

		u16 sizeParm)

{

	int xRetSize;

	u64 xRc = HvCall4(HvCallPciGetCardVpd, busNumParm, destParm, sizeParm, HvCallPci_BusVpd);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	u64 xRc = HvCall4(HvCallPciGetCardVpd, busNumParm, destParm,

			sizeParm, HvCallPci_BusVpd);

	if (xRc == -1)

		xRetSize = -1;

		return -1;

	else

		xRetSize = xRc & 0xFFFF;

	return xRetSize;

		return xRc & 0xFFFF;

}



static inline int HvCallPci_getBusAdapterVpd(u16 busNumParm, u64 destParm,

		u16 sizeParm)

{

	int xRetSize;

	u64 xRc = HvCall4(HvCallPciGetCardVpd, busNumParm, destParm, sizeParm, HvCallPci_BusAdapterVpd);

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	u64 xRc = HvCall4(HvCallPciGetCardVpd, busNumParm, destParm,

			sizeParm, HvCallPci_BusAdapterVpd);

	if (xRc == -1)

		xRetSize = -1;

		return -1;

	else

		xRetSize = xRc & 0xFFFF;

	return xRetSize;

		return xRc & 0xFFFF;

}



#endif /* _HVCALLPCI_H */

include/asm-ppc64/iSeries/HvCallSm.h

+1 −4
Original line number Diff line number Diff line
@@ -32,10 +32,7 @@ 
static inline u64 HvCallSm_get64BitsOfAccessMap(HvLpIndex lpIndex,

		u64 indexIntoBitMap)

{

	u64 retval = HvCall2(HvCallSmGet64BitsOfAccessMap, lpIndex,

			     indexIntoBitMap );

	// getPaca()->adjustHmtForNoOfSpinLocksHeld();

	return retval;

	return HvCall2(HvCallSmGet64BitsOfAccessMap, lpIndex, indexIntoBitMap);

}



#endif /* _HVCALLSM_H */