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

Commit cdfb5c18 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: configure HPS/DPS sequencers"

parents d5f9aaa2 ebbb650b

drivers/platform/msm/ipa/ipa_v3/ipa_utils.c

+152 −50
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ 
#define IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_DEC_NO_UCP 0x00000017

/* COMP/DECOMP */

#define IPA_DPS_HPS_SEQ_TYPE_DMA_COMP_DECOMP 0x00000020

/* Invalid sequencer type */

#define IPA_DPS_HPS_SEQ_TYPE_INVALID 0xFFFFFFFF



#define IPA_CLIENT_NOT_USED {-1, -1, false}

#define IPA_CLIENT_NOT_USED {-1, -1, false, IPA_DPS_HPS_SEQ_TYPE_INVALID}



/* Resource Group index*/

#define IPA_GROUP_UL		(0)
@@ -160,12 +162,14 @@ struct ipa_ep_configuration { 
	int pipe_num;

	int group_num;

	bool support_flt;

	int sequencer_type;

};



static const struct ipa_ep_configuration ipa3_ep_mapping

					[IPA_VER_MAX][IPA_CLIENT_MAX] = {

	[IPA_3_0][IPA_CLIENT_HSIC1_PROD]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_WLAN1_PROD]          = {10, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_WLAN1_PROD]          = {10, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_HSIC2_PROD]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB2_PROD]           = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_HSIC3_PROD]          = IPA_CLIENT_NOT_USED,
