From 782d767a2d0fb08bc4d5d26f789769a84b88400b Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Sun, 28 Mar 2021 12:31:09 -0500 Subject: net: ipa: use version based configuration for SC7180 Rename the SC7180 configuration data file so that its name is derived from its IPA version. Update a few other references to the code that talk about the SC7180 rather than just IPA v4.2. Signed-off-by: Alex Elder Signed-off-by: David S. Miller --- drivers/net/ipa/Makefile | 2 +- drivers/net/ipa/ipa_data-sc7180.c | 360 ------------------------------------- drivers/net/ipa/ipa_data-v4.2.c | 362 ++++++++++++++++++++++++++++++++++++++ drivers/net/ipa/ipa_data.h | 2 +- drivers/net/ipa/ipa_main.c | 2 +- 5 files changed, 365 insertions(+), 363 deletions(-) delete mode 100644 drivers/net/ipa/ipa_data-sc7180.c create mode 100644 drivers/net/ipa/ipa_data-v4.2.c (limited to 'drivers/net/ipa') diff --git a/drivers/net/ipa/Makefile b/drivers/net/ipa/Makefile index a4a42fc7b840..6abd1db9fe33 100644 --- a/drivers/net/ipa/Makefile +++ b/drivers/net/ipa/Makefile @@ -9,4 +9,4 @@ ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \ ipa_endpoint.o ipa_cmd.o ipa_modem.o \ ipa_resource.o ipa_qmi.o ipa_qmi_msg.o -ipa-y += ipa_data-v3.5.1.o ipa_data-sc7180.o +ipa-y += ipa_data-v3.5.1.o ipa_data-v4.2.o diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c deleted file mode 100644 index 810c673be56e..000000000000 --- a/drivers/net/ipa/ipa_data-sc7180.c +++ /dev/null @@ -1,360 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -/* Copyright (C) 2019-2021 Linaro Ltd. */ - -#include - -#include "gsi.h" -#include "ipa_data.h" -#include "ipa_endpoint.h" -#include "ipa_mem.h" - -/** enum ipa_resource_type - IPA resource types */ -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 the SC7180 SoC */ -enum ipa_rsrc_group_id { - /* Source resource group identifiers */ - IPA_RSRC_GROUP_SRC_UL_DL = 0, - 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_COUNT, /* Last; not a destination group */ -}; - -/* QSB configuration for the SC7180 SoC. */ -static const struct ipa_qsb_data ipa_qsb_data[] = { - [IPA_QSB_MASTER_DDR] = { - .max_writes = 8, - .max_reads = 12, - /* no outstanding read byte (beat) limit */ - }, -}; - -/* Endpoint configuration for the SC7180 SoC. */ -static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { - [IPA_ENDPOINT_AP_COMMAND_TX] = { - .ee_id = GSI_EE_AP, - .channel_id = 1, - .endpoint_id = 6, - .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 = 2, - .endpoint_id = 8, - .toward_ipa = false, - .channel = { - .tre_count = 256, - .event_count = 256, - .tlv_count = 6, - }, - .endpoint = { - .config = { - .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL, - .aggregation = true, - .status_enable = true, - .rx = { - .pad_align = ilog2(sizeof(u32)), - }, - }, - }, - }, - [IPA_ENDPOINT_AP_MODEM_TX] = { - .ee_id = GSI_EE_AP, - .channel_id = 0, - .endpoint_id = 1, - .toward_ipa = true, - .channel = { - .tre_count = 512, - .event_count = 512, - .tlv_count = 8, - }, - .endpoint = { - .filter_support = true, - .config = { - .resource_group = IPA_RSRC_GROUP_SRC_UL_DL, - .checksum = true, - .qmap = true, - .status_enable = true, - .tx = { - .seq_type = IPA_SEQ_1_PASS_SKIP_LAST_UC, - .seq_rep_type = IPA_SEQ_REP_DMA_PARSER, - .status_endpoint = - IPA_ENDPOINT_MODEM_AP_RX, - }, - }, - }, - }, - [IPA_ENDPOINT_AP_MODEM_RX] = { - .ee_id = GSI_EE_AP, - .channel_id = 3, - .endpoint_id = 9, - .toward_ipa = false, - .channel = { - .tre_count = 256, - .event_count = 256, - .tlv_count = 6, - }, - .endpoint = { - .config = { - .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL, - .checksum = true, - .qmap = true, - .aggregation = true, - .rx = { - .aggr_close_eof = true, - }, - }, - }, - }, - [IPA_ENDPOINT_MODEM_COMMAND_TX] = { - .ee_id = GSI_EE_MODEM, - .channel_id = 1, - .endpoint_id = 5, - .toward_ipa = true, - }, - [IPA_ENDPOINT_MODEM_LAN_RX] = { - .ee_id = GSI_EE_MODEM, - .channel_id = 3, - .endpoint_id = 11, - .toward_ipa = false, - }, - [IPA_ENDPOINT_MODEM_AP_TX] = { - .ee_id = GSI_EE_MODEM, - .channel_id = 0, - .endpoint_id = 4, - .toward_ipa = true, - .endpoint = { - .filter_support = true, - }, - }, - [IPA_ENDPOINT_MODEM_AP_RX] = { - .ee_id = GSI_EE_MODEM, - .channel_id = 2, - .endpoint_id = 10, - .toward_ipa = false, - }, -}; - -/* Source resource configuration data for the SC7180 SoC */ -static const struct ipa_resource ipa_resource_src[] = { - [IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = { - .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { - .min = 3, .max = 63, - }, - }, - [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = { - .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { - .min = 3, .max = 3, - }, - }, - [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = { - .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { - .min = 10, .max = 10, - }, - }, - [IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = { - .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { - .min = 1, .max = 1, - }, - }, - [IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = { - .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { - .min = 5, .max = 5, - }, - }, -}; - -/* Destination resource configuration data for the SC7180 SoC */ -static const struct ipa_resource ipa_resource_dst[] = { - [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = { - .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = { - .min = 3, .max = 3, - }, - }, - [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = { - .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = { - .min = 1, .max = 63, - }, - }, -}; - -/* Resource configuration for the SC7180 SoC. */ -static const struct ipa_resource_data ipa_resource_data = { - .rsrc_group_src_count = IPA_RSRC_GROUP_SRC_COUNT, - .rsrc_group_dst_count = IPA_RSRC_GROUP_DST_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 configuration for the SC7180 SoC. */ -static const struct ipa_mem ipa_mem_local_data[] = { - [IPA_MEM_UC_SHARED] = { - .offset = 0x0000, - .size = 0x0080, - .canary_count = 0, - }, - [IPA_MEM_UC_INFO] = { - .offset = 0x0080, - .size = 0x0200, - .canary_count = 0, - }, - [IPA_MEM_V4_FILTER_HASHED] = { - .offset = 0x0288, - .size = 0, - .canary_count = 2, - }, - [IPA_MEM_V4_FILTER] = { - .offset = 0x0290, - .size = 0x0078, - .canary_count = 2, - }, - [IPA_MEM_V6_FILTER_HASHED] = { - .offset = 0x0310, - .size = 0, - .canary_count = 2, - }, - [IPA_MEM_V6_FILTER] = { - .offset = 0x0318, - .size = 0x0078, - .canary_count = 2, - }, - [IPA_MEM_V4_ROUTE_HASHED] = { - .offset = 0x0398, - .size = 0, - .canary_count = 2, - }, - [IPA_MEM_V4_ROUTE] = { - .offset = 0x03a0, - .size = 0x0078, - .canary_count = 2, - }, - [IPA_MEM_V6_ROUTE_HASHED] = { - .offset = 0x0420, - .size = 0, - .canary_count = 2, - }, - [IPA_MEM_V6_ROUTE] = { - .offset = 0x0428, - .size = 0x0078, - .canary_count = 2, - }, - [IPA_MEM_MODEM_HEADER] = { - .offset = 0x04a8, - .size = 0x0140, - .canary_count = 2, - }, - [IPA_MEM_MODEM_PROC_CTX] = { - .offset = 0x05f0, - .size = 0x0200, - .canary_count = 2, - }, - [IPA_MEM_AP_PROC_CTX] = { - .offset = 0x07f0, - .size = 0x0200, - .canary_count = 0, - }, - [IPA_MEM_PDN_CONFIG] = { - .offset = 0x09f8, - .size = 0x0050, - .canary_count = 2, - }, - [IPA_MEM_STATS_QUOTA_MODEM] = { - .offset = 0x0a50, - .size = 0x0060, - .canary_count = 2, - }, - [IPA_MEM_STATS_TETHERING] = { - .offset = 0x0ab0, - .size = 0x0140, - .canary_count = 0, - }, - [IPA_MEM_MODEM] = { - .offset = 0x0bf0, - .size = 0x140c, - .canary_count = 0, - }, - [IPA_MEM_UC_EVENT_RING] = { - .offset = 0x2000, - .size = 0, - .canary_count = 1, - }, -}; - -static const struct ipa_mem_data ipa_mem_data = { - .local_count = ARRAY_SIZE(ipa_mem_local_data), - .local = ipa_mem_local_data, - .imem_addr = 0x146a8000, - .imem_size = 0x00002000, - .smem_id = 497, - .smem_size = 0x00002000, -}; - -/* Interconnect bandwidths are in 1000 byte/second units */ -static const struct ipa_interconnect_data ipa_interconnect_data[] = { - { - .name = "memory", - .peak_bandwidth = 465000, /* 465 MBps */ - .average_bandwidth = 80000, /* 80 MBps */ - }, - /* Average bandwidth is unused for the next two interconnects */ - { - .name = "imem", - .peak_bandwidth = 68570, /* 68.570 MBps */ - .average_bandwidth = 0, /* unused */ - }, - { - .name = "config", - .peak_bandwidth = 30000, /* 30 MBps */ - .average_bandwidth = 0, /* unused */ - }, -}; - -static const struct ipa_clock_data ipa_clock_data = { - .core_clock_rate = 100 * 1000 * 1000, /* Hz */ - .interconnect_count = ARRAY_SIZE(ipa_interconnect_data), - .interconnect_data = ipa_interconnect_data, -}; - -/* Configuration data for the SC7180 SoC. */ -const struct ipa_data ipa_data_sc7180 = { - .version = IPA_VERSION_4_2, - /* backward_compat value is 0 */ - .qsb_count = ARRAY_SIZE(ipa_qsb_data), - .qsb_data = ipa_qsb_data, - .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), - .endpoint_data = ipa_gsi_endpoint_data, - .resource_data = &ipa_resource_data, - .mem_data = &ipa_mem_data, - .clock_data = &ipa_clock_data, -}; diff --git a/drivers/net/ipa/ipa_data-v4.2.c b/drivers/net/ipa/ipa_data-v4.2.c new file mode 100644 index 000000000000..8744f19c6401 --- /dev/null +++ b/drivers/net/ipa/ipa_data-v4.2.c @@ -0,0 +1,362 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* Copyright (C) 2019-2021 Linaro Ltd. */ + +#include + +#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.2 */ +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.2 */ +enum ipa_rsrc_group_id { + /* Source resource group identifiers */ + IPA_RSRC_GROUP_SRC_UL_DL = 0, + 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_COUNT, /* Last; not a destination group */ +}; + +/* QSB configuration data for an SoC having IPA v4.2 */ +static const struct ipa_qsb_data ipa_qsb_data[] = { + [IPA_QSB_MASTER_DDR] = { + .max_writes = 8, + .max_reads = 12, + /* no outstanding read byte (beat) limit */ + }, +}; + +/* Endpoint configuration data for an SoC having IPA v4.2 */ +static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = { + [IPA_ENDPOINT_AP_COMMAND_TX] = { + .ee_id = GSI_EE_AP, + .channel_id = 1, + .endpoint_id = 6, + .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 = 2, + .endpoint_id = 8, + .toward_ipa = false, + .channel = { + .tre_count = 256, + .event_count = 256, + .tlv_count = 6, + }, + .endpoint = { + .config = { + .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL, + .aggregation = true, + .status_enable = true, + .rx = { + .pad_align = ilog2(sizeof(u32)), + }, + }, + }, + }, + [IPA_ENDPOINT_AP_MODEM_TX] = { + .ee_id = GSI_EE_AP, + .channel_id = 0, + .endpoint_id = 1, + .toward_ipa = true, + .channel = { + .tre_count = 512, + .event_count = 512, + .tlv_count = 8, + }, + .endpoint = { + .filter_support = true, + .config = { + .resource_group = IPA_RSRC_GROUP_SRC_UL_DL, + .checksum = true, + .qmap = true, + .status_enable = true, + .tx = { + .seq_type = IPA_SEQ_1_PASS_SKIP_LAST_UC, + .seq_rep_type = IPA_SEQ_REP_DMA_PARSER, + .status_endpoint = + IPA_ENDPOINT_MODEM_AP_RX, + }, + }, + }, + }, + [IPA_ENDPOINT_AP_MODEM_RX] = { + .ee_id = GSI_EE_AP, + .channel_id = 3, + .endpoint_id = 9, + .toward_ipa = false, + .channel = { + .tre_count = 256, + .event_count = 256, + .tlv_count = 6, + }, + .endpoint = { + .config = { + .resource_group = IPA_RSRC_GROUP_DST_UL_DL_DPL, + .checksum = true, + .qmap = true, + .aggregation = true, + .rx = { + .aggr_close_eof = true, + }, + }, + }, + }, + [IPA_ENDPOINT_MODEM_COMMAND_TX] = { + .ee_id = GSI_EE_MODEM, + .channel_id = 1, + .endpoint_id = 5, + .toward_ipa = true, + }, + [IPA_ENDPOINT_MODEM_LAN_RX] = { + .ee_id = GSI_EE_MODEM, + .channel_id = 3, + .endpoint_id = 11, + .toward_ipa = false, + }, + [IPA_ENDPOINT_MODEM_AP_TX] = { + .ee_id = GSI_EE_MODEM, + .channel_id = 0, + .endpoint_id = 4, + .toward_ipa = true, + .endpoint = { + .filter_support = true, + }, + }, + [IPA_ENDPOINT_MODEM_AP_RX] = { + .ee_id = GSI_EE_MODEM, + .channel_id = 2, + .endpoint_id = 10, + .toward_ipa = false, + }, +}; + +/* Source resource configuration data for an SoC having IPA v4.2 */ +static const struct ipa_resource ipa_resource_src[] = { + [IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = { + .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { + .min = 3, .max = 63, + }, + }, + [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = { + .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { + .min = 3, .max = 3, + }, + }, + [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = { + .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { + .min = 10, .max = 10, + }, + }, + [IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = { + .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { + .min = 1, .max = 1, + }, + }, + [IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = { + .limits[IPA_RSRC_GROUP_SRC_UL_DL] = { + .min = 5, .max = 5, + }, + }, +}; + +/* Destination resource configuration data for an SoC having IPA v4.2 */ +static const struct ipa_resource ipa_resource_dst[] = { + [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = { + .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = { + .min = 3, .max = 3, + }, + }, + [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = { + .limits[IPA_RSRC_GROUP_DST_UL_DL_DPL] = { + .min = 1, .max = 63, + }, + }, +}; + +/* Resource configuration data for an SoC having IPA v4.2 */ +static const struct ipa_resource_data ipa_resource_data = { + .rsrc_group_src_count = IPA_RSRC_GROUP_SRC_COUNT, + .rsrc_group_dst_count = IPA_RSRC_GROUP_DST_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.2 */ +static const struct ipa_mem ipa_mem_local_data[] = { + [IPA_MEM_UC_SHARED] = { + .offset = 0x0000, + .size = 0x0080, + .canary_count = 0, + }, + [IPA_MEM_UC_INFO] = { + .offset = 0x0080, + .size = 0x0200, + .canary_count = 0, + }, + [IPA_MEM_V4_FILTER_HASHED] = { + .offset = 0x0288, + .size = 0, + .canary_count = 2, + }, + [IPA_MEM_V4_FILTER] = { + .offset = 0x0290, + .size = 0x0078, + .canary_count = 2, + }, + [IPA_MEM_V6_FILTER_HASHED] = { + .offset = 0x0310, + .size = 0, + .canary_count = 2, + }, + [IPA_MEM_V6_FILTER] = { + .offset = 0x0318, + .size = 0x0078, + .canary_count = 2, + }, + [IPA_MEM_V4_ROUTE_HASHED] = { + .offset = 0x0398, + .size = 0, + .canary_count = 2, + }, + [IPA_MEM_V4_ROUTE] = { + .offset = 0x03a0, + .size = 0x0078, + .canary_count = 2, + }, + [IPA_MEM_V6_ROUTE_HASHED] = { + .offset = 0x0420, + .size = 0, + .canary_count = 2, + }, + [IPA_MEM_V6_ROUTE] = { + .offset = 0x0428, + .size = 0x0078, + .canary_count = 2, + }, + [IPA_MEM_MODEM_HEADER] = { + .offset = 0x04a8, + .size = 0x0140, + .canary_count = 2, + }, + [IPA_MEM_MODEM_PROC_CTX] = { + .offset = 0x05f0, + .size = 0x0200, + .canary_count = 2, + }, + [IPA_MEM_AP_PROC_CTX] = { + .offset = 0x07f0, + .size = 0x0200, + .canary_count = 0, + }, + [IPA_MEM_PDN_CONFIG] = { + .offset = 0x09f8, + .size = 0x0050, + .canary_count = 2, + }, + [IPA_MEM_STATS_QUOTA_MODEM] = { + .offset = 0x0a50, + .size = 0x0060, + .canary_count = 2, + }, + [IPA_MEM_STATS_TETHERING] = { + .offset = 0x0ab0, + .size = 0x0140, + .canary_count = 0, + }, + [IPA_MEM_MODEM] = { + .offset = 0x0bf0, + .size = 0x140c, + .canary_count = 0, + }, + [IPA_MEM_UC_EVENT_RING] = { + .offset = 0x2000, + .size = 0, + .canary_count = 1, + }, +}; + +/* Memory configuration data for an SoC having IPA v4.2 */ +static const struct ipa_mem_data ipa_mem_data = { + .local_count = ARRAY_SIZE(ipa_mem_local_data), + .local = ipa_mem_local_data, + .imem_addr = 0x146a8000, + .imem_size = 0x00002000, + .smem_id = 497, + .smem_size = 0x00002000, +}; + +/* Interconnect rates are in 1000 byte/second units */ +static const struct ipa_interconnect_data ipa_interconnect_data[] = { + { + .name = "memory", + .peak_bandwidth = 465000, /* 465 MBps */ + .average_bandwidth = 80000, /* 80 MBps */ + }, + /* Average bandwidth is unused for the next two interconnects */ + { + .name = "imem", + .peak_bandwidth = 68570, /* 68.570 MBps */ + .average_bandwidth = 0, /* unused */ + }, + { + .name = "config", + .peak_bandwidth = 30000, /* 30 MBps */ + .average_bandwidth = 0, /* unused */ + }, +}; + +/* Clock and interconnect configuration data for an SoC having IPA v4.2 */ +static const struct ipa_clock_data ipa_clock_data = { + .core_clock_rate = 100 * 1000 * 1000, /* Hz */ + .interconnect_count = ARRAY_SIZE(ipa_interconnect_data), + .interconnect_data = ipa_interconnect_data, +}; + +/* Configuration data for an SoC having IPA v4.2 */ +const struct ipa_data ipa_data_v4_2 = { + .version = IPA_VERSION_4_2, + /* backward_compat value is 0 */ + .qsb_count = ARRAY_SIZE(ipa_qsb_data), + .qsb_data = ipa_qsb_data, + .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), + .endpoint_data = ipa_gsi_endpoint_data, + .resource_data = &ipa_resource_data, + .mem_data = &ipa_mem_data, + .clock_data = &ipa_clock_data, +}; diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h index 17cdc376e95f..e97342e80d53 100644 --- a/drivers/net/ipa/ipa_data.h +++ b/drivers/net/ipa/ipa_data.h @@ -301,6 +301,6 @@ struct ipa_data { }; extern const struct ipa_data ipa_data_v3_5_1; -extern const struct ipa_data ipa_data_sc7180; +extern const struct ipa_data ipa_data_v4_2; #endif /* _IPA_DATA_H_ */ diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 37e85a5ab75c..a970d10e650e 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -582,7 +582,7 @@ static const struct of_device_id ipa_match[] = { }, { .compatible = "qcom,sc7180-ipa", - .data = &ipa_data_sc7180, + .data = &ipa_data_v4_2, }, { }, }; -- cgit v1.2.3