All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com,
	Jonathan.Cameron@Huawei.com, f.fainelli@gmail.com,
	etienne.carriere@linaro.org, vincent.guittot@linaro.org,
	souvik.chakravarty@arm.com, peter.hilber@opensynergy.com,
	igor.skalkin@opensynergy.com, cristian.marussi@arm.com
Subject: [PATCH v5 01/13] firmware: arm_scmi: Perform earlier cinfo lookup call in do_xfer
Date: Thu, 23 Sep 2021 15:57:50 +0100	[thread overview]
Message-ID: <20210923145802.50938-2-cristian.marussi@arm.com> (raw)
In-Reply-To: <20210923145802.50938-1-cristian.marussi@arm.com>

Lookup cinfo data early in do_xfer so as to avoid any further init work
on xfer structure in case of error.

No functional change.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
 drivers/firmware/arm_scmi/driver.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index b406b3f78f46..01c79a8fa77f 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -766,6 +766,10 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
 		return -EINVAL;
 	}
 
+	cinfo = idr_find(&info->tx_idr, pi->proto->id);
+	if (unlikely(!cinfo))
+		return -EINVAL;
+
 	/*
 	 * Initialise protocol id now from protocol handle to avoid it being
 	 * overridden by mistake (or malice) by the protocol code mangling with
@@ -774,10 +778,6 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
 	xfer->hdr.protocol_id = pi->proto->id;
 	reinit_completion(&xfer->done);
 
-	cinfo = idr_find(&info->tx_idr, xfer->hdr.protocol_id);
-	if (unlikely(!cinfo))
-		return -EINVAL;
-
 	trace_scmi_xfer_begin(xfer->transfer_id, xfer->hdr.id,
 			      xfer->hdr.protocol_id, xfer->hdr.seq,
 			      xfer->hdr.poll_completion);
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, james.quinlan@broadcom.com,
	Jonathan.Cameron@Huawei.com, f.fainelli@gmail.com,
	etienne.carriere@linaro.org, vincent.guittot@linaro.org,
	souvik.chakravarty@arm.com, peter.hilber@opensynergy.com,
	igor.skalkin@opensynergy.com, cristian.marussi@arm.com
Subject: [PATCH v5 01/13] firmware: arm_scmi: Perform earlier cinfo lookup call in do_xfer
Date: Thu, 23 Sep 2021 15:57:50 +0100	[thread overview]
Message-ID: <20210923145802.50938-2-cristian.marussi@arm.com> (raw)
In-Reply-To: <20210923145802.50938-1-cristian.marussi@arm.com>

Lookup cinfo data early in do_xfer so as to avoid any further init work
on xfer structure in case of error.

No functional change.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
 drivers/firmware/arm_scmi/driver.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index b406b3f78f46..01c79a8fa77f 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -766,6 +766,10 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
 		return -EINVAL;
 	}
 
+	cinfo = idr_find(&info->tx_idr, pi->proto->id);
+	if (unlikely(!cinfo))
+		return -EINVAL;
+
 	/*
 	 * Initialise protocol id now from protocol handle to avoid it being
 	 * overridden by mistake (or malice) by the protocol code mangling with
@@ -774,10 +778,6 @@ static int do_xfer(const struct scmi_protocol_handle *ph,
 	xfer->hdr.protocol_id = pi->proto->id;
 	reinit_completion(&xfer->done);
 
-	cinfo = idr_find(&info->tx_idr, xfer->hdr.protocol_id);
-	if (unlikely(!cinfo))
-		return -EINVAL;
-
 	trace_scmi_xfer_begin(xfer->transfer_id, xfer->hdr.id,
 			      xfer->hdr.protocol_id, xfer->hdr.seq,
 			      xfer->hdr.poll_completion);
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2021-09-23 14:58 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-23 14:57 [PATCH v5 0/13] Introduce atomic support for SCMI transports Cristian Marussi
2021-09-23 14:57 ` Cristian Marussi
2021-09-23 14:57 ` Cristian Marussi [this message]
2021-09-23 14:57   ` [PATCH v5 01/13] firmware: arm_scmi: Perform earlier cinfo lookup call in do_xfer Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 02/13] firmware: arm_scmi: Add configurable polling mode for transports Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 03/13] firmware: arm_scmi: Add forced polling support to mailbox transport Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 04/13] firmware: arm_scmi: Add support for atomic transports Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 05/13] include: trace: Add new scmi_xfer_response_wait event Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 06/13] firmware: arm_scmi: Use new trace event scmi_xfer_response_wait Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 07/13] firmware: arm_scmi: Add is_transport_atomic() handle method Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 08/13] clk: scmi: Support atomic enable/disable API Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 09/13] firmware: arm_scmi: Add atomic mode support to virtio transport Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:57 ` [PATCH v5 10/13] firmware: arm_scmi: Make smc transport use common completions Cristian Marussi
2021-09-23 14:57   ` Cristian Marussi
2021-09-23 14:58 ` [PATCH v5 11/13] firmware: arm_scmi: Add atomic mode support to smc transport Cristian Marussi
2021-09-23 14:58   ` Cristian Marussi
2021-09-23 14:58 ` [PATCH v5 12/13] firmware: arm_scmi: Add sync_cmds_atomic_replies transport flag Cristian Marussi
2021-09-23 14:58   ` Cristian Marussi
2021-09-23 14:58 ` [PATCH v5 13/13] firmware: arm_scmi: Make smc support atomic sync commands replies Cristian Marussi
2021-09-23 14:58   ` Cristian Marussi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210923145802.50938-2-cristian.marussi@arm.com \
    --to=cristian.marussi@arm.com \
    --cc=Jonathan.Cameron@Huawei.com \
    --cc=etienne.carriere@linaro.org \
    --cc=f.fainelli@gmail.com \
    --cc=igor.skalkin@opensynergy.com \
    --cc=james.quinlan@broadcom.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.hilber@opensynergy.com \
    --cc=souvik.chakravarty@arm.com \
    --cc=sudeep.holla@arm.com \
    --cc=vincent.guittot@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.