Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1732590 > unrolled thread
| Started by | Chris Lew <clew@codeaurora.org> |
|---|---|
| First post | 2017-09-14 23:30 +0200 |
| Last post | 2017-09-15 03:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 2/5] soc: qcom: smem: Read version by using the smem header Chris Lew <clew@codeaurora.org> - 2017-09-14 23:30 +0200
Re: [PATCH v2 2/5] soc: qcom: smem: Read version by using the smem header Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-09-15 03:20 +0200
| From | Chris Lew <clew@codeaurora.org> |
|---|---|
| Date | 2017-09-14 23:30 +0200 |
| Subject | [PATCH v2 2/5] soc: qcom: smem: Read version by using the smem header |
| Message-ID | <upJRT-1Rr-1@gated-at.bofh.it> |
The SMEM header structure includes the version information.
Read the version directly from the header instead of getting
an item from the global heap.
Signed-off-by: Chris Lew <clew@codeaurora.org>
---
Changes since v1:
- Remove unused smem item version macro
- Move smem get version change to separate commit
drivers/soc/qcom/smem.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index db04c45d4132..540322ae409e 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -63,13 +63,12 @@
*/
/*
- * Item 3 of the global heap contains an array of versions for the various
- * software components in the SoC. We verify that the boot loader version is
- * what the expected version (SMEM_EXPECTED_VERSION) as a sanity check.
+ * The version member of the smem header contains an array of versions for the
+ * various software components in the SoC. We verify that the boot loader
+ * version is a valid version as a sanity check.
*/
-#define SMEM_ITEM_VERSION 3
-#define SMEM_MASTER_SBL_VERSION_INDEX 7
-#define SMEM_EXPECTED_VERSION 11
+#define SMEM_MASTER_SBL_VERSION_INDEX 7
+#define SMEM_EXPECTED_VERSION 11
/*
* The first 8 items are only to be allocated by the boot loader while
@@ -604,19 +603,11 @@ int qcom_smem_get_free_space(unsigned host)
static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
{
+ struct smem_header *header;
__le32 *versions;
- size_t size;
-
- versions = qcom_smem_get_global(smem, SMEM_ITEM_VERSION, &size);
- if (IS_ERR(versions)) {
- dev_err(smem->dev, "Unable to read the version item\n");
- return -ENOENT;
- }
- if (size < sizeof(unsigned) * SMEM_MASTER_SBL_VERSION_INDEX) {
- dev_err(smem->dev, "Version item is too small\n");
- return -EINVAL;
- }
+ header = smem->regions[0].virt_base;
+ versions = header->version;
return le32_to_cpu(versions[SMEM_MASTER_SBL_VERSION_INDEX]);
}
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
[toc] | [next] | [standalone]
| From | Bjorn Andersson <bjorn.andersson@linaro.org> |
|---|---|
| Date | 2017-09-15 03:20 +0200 |
| Subject | Re: [PATCH v2 2/5] soc: qcom: smem: Read version by using the smem header |
| Message-ID | <upNsu-4eb-13@gated-at.bofh.it> |
| In reply to | #1732590 |
On Thu 14 Sep 14:24 PDT 2017, Chris Lew wrote:
> The SMEM header structure includes the version information.
> Read the version directly from the header instead of getting
> an item from the global heap.
>
> Signed-off-by: Chris Lew <clew@codeaurora.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
>
> Changes since v1:
> - Remove unused smem item version macro
> - Move smem get version change to separate commit
>
> drivers/soc/qcom/smem.c | 25 ++++++++-----------------
> 1 file changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index db04c45d4132..540322ae409e 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -63,13 +63,12 @@
> */
>
> /*
> - * Item 3 of the global heap contains an array of versions for the various
> - * software components in the SoC. We verify that the boot loader version is
> - * what the expected version (SMEM_EXPECTED_VERSION) as a sanity check.
> + * The version member of the smem header contains an array of versions for the
> + * various software components in the SoC. We verify that the boot loader
> + * version is a valid version as a sanity check.
> */
> -#define SMEM_ITEM_VERSION 3
> -#define SMEM_MASTER_SBL_VERSION_INDEX 7
> -#define SMEM_EXPECTED_VERSION 11
> +#define SMEM_MASTER_SBL_VERSION_INDEX 7
> +#define SMEM_EXPECTED_VERSION 11
>
> /*
> * The first 8 items are only to be allocated by the boot loader while
> @@ -604,19 +603,11 @@ int qcom_smem_get_free_space(unsigned host)
>
> static int qcom_smem_get_sbl_version(struct qcom_smem *smem)
> {
> + struct smem_header *header;
> __le32 *versions;
> - size_t size;
> -
> - versions = qcom_smem_get_global(smem, SMEM_ITEM_VERSION, &size);
> - if (IS_ERR(versions)) {
> - dev_err(smem->dev, "Unable to read the version item\n");
> - return -ENOENT;
> - }
>
> - if (size < sizeof(unsigned) * SMEM_MASTER_SBL_VERSION_INDEX) {
> - dev_err(smem->dev, "Version item is too small\n");
> - return -EINVAL;
> - }
> + header = smem->regions[0].virt_base;
> + versions = header->version;
>
> return le32_to_cpu(versions[SMEM_MASTER_SBL_VERSION_INDEX]);
> }
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web