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

Commit cca55d9d authored by Ian Munsie's avatar Ian Munsie Committed by Benjamin Herrenschmidt
Browse files

powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function 



I am going to use this in the next patch, better to have this code in
one place rather than three.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 798042da

arch/powerpc/include/asm/hvcall.h

+20 −0
Original line number Original line Diff line number Diff line
@@ -356,6 +356,26 @@ struct hvcall_mpp_x_data { 




int h_get_mpp_x(struct hvcall_mpp_x_data *mpp_x_data);

int h_get_mpp_x(struct hvcall_mpp_x_data *mpp_x_data);





static inline unsigned int get_longbusy_msecs(int longbusy_rc)

{

	switch (longbusy_rc) {

	case H_LONG_BUSY_ORDER_1_MSEC:

		return 1;

	case H_LONG_BUSY_ORDER_10_MSEC:

		return 10;

	case H_LONG_BUSY_ORDER_100_MSEC:

		return 100;

	case H_LONG_BUSY_ORDER_1_SEC:

		return 1000;

	case H_LONG_BUSY_ORDER_10_SEC:

		return 10000;

	case H_LONG_BUSY_ORDER_100_SEC:

		return 100000;

	default:

		return 1;

	}

}



#ifdef CONFIG_PPC_PSERIES

#ifdef CONFIG_PPC_PSERIES

extern int CMO_PrPSP;

extern int CMO_PrPSP;

extern int CMO_SecPSP;

extern int CMO_SecPSP;

drivers/infiniband/hw/ehca/hcp_if.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -90,26 +90,6 @@ 




static DEFINE_SPINLOCK(hcall_lock);

static DEFINE_SPINLOCK(hcall_lock);





static u32 get_longbusy_msecs(int longbusy_rc)

{

	switch (longbusy_rc) {

	case H_LONG_BUSY_ORDER_1_MSEC:

		return 1;

	case H_LONG_BUSY_ORDER_10_MSEC:

		return 10;

	case H_LONG_BUSY_ORDER_100_MSEC:

		return 100;

	case H_LONG_BUSY_ORDER_1_SEC:

		return 1000;

	case H_LONG_BUSY_ORDER_10_SEC:

		return 10000;

	case H_LONG_BUSY_ORDER_100_SEC:

		return 100000;

	default:

		return 1;

	}

}



static long ehca_plpar_hcall_norets(unsigned long opcode,

static long ehca_plpar_hcall_norets(unsigned long opcode,

				    unsigned long arg1,

				    unsigned long arg1,

				    unsigned long arg2,

				    unsigned long arg2,

drivers/net/ethernet/ibm/ehea/ehea_phyp.h

+0 −20
Original line number Original line Diff line number Diff line
@@ -39,26 +39,6 @@ 
 * hcp_*  - structures, variables and functions releated to Hypervisor Calls

 * hcp_*  - structures, variables and functions releated to Hypervisor Calls

 */

 */





static inline u32 get_longbusy_msecs(int long_busy_ret_code)

{

	switch (long_busy_ret_code) {

	case H_LONG_BUSY_ORDER_1_MSEC:

		return 1;

	case H_LONG_BUSY_ORDER_10_MSEC:

		return 10;

	case H_LONG_BUSY_ORDER_100_MSEC:

		return 100;

	case H_LONG_BUSY_ORDER_1_SEC:

		return 1000;

	case H_LONG_BUSY_ORDER_10_SEC:

		return 10000;

	case H_LONG_BUSY_ORDER_100_SEC:

		return 100000;

	default:

		return 1;

	}

}



/* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */

/* Number of pages which can be registered at once by H_REGISTER_HEA_RPAGES */

#define EHEA_MAX_RPAGE 512

#define EHEA_MAX_RPAGE 512