When the CCF is activated, the dev->parent is not necessary
the reference to SCMI transport and the function devm_scmi_of_get_channel
failed for the registered SCMI clock, child for protocol@14,
the channel is null and the SCMI clock driver crash for any operations.
This patch changes the first parameter of the ops of_get_channel(),
aligned with other process_msg() to pass directly the good reference,
i.e. parent result of find_scmi_transport_device(dev)
which return the reference of the scmi transport device.
Fixes: 8e96801aa6a ("firmware: scmi: add multi-channel support")
Signed-off-by: Patrick Delaunay <patrick.delau...@foss.st.com>
---
drivers/firmware/scmi/mailbox_agent.c | 2 +-
drivers/firmware/scmi/optee_agent.c | 2 +-
drivers/firmware/scmi/scmi_agent-uclass.c | 2 +-
drivers/firmware/scmi/smccc_agent.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/scmi/mailbox_agent.c
b/drivers/firmware/scmi/mailbox_agent.c
index 3efdab9e723..8277c186060 100644
--- a/drivers/firmware/scmi/mailbox_agent.c
+++ b/drivers/firmware/scmi/mailbox_agent.c
@@ -96,7 +96,7 @@ static int setup_channel(struct udevice *dev, struct
scmi_mbox_channel *chan)
static int scmi_mbox_get_channel(struct udevice *dev,
struct scmi_channel **channel)
{
- struct scmi_mbox_channel *base_chan = dev_get_plat(dev->parent);
+ struct scmi_mbox_channel *base_chan = dev_get_plat(dev);
struct scmi_mbox_channel *chan;
int ret;
diff --git a/drivers/firmware/scmi/optee_agent.c
b/drivers/firmware/scmi/optee_agent.c
index 2b2b8c1670a..db927fb2140 100644
--- a/drivers/firmware/scmi/optee_agent.c
+++ b/drivers/firmware/scmi/optee_agent.c
@@ -326,7 +326,7 @@ static int setup_channel(struct udevice *dev, struct
scmi_optee_channel *chan)
static int scmi_optee_get_channel(struct udevice *dev,
struct scmi_channel **channel)
{
- struct scmi_optee_channel *base_chan = dev_get_plat(dev->parent);
+ struct scmi_optee_channel *base_chan = dev_get_plat(dev);
struct scmi_optee_channel *chan;
u32 channel_id;
int ret;
diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c
b/drivers/firmware/scmi/scmi_agent-uclass.c
index 2b6211c4e6a..5c98a304a22 100644
--- a/drivers/firmware/scmi/scmi_agent-uclass.c
+++ b/drivers/firmware/scmi/scmi_agent-uclass.c
@@ -137,7 +137,7 @@ int devm_scmi_of_get_channel(struct udevice *dev, struct
scmi_channel **channel)
return -ENODEV;
if (transport_dev_ops(parent)->of_get_channel)
- return transport_dev_ops(parent)->of_get_channel(dev, channel);
+ return transport_dev_ops(parent)->of_get_channel(parent,
channel);
/* Drivers without a get_channel operator don't need a channel ref */
*channel = NULL;
diff --git a/drivers/firmware/scmi/smccc_agent.c
b/drivers/firmware/scmi/smccc_agent.c
index bc2eb67335b..6a52cd75d67 100644
--- a/drivers/firmware/scmi/smccc_agent.c
+++ b/drivers/firmware/scmi/smccc_agent.c
@@ -83,7 +83,7 @@ static int setup_channel(struct udevice *dev, struct
scmi_smccc_channel *chan)
static int scmi_smccc_get_channel(struct udevice *dev,
struct scmi_channel **channel)
{
- struct scmi_smccc_channel *base_chan = dev_get_plat(dev->parent);
+ struct scmi_smccc_channel *base_chan = dev_get_plat(dev);
struct scmi_smccc_channel *chan;
u32 func_id;
int ret;
--
2.25.1
