[PATCH NOT APPLY v2 5/6] firmware: scmi: support compatible string

Peng Fan (OSS)
2024-01-04T10:45:16Z

From: Peng Fan <peng.fan@nxp.com>

i.MX95 use SCMI PINCTRL OEM config type, so it could not reuse
pinctrl-scmi.c which use generic pinconf. Then need introduce
saying pinctrl-imx-scmi.c to support i.MX95, however both
pinctrl-scmi and pinctrl-imx-scmi driver will register a pinctrl device
with the same of_node(protocl@19). This will introduce an issue, because
the pinctrl subsystem will use of_node to find the exact pinctrl
device. But with two pinctrl devices registered by two drivers, it is
unknown which pinctrl device will be chosen.

So introduce compatible string to support cases that Vendor SCMI
driver which does almost same thing as generic SCMI driver, but
has some specific Vendor settings to do.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/firmware/arm_scmi/bus.c | 39 ++++++++++++++++++++++++++++++--------
drivers/firmware/arm_scmi/common.h | 2 +-
drivers/firmware/arm_scmi/driver.c | 15 ++++++++++-----
include/linux/scmi_protocol.h | 2 ++
4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 1f9735dbebec..9043f6366fa8 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -214,13 +214,21 @@ scmi_dev_match_id(struct scmi_device *scmi_dev, struct scmi_driver *scmi_drv)
if (!id)
return NULL;

- for (; id->protocol_id; id++)
- if (id->protocol_id == scmi_dev->protocol_id) {
- if (!id->name)
+ for (; id->protocol_id; id++) {
+ if (id->protocol_id != scmi_dev->protocol_id)
+ continue;
+ if (!id->name)
+ return id;
+
+ if (!strcmp(id->name, scmi_dev->name)) {
+ if (!id->compatible &&
+ device_property_read_string(&scmi_dev->dev, "compatible", NULL))
return id;
- else if (!strcmp(id->name, scmi_dev->name))
+
+ if (id->compatible && device_is_compatible(&scmi_dev->dev, id->compatible))
return id;
}
+ }

return NULL;
}
@@ -345,11 +353,14 @@ static void __scmi_device_destroy(struct scmi_device *scmi_dev)

