firmware: arm_scmi: Rename struct scmi_revision_info to scmi_base_info

Rename struct scmi_revision_info to struct scmi_base_info , to
accurately represent its content. The scmi_revision_info is no
longer accurate, because the structure now contains more than
only SCMI base protocol revision, it now also contains number
of protocols, agents, vendor and subvendor strings. All those
are fetched from the base protocol, so rename the structure to
scmi_base_info, to match the other scmi_*_info structure names.
No functional change.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Link: https://patch.msgid.link/20260406155343.72087-1-marek.vasut+renesas@mailbox.org
Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>

diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c
index cd1331c2fc40355b54716d4b4fee69b017d3817e..4df2620e3c5d0edb955d3b33a0b2114df74cd7a3 100644 (file)
--- a/drivers/firmware/arm_scmi/base.c
+++ b/drivers/firmware/arm_scmi/base.c
@@ -69,7 +69,7 @@ static int scmi_base_attributes_get(const struct scmi_protocol_handle *ph)
        int ret;
        struct scmi_xfer *t;
        struct scmi_msg_resp_base_attributes *attr_info;
-       struct scmi_revision_info *rev = ph->get_priv(ph);
+       struct scmi_base_info *rev = ph->get_priv(ph);
 
        ret = ph->xops->xfer_get_init(ph, PROTOCOL_ATTRIBUTES,
                                      0, sizeof(*attr_info), &t);
@@ -103,7 +103,7 @@ scmi_base_vendor_id_get(const struct scmi_protocol_handle *ph, bool sub_vendor)
        int ret, size;
        char *vendor_id;
        struct scmi_xfer *t;
-       struct scmi_revision_info *rev = ph->get_priv(ph);
+       struct scmi_base_info *rev = ph->get_priv(ph);
 
        if (sub_vendor) {
                cmd = BASE_DISCOVER_SUB_VENDOR;
@@ -143,7 +143,7 @@ scmi_base_implementation_version_get(const struct scmi_protocol_handle *ph)
        int ret;
        __le32 *impl_ver;
        struct scmi_xfer *t;
-       struct scmi_revision_info *rev = ph->get_priv(ph);
+       struct scmi_base_info *rev = ph->get_priv(ph);
 
        ret = ph->xops->xfer_get_init(ph, BASE_DISCOVER_IMPLEMENT_VERSION,
                                      0, sizeof(*impl_ver), &t);
@@ -180,7 +180,7 @@ scmi_base_implementation_list_get(const struct scmi_protocol_handle *ph,
        __le32 *num_skip, *num_ret;
        u32 tot_num_ret = 0, loop_num_ret;
        struct device *dev = ph->dev;
-       struct scmi_revision_info *rev = ph->get_priv(ph);
+       struct scmi_base_info *rev = ph->get_priv(ph);
 
        ret = ph->xops->xfer_get_init(ph, BASE_DISCOVER_LIST_PROTOCOLS,
                                      sizeof(*num_skip), 0, &t);
@@ -377,7 +377,7 @@ static int scmi_base_protocol_init(const struct scmi_protocol_handle *ph)
        u8 *prot_imp;
        char name[SCMI_SHORT_NAME_MAX_SIZE];
        struct device *dev = ph->dev;
-       struct scmi_revision_info *rev = scmi_revision_area_get(ph);
+       struct scmi_base_info *rev = scmi_revision_area_get(ph);
 
        rev->major_ver = PROTOCOL_REV_MAJOR(ph->version);
        rev->minor_ver = PROTOCOL_REV_MINOR(ph->version);

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 7c9617d080a023c1c28aab60ec02e84294fbfc97..07a127dec0319e3c128d87462d8c5079578e6c93 100644 (file)
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -138,7 +138,7 @@ static inline void unpack_scmi_header(u32 msg_hdr, struct scmi_msg_hdr *hdr)
        xfer_;                                                  \
 })
 
