[PATCH v4 8/9] firmware: arm_scmi: Initialise known ACPI protocol devices and channels
From: Sudeep Holla <sudeep.holla@kernel.org>
Date: 2026-09-04 15:59:48
Also in:
arm-scmi
Subsystem:
system control & power/management interface (scpi/scmi) message protocol drivers, the rest · Maintainers:
Sudeep Holla, Linus Torvalds
Unlike Device Tree, the ACPI SCMI namespace device does not provide child fwnodes to represent each protocol. Iterate over the non-BASE entries in scmi_dsd_info_list to initialize their protocol devices and transport channels. The BASE channel and device are handled by the common setup path. Let the transport channel-availability and SCMI protocol implementation checks decide which of the known protocols are usable on the platform. Reviewed-by: Jonathan Cameron <redacted> Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org> --- drivers/firmware/arm_scmi/driver.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 10e660da440c..01117c21805d 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c@@ -2873,7 +2873,7 @@ scmi_txrx_setup(struct scmi_info *info, struct fwnode_handle *fwnode, */ static int scmi_channels_setup(struct scmi_info *info) { - int ret; + int ret, idx; struct fwnode_handle *fwnode = dev_fwnode(info->dev); /* Initialize a common generic channel at first */
@@ -2898,6 +2898,20 @@ static int scmi_channels_setup(struct scmi_info *info) return ret; } + if (!is_acpi_node(fwnode)) + return 0; + + for (idx = 0; idx < ARRAY_SIZE(scmi_dsd_info_list); idx++) { + int prot_id = scmi_dsd_info_list[idx].protocol_id; + + if (prot_id == SCMI_PROTOCOL_BASE) + continue; + + ret = scmi_txrx_setup(info, fwnode, prot_id); + if (ret) + return ret; + } + return 0; }
@@ -3245,7 +3259,7 @@ static void scmi_enable_matching_quirks(struct scmi_info *info) } static void scmi_device_check_create(struct fwnode_handle *fwnode, int prot_id, - struct scmi_info *info) + struct scmi_info *info, bool report_missing) { int ret; struct device *dev = info->dev;
@@ -3257,6 +3271,9 @@ static void scmi_device_check_create(struct fwnode_handle *fwnode, int prot_id, } if (!scmi_is_protocol_implemented(handle, prot_id)) { + if (!report_missing) + return; + dev_err(dev, "SCMI protocol %d not implemented\n", prot_id); return; }
@@ -3279,7 +3296,7 @@ static void scmi_device_check_create(struct fwnode_handle *fwnode, int prot_id, static int scmi_probe(struct platform_device *pdev) { - int ret; + int ret, idx; char *err_str = "probe failure\n"; struct scmi_handle *handle; const struct scmi_desc *desc;
@@ -3406,7 +3423,19 @@ static int scmi_probe(struct platform_device *pdev) if (fwnode_property_read_u32(child, "reg", &prot_id)) continue; - scmi_device_check_create(child, prot_id, info); + scmi_device_check_create(child, prot_id, info, true); + } + + if (!is_acpi_node(dev_fwnode(dev))) + return 0; + + for (idx = 0; idx < ARRAY_SIZE(scmi_dsd_info_list); idx++) { + int prot_id = scmi_dsd_info_list[idx].protocol_id; + + if (prot_id == SCMI_PROTOCOL_BASE) + continue; + + scmi_device_check_create(dev_fwnode(dev), prot_id, info, false); } return 0;
--
2.43.0