Commit c4b7a297 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ipa-enable-ipa-v4-7-support' 

Alex Elder says:

====================
net: ipa: enable IPA v4.7 support

The first patch in this series adds "qcom,sm6350-ipa" as a possible
IPA compatible string, for the Qualcomm SM6350 SoC.  That SoC uses
IPA v4.7

The second patch in this series adds code that enables support for
IPA v4.7.  DTS updates that make use of these will be merged later.
====================

Link: https://lore.kernel.org/r/20221208211529.757669-1-elder@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b6488b16 b310de78

Documentation/devicetree/bindings/net/qcom,ipa.yaml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ properties: 
      - qcom,sc7280-ipa

      - qcom,sdm845-ipa

      - qcom,sdx55-ipa

      - qcom,sm6350-ipa

      - qcom,sm8350-ipa



  reg:

drivers/net/ipa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#

# Makefile for the Qualcomm IPA driver.



IPA_VERSIONS		:=	3.1 3.5.1 4.2 4.5 4.9 4.11

IPA_VERSIONS		:=	3.1 3.5.1 4.2 4.5 4.7 4.9 4.11



obj-$(CONFIG_QCOM_IPA)	+=	ipa.o

drivers/net/ipa/data/ipa_data-v4.7.c

0 → 100644
+405 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



/* Copyright (C) 2022 Linaro Ltd. */



#include <linux/log2.h>



#include "../gsi.h"

#include "../ipa_data.h"

#include "../ipa_endpoint.h"

#include "../ipa_mem.h"



/** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.7 */

enum ipa_resource_type {

	/* Source resource types; first must have value 0 */

	IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS		= 0,

	IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS,

	IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF,

	IPA_RESOURCE_TYPE_SRC_HPS_DMARS,

	IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES,



	/* Destination resource types; first must have value 0 */

	IPA_RESOURCE_TYPE_DST_DATA_SECTORS		= 0,

	IPA_RESOURCE_TYPE_DST_DPS_DMARS,

};



/* Resource groups used for an SoC having IPA v4.7 */

enum ipa_rsrc_group_id {

	/* Source resource group identifiers */

	IPA_RSRC_GROUP_SRC_UL_DL			= 0,

	IPA_RSRC_GROUP_SRC_UC_RX_Q,

	IPA_RSRC_GROUP_SRC_COUNT,	/* Last in set; not a source group */



	/* Destination resource group identifiers */

	IPA_RSRC_GROUP_DST_UL_DL_DPL			= 0,

	IPA_RSRC_GROUP_DST_UNUSED_1,

	IPA_RSRC_GROUP_DST_COUNT,	/* Last; not a destination group */

};



/* QSB configuration data for an SoC having IPA v4.7 */

static const struct ipa_qsb_data ipa_qsb_data[] = {

	[IPA_QSB_MASTER_DDR] = {

		.max_writes		= 8,

		.max_reads		= 0,	/* no limit (hardware max) */

		.max_reads_beats	= 120,

	},

};



/* Endpoint configuration data for an SoC having IPA v4.7 */