-struct scmi_revision_info *
+struct scmi_base_info *
 scmi_revision_area_get(const struct scmi_protocol_handle *ph);
 void scmi_setup_protocol_implemented(const struct scmi_protocol_handle *ph,
                                     u8 *prot_imp);

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index f167194f7cf6789a7aaa74e95861ec9110085d50..f7ee1b1495d7e67c59a5b748762994d522ec8ccf 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -133,7 +133,7 @@ struct scmi_protocol_instance {
  *            usage.
  * @protocols_mtx: A mutex to protect protocols instances initialization.
  * @protocols_imp: List of protocols implemented, currently maximum of
- *                scmi_revision_info.num_protocols elements allocated by the
+ *                scmi_base_info.num_protocols elements allocated by the
  *                base protocol
  * @active_protocols: IDR storing device_nodes for protocols actually defined
  *                   in the DT and confirmed as implemented by fw.
@@ -151,7 +151,7 @@ struct scmi_info {
        int id;
        struct device *dev;
        const struct scmi_desc *desc;
-       struct scmi_revision_info version;
+       struct scmi_base_info version;
        struct scmi_handle handle;
        struct scmi_xfers_info tx_minfo;
        struct scmi_xfers_info rx_minfo;
@@ -265,7 +265,7 @@ scmi_vendor_protocol_lookup(int protocol_id, char *vendor_id,
 }
 
 static const struct scmi_protocol *
-scmi_vendor_protocol_get(int protocol_id, struct scmi_revision_info *version)
+scmi_vendor_protocol_get(int protocol_id, struct scmi_base_info *version)
 {
        const struct scmi_protocol *proto;
 
@@ -303,7 +303,7 @@ scmi_vendor_protocol_get(int protocol_id, struct scmi_revision_info *version)
 }
 
 static const struct scmi_protocol *
-scmi_protocol_get(int protocol_id, struct scmi_revision_info *version)
+scmi_protocol_get(int protocol_id, struct scmi_base_info *version)
 {
        const struct scmi_protocol *proto = NULL;
 
@@ -2063,7 +2063,7 @@ static const struct scmi_proto_helpers_ops helpers_ops = {
  * Return: A reference to the version memory area associated to the SCMI
  *        instance underlying this protocol handle.
  */
-struct scmi_revision_info *
+struct scmi_base_info *
 scmi_revision_area_get(const struct scmi_protocol_handle *ph)
 {
        const struct scmi_protocol_instance *pi = ph_to_pi(ph);
@@ -2376,7 +2376,7 @@ scmi_is_protocol_implemented(const struct scmi_handle *handle, u8 prot_id)
 {
        int i;
        struct scmi_info *info = handle_to_scmi_info(handle);
-       struct scmi_revision_info *rev = handle->version;
+       struct scmi_base_info *rev = handle->version;
 
        if (!info->protocols_imp)
                return false;
@@ -3171,7 +3171,7 @@ static const struct scmi_desc *scmi_transport_setup(struct device *dev)
 
 static void scmi_enable_matching_quirks(struct scmi_info *info)
 {
-       struct scmi_revision_info *rev = &info->version;
+       struct scmi_base_info *rev = &info->version;
 
        dev_dbg(info->dev, "Looking for quirks matching: %s/%s/0x%08X\n",
                rev->vendor_id, rev->sub_vendor_id, rev->impl_ver);

diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index aafaac1496b06a6e4f0ca32eee58a9edf7d4a70f..8d0b106caed8a1a33fb74f03465ce77ec427da47 100644 (file)
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -18,7 +18,7 @@
 #define SCMI_MAX_NUM_RATES             16
 
 /**
- * struct scmi_revision_info - version information structure
+ * struct scmi_base_info - version information structure
  *
  * @major_ver: Major ABI version. Change here implies risk of backward
  *     compatibility break.
@@ -31,7 +31,7 @@
  * @vendor_id: A vendor identifier(Null terminated ASCII string)
  * @sub_vendor_id: A sub-vendor identifier(Null terminated ASCII string)
  */
-struct scmi_revision_info {
+struct scmi_base_info {
        u16 major_ver;
        u16 minor_ver;
        u8 num_protocols;
@@ -901,7 +901,7 @@ struct scmi_notify_ops {
  */
 struct scmi_handle {
        struct device *dev;
-       struct scmi_revision_info *version;
+       struct scmi_base_info *version;
 
        int __must_check (*devm_protocol_acquire)(struct scmi_device *sdev,
                                                  u8 proto);