MISC protocol supports getting the System Manager(SM) mode selection
and configuration name. Retrieve the information from SM.
Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
.../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c
index 464afeae8267d8c1eca4c4d5e008eca6d741c6ff..220b9369fb537306f9e1a105930ad4d65e6b10aa 100644
--- a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c
+++ b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c
@@ -26,6 +26,7 @@ enum scmi_imx_misc_protocol_cmd {
SCMI_IMX_MISC_CTRL_SET = 0x3,
SCMI_IMX_MISC_CTRL_GET = 0x4,
SCMI_IMX_MISC_DISCOVER_BUILDINFO = 0x6,
+ SCMI_IMX_MISC_CFG_INFO = 0xC,
SCMI_IMX_MISC_CTRL_NOTIFY = 0x8,
};
@@ -75,6 +76,12 @@ struct scmi_imx_misc_buildinfo_out {
u8 buildtime[MISC_MAX_BUILDTIME];
};
+struct scmi_imx_misc_cfg_info_out {
+ __le32 msel;
+#define MISC_MAX_CFGNAME 16
+ u8 cfgname[MISC_MAX_CFGNAME];
+};
+
static int scmi_imx_misc_attributes_get(const struct scmi_protocol_handle *ph,
struct scmi_imx_misc_info *mi)
{
@@ -309,6 +316,30 @@ static int scmi_imx_misc_discover_build_info(const struct scmi_protocol_handle *
return ret;
}
+static int scmi_imx_misc_cfg_info(const struct scmi_protocol_handle *ph)
+{
+ struct scmi_imx_misc_cfg_info_out *out;
+ char name[MISC_MAX_CFGNAME];
+ struct scmi_xfer *t;
+ int ret;
+
+ ret = ph->xops->xfer_get_init(ph, SCMI_IMX_MISC_CFG_INFO, 0, sizeof(*out), &t);
+ if (ret)
+ return ret;
+
+ ret = ph->xops->do_xfer(ph, t);
+ if (!ret) {
+ out = t->rx.buf;
+ strscpy(name, out->cfgname, MISC_MAX_CFGNAME);
+ dev_info(ph->dev, "SM Config\t= %s, mSel = %u\n",
+ name, le32_to_cpu(out->msel));
+ }
+
+ ph->xops->xfer_put(ph, t);
+
+ return ret;
+}
+
static const struct scmi_imx_misc_proto_ops scmi_imx_misc_proto_ops = {
.misc_ctrl_set = scmi_imx_misc_ctrl_set,
.misc_ctrl_get = scmi_imx_misc_ctrl_get,
@@ -340,6 +371,10 @@ static int scmi_imx_misc_protocol_init(const struct scmi_protocol_handle *ph)
if (ret)
return ret;
+ ret = scmi_imx_misc_cfg_info(ph);
+ if (ret)
+ return ret;
+
return ph->set_priv(ph, minfo, version);
}
--
2.37.1
On Wed, Aug 27, 2025 at 12:59:15PM +0800, Peng Fan wrote: > MISC protocol supports getting the System Manager(SM) mode selection > and configuration name. Retrieve the information from SM. > > Reviewed-by: Cristian Marussi <cristian.marussi@arm.com> > Signed-off-by: Peng Fan <peng.fan@nxp.com> > --- > .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 35 ++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c > index 464afeae8267d8c1eca4c4d5e008eca6d741c6ff..220b9369fb537306f9e1a105930ad4d65e6b10aa 100644 > --- a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c > +++ b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c > @@ -26,6 +26,7 @@ enum scmi_imx_misc_protocol_cmd { > SCMI_IMX_MISC_CTRL_SET = 0x3, > SCMI_IMX_MISC_CTRL_GET = 0x4, > SCMI_IMX_MISC_DISCOVER_BUILDINFO = 0x6, > + SCMI_IMX_MISC_CFG_INFO = 0xC, 1. Order it by command number 2. Be consistent with the document, MISC_CFG_INFO_GET is used there. > SCMI_IMX_MISC_CTRL_NOTIFY = 0x8, > }; > > @@ -75,6 +76,12 @@ struct scmi_imx_misc_buildinfo_out { > u8 buildtime[MISC_MAX_BUILDTIME]; > }; > > +struct scmi_imx_misc_cfg_info_out { > + __le32 msel; > +#define MISC_MAX_CFGNAME 16 > + u8 cfgname[MISC_MAX_CFGNAME]; > +}; > + > static int scmi_imx_misc_attributes_get(const struct scmi_protocol_handle *ph, > struct scmi_imx_misc_info *mi) > { > @@ -309,6 +316,30 @@ static int scmi_imx_misc_discover_build_info(const struct scmi_protocol_handle * > return ret; > } > > +static int scmi_imx_misc_cfg_info(const struct scmi_protocol_handle *ph) > +{ > + struct scmi_imx_misc_cfg_info_out *out; > + char name[MISC_MAX_CFGNAME]; > + struct scmi_xfer *t; > + int ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_MISC_CFG_INFO, 0, sizeof(*out), &t); > + if (ret) > + return ret; > + > + ret = ph->xops->do_xfer(ph, t); > + if (!ret) { > + out = t->rx.buf; > + strscpy(name, out->cfgname, MISC_MAX_CFGNAME); > + dev_info(ph->dev, "SM Config\t= %s, mSel = %u\n", > + name, le32_to_cpu(out->msel)); > + } > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > static const struct scmi_imx_misc_proto_ops scmi_imx_misc_proto_ops = { > .misc_ctrl_set = scmi_imx_misc_ctrl_set, > .misc_ctrl_get = scmi_imx_misc_ctrl_get, > @@ -340,6 +371,10 @@ static int scmi_imx_misc_protocol_init(const struct scmi_protocol_handle *ph) > if (ret) > return ret; > > + ret = scmi_imx_misc_cfg_info(ph); s/scmi_imx_misc_cfg_info/scmi_imx_misc_cfg_info_get/ > + if (ret) Again the document hasn't mark it as mandatory, so handle NOT_SUPPORTED gracefully. -- Regards, Sudeep
On Fri, Aug 29, 2025 at 11:56:15AM +0100, Sudeep Holla wrote: >On Wed, Aug 27, 2025 at 12:59:15PM +0800, Peng Fan wrote: >> MISC protocol supports getting the System Manager(SM) mode selection >> and configuration name. Retrieve the information from SM. >> >> Reviewed-by: Cristian Marussi <cristian.marussi@arm.com> >> Signed-off-by: Peng Fan <peng.fan@nxp.com> >> --- >> .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 35 ++++++++++++++++++++++ >> 1 file changed, 35 insertions(+) >> >> diff --git a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c >> index 464afeae8267d8c1eca4c4d5e008eca6d741c6ff..220b9369fb537306f9e1a105930ad4d65e6b10aa 100644 >> --- a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c >> +++ b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c >> @@ -26,6 +26,7 @@ enum scmi_imx_misc_protocol_cmd { >> SCMI_IMX_MISC_CTRL_SET = 0x3, >> SCMI_IMX_MISC_CTRL_GET = 0x4, >> SCMI_IMX_MISC_DISCOVER_BUILDINFO = 0x6, >> + SCMI_IMX_MISC_CFG_INFO = 0xC, > >1. Order it by command number >2. Be consistent with the document, MISC_CFG_INFO_GET is used there. Fix in V4. > >> SCMI_IMX_MISC_CTRL_NOTIFY = 0x8, >> }; >> >> @@ -75,6 +76,12 @@ struct scmi_imx_misc_buildinfo_out { >> u8 buildtime[MISC_MAX_BUILDTIME]; >> }; >> >> +struct scmi_imx_misc_cfg_info_out { >> + __le32 msel; >> +#define MISC_MAX_CFGNAME 16 >> + u8 cfgname[MISC_MAX_CFGNAME]; >> +}; >> + >> static int scmi_imx_misc_attributes_get(const struct scmi_protocol_handle *ph, >> struct scmi_imx_misc_info *mi) >> { >> @@ -309,6 +316,30 @@ static int scmi_imx_misc_discover_build_info(const struct scmi_protocol_handle * >> return ret; >> } >> >> +static int scmi_imx_misc_cfg_info(const struct scmi_protocol_handle *ph) >> +{ >> + struct scmi_imx_misc_cfg_info_out *out; >> + char name[MISC_MAX_CFGNAME]; >> + struct scmi_xfer *t; >> + int ret; >> + >> + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_MISC_CFG_INFO, 0, sizeof(*out), &t); >> + if (ret) >> + return ret; >> + >> + ret = ph->xops->do_xfer(ph, t); >> + if (!ret) { >> + out = t->rx.buf; >> + strscpy(name, out->cfgname, MISC_MAX_CFGNAME); >> + dev_info(ph->dev, "SM Config\t= %s, mSel = %u\n", >> + name, le32_to_cpu(out->msel)); >> + } >> + >> + ph->xops->xfer_put(ph, t); >> + >> + return ret; >> +} >> + >> static const struct scmi_imx_misc_proto_ops scmi_imx_misc_proto_ops = { >> .misc_ctrl_set = scmi_imx_misc_ctrl_set, >> .misc_ctrl_get = scmi_imx_misc_ctrl_get, >> @@ -340,6 +371,10 @@ static int scmi_imx_misc_protocol_init(const struct scmi_protocol_handle *ph) >> if (ret) >> return ret; >> >> + ret = scmi_imx_misc_cfg_info(ph); > >s/scmi_imx_misc_cfg_info/scmi_imx_misc_cfg_info_get/ Fix in V4. > >> + if (ret) > >Again the document hasn't mark it as mandatory, so handle NOT_SUPPORTED >gracefully. Yeah, "if (ret && ret != -EOPNOTSUPP) return ret; " Thanks, Peng > >-- >Regards, >Sudeep
© 2016 - 2025 Red Hat, Inc.