firmware: arm_scmi: Add receive buffer support for notifications

With all the plumbing in place, let's just add the separate dedicated
receive buffers to handle notifications that can arrive asynchronously
from the platform firmware to OS.

Also add one check to see if the platform supports any receive channels
before allocating the receive buffers: since those buffers are optionally
supported though, the whole xfer initialization is also postponed to be
able to check for their existence in advance.

Link: https://lore.kernel.org/r/20200327143438.5382-2-cristian.marussi@arm.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
[Changed parameters in __scmi_xfer_info_init()]
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/driver.c b/drivers/firmware/arm_scmi/driver.c
index 6ef61e52eef74b06e5677697bee42c23d77c7131..ba9617dbe93f85f73e4db4ff52db3962073da11d 100644 (file)
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -76,6 +76,7 @@ struct scmi_xfers_info {
  *     implementation version and (sub-)vendor identification.
  * @handle: Instance of SCMI handle to send to clients
  * @tx_minfo: Universal Transmit Message management info
+ * @rx_minfo: Universal Receive Message management info
  * @tx_idr: IDR object to map protocol id to Tx channel info pointer
  * @rx_idr: IDR object to map protocol id to Rx channel info pointer
  * @protocols_imp: List of protocols implemented, currently maximum of
@@ -89,6 +90,7 @@ struct scmi_info {
        struct scmi_revision_info version;
        struct scmi_handle handle;
        struct scmi_xfers_info tx_minfo;
+       struct scmi_xfers_info rx_minfo;
        struct idr tx_idr;
        struct idr rx_idr;
        u8 *protocols_imp;
@@ -525,13 +527,13 @@ int scmi_handle_put(const struct scmi_handle *handle)
        return 0;
 }
 
-static int scmi_xfer_info_init(struct scmi_info *sinfo)
+static int __scmi_xfer_info_init(struct scmi_info *sinfo,
+                                struct scmi_xfers_info *info)
 {
        int i;
        struct scmi_xfer *xfer;
        struct device *dev = sinfo->dev;
        const struct scmi_desc *desc = sinfo->desc;
-       struct scmi_xfers_info *info = &sinfo->tx_minfo;
 
        /* Pre-allocated messages, no more than what hdr.seq can support */
        if (WARN_ON(desc->max_msg >= MSG_TOKEN_MAX)) {
@@ -566,6 +568,16 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo)
        return 0;
 }
 
+static int scmi_xfer_info_init(struct scmi_info *sinfo)
+{
+       int ret = __scmi_xfer_info_init(sinfo, &sinfo->tx_minfo);
+
+       if (!ret && idr_find(&sinfo->rx_idr, SCMI_PROTOCOL_BASE))
+               ret = __scmi_xfer_info_init(sinfo, &sinfo->rx_minfo);
+
+       return ret;
+}
+
 static int scmi_chan_setup(struct scmi_info *info, struct device *dev,
                           int prot_id, bool tx)
 {
@@ -699,10 +711,6 @@ static int scmi_probe(struct platform_device *pdev)
        info->desc = desc;
        INIT_LIST_HEAD(&info->node);
 
-       ret = scmi_xfer_info_init(info);
-       if (ret)
-               return ret;
-
        platform_set_drvdata(pdev, info);
        idr_init(&info->tx_idr);
        idr_init(&info->rx_idr);
@@ -715,6 +723,10 @@ static int scmi_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
+       ret = scmi_xfer_info_init(info);
+       if (ret)
+               return ret;
+
        ret = scmi_base_protocol_init(handle);
        if (ret) {
                dev_err(dev, "unable to communicate with SCMI(%d)\n", ret);