static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {

	[IPA_ENDPOINT_AP_COMMAND_TX] = {

		.ee_id		= GSI_EE_AP,

		.channel_id	= 5,

		.endpoint_id	= 7,

		.toward_ipa	= true,

		.channel = {

			.tre_count	= 256,

			.event_count	= 256,

			.tlv_count	= 20,

		},

		.endpoint = {

			.config = {

				.resource_group	= IPA_RSRC_GROUP_SRC_UL_DL,

				.dma_mode	= true,

				.dma_endpoint	= IPA_ENDPOINT_AP_LAN_RX,

				.tx = {

					.seq_type = IPA_SEQ_DMA,

				},

			},

		},

	},

	[IPA_ENDPOINT_AP_LAN_RX] = {

		.ee_id		= GSI_EE_AP,

		.channel_id	= 14,

		.endpoint_id	= 9,

		.toward_ipa	= false,

		.channel = {

			.tre_count	= 256,

			.event_count	= 256,

			.tlv_count	= 9,

		},

		.endpoint = {

			.config = {

				.resource_group	= IPA_RSRC_GROUP_DST_UL_DL_DPL,

				.aggregation	= true,

				.status_enable	= true,

				.rx = {

					.buffer_size	= 8192,

					.pad_align	= ilog2(sizeof(u32)),

					.aggr_time_limit = 500,

				},

			},

		},

	},

	[IPA_ENDPOINT_AP_MODEM_TX] = {

		.ee_id		= GSI_EE_AP,

		.channel_id	= 2,

		.endpoint_id	= 2,

		.toward_ipa	= true,

		.channel = {

			.tre_count	= 512,

			.event_count	= 512,

			.tlv_count	= 16,

		},

		.endpoint = {

			.filter_support	= true,

			.config = {

				.resource_group	= IPA_RSRC_GROUP_SRC_UL_DL,

				.qmap		= true,

				.status_enable	= true,

				.tx = {

					.seq_type = IPA_SEQ_2_PASS_SKIP_LAST_UC,

					.status_endpoint =

						IPA_ENDPOINT_MODEM_AP_RX,

				},

			},

		},

	},

	[IPA_ENDPOINT_AP_MODEM_RX] = {

		.ee_id		= GSI_EE_AP,

		.channel_id	= 7,

		.endpoint_id	= 16,

		.toward_ipa	= false,

		.channel = {

			.tre_count	= 256,

			.event_count	= 256,

			.tlv_count	= 9,

		},

		.endpoint = {

			.config = {

				.resource_group	= IPA_RSRC_GROUP_DST_UL_DL_DPL,

				.qmap		= true,

				.aggregation	= true,

				.rx = {

					.buffer_size	= 8192,

					.aggr_time_limit = 500,

					.aggr_close_eof	= true,

				},

			},

		},

	},

	[IPA_ENDPOINT_MODEM_AP_TX] = {

		.ee_id		= GSI_EE_MODEM,

		.channel_id	= 0,

		.endpoint_id	= 5,

		.toward_ipa	= true,

		.endpoint = {

			.filter_support	= true,

		},

	},

	[IPA_ENDPOINT_MODEM_AP_RX] = {

		.ee_id		= GSI_EE_MODEM,

		.channel_id	= 7,

		.endpoint_id	= 14,

		.toward_ipa	= false,

	},

	[IPA_ENDPOINT_MODEM_DL_NLO_TX] = {

		.ee_id		= GSI_EE_MODEM,

		.channel_id	= 2,

		.endpoint_id	= 8,

		.toward_ipa	= true,

		.endpoint = {

			.filter_support	= true,

		},

	},

};



/* Source resource configuration data for an SoC having IPA v4.7 */

