From: khilman@baylibre.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] meson-gx-socinfo: Fix package id parsing
Date: Wed, 29 Nov 2017 16:00:36 -0800 [thread overview]
Message-ID: <7h4lpc8wkb.fsf@baylibre.com> (raw)
In-Reply-To: <2d1b540e-74c3-07e6-eedd-94a9c6f52213@baylibre.com> (Neil Armstrong's message of "Wed, 29 Nov 2017 16:16:11 +0100")
Hi Arnaud,
Neil Armstrong <narmstrong@baylibre.com> writes:
> On 29/11/2017 16:09, Arnaud Patard wrote:
>> 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:
>> ...
>> #define SOCINFO_MINOR GENMASK(23, 16)
>> #define SOCINFO_PACK GENMASK(15, 8)
>> ...
>>
>> This means that the current mainline code has package id and minor
>> version reversed.
>>
>> Fixes: a9daaba2965e8 ("soc: Add Amlogic SoC Information driver")
>> Signed-off-by: Arnaud Patard <apatard@hupstream.com>
>> Index: linux/drivers/soc/amlogic/meson-gx-socinfo.c
>> ===================================================================
>> --- linux.orig/drivers/soc/amlogic/meson-gx-socinfo.c 2017-11-29 10:26:49.081335917 +0100
>> +++ linux/drivers/soc/amlogic/meson-gx-socinfo.c 2017-11-29 10:26:49.041335074 +0100
>> @@ -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 {
>>
>>
>
> Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Thanks for the fix!
Applied to v4.15/fixes with Neil's ack.
Kevin
next prev parent reply other threads:[~2017-11-30 0:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 15:09 [PATCH] meson-gx-socinfo: Fix package id parsing Arnaud Patard
2017-11-29 15:16 ` Neil Armstrong
2017-11-30 0:00 ` Kevin Hilman [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-29 9:30 Arnaud Patard
2017-11-29 9:53 ` Neil Armstrong
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=7h4lpc8wkb.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).