From: Sudeep Holla <[email protected]>
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.
Signed-off-by: Sudeep Holla <[email protected]>
[Changed parameters in __scmi_xfer_info_init()]
Signed-off-by: Cristian Marussi <[email protected]>
---
V1 --> V2:
- reviewed commit message
- reviewed parameters of __scmi_xfer_info_init()
---
drivers/firmware/arm_scmi/driver.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index dbec767222e9..efb660c34b57 100644
--- 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);
--
2.17.1
On Mon, 24 Feb 2020 14:41:12 +0000
Cristian Marussi <[email protected]> wrote:
> From: Sudeep Holla <[email protected]>
>
> 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.
>
> Signed-off-by: Sudeep Holla <[email protected]>
> [Changed parameters in __scmi_xfer_info_init()]
> Signed-off-by: Cristian Marussi <[email protected]>
Looks good to me.
Reviewed-by: Jonathan Cameron <[email protected]>
> ---
> V1 --> V2:
> - reviewed commit message
> - reviewed parameters of __scmi_xfer_info_init()
> ---
> drivers/firmware/arm_scmi/driver.c | 24 ++++++++++++++++++------
> 1 file changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
> index dbec767222e9..efb660c34b57 100644
> --- 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);
On 02/03/2020 14:52, Jonathan Cameron wrote:
> On Mon, 24 Feb 2020 14:41:12 +0000
> Cristian Marussi <[email protected]> wrote:
>
>> From: Sudeep Holla <[email protected]>
>>
>> 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.
>>
>> Signed-off-by: Sudeep Holla <[email protected]>
>> [Changed parameters in __scmi_xfer_info_init()]
>> Signed-off-by: Cristian Marussi <[email protected]>
> Looks good to me.
>
> Reviewed-by: Jonathan Cameron <[email protected]>
>
Thanks for the review.
As a side note, in a couple of days I'm going to push out a v4, which beside trying to
address some concern from Jim regarding the number of memcopies, it will review drastically
subsystem initialization and partially also the locking strategy to address some known issues
present in v3 (which could be exposed loading SCMI protocols as modules in a deferred way).
In short, be aware that, the implementation in patches 05/06/07/08 will be radically different
in the upcoming series.
Regards
Cristian
>> ---
>> V1 --> V2:
>> - reviewed commit message
>> - reviewed parameters of __scmi_xfer_info_init()
>> ---
>> drivers/firmware/arm_scmi/driver.c | 24 ++++++++++++++++++------
>> 1 file changed, 18 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
>> index dbec767222e9..efb660c34b57 100644
>> --- 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);
>
>