soc: qcom: socinfo: add support to extract more than 32 image versions

SMEM_IMAGE_VERSION_TABLE contains the version of the first 32 images.
Add images beyond that and read these from SMEM_IMAGE_VERSION_TABLE_2.

Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251031-image-crm-part2-v2-2-c224c45c381a@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index 69642891ad579bde5c492ea8f9e0110202b97866..af0188bd388012a61f6cee92948f2f3ca999027d 100644 (file)
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -67,7 +67,17 @@
 #define SMEM_IMAGE_TABLE_GEARVM_INDEX  29
 #define SMEM_IMAGE_TABLE_UEFI_INDEX    30
 #define SMEM_IMAGE_TABLE_CDSP3_INDEX   31
+#define SMEM_IMAGE_TABLE_AUDIOPD_ADSP1_INDEX   32
+#define SMEM_IMAGE_TABLE_AUDIOPD_ADSP2_INDEX   33
+#define SMEM_IMAGE_TABLE_DCP_INDEX     34
+#define SMEM_IMAGE_TABLE_OOBS_INDEX    35
+#define SMEM_IMAGE_TABLE_OOBNS_INDEX   36
+#define SMEM_IMAGE_TABLE_DEVCFG_INDEX  37
+#define SMEM_IMAGE_TABLE_BTPD_INDEX    38
+#define SMEM_IMAGE_TABLE_QECP_INDEX    39
+
 #define SMEM_IMAGE_VERSION_TABLE       469
+#define SMEM_IMAGE_VERSION_TABLE_2     667
 
 /*
  * SMEM Image table names
@@ -79,13 +89,18 @@ static const char *const socinfo_image_names[] = {
        [SMEM_IMAGE_TABLE_APPSBL_INDEX] = "appsbl",
        [SMEM_IMAGE_TABLE_APPS_INDEX] = "apps",
        [SMEM_IMAGE_TABLE_AUDIOPD_INDEX] = "audiopd",
+       [SMEM_IMAGE_TABLE_AUDIOPD_ADSP1_INDEX] = "audiopd_adsp1",
+       [SMEM_IMAGE_TABLE_AUDIOPD_ADSP2_INDEX] = "audiopd_adsp2",
        [SMEM_IMAGE_TABLE_BOOT_INDEX] = "boot",
+       [SMEM_IMAGE_TABLE_BTPD_INDEX] = "btpd",
        [SMEM_IMAGE_TABLE_CDSP1_INDEX] = "cdsp1",
        [SMEM_IMAGE_TABLE_CDSP2_INDEX] = "cdsp2",
        [SMEM_IMAGE_TABLE_CDSP3_INDEX] = "cdsp3",
        [SMEM_IMAGE_TABLE_CDSP_INDEX] = "cdsp",
        [SMEM_IMAGE_TABLE_CHARGERPD_INDEX] = "chargerpd",
        [SMEM_IMAGE_TABLE_CNSS_INDEX] = "cnss",
+       [SMEM_IMAGE_TABLE_DCP_INDEX] = "dcp",
+       [SMEM_IMAGE_TABLE_DEVCFG_INDEX] = "devcfg",
        [SMEM_IMAGE_TABLE_DSPS_INDEX] = "dsps",
        [SMEM_IMAGE_TABLE_GEARVM_INDEX] = "gearvm",
        [SMEM_IMAGE_TABLE_GPDSP1_INDEX] = "gpdsp1",
@@ -95,6 +110,9 @@ static const char *const socinfo_image_names[] = {
        [SMEM_IMAGE_TABLE_NPU_INDEX] = "npu",
        [SMEM_IMAGE_TABLE_OEMPD_INDEX] = "oempd",
        [SMEM_IMAGE_TABLE_OISPD_INDEX] = "oispd",
+       [SMEM_IMAGE_TABLE_OOBNS_INDEX] = "oobns",
+       [SMEM_IMAGE_TABLE_OOBS_INDEX] = "oobs",
+       [SMEM_IMAGE_TABLE_QECP_INDEX] = "qecp",
        [SMEM_IMAGE_TABLE_RPM_INDEX] = "rpm",
        [SMEM_IMAGE_TABLE_SDI_INDEX] = "sdi",
        [SMEM_IMAGE_TABLE_SENSORPD_INDEX] = "sensorpd",
@@ -645,7 +663,7 @@ static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo,
        struct smem_image_version *versions;
        struct dentry *dentry;
        size_t size;
-       int i;
+       int i, j;
        unsigned int num_pmics;
        unsigned int pmic_array_offset;
 
@@ -789,20 +807,31 @@ static void socinfo_debugfs_init(struct qcom_socinfo *qcom_socinfo,
                break;
        }
 
-       versions = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_IMAGE_VERSION_TABLE,
-                                &size);
-
-       for (i = 0; i < ARRAY_SIZE(socinfo_image_names); i++) {
+       for (i = 0, j = 0; i < ARRAY_SIZE(socinfo_image_names); i++, j++) {
                if (!socinfo_image_names[i])
                        continue;
 
+               if (i == 0) {
+                       versions = qcom_smem_get(QCOM_SMEM_HOST_ANY,
+                                                SMEM_IMAGE_VERSION_TABLE,
+                                                &size);
+               } else if (i == 32) {
+                       versions = qcom_smem_get(QCOM_SMEM_HOST_ANY,
+                                                SMEM_IMAGE_VERSION_TABLE_2,
+                                                &size);
+                       if (IS_ERR(versions))
+                               break;
+
+                       j = 0;
+               }
+
                dentry = debugfs_create_dir(socinfo_image_names[i],
                                            qcom_socinfo->dbg_root);
-               debugfs_create_file("name", 0444, dentry, &versions[i],
+               debugfs_create_file("name", 0444, dentry, &versions[j],
                                    &qcom_image_name_ops);
-               debugfs_create_file("variant", 0444, dentry, &versions[i],
+               debugfs_create_file("variant", 0444, dentry, &versions[j],
                                    &qcom_image_variant_ops);
-               debugfs_create_file("oem", 0444, dentry, &versions[i],
+               debugfs_create_file("oem", 0444, dentry, &versions[j],
                                    &qcom_image_oem_ops);
        }
 }