2023-05-29 08:47:35

by Luca Weiss

Subject: [PATCH v3] soc: qcom: ocmem: Add OCMEM hardware version print

It might be useful to know what hardware version of the OCMEM block the
SoC contains. Add a debug print for that.

Signed-off-by: Luca Weiss <[email protected]>
---
This patch is depends on [0] but could also be applied in the other
order, if conflicts are resolved.

[0] https://lore.kernel.org/linux-arm-msm/[email protected]/
---
Changes in v3:
- Use %lu instead of %ld for print (Konrad)
- Re-wrap lines so reading is easier (Konrad)
- Link to v2: https://lore.kernel.org/r/[email protected]

Changes in v2:
- Use FIELD_GET macros for getting correct bits from register (take
wording from mdp5: major, minor, step which hopefully is sort of
accurate)
- Link to v1: https://lore.kernel.org/r/[email protected]
---
drivers/soc/qcom/ocmem.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
index c3e78411c637..ef7c1748242a 100644
--- a/drivers/soc/qcom/ocmem.c
+++ b/drivers/soc/qcom/ocmem.c
@@ -76,6 +76,10 @@ struct ocmem {
#define OCMEM_REG_GFX_MPU_START 0x00001004
#define OCMEM_REG_GFX_MPU_END 0x00001008

+#define OCMEM_HW_VERSION_MAJOR(val) FIELD_GET(GENMASK(31, 28), val)
+#define OCMEM_HW_VERSION_MINOR(val) FIELD_GET(GENMASK(27, 16), val)
+#define OCMEM_HW_VERSION_STEP(val) FIELD_GET(GENMASK(15, 0), val)
+
#define OCMEM_HW_PROFILE_NUM_PORTS(val) FIELD_GET(0x0000000f, (val))
#define OCMEM_HW_PROFILE_NUM_MACROS(val) FIELD_GET(0x00003f00, (val))

@@ -355,6 +359,12 @@ static int ocmem_dev_probe(struct platform_device *pdev)
}
}

+ reg = ocmem_read(ocmem, OCMEM_REG_HW_VERSION);
+ dev_dbg(dev, "OCMEM hardware version: %lu.%lu.%lu\n",
+ OCMEM_HW_VERSION_MAJOR(reg),
+ OCMEM_HW_VERSION_MINOR(reg),
+ OCMEM_HW_VERSION_STEP(reg));
+
reg = ocmem_read(ocmem, OCMEM_REG_HW_PROFILE);
ocmem->num_ports = OCMEM_HW_PROFILE_NUM_PORTS(reg);
ocmem->num_macros = OCMEM_HW_PROFILE_NUM_MACROS(reg);

---
base-commit: 8705151771af822ac794b44504cd72eebc423499
change-id: 20230509-ocmem-hwver-99bcb33b028b

Best regards,
--
Luca Weiss <[email protected]>

2023-05-29 09:31:23

by Konrad Dybcio

Subject: Re: [PATCH v3] soc: qcom: ocmem: Add OCMEM hardware version print

On 29.05.2023 10:41, Luca Weiss wrote:
> It might be useful to know what hardware version of the OCMEM block the
> SoC contains. Add a debug print for that.
>
> Signed-off-by: Luca Weiss <[email protected]>
> ---
> This patch is depends on [0] but could also be applied in the other
> order, if conflicts are resolved.
>
> [0] https://lore.kernel.org/linux-arm-msm/[email protected]/
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> Changes in v3:
> - Use %lu instead of %ld for print (Konrad)
> - Re-wrap lines so reading is easier (Konrad)
> - Link to v2: https://lore.kernel.org/r/[email protected]
>
> Changes in v2:
> - Use FIELD_GET macros for getting correct bits from register (take
> wording from mdp5: major, minor, step which hopefully is sort of
> accurate)
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> drivers/soc/qcom/ocmem.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c
> index c3e78411c637..ef7c1748242a 100644
> --- a/drivers/soc/qcom/ocmem.c
> +++ b/drivers/soc/qcom/ocmem.c
> @@ -76,6 +76,10 @@ struct ocmem {
> #define OCMEM_REG_GFX_MPU_START 0x00001004
> #define OCMEM_REG_GFX_MPU_END 0x00001008
>
> +#define OCMEM_HW_VERSION_MAJOR(val) FIELD_GET(GENMASK(31, 28), val)
> +#define OCMEM_HW_VERSION_MINOR(val) FIELD_GET(GENMASK(27, 16), val)
> +#define OCMEM_HW_VERSION_STEP(val) FIELD_GET(GENMASK(15, 0), val)
> +
> #define OCMEM_HW_PROFILE_NUM_PORTS(val) FIELD_GET(0x0000000f, (val))
> #define OCMEM_HW_PROFILE_NUM_MACROS(val) FIELD_GET(0x00003f00, (val))
>
> @@ -355,6 +359,12 @@ static int ocmem_dev_probe(struct platform_device *pdev)
> }
> }
>
> + reg = ocmem_read(ocmem, OCMEM_REG_HW_VERSION);
> + dev_dbg(dev, "OCMEM hardware version: %lu.%lu.%lu\n",
> + OCMEM_HW_VERSION_MAJOR(reg),
> + OCMEM_HW_VERSION_MINOR(reg),
> + OCMEM_HW_VERSION_STEP(reg));
> +
> reg = ocmem_read(ocmem, OCMEM_REG_HW_PROFILE);
> ocmem->num_ports = OCMEM_HW_PROFILE_NUM_PORTS(reg);
> ocmem->num_macros = OCMEM_HW_PROFILE_NUM_MACROS(reg);
>
> ---
> base-commit: 8705151771af822ac794b44504cd72eebc423499
> change-id: 20230509-ocmem-hwver-99bcb33b028b
>
> Best regards,

2023-05-30 00:20:11

by Bjorn Andersson

Subject: Re: [PATCH v3] soc: qcom: ocmem: Add OCMEM hardware version print

On Mon, 29 May 2023 10:41:15 +0200, Luca Weiss wrote:
> It might be useful to know what hardware version of the OCMEM block the
> SoC contains. Add a debug print for that.
>
>

Applied, thanks!

[1/1] soc: qcom: ocmem: Add OCMEM hardware version print
commit: e81a16e77259294cd4ff0a9c1fbe5aa0e311a47d

Best regards,
--
Bjorn Andersson <[email protected]>