Skip to contentSkip to conversation

Patch "meson-gx-socinfo: Fix package id parsing" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Feb 23, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

meson-gx-socinfo: Fix package id parsing

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
meson-gx-socinfo-fix-package-id-parsing.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Feb 23 11:45:09 CET 2018

From: Arnaud Patard <[email protected]>
Date: Wed, 29 Nov 2017 16:09:46 +0100
Subject: meson-gx-socinfo: Fix package id parsing

From: Arnaud Patard <[email protected]>

[ Upstream commit 044d71bc6cdee8980d0fdc35ec79a0d5818b2ce3 ]

I've noticed the following message while booting a S905X based board:

soc soc0: Amlogic Meson GXL (S905D) Revision 21:82 (b:2) Detected

The S905D string is obviously wrong. The vendor code does:
...

        ver = (readl(assist_hw_rev) >> 8) & 0xff;
        meson_cpu_version[MESON_CPU_VERSION_LVL_MINOR] = ver;
        ver =  (readl(assist_hw_rev) >> 16) & 0xff;
        meson_cpu_version[MESON_CPU_VERSION_LVL_PACK] = ver;

...

while the current code does:
...
...

This means that the current mainline code has package id and minor version reversed.

Fixes a9daaba2965e8 ("soc: Add Amlogic SoC Information driver")
---
 drivers/soc/amlogic/meson-gx-socinfo.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/amlogic/meson-gx-socinfo.c +2 -2
@@ -20,8 +20,8 @@
 #define AO_SEC_SOCINFO_OFFSET	AO_SEC_SD_CFG8
 
 #define SOCINFO_MAJOR	GENMASK(31, 24)
-#define SOCINFO_MINOR	GENMASK(23, 16)
-#define SOCINFO_PACK	GENMASK(15, 8)
+#define SOCINFO_PACK	GENMASK(23, 16)
+#define SOCINFO_MINOR	GENMASK(15, 8)
 #define SOCINFO_MISC	GENMASK(7, 0)
 
 static const struct meson_gx_soc_id {

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/meson-gx-socinfo-fix-package-id-parsing.patch