* [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id
@ 2021-06-08 14:01 Sudeep Holla
2021-06-08 14:56 ` Cristian Marussi
2021-06-09 20:47 ` Sudeep Holla
0 siblings, 2 replies; 3+ messages in thread
From: Sudeep Holla @ 2021-06-08 14:01 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Sudeep Holla, Cristian Marussi
Since the hdr->protocol_id is set from the scmi_protocol_instance handle
just before the transfer, there is no need to initialise the same in
scmi_xfer_get_init. Remove the unnecessary initialisations.
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/firmware/arm_scmi/driver.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 80010d3f5975..1b446d076b12 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -432,9 +432,9 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
struct scmi_chan_info *cinfo;
/*
- * Re-instate protocol id here from protocol handle so that cannot be
+ * Initialise protocol id now from protocol handle to avoid it being
* overridden by mistake (or malice) by the protocol code mangling with
- * the scmi_xfer structure.
+ * the scmi_xfer structure prior to this.
*/
xfer->hdr.protocol_id = pi->proto->id;
reinit_completion(&xfer->done);
@@ -512,8 +512,6 @@ static int do_xfer_with_response(const struct scmi_protocol_handle *ph,
const struct scmi_protocol_instance *pi = ph_to_pi(ph);
DECLARE_COMPLETION_ONSTACK(async_response);
- xfer->hdr.protocol_id = pi->proto->id;
-
xfer->async_done = &async_response;
ret = do_xfer(ph, xfer);
@@ -569,7 +567,6 @@ static int xfer_get_init(const struct scmi_protocol_handle *ph,
xfer->tx.len = tx_size;
xfer->rx.len = rx_size ? : info->desc->max_msg_size;
xfer->hdr.id = msg_id;
- xfer->hdr.protocol_id = pi->proto->id;
xfer->hdr.poll_completion = false;
*p = xfer;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id
2021-06-08 14:01 [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id Sudeep Holla
@ 2021-06-08 14:56 ` Cristian Marussi
2021-06-09 20:47 ` Sudeep Holla
1 sibling, 0 replies; 3+ messages in thread
From: Cristian Marussi @ 2021-06-08 14:56 UTC (permalink / raw)
To: Sudeep Holla; +Cc: linux-arm-kernel
Hi,
On Tue, Jun 08, 2021 at 03:01:40PM +0100, Sudeep Holla wrote:
> Since the hdr->protocol_id is set from the scmi_protocol_instance handle
> just before the transfer, there is no need to initialise the same in
> scmi_xfer_get_init. Remove the unnecessary initialisations.
>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
> drivers/firmware/arm_scmi/driver.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
> index 80010d3f5975..1b446d076b12 100644
> --- a/drivers/firmware/arm_scmi/driver.c
> +++ b/drivers/firmware/arm_scmi/driver.c
> @@ -432,9 +432,9 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
> struct scmi_chan_info *cinfo;
>
> /*
> - * Re-instate protocol id here from protocol handle so that cannot be
> + * Initialise protocol id now from protocol handle to avoid it being
> * overridden by mistake (or malice) by the protocol code mangling with
> - * the scmi_xfer structure.
> + * the scmi_xfer structure prior to this.
> */
> xfer->hdr.protocol_id = pi->proto->id;
> reinit_completion(&xfer->done);
> @@ -512,8 +512,6 @@ static int do_xfer_with_response(const struct scmi_protocol_handle *ph,
> const struct scmi_protocol_instance *pi = ph_to_pi(ph);
This stale unused pi now causing a Warning.
> DECLARE_COMPLETION_ONSTACK(async_response);
>
> - xfer->hdr.protocol_id = pi->proto->id;
> -
> xfer->async_done = &async_response;
>
> ret = do_xfer(ph, xfer);
> @@ -569,7 +567,6 @@ static int xfer_get_init(const struct scmi_protocol_handle *ph,
> xfer->tx.len = tx_size;
> xfer->rx.len = rx_size ? : info->desc->max_msg_size;
> xfer->hdr.id = msg_id;
> - xfer->hdr.protocol_id = pi->proto->id;
> xfer->hdr.poll_completion = false;
>
> *p = xfer;
LGTM, other that the warning above, and tested fine too.
Reviewed-by: Cristian Marussi <cristian.marussi@arm.com>
Tested-by: Cristian Marussi <cristian.marussi@arm.com>
Thanks,
Cristian
> --
> 2.25.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id
2021-06-08 14:01 [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id Sudeep Holla
2021-06-08 14:56 ` Cristian Marussi
@ 2021-06-09 20:47 ` Sudeep Holla
1 sibling, 0 replies; 3+ messages in thread
From: Sudeep Holla @ 2021-06-09 20:47 UTC (permalink / raw)
To: linux-arm-kernel, Sudeep Holla; +Cc: Cristian Marussi
On Tue, 8 Jun 2021 15:01:40 +0100, Sudeep Holla wrote:
> Since the hdr->protocol_id is set from the scmi_protocol_instance handle
> just before the transfer, there is no need to initialise the same in
> scmi_xfer_get_init. Remove the unnecessary initialisations.
Applied to sudeep.holla/linux (master), thanks!
[1/1] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id
https://git.kernel.org/sudeep.holla/c/61832b35b4
--
Regards,
Sudeep
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-09 20:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 14:01 [PATCH] firmware: arm_scmi: Avoid multiple initialisations of hdr->protocol_id Sudeep Holla
2021-06-08 14:56 ` Cristian Marussi
2021-06-09 20:47 ` Sudeep Holla
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.