static const struct ipa_resource ipa_resource_src[] = {

	[IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = {

		.limits[IPA_RSRC_GROUP_SRC_UL_DL] = {

			.min = 8,	.max = 8,

		},

	},

	[IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = {

		.limits[IPA_RSRC_GROUP_SRC_UL_DL] = {

			.min = 8,	.max = 8,

		},

	},

	[IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = {

		.limits[IPA_RSRC_GROUP_SRC_UL_DL] = {

			.min = 18,	.max = 18,

		},

	},

	[IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = {

		.limits[IPA_RSRC_GROUP_SRC_UL_DL] = {

			.min = 2,	.max = 2,

		},

	},

	[IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = {

		.limits[IPA_RSRC_GROUP_SRC_UL_DL] = {

			.min = 15,	.max = 15,

		},

	},

};



/* Destination resource configuration data for an SoC having IPA v4.7 */

static const struct ipa_resource ipa_resource_dst[] = {

	[IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = {

		.limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {

			.min = 7,	.max = 7,

		},

	},

	[IPA_RESOURCE_TYPE_DST_DPS_DMARS] = {

		.limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = {

			.min = 2,	.max = 2,

		},

	},

};



/* Resource configuration data for an SoC having IPA v4.7 */

static const struct ipa_resource_data ipa_resource_data = {

	.rsrc_group_dst_count	= IPA_RSRC_GROUP_DST_COUNT,

	.rsrc_group_src_count	= IPA_RSRC_GROUP_SRC_COUNT,

	.resource_src_count	= ARRAY_SIZE(ipa_resource_src),

	.resource_src		= ipa_resource_src,

	.resource_dst_count	= ARRAY_SIZE(ipa_resource_dst),

	.resource_dst		= ipa_resource_dst,

};



/* IPA-resident memory region data for an SoC having IPA v4.7 */

static const struct ipa_mem ipa_mem_local_data[] = {

	{

		.id		= IPA_MEM_UC_SHARED,

		.offset		= 0x0000,

		.size		= 0x0080,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_UC_INFO,

		.offset		= 0x0080,

		.size		= 0x0200,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_V4_FILTER_HASHED,

		.offset		= 0x0288,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V4_FILTER,

		.offset		= 0x0308,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V6_FILTER_HASHED,

		.offset		= 0x0388,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V6_FILTER,

		.offset		= 0x0408,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V4_ROUTE_HASHED,

		.offset		= 0x0488,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V4_ROUTE,

		.offset		= 0x0508,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V6_ROUTE_HASHED,

		.offset		= 0x0588,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_V6_ROUTE,

		.offset		= 0x0608,

		.size		= 0x0078,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_MODEM_HEADER,

		.offset		= 0x0688,

		.size		= 0x0240,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_AP_HEADER,

		.offset		= 0x08c8,

		.size		= 0x0200,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_MODEM_PROC_CTX,

		.offset		= 0x0ad0,

		.size		= 0x0200,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_AP_PROC_CTX,

		.offset		= 0x0cd0,

		.size		= 0x0200,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_NAT_TABLE,

		.offset		= 0x0ee0,

		.size		= 0x0d00,

		.canary_count	= 4,

	},

	{

		.id		= IPA_MEM_PDN_CONFIG,

		.offset		= 0x1be8,

		.size		= 0x0050,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_STATS_QUOTA_MODEM,

		.offset		= 0x1c40,

		.size		= 0x0030,

		.canary_count	= 4,

	},

	{

		.id		= IPA_MEM_STATS_QUOTA_AP,

		.offset		= 0x1c70,

		.size		= 0x0048,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_STATS_TETHERING,

		.offset		= 0x1cb8,

		.size		= 0x0238,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_STATS_DROP,

		.offset		= 0x1ef0,

		.size		= 0x0020,

		.canary_count	= 0,

	},

	{

		.id		= IPA_MEM_MODEM,

		.offset		= 0x1f18,

		.size		= 0x100c,

		.canary_count	= 2,

	},

	{

		.id		= IPA_MEM_END_MARKER,

		.offset		= 0x3000,

		.size		= 0x0000,

		.canary_count	= 1,

	},

};



/* Memory configuration data for an SoC having IPA v4.7 */

static const struct ipa_mem_data ipa_mem_data = {

	.local_count	= ARRAY_SIZE(ipa_mem_local_data),

	.local		= ipa_mem_local_data,

	.imem_addr	= 0x146a9000,

	.imem_size	= 0x00002000,

	.smem_id	= 497,

	.smem_size	= 0x00009000,

};



/* Interconnect rates are in 1000 byte/second units */

static const struct ipa_interconnect_data ipa_interconnect_data[] = {

	{

		.name			= "memory",

		.peak_bandwidth		= 600000,	/* 600 MBps */

		.average_bandwidth	= 150000,	/* 150 MBps */

	},

	/* Average rate is unused for the next two interconnects */

	{

		.name			= "imem",

		.peak_bandwidth		= 450000,	/* 450 MBps */

		.average_bandwidth	= 75000,	/* 75 MBps (unused?) */

	},

	{

		.name			= "config",

		.peak_bandwidth		= 171400,	/* 171.4 MBps */

		.average_bandwidth	= 0,		/* unused */

	},

};



/* Clock and interconnect configuration data for an SoC having IPA v4.7 */

static const struct ipa_power_data ipa_power_data = {

	/* XXX Downstream code says 150 MHz (DT SVS2), 60 MHz (code) */

	.core_clock_rate	= 100 * 1000 * 1000,	/* Hz (150?  60?) */

	.interconnect_count	= ARRAY_SIZE(ipa_interconnect_data),

	.interconnect_data	= ipa_interconnect_data,

};



/* Configuration data for an SoC having IPA v4.7 */

const struct ipa_data ipa_data_v4_7 = {

	.version		= IPA_VERSION_4_7,

	.qsb_count		= ARRAY_SIZE(ipa_qsb_data),

	.qsb_data		= ipa_qsb_data,

	.modem_route_count	= 8,

	.endpoint_count		= ARRAY_SIZE(ipa_gsi_endpoint_data),

	.endpoint_data		= ipa_gsi_endpoint_data,

	.resource_data		= &ipa_resource_data,

	.mem_data		= &ipa_mem_data,

	.power_data		= &ipa_power_data,

};

drivers/net/ipa/ipa_data.h

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ extern const struct ipa_data ipa_data_v3_1; 
extern const struct ipa_data ipa_data_v3_5_1;

extern const struct ipa_data ipa_data_v4_2;

extern const struct ipa_data ipa_data_v4_5;

extern const struct ipa_data ipa_data_v4_7;

extern const struct ipa_data ipa_data_v4_9;

extern const struct ipa_data ipa_data_v4_11;

drivers/net/ipa/ipa_main.c

+4 −0
Original line number Diff line number Diff line
@@ -662,6 +662,10 @@ static const struct of_device_id ipa_match[] = { 
		.compatible	= "qcom,sdx55-ipa",

		.data		= &ipa_data_v4_5,

	},

	{

		.compatible	= "qcom,sm6350-ipa",

		.data		= &ipa_data_v4_7,

	},

	{

		.compatible	= "qcom,sm8350-ipa",

		.data		= &ipa_data_v4_9,