firmware: arm_scmi: Make protocols initialisation fail on basic errors

Bail out of protocol initialisation routine early when basic information
about protocol version and attributes could not be retrieved. Failing to
act this way can lead to a successfully initialized SCMI protocol which
is in fact not fully functional.

Link: https://lore.kernel.org/r/20220330150551.2573938-3-cristian.marussi@arm.com
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c
index f5219334fd3a56cf68fe8e3a28e55905d43a93a7..ebaef5d320afda9c03abc0ece983accf4ac4caaf 100644 (file)
--- a/drivers/firmware/arm_scmi/base.c
+++ b/drivers/firmware/arm_scmi/base.c
@@ -359,7 +359,10 @@ static int scmi_base_protocol_init(const struct scmi_protocol_handle *ph)
        rev->minor_ver = PROTOCOL_REV_MINOR(version);
        ph->set_priv(ph, rev);
 
-       scmi_base_attributes_get(ph);
+       ret = scmi_base_attributes_get(ph);
+       if (ret)
+               return ret;
+
        scmi_base_vendor_id_get(ph, false);
        scmi_base_vendor_id_get(ph, true);
        scmi_base_implementation_version_get(ph);

diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c
index 45600acc0f455e55be81b75ec0cbebe3fc9a119e..9f610206cbb8f3df9e15253703157c0c02628ef8 100644 (file)
--- a/drivers/firmware/arm_scmi/clock.c
+++ b/drivers/firmware/arm_scmi/clock.c
@@ -361,7 +361,9 @@ static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph)
        int clkid, ret;
        struct clock_info *cinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "Clock Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));
@@ -370,7 +372,9 @@ static int scmi_clock_protocol_init(const struct scmi_protocol_handle *ph)
        if (!cinfo)
                return -ENOMEM;
 
-       scmi_clock_protocol_attributes_get(ph, cinfo);
+       ret = scmi_clock_protocol_attributes_get(ph, cinfo);
+       if (ret)
+               return ret;
 
        cinfo->clk = devm_kcalloc(ph->dev, cinfo->num_clocks,
                                  sizeof(*cinfo->clk), GFP_KERNEL);

diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c
index f4cd5193b9617f8ed70bd3d5fd10d24573130c96..e9f68b91580cc2f54d808c04e70197dcbfafcc88 100644 (file)
--- a/drivers/firmware/arm_scmi/perf.c
+++ b/drivers/firmware/arm_scmi/perf.c
@@ -873,11 +873,13 @@ static const struct scmi_protocol_events perf_protocol_events = {
 
 static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph)
 {
-       int domain;
+       int domain, ret;
        u32 version;
        struct scmi_perf_info *pinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "Performance Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));
@@ -886,7 +888,9 @@ static int scmi_perf_protocol_init(const struct scmi_protocol_handle *ph)
        if (!pinfo)
                return -ENOMEM;
 
-       scmi_perf_attributes_get(ph, pinfo);
+       ret = scmi_perf_attributes_get(ph, pinfo);
+       if (ret)
+               return ret;
 
        pinfo->dom_info = devm_kcalloc(ph->dev, pinfo->num_domains,
                                       sizeof(*pinfo->dom_info), GFP_KERNEL);

diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c
index ad2ab080f3443c251153fa606f2f4fd53e369655..0f0b94f0b624aacdde83c33891c1c1a7f914c4c4 100644 (file)
--- a/drivers/firmware/arm_scmi/power.c
+++ b/drivers/firmware/arm_scmi/power.c
@@ -280,11 +280,13 @@ static const struct scmi_protocol_events power_protocol_events = {
 
 static int scmi_power_protocol_init(const struct scmi_protocol_handle *ph)
 {
-       int domain;
+       int domain, ret;
        u32 version;
        struct scmi_power_info *pinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "Power Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));
@@ -293,7 +295,9 @@ static int scmi_power_protocol_init(const struct scmi_protocol_handle *ph)
        if (!pinfo)
                return -ENOMEM;
 
-       scmi_power_attributes_get(ph, pinfo);
+       ret = scmi_power_attributes_get(ph, pinfo);
+       if (ret)
+               return ret;
 
        pinfo->dom_info = devm_kcalloc(ph->dev, pinfo->num_domains,
                                       sizeof(*pinfo->dom_info), GFP_KERNEL);

diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c
index 9bf2478ec6d1765d81e8afafc8b9ec4df0b74ebc..9cdbd133db10e12261d31a2d6c9b0f7e39408035 100644 (file)
--- a/drivers/firmware/arm_scmi/reset.c
+++ b/drivers/firmware/arm_scmi/reset.c
@@ -293,11 +293,13 @@ static const struct scmi_protocol_events reset_protocol_events = {
 
 static int scmi_reset_protocol_init(const struct scmi_protocol_handle *ph)
 {
-       int domain;
+       int domain, ret;
        u32 version;
        struct scmi_reset_info *pinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "Reset Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));
@@ -306,7 +308,9 @@ static int scmi_reset_protocol_init(const struct scmi_protocol_handle *ph)
        if (!pinfo)
                return -ENOMEM;
 
-       scmi_reset_attributes_get(ph, pinfo);
+       ret = scmi_reset_attributes_get(ph, pinfo);
+       if (ret)
+               return ret;
 
        pinfo->dom_info = devm_kcalloc(ph->dev, pinfo->num_domains,
                                       sizeof(*pinfo->dom_info), GFP_KERNEL);

diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c
index cdbb287bd8bcd4d8da9d01bb81ff35f5139d1505..f37ac9824a8730a1d8d48f5910510be3eae70d4e 100644 (file)
--- a/drivers/firmware/arm_scmi/sensors.c
+++ b/drivers/firmware/arm_scmi/sensors.c
@@ -966,7 +966,9 @@ static int scmi_sensors_protocol_init(const struct scmi_protocol_handle *ph)
        int ret;
        struct sensors_info *sinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "Sensor Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));

diff --git a/drivers/firmware/arm_scmi/system.c b/drivers/firmware/arm_scmi/system.c
index e5175ef73b40e0d0375466f647203dd91299f3eb..cbfc19f7a463dafc0e3302ce46e4d264d7baaa00 100644 (file)
--- a/drivers/firmware/arm_scmi/system.c
+++ b/drivers/firmware/arm_scmi/system.c
@@ -113,10 +113,13 @@ static const struct scmi_protocol_events system_protocol_events = {
 
 static int scmi_system_protocol_init(const struct scmi_protocol_handle *ph)
 {
+       int ret;
        u32 version;
        struct scmi_system_info *pinfo;
 
-       ph->xops->version_get(ph, &version);
+       ret = ph->xops->version_get(ph, &version);
+       if (ret)
+               return ret;
 
        dev_dbg(ph->dev, "System Power Version %d.%d\n",
                PROTOCOL_REV_MAJOR(version), PROTOCOL_REV_MINOR(version));