]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: ipa: add IPA v5.2 configuration data
authorLuca Weiss <luca.weiss@fairphone.com>
Fri, 10 Apr 2026 07:40:08 +0000 (09:40 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sun, 12 Apr 2026 22:26:13 +0000 (15:26 -0700)
Add the configuration data required for IPA v5.2, which is used in
the Qualcomm Milos SoC.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
Link: https://patch.msgid.link/20260410-ipa-v5-2-v2-2-778422a05060@fairphone.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ipa/Makefile
drivers/net/ipa/data/ipa_data-v5.2.c [new file with mode: 0644]
drivers/net/ipa/gsi_reg.c
drivers/net/ipa/ipa_data.h
drivers/net/ipa/ipa_main.c
drivers/net/ipa/ipa_reg.c
drivers/net/ipa/ipa_sysfs.c
drivers/net/ipa/ipa_version.h

index d3abb38633e080770c4f7148c7ff8a185aa0fe81..e148ec3c1a10103a1d5de1707f3b599ac5b3cd7d 100644 (file)
@@ -7,7 +7,7 @@ IPA_REG_VERSIONS        :=      3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0 5.5
 # Some IPA versions can reuse another set of GSI register definitions.
 GSI_REG_VERSIONS       :=      3.1 3.5.1 4.0 4.5 4.9 4.11 5.0
 
-IPA_DATA_VERSIONS      :=      3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0 5.5
+IPA_DATA_VERSIONS      :=      3.1 3.5.1 4.2 4.5 4.7 4.9 4.11 5.0 5.2 5.5
 
 obj-$(CONFIG_QCOM_IPA) +=      ipa.o
 
diff --git a/drivers/net/ipa/data/ipa_data-v5.2.c b/drivers/net/ipa/data/ipa_data-v5.2.c
new file mode 100644 (file)
index 0000000..c56c4f1
--- /dev/null
@@ -0,0 +1,452 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023-2024 Linaro Ltd.
+ * Copyright (c) 2026, Luca Weiss <luca.weiss@fairphone.com>
+ */
+
+#include <linux/array_size.h>
+#include <linux/log2.h>
+
+#include "../ipa_data.h"
+#include "../ipa_endpoint.h"
+#include "../ipa_mem.h"
+#include "../ipa_version.h"
+
+/** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.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,
+       IPA_RESOURCE_TYPE_DST_ULSO_SEGMENTS,
+};
+
+/* Resource groups used for an SoC having IPA v5.2 */
+enum ipa_rsrc_group_id {
+       /* Source resource group identifiers */
+       IPA_RSRC_GROUP_SRC_UL                           = 0,
+       IPA_RSRC_GROUP_SRC_DL,
+       IPA_RSRC_GROUP_SRC_URLLC,
+       IPA_RSRC_GROUP_SRC_COUNT,       /* Last in set; not a source group */
+
+       /* Destination resource group identifiers */
+       IPA_RSRC_GROUP_DST_UL                           = 0,
+       IPA_RSRC_GROUP_DST_DL,
+       IPA_RSRC_GROUP_DST_UNUSED_1,
+       IPA_RSRC_GROUP_DST_DRB_IP,
+       IPA_RSRC_GROUP_DST_COUNT,       /* Last; not a destination group */
+};
+
+/* QSB configuration data for an SoC having IPA v5.2 */
+static const struct ipa_qsb_data ipa_qsb_data[] = {
+       [IPA_QSB_MASTER_DDR] = {
+               .max_writes             = 13,
+               .max_reads              = 13,
+               .max_reads_beats        = 0,
+       },
+};
+
+/* Endpoint configuration data for an SoC having IPA v5.2 */
+static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
+       [IPA_ENDPOINT_AP_COMMAND_TX] = {
+               .ee_id          = GSI_EE_AP,
+               .channel_id     = 6,
+               .endpoint_id    = 9,
+               .toward_ipa     = true,
+               .channel = {
+                       .tre_count      = 256,
+                       .event_count    = 256,
+                       .tlv_count      = 20,
+               },
+               .endpoint = {
+                       .config = {
+                               .resource_group = IPA_RSRC_GROUP_SRC_UL,
+                               .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     = 7,
+               .endpoint_id    = 11,
+               .toward_ipa     = false,
+               .channel = {
+                       .tre_count      = 256,
+                       .event_count    = 256,
+                       .tlv_count      = 9,
+               },
+               .endpoint = {
+                       .config = {
+                               .resource_group = IPA_RSRC_GROUP_DST_UL,
+                               .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     = 5,
+               .endpoint_id    = 2,
+               .toward_ipa     = true,
+               .channel = {
+                       .tre_count      = 512,
+                       .event_count    = 512,
+                       .tlv_count      = 25,
+               },
+               .endpoint = {
+                       .filter_support = true,
+                       .config = {
+                               .resource_group = IPA_RSRC_GROUP_SRC_UL,
+                               .checksum       = true,
+                               .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     = 9,
+               .endpoint_id    = 18,
+               .toward_ipa     = false,
+               .channel = {
+                       .tre_count      = 256,
+                       .event_count    = 256,
+                       .tlv_count      = 9,
+               },
+               .endpoint = {
+                       .config = {
+                               .resource_group = IPA_RSRC_GROUP_DST_DL,
+                               .checksum       = true,
+                               .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    = 7,
+               .toward_ipa     = true,
+               .endpoint = {
+                       .filter_support = true,
+               },
+       },
+       [IPA_ENDPOINT_MODEM_AP_RX] = {
+               .ee_id          = GSI_EE_MODEM,
+               .channel_id     = 7,
+               .endpoint_id    = 16,
+               .toward_ipa     = false,
+       },
+       [IPA_ENDPOINT_MODEM_DL_NLO_TX] = {
+               .ee_id          = GSI_EE_MODEM,
+               .channel_id     = 2,
+               .endpoint_id    = 10,
+               .toward_ipa     = true,
+               .endpoint = {
+                       .filter_support = true,
+               },
+       },
+};
+
+/* Source resource configuration data for an SoC having IPA v5.2 */
+static const struct ipa_resource ipa_resource_src[] = {
+       [IPA_RESOURCE_TYPE_SRC_PKT_CONTEXTS] = {
+               .limits[IPA_RSRC_GROUP_SRC_UL] = {
+                       .min = 1,       .max = 7,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_DL] = {
+                       .min = 1,       .max = 7,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_URLLC] = {
+                       .min = 0,       .max = 5,
+               },
+       },
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_LISTS] = {
+               .limits[IPA_RSRC_GROUP_SRC_UL] = {
+                       .min = 8,       .max = 8,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_DL] = {
+                       .min = 8,       .max = 8,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_URLLC] = {
+                       .min = 8,       .max = 8,
+               },
+       },
+       [IPA_RESOURCE_TYPE_SRC_DESCRIPTOR_BUFF] = {
+               .limits[IPA_RSRC_GROUP_SRC_UL] = {
+                       .min = 10,      .max = 10,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_DL] = {
+                       .min = 12,      .max = 12,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_URLLC] = {
+                       .min = 12,      .max = 12,
+               },
+       },
+       [IPA_RESOURCE_TYPE_SRC_HPS_DMARS] = {
+               .limits[IPA_RSRC_GROUP_SRC_UL] = {
+                       .min = 0,       .max = 63,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_DL] = {
+                       .min = 0,       .max = 63,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_URLLC] = {
+                       .min = 0,       .max = 63,
+               },
+       },
+       [IPA_RESOURCE_TYPE_SRC_ACK_ENTRIES] = {
+               .limits[IPA_RSRC_GROUP_SRC_UL] = {
+                       .min = 15,      .max = 15,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_DL] = {
+                       .min = 15,      .max = 15,
+               },
+               .limits[IPA_RSRC_GROUP_SRC_URLLC] = {
+                       .min = 12,      .max = 12,
+               },
+       },
+};
+
+/* Destination resource configuration data for an SoC having IPA v5.2 */
+static const struct ipa_resource ipa_resource_dst[] = {
+       [IPA_RESOURCE_TYPE_DST_DATA_SECTORS] = {
+               .limits[IPA_RSRC_GROUP_DST_UL] = {
+                       .min = 3,       .max = 3,
+               },
+               .limits[IPA_RSRC_GROUP_DST_DL] = {
+                       .min = 3,       .max = 3,
+               },
+               .limits[IPA_RSRC_GROUP_DST_DRB_IP] = {
+                       .min = 23,      .max = 23,
+               },
+       },
+       [IPA_RESOURCE_TYPE_DST_DPS_DMARS] = {
+               .limits[IPA_RSRC_GROUP_DST_UL] = {
+                       .min = 1,       .max = 2,
+               },
+               .limits[IPA_RSRC_GROUP_DST_DL] = {
+                       .min = 1,       .max = 2,
+               },
+       },
+       [IPA_RESOURCE_TYPE_DST_ULSO_SEGMENTS] = {
+               .limits[IPA_RSRC_GROUP_DST_UL] = {
+                       .min = 1,       .max = 63,
+               },
+               .limits[IPA_RSRC_GROUP_DST_DL] = {
+                       .min = 1,       .max = 63,
+               },
+       },
+};
+
+/* Resource configuration data for an SoC having IPA v5.2 */
+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 v5.2 */
+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           = 0x0098,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_V4_ROUTE,
+               .offset         = 0x0528,
+               .size           = 0x0098,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_V6_ROUTE_HASHED,
+               .offset         = 0x05c8,
+               .size           = 0x0098,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_V6_ROUTE,
+               .offset         = 0x0668,
+               .size           = 0x0098,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_MODEM_HEADER,
+               .offset         = 0x0708,
+               .size           = 0x0240,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_AP_HEADER,
+               .offset         = 0x0948,
+               .size           = 0x01e0,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_MODEM_PROC_CTX,
+               .offset         = 0x0b40,
+               .size           = 0x0b20,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_AP_PROC_CTX,
+               .offset         = 0x1660,
+               .size           = 0x0200,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_STATS_QUOTA_MODEM,
+               .offset         = 0x1868,
+               .size           = 0x0060,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_STATS_QUOTA_AP,
+               .offset         = 0x18c8,
+               .size           = 0x0048,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_STATS_TETHERING,
+               .offset         = 0x1910,
+               .size           = 0x03c0,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_STATS_FILTER_ROUTE,
+               .offset         = 0x1cd0,
+               .size           = 0x0ba0,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_STATS_DROP,
+               .offset         = 0x2870,
+               .size           = 0x0020,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_MODEM,
+               .offset         = 0x2898,
+               .size           = 0x0d48,
+               .canary_count   = 2,
+       },
+       {
+               .id             = IPA_MEM_NAT_TABLE,
+               .offset         = 0x35e0,
+               .size           = 0x0900,
+               .canary_count   = 0,
+       },
+       {
+               .id             = IPA_MEM_PDN_CONFIG,
+               .offset         = 0x3ee8,
+               .size           = 0x0100,
+               .canary_count   = 2,
+       },
+};
+
+/* Memory configuration data for an SoC having IPA v5.2 */
+static const struct ipa_mem_data ipa_mem_data = {
+       .local_count    = ARRAY_SIZE(ipa_mem_local_data),
+       .local          = ipa_mem_local_data,
+       .smem_size      = 0x0000b000,
+};
+
+/* Interconnect rates are in 1000 byte/second units */
+static const struct ipa_interconnect_data ipa_interconnect_data[] = {
+       {
+               .name                   = "memory",
+               .peak_bandwidth         = 1300000,      /* 1.3 GBps */
+               .average_bandwidth      = 600000,       /* 600 MBps */
+       },
+       /* Average rate is unused for the next interconnect */
+       {
+               .name                   = "config",
+               .peak_bandwidth         = 76800,        /* 76.8 MBps */
+               .average_bandwidth      = 0,            /* unused */
+       },
+};
+
+/* Clock and interconnect configuration data for an SoC having IPA v5.2 */
+static const struct ipa_power_data ipa_power_data = {
+       .core_clock_rate        = 120 * 1000 * 1000,    /* Hz */
+       .interconnect_count     = ARRAY_SIZE(ipa_interconnect_data),
+       .interconnect_data      = ipa_interconnect_data,
+};
+
+/* Configuration data for an SoC having IPA v5.2. */
+const struct ipa_data ipa_data_v5_2 = {
+       .version                = IPA_VERSION_5_2,
+       .qsb_count              = ARRAY_SIZE(ipa_qsb_data),
+       .qsb_data               = ipa_qsb_data,
+       .modem_route_count      = 11,
+       .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,
+};
index 825598661188e2f36f14a893fb31b4425b5d847d..e13cf835a013c9988873ca0a866dcf4155bef19f 100644 (file)
@@ -110,6 +110,7 @@ static const struct regs *gsi_regs(struct gsi *gsi)
                return &gsi_regs_v4_11;
 
        case IPA_VERSION_5_0:
+       case IPA_VERSION_5_2:
        case IPA_VERSION_5_5:
                return &gsi_regs_v5_0;
 
index f3bdc64cef05d00a47184ada4f128a5f1a84f934..3eb9dc2ce3398d07954c5a7e5be85292323b9b0f 100644 (file)
@@ -253,6 +253,7 @@ 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;
 extern const struct ipa_data ipa_data_v5_0;
+extern const struct ipa_data ipa_data_v5_2;
 extern const struct ipa_data ipa_data_v5_5;
 
 #endif /* _IPA_DATA_H_ */
index edead9c48d1fe47a3145e67dec2788b5cf2831e5..8e2b4bf7b14e300dec6f8b30deaa36c3a29b873a 100644 (file)
@@ -669,6 +669,10 @@ static const struct of_device_id ipa_match[] = {
                .compatible     = "qcom,sdx65-ipa",
                .data           = &ipa_data_v5_0,
        },
+       {
+               .compatible     = "qcom,milos-ipa",
+               .data           = &ipa_data_v5_2,
+       },
        {
                .compatible     = "qcom,sm8550-ipa",
                .data           = &ipa_data_v5_5,
index c574f798fdc951774ff1112f0bc8470b7b407158..30bd69f4c147cdf23e020b99f2ec5cb06aa37c06 100644 (file)
@@ -125,6 +125,7 @@ static const struct regs *ipa_regs(enum ipa_version version)
        case IPA_VERSION_4_11:
                return &ipa_regs_v4_11;
        case IPA_VERSION_5_0:
+       case IPA_VERSION_5_2:
                return &ipa_regs_v5_0;
        case IPA_VERSION_5_5:
                return &ipa_regs_v5_5;
index a53e9e6f6cdf50103e94e496fd06b55636ba02f4..8b805a9d49e610f60c72d0a4d65d4c3929aa4689 100644 (file)
@@ -39,6 +39,8 @@ static const char *ipa_version_string(struct ipa *ipa)
                return "5.0";
        case IPA_VERSION_5_1:
                return "5.1";
+       case IPA_VERSION_5_2:
+               return "5.2";
        case IPA_VERSION_5_5:
                return "5.5";
        default:
index 38c47f51a50c9f7643501b47bf49ed7f32eb8096..c157c72a5bad9a2fc19367b12fca36ba64bf8cfa 100644 (file)
@@ -23,6 +23,7 @@
  * @IPA_VERSION_4_11:  IPA version 4.11/GSI version 2.11 (2.1.1)
  * @IPA_VERSION_5_0:   IPA version 5.0/GSI version 3.0
  * @IPA_VERSION_5_1:   IPA version 5.1/GSI version 3.0
+ * @IPA_VERSION_5_2:   IPA version 5.2/GSI version 5.2
  * @IPA_VERSION_5_5:   IPA version 5.5/GSI version 5.5
  * @IPA_VERSION_COUNT: Number of defined IPA versions
  *
@@ -43,6 +44,7 @@ enum ipa_version {
        IPA_VERSION_4_11,
        IPA_VERSION_5_0,
        IPA_VERSION_5_1,
+       IPA_VERSION_5_2,
        IPA_VERSION_5_5,
        IPA_VERSION_COUNT,                      /* Last; not a version */
 };