Commit 2d265342 authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: assign endpoint to a resource group 



The IPA hardware manages various resources (e.g. descriptors)
internally to perform its functions.  The resources are grouped,
allowing different endpoints to use separate resource pools.  This
way one group of endpoints can be configured to operate unaffected
by the resource use of endpoints in a different group.

Endpoints should be assigned to a resource group, but we currently
don't do that.

Define a new resource_group field in the endpoint configuration
data, and use it to assign the proper resource group to use for
each AP endpoint.

Tested-by: default avatarSujit Kautkar <sujitka@chromium.org>
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d773f404

drivers/net/ipa/ipa_data-sc7180.c

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_DMA_ONLY,

			.config = {

				.resource_group	= 0,

				.dma_mode	= true,

				.dma_endpoint	= IPA_ENDPOINT_AP_LAN_RX,

			},
@@ -42,6 +43,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_INVALID,

			.config = {

				.resource_group	= 0,

				.aggregation	= true,

				.status_enable	= true,

				.rx = {
@@ -65,6 +67,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
			.seq_type	=

				IPA_SEQ_PKT_PROCESS_NO_DEC_NO_UCP_DMAP,

			.config = {

				.resource_group	= 0,

				.checksum	= true,

				.qmap		= true,

				.status_enable	= true,
@@ -88,6 +91,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_INVALID,

			.config = {

				.resource_group	= 0,

				.checksum	= true,

				.qmap		= true,

				.aggregation	= true,

drivers/net/ipa/ipa_data-sdm845.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_DMA_ONLY,

			.config = {

				.resource_group	= 1,

				.dma_mode	= true,

				.dma_endpoint	= IPA_ENDPOINT_AP_LAN_RX,

			},
@@ -44,6 +45,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_INVALID,

			.config = {

				.resource_group	= 1,

				.aggregation	= true,

				.status_enable	= true,

				.rx = {
@@ -67,6 +69,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
			.seq_type	=

				IPA_SEQ_2ND_PKT_PROCESS_PASS_NO_DEC_UCP,

			.config = {

				.resource_group	= 1,

				.checksum	= true,

				.qmap		= true,

				.status_enable	= true,
@@ -90,6 +93,7 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { 
		.endpoint = {

			.seq_type	= IPA_SEQ_INVALID,

			.config = {

				.resource_group	= 1,

				.checksum	= true,

				.qmap		= true,

				.aggregation	= true,

drivers/net/ipa/ipa_data.h

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct ipa_endpoint_rx_data { 


/**

 * struct ipa_endpoint_config_data - IPA endpoint hardware configuration

 * @resource_group:	resource group to assign endpoint to

 * @checksum:		whether checksum offload is enabled

 * @qmap:		whether endpoint uses QMAP protocol

 * @aggregation:	whether endpoint supports aggregation
@@ -119,6 +120,7 @@ struct ipa_endpoint_rx_data { 
 * @rx:			RX-specific endpoint information (see above)

 */

struct ipa_endpoint_config_data {

	u32 resource_group;

	bool checksum;

	bool qmap;

	bool aggregation;

drivers/net/ipa/ipa_endpoint.c

+11 −0
Original line number Diff line number Diff line
@@ -751,6 +751,16 @@ static void ipa_endpoint_init_deaggr(struct ipa_endpoint *endpoint) 
	iowrite32(val, endpoint->ipa->reg_virt + offset);

}



static void ipa_endpoint_init_rsrc_grp(struct ipa_endpoint *endpoint)

{

	u32 offset = IPA_REG_ENDP_INIT_RSRC_GRP_N_OFFSET(endpoint->endpoint_id);

	struct ipa *ipa = endpoint->ipa;

	u32 val;



	val = rsrc_grp_encoded(ipa->version, endpoint->data->resource_group);

	iowrite32(val, ipa->reg_virt + offset);

}



static void ipa_endpoint_init_seq(struct ipa_endpoint *endpoint)

{

	u32 offset = IPA_REG_ENDP_INIT_SEQ_N_OFFSET(endpoint->endpoint_id);
@@ -1328,6 +1338,7 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint) 
	ipa_endpoint_init_mode(endpoint);

	ipa_endpoint_init_aggr(endpoint);

	ipa_endpoint_init_deaggr(endpoint);

	ipa_endpoint_init_rsrc_grp(endpoint);

	ipa_endpoint_init_seq(endpoint);

	ipa_endpoint_status(endpoint);

}