@@ -173,73 +177,113 @@ static const struct ipa_ep_configuration ipa3_ep_mapping 
	[IPA_3_0][IPA_CLIENT_HSIC4_PROD]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB4_PROD]           = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_HSIC5_PROD]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB_PROD]            = {1, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_UC_USB_PROD]         = {2, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_USB_PROD]            = {1, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_UC_USB_PROD]         = {2, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_A5_WLAN_AMPDU_PROD]  = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_A2_EMBEDDED_PROD]    = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_A2_TETHERED_PROD]    = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_APPS_LAN_WAN_PROD]   = {14, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_APPS_LAN_WAN_PROD]   = {14, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_APPS_CMD_PROD]

					= {22, IPA_GROUP_IMM_CMD, false},

	[IPA_3_0][IPA_CLIENT_ODU_PROD]            = {12, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_MHI_PROD]            = {0, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_Q6_LAN_PROD]         = {9, IPA_GROUP_UL, false},

	[IPA_3_0][IPA_CLIENT_Q6_WAN_PROD]         = {5, IPA_GROUP_DL, true},

			= {22, IPA_GROUP_IMM_CMD, false,

				IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_ODU_PROD]            = {12, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_MHI_PROD]            = {0, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_Q6_LAN_PROD]         = {9, IPA_GROUP_UL, false,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_Q6_WAN_PROD]         = {5, IPA_GROUP_DL,

			true, IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_Q6_CMD_PROD]

					= {6, IPA_GROUP_IMM_CMD, false},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP_PROD]      = {7, IPA_GROUP_Q6ZIP, false},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP2_PROD]     = {8, IPA_GROUP_Q6ZIP, false},

			= {6, IPA_GROUP_IMM_CMD, false,

				IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP_PROD]      = {7, IPA_GROUP_Q6ZIP,

			false, IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP2_PROD]     = {8, IPA_GROUP_Q6ZIP,

			false, IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_MEMCPY_DMA_SYNC_PROD]

					= {12, IPA_GROUP_DMA, false},

			= {12, IPA_GROUP_DMA, false,

				IPA_DPS_HPS_SEQ_TYPE_DMA_ONLY},

	[IPA_3_0][IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD]

					= {13, IPA_GROUP_DMA, false},

			= {13, IPA_GROUP_DMA, false,

				IPA_DPS_HPS_SEQ_TYPE_DMA_ONLY},

	/* Only for test purpose */

	[IPA_3_0][IPA_CLIENT_TEST_PROD]           = {1, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_TEST1_PROD]          = {1, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_TEST2_PROD]          = {3, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_TEST3_PROD]          = {12, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_TEST4_PROD]          = {13, IPA_GROUP_UL, true},

	[IPA_3_0][IPA_CLIENT_TEST_PROD]           = {1, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_TEST1_PROD]          = {1, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_TEST2_PROD]          = {3, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_TEST3_PROD]          = {12, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_TEST4_PROD]          = {13, IPA_GROUP_UL, true,

			IPA_DPS_HPS_SEQ_TYPE_2ND_PKT_PROCESS_PASS_NO_DEC_UCP},



	[IPA_3_0][IPA_CLIENT_HSIC1_CONS]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_WLAN1_CONS]          = {25, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_WLAN1_CONS]          = {25, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_HSIC2_CONS]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB2_CONS]           = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_WLAN2_CONS]          = {27, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_WLAN2_CONS]          = {27, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_HSIC3_CONS]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB3_CONS]           = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_WLAN3_CONS]          = {28, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_WLAN3_CONS]          = {28, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_HSIC4_CONS]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB4_CONS]           = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_WLAN4_CONS]          = {29, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_WLAN4_CONS]          = {29, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP},

	[IPA_3_0][IPA_CLIENT_HSIC5_CONS]          = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_USB_CONS]            = {26, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_USB_DPL_CONS]        = {17, IPA_GROUP_DPL, false},

	[IPA_3_0][IPA_CLIENT_USB_CONS]            = {26, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_USB_DPL_CONS]        = {17, IPA_GROUP_DPL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_A2_EMBEDDED_CONS]    = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_A2_TETHERED_CONS]    = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_A5_LAN_WAN_CONS]     = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_APPS_LAN_CONS]       = {15, IPA_GROUP_UL, false},

	[IPA_3_0][IPA_CLIENT_APPS_WAN_CONS]       = {16, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_ODU_EMB_CONS]        = {23, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_APPS_LAN_CONS]       = {15, IPA_GROUP_UL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_APPS_WAN_CONS]       = {16, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_ODU_EMB_CONS]        = {23, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_ODU_TETH_CONS]       = IPA_CLIENT_NOT_USED,

	[IPA_3_0][IPA_CLIENT_MHI_CONS]            = {23, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_Q6_LAN_CONS]         = {19, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_Q6_WAN_CONS]         = {18, IPA_GROUP_UL, false},

	[IPA_3_0][IPA_CLIENT_Q6_DUN_CONS]         = {30, IPA_GROUP_DIAG, false},

	[IPA_3_0][IPA_CLIENT_MHI_CONS]            = {23, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_LAN_CONS]         = {19, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_WAN_CONS]         = {18, IPA_GROUP_UL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_DUN_CONS]         = {30, IPA_GROUP_DIAG,

			false, IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP_CONS]

					= {21, IPA_GROUP_Q6ZIP, false},

			= {21, IPA_GROUP_Q6ZIP, false,

					IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_DECOMP2_CONS]

					= {4, IPA_GROUP_Q6ZIP, false},

			= {4, IPA_GROUP_Q6ZIP, false,

					IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_MEMCPY_DMA_SYNC_CONS]

					= {28, IPA_GROUP_DMA, false},

			= {28, IPA_GROUP_DMA, false,

					IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS]

					= {29, IPA_GROUP_DMA, false},

			= {29, IPA_GROUP_DMA, false,

					IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS]     = IPA_CLIENT_NOT_USED,

	/* Only for test purpose */

	[IPA_3_0][IPA_CLIENT_TEST_CONS]           = {16, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST1_CONS]          = {16, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST2_CONS]          = {27, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST3_CONS]          = {28, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST4_CONS]          = {29, IPA_GROUP_DL, false},

	[IPA_3_0][IPA_CLIENT_TEST_CONS]           = {16, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_TEST1_CONS]          = {16, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_TEST2_CONS]          = {27, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_TEST3_CONS]          = {28, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

	[IPA_3_0][IPA_CLIENT_TEST4_CONS]          = {29, IPA_GROUP_DL, false,

			IPA_DPS_HPS_SEQ_TYPE_INVALID},

};



/* this array include information tuple:
@@ -2463,6 +2507,57 @@ int ipa3_generate_flt_eq(enum ipa_ip_type ip, 
	return 0;

}



/**

 * ipa3_cfg_ep_seq() - IPA end-point HPS/DPS sequencer type configuration

 * @clnt_hdl:	[in] opaque client handle assigned by IPA to client

 *

 * Returns:	0 on success, negative on failure

 *

 * Note:	Should not be called from atomic context

 */

int ipa3_cfg_ep_seq(u32 clnt_hdl)

