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 12/12] soc: qcom: smem: a few last cleanups
Date: Tue, 1 May 2018 20:10:19 -0500 [thread overview]
Message-ID: <20180502011019.22812-13-elder@linaro.org> (raw)
In-Reply-To: <20180502011019.22812-1-elder@linaro.org>
This patch contains several small cleanups:
- In qcom_smem_enumerate_partitions(), change the "local_host"
argument to have 16 bit unsigned type
- Also in qcom_smem_enumerate_partitions(), change the type of
the "host0" and "host1" local variables to be u16
- Fix error messages reporting host ids to use the right format
specifier
- Shorten the error messages as well, to fit on one line
- Add a compile-time check to ensure the local host value passed
to qcom_smem_enumerate_partitions() is in range
Signed-off-by: Alex Elder <elder@linaro.org>
---
drivers/soc/qcom/smem.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 7383a0e1b468..0d7f369c3f7a 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -819,14 +819,14 @@ static int qcom_smem_set_global_partition(struct qcom_smem *smem)
return 0;
}
-static int qcom_smem_enumerate_partitions(struct qcom_smem *smem,
- unsigned int local_host)
+static int
+qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
{
struct smem_partition_header *header;
struct smem_ptable_entry *entry;
struct smem_ptable *ptable;
unsigned int remote_host;
- u32 host0, host1;
+ u16 host0, host1;
int i;
ptable = qcom_smem_get_ptable(smem);
@@ -850,16 +850,12 @@ static int qcom_smem_enumerate_partitions(struct qcom_smem *smem,
continue;
if (remote_host >= SMEM_HOST_COUNT) {
- dev_err(smem->dev,
- "Invalid remote host %d\n",
- remote_host);
+ dev_err(smem->dev, "bad host %hu\n", remote_host);
return -EINVAL;
}
if (smem->partitions[remote_host]) {
- dev_err(smem->dev,
- "Already found a partition for host %d\n",
- remote_host);
+ dev_err(smem->dev, "duplicate host %hu\n", remote_host);
return -EINVAL;
}
@@ -956,6 +952,7 @@ static int qcom_smem_probe(struct platform_device *pdev)
return -EINVAL;
}
+ BUILD_BUG_ON(SMEM_HOST_APPS >= SMEM_HOST_COUNT);
ret = qcom_smem_enumerate_partitions(smem, SMEM_HOST_APPS);
if (ret < 0 && ret != -ENOENT)
return ret;
--
2.14.1
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 ` [PATCH 02/12] soc: qcom: smem: initialize region struct only when successful Alex Elder
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 ` Alex Elder [this message]
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-13-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