static struct scmi_device *
__scmi_device_create(struct device_node *np, struct device *parent,
- int protocol, const char *name)
+ int protocol, const char *name, const char *compatible)
{
int id, retval;
struct scmi_device *scmi_dev;

+ if (compatible && !of_device_is_compatible(np, compatible))
+ return NULL;
+
/*
* If the same protocol/name device already exist under the same parent
* (i.e. SCMI instance) just return the existent device.
@@ -425,6 +436,7 @@ __scmi_device_create(struct device_node *np, struct device *parent,
* @name: The requested-name of the device to be created; this is optional
* and if no @name is provided, all the devices currently known to
* be requested on the SCMI bus for @protocol will be created.
+ * @compatible: The compatible string
*
* This method can be invoked to create a single well-defined device (like
* a transport device or a device requested by an SCMI driver loaded after
@@ -441,14 +453,14 @@ __scmi_device_create(struct device_node *np, struct device *parent,
*/
struct scmi_device *scmi_device_create(struct device_node *np,
struct device *parent, int protocol,
- const char *name)
+ const char *name, const char *compatible)
{
struct list_head *phead;
struct scmi_requested_dev *rdev;
struct scmi_device *scmi_dev = NULL;

if (name)
- return __scmi_device_create(np, parent, protocol, name);
+ return __scmi_device_create(np, parent, protocol, name, compatible);

mutex_lock(&scmi_requested_devices_mtx);
phead = idr_find(&scmi_requested_devices, protocol);
@@ -462,9 +474,20 @@ struct scmi_device *scmi_device_create(struct device_node *np,
list_for_each_entry(rdev, phead, node) {
struct scmi_device *sdev;

+ if (compatible) {
+ if (!rdev->id_table->compatible)
+ continue;
+ if (strcmp(compatible, rdev->id_table->compatible))
+ continue;
+ } else {
+ if (rdev->id_table->compatible)
+ continue;
+ }
+
sdev = __scmi_device_create(np, parent,
rdev->id_table->protocol_id,
- rdev->id_table->name);
+ rdev->id_table->name,
+ rdev->id_table->compatible);
/* Report errors and carry on... */
if (sdev)
scmi_dev = sdev;
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 00b165d1f502..ac0d83ed5803 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -149,7 +149,7 @@ extern struct blocking_notifier_head scmi_requested_devices_nh;

struct scmi_device *scmi_device_create(struct device_node *np,
struct device *parent, int protocol,
- const char *name);
+ const char *name, const char *compatible);
void scmi_device_destroy(struct device *parent, int protocol, const char *name);

int scmi_protocol_acquire(const struct scmi_handle *handle, u8 protocol_id);
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 4c3752749105..b78fce62a0de 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -261,15 +261,17 @@ EXPORT_SYMBOL_GPL(scmi_protocol_unregister);
* @name: The optional name of the device to be created: if not provided this
* call will lead to the creation of all the devices currently requested
* for the specified protocol.
+ * @compatible: optional, the compatible string
*/
static void scmi_create_protocol_devices(struct device_node *np,
struct scmi_info *info,
- int prot_id, const char *name)
+ int prot_id, const char *name,
+ const char *compatible)
{
struct scmi_device *sdev;

mutex_lock(&info->devreq_mtx);
- sdev = scmi_device_create(np, info->dev, prot_id, name);
+ sdev = scmi_device_create(np, info->dev, prot_id, name, compatible);
if (name && !sdev)
dev_err(info->dev,
"failed to create device for protocol 0x%X (%s)\n",
@@ -2354,7 +2356,7 @@ static int scmi_chan_setup(struct scmi_info *info, struct device_node *of_node,
snprintf(name, 32, "__scmi_transport_device_%s_%02X",
idx ? "rx" : "tx", prot_id);
/* Create a uniquely named, dedicated transport device for this chan */
- tdev = scmi_device_create(of_node, info->dev, prot_id, name);
+ tdev = scmi_device_create(of_node, info->dev, prot_id, name, NULL);
if (!tdev) {
dev_err(info->dev,
"failed to create transport device (%s)\n", name);
@@ -2550,7 +2552,7 @@ static int scmi_device_request_notifier(struct notifier_block *nb,
switch (action) {
case SCMI_BUS_NOTIFY_DEVICE_REQUEST:
scmi_create_protocol_devices(np, info, id_table->protocol_id,
- id_table->name);
+ id_table->name, id_table->compatible);
break;
case SCMI_BUS_NOTIFY_DEVICE_UNREQUEST:
scmi_destroy_protocol_devices(info, id_table->protocol_id,
@@ -2802,10 +2804,13 @@ static int scmi_probe(struct platform_device *pdev)

for_each_available_child_of_node(np, child) {
u32 prot_id;
+ const char *s = NULL;

if (of_property_read_u32(child, "reg", &prot_id))
continue;

+ of_property_read_string(child, "compatible", &s);
+
if (!FIELD_FIT(MSG_PROTOCOL_ID_MASK, prot_id))
dev_err(dev, "Out of range protocol %d\n", prot_id);

@@ -2828,7 +2833,7 @@ static int scmi_probe(struct platform_device *pdev)
}

of_node_get(child);
- scmi_create_protocol_devices(child, info, prot_id, NULL);
+ scmi_create_protocol_devices(child, info, prot_id, NULL, s);
}

return 0;
diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h
index d8e2bb828ee7..ee7b77eb9466 100644
--- a/include/linux/scmi_protocol.h
+++ b/include/linux/scmi_protocol.h
@@ -912,6 +912,7 @@ struct scmi_device {
u32 id;
u8 protocol_id;
const char *name;
+ const char *compatible; /* Optional */
struct device dev;
struct scmi_handle *handle;
};
@@ -921,6 +922,7 @@ struct scmi_device {
struct scmi_device_id {
u8 protocol_id;
const char *name;
+ const char *compatible; /* Optional */
};

struct scmi_driver {

--
2.37.1