{

	int type;

	u8 hw_type_index;



	if (clnt_hdl >= ipa3_ctx->ipa_num_pipes ||

	    ipa3_ctx->ep[clnt_hdl].valid == 0) {

		IPAERR("bad param, clnt_hdl = %d", clnt_hdl);

		return -EINVAL;

	}



	if (IPA_CLIENT_IS_CONS(ipa3_ctx->ep[clnt_hdl].client)) {

		IPAERR("SEQ does not apply to IPA consumer EP %d\n", clnt_hdl);

		return -EINVAL;

	}

	switch (ipa3_ctx->ipa_hw_type) {

	case IPA_HW_v3_0:

		hw_type_index = IPA_3_0;

		break;

	default:

		IPAERR("Incorrect IPA version %d\n", ipa3_ctx->ipa_hw_type);

		hw_type_index = IPA_3_0;

		break;

	}



	type = ipa3_ep_mapping[hw_type_index][ipa3_ctx->ep[clnt_hdl].client]

						.sequencer_type;

	if (type != IPA_DPS_HPS_SEQ_TYPE_INVALID) {

		ipa3_inc_client_enable_clks();

		/* Configure sequencers type*/



		IPADBG("set sequencers to sequence 0x%x, ep = %d\n", type,

				clnt_hdl);

		ipa_write_reg(ipa3_ctx->mmio,

				IPA_ENDP_INIT_SEQ_n_OFST(clnt_hdl), type);



		ipa3_dec_client_disable_clks();

	} else {

		IPADBG("should not set sequencer type of ep = %d\n", clnt_hdl);

	}

	return 0;

}



/**

 * ipa3_cfg_ep - IPA end-point configuration

 * @clnt_hdl:	[in] opaque client handle assigned by IPA to client
@@ -2506,6 +2601,10 @@ int ipa3_cfg_ep(u32 clnt_hdl, const struct ipa_ep_cfg *ipa_ep_cfg) 
		if (result)

			return result;



		result = ipa3_cfg_ep_seq(clnt_hdl);

		if (result)

			return result;



		result = ipa3_cfg_ep_mode(clnt_hdl, &ipa_ep_cfg->mode);

		if (result)

			return result;
@@ -3157,15 +3256,18 @@ int ipa3_cfg_ep_mode(u32 clnt_hdl, const struct ipa_ep_cfg_mode *ep_mode) 
			ipa3_ctx->ep[clnt_hdl].dst_pipe_index,

			ep_mode);



	 /* Configure sequencers type*/

	 /* Configure sequencers type for test clients*/

	if (IPA_CLIENT_IS_TEST(ipa3_ctx->ep[clnt_hdl].client)) {

		if (ep_mode->mode == IPA_DMA)

			type = IPA_DPS_HPS_SEQ_TYPE_DMA_ONLY;

		else

			type = IPA_DPS_HPS_SEQ_TYPE_PKT_PROCESS_NO_DEC_UCP;



	IPADBG(" set sequencers to sequance 0x%x, ep = %d\n", type, clnt_hdl);

	ipa_write_reg(ipa3_ctx->mmio, IPA_ENDP_INIT_SEQ_n_OFST(clnt_hdl), type);



		IPADBG(" set sequencers to sequance 0x%x, ep = %d\n", type,

				clnt_hdl);

		ipa_write_reg(ipa3_ctx->mmio,

				IPA_ENDP_INIT_SEQ_n_OFST(clnt_hdl), type);

	}

	ipa3_dec_client_disable_clks();



	return 0;

include/uapi/linux/msm_ipa.h

+16 −2
Original line number Diff line number Diff line
@@ -254,8 +254,22 @@ enum ipa_client_type { 
	((client) == IPA_CLIENT_MHI_CONS || \

	(client) == IPA_CLIENT_MHI_PROD)







#define IPA_CLIENT_IS_TEST_PROD(client) \

	((client) == IPA_CLIENT_TEST_PROD || \

	(client) == IPA_CLIENT_TEST1_PROD || \

	(client) == IPA_CLIENT_TEST2_PROD || \

	(client) == IPA_CLIENT_TEST3_PROD || \

	(client) == IPA_CLIENT_TEST4_PROD)



#define IPA_CLIENT_IS_TEST_CONS(client) \

	((client) == IPA_CLIENT_TEST_CONS || \

	(client) == IPA_CLIENT_TEST1_CONS || \

	(client) == IPA_CLIENT_TEST2_CONS || \

	(client) == IPA_CLIENT_TEST3_CONS || \

	(client) == IPA_CLIENT_TEST4_CONS)



#define IPA_CLIENT_IS_TEST(client) \

	(IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))



/**

 * enum ipa_ip_type - Address family: IPv4 or IPv6