From: Alex Elder <elder@linaro.org>
To: andy.gross@linaro.org
Cc: clew@codeaurora.org, aneela@codeaurora.org,
david.brown@linaro.org, linux-arm-msm@vger.kernel.org,
linux-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 02/12] soc: qcom: smem: initialize region struct only when successful
Date: Tue, 1 May 2018 20:10:09 -0500 [thread overview]
Message-ID: <20180502011019.22812-3-elder@linaro.org> (raw)
In-Reply-To: <20180502011019.22812-1-elder@linaro.org>
Hold off initializing anything for the array entry representing a
memory region in qcom_smem_map_memory() until we know we've
successfully mapped it.
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/soc/qcom/smem.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index c46bb43c0f3d..d8008bf480a4 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -887,6 +887,7 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev,
{
struct device_node *np;
struct resource r;
+ resource_size_t size;
int ret;
np = of_parse_phandle(dev->of_node, name, 0);
@@ -899,12 +900,13 @@ static int qcom_smem_map_memory(struct qcom_smem *smem, struct device *dev,
of_node_put(np);
if (ret)
return ret;
+ size = resource_size(&r);
- smem->regions[i].aux_base = (u32)r.start;
- smem->regions[i].size = resource_size(&r);
- smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, resource_size(&r));
+ smem->regions[i].virt_base = devm_ioremap_wc(dev, r.start, size);
if (!smem->regions[i].virt_base)
return -ENOMEM;
+ smem->regions[i].aux_base = (u32)r.start;
+ smem->regions[i].size = size;
return 0;
}
--
2.14.1
next prev parent reply other threads:[~2018-05-02 1:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-02 1:10 [PATCH 00/12] soc: qcom: smem: some refactoring Alex Elder
2018-05-02 1:10 ` [PATCH 01/12] soc: qcom: smem: rename variable in qcom_smem_get_global() Alex Elder
2018-05-02 1:10 ` Alex Elder [this message]
2018-05-02 1:10 ` [PATCH 03/12] soc: qcom: smem: always ignore partitions with 0 offset or size Alex Elder
2018-05-02 1:10 ` [PATCH 04/12] soc: qcom: smem: small refactor in qcom_smem_enumerate_partitions() Alex Elder
2018-05-02 1:10 ` [PATCH 05/12] soc: qcom: smem: verify both host ids in partition header Alex Elder
2018-05-02 1:10 ` [PATCH 06/12] soc: qcom: smem: require order of host ids to match Alex Elder
2018-05-02 1:10 ` [PATCH 07/12] soc: qcom: smem: introduce qcom_smem_partition_header() Alex Elder
2018-05-02 1:10 ` [PATCH 08/12] soc: qcom: smem: verify partition header size Alex Elder
2018-05-02 1:10 ` [PATCH 09/12] soc: qcom: smem: verify partition offset_free_uncached Alex Elder
2018-05-02 1:10 ` [PATCH 10/12] soc: qcom: smem: small change in global entry loop Alex Elder
2018-05-02 1:10 ` [PATCH 11/12] soc: qcom: smem: verify partition host ids match Alex Elder
2018-05-02 1:10 ` [PATCH 12/12] soc: qcom: smem: a few last cleanups Alex Elder
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=20180502011019.22812-3-elder@linaro.org \
--to=elder@linaro.org \
--cc=andy.gross@linaro.org \
--cc=aneela@codeaurora.org \
--cc=clew@codeaurora.org \
--cc=david.brown@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox