lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 263/639] soc: amlogic: gx-socinfo: Add mask for each SoC packages
    Date
    From: Neil Armstrong <narmstrong@baylibre.com>

    [ Upstream commit dce47aed20c7de3ee2011b7a63e67f08e9dcfb5e ]

    When updated IDs on f842c41adc04 ("amlogic: meson-gx-socinfo: Update soc ids")
    we introduced packages ids using the full 8bit value, but in the function
    socinfo_to_package_id() the id was filtered with the 0xf0 mask.

    While the 0xf0 mask is valid for most board, it filters out the lower
    4 bits which encodes some characteristics of the chip.

    This patch moves the mask into the meson_gx_package_id table to be applied
    on each package name independently and add the correct mask for some
    specific entries.

    An example is the S905, in the vendor code the S905 is package_id
    different from 0x20, and S905M is exactly 0x20.

    Another example are the The Wetek Hub & Play2 boards using a S905-H
    variant, which is the S905 SoC with some licence bits enabled.
    These licence bits are encoded in the lower 4bits, so to detect
    the -H variant, we must detect the id == 0x3 with the 0xf mask.

    Fixes: f842c41adc04 ("amlogic: meson-gx-socinfo: Update soc ids")
    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Signed-off-by: Kevin Hilman <khilman@baylibre.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/amlogic/meson-gx-socinfo.c | 32 ++++++++++++++------------
    1 file changed, 17 insertions(+), 15 deletions(-)

    diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c
    index 37ea0a1c24c82..1ae339f5eadbd 100644
    --- a/drivers/soc/amlogic/meson-gx-socinfo.c
    +++ b/drivers/soc/amlogic/meson-gx-socinfo.c
    @@ -43,20 +43,21 @@ static const struct meson_gx_package_id {
    const char *name;
    unsigned int major_id;
    unsigned int pack_id;
    + unsigned int pack_mask;
    } soc_packages[] = {
    - { "S905", 0x1f, 0 },
    - { "S905H", 0x1f, 0x13 },
    - { "S905M", 0x1f, 0x20 },
    - { "S905D", 0x21, 0 },
    - { "S905X", 0x21, 0x80 },
    - { "S905W", 0x21, 0xa0 },
    - { "S905L", 0x21, 0xc0 },
    - { "S905M2", 0x21, 0xe0 },
    - { "S912", 0x22, 0 },
    - { "962X", 0x24, 0x10 },
    - { "962E", 0x24, 0x20 },
    - { "A113X", 0x25, 0x37 },
    - { "A113D", 0x25, 0x22 },
    + { "S905", 0x1f, 0, 0x20 }, /* pack_id != 0x20 */
    + { "S905H", 0x1f, 0x3, 0xf }, /* pack_id & 0xf == 0x3 */
    + { "S905M", 0x1f, 0x20, 0xf0 }, /* pack_id == 0x20 */
    + { "S905D", 0x21, 0, 0xf0 },
    + { "S905X", 0x21, 0x80, 0xf0 },
    + { "S905W", 0x21, 0xa0, 0xf0 },
    + { "S905L", 0x21, 0xc0, 0xf0 },
    + { "S905M2", 0x21, 0xe0, 0xf0 },
    + { "S912", 0x22, 0, 0x0 }, /* Only S912 is known for GXM */
    + { "962X", 0x24, 0x10, 0xf0 },
    + { "962E", 0x24, 0x20, 0xf0 },
    + { "A113X", 0x25, 0x37, 0xff },
    + { "A113D", 0x25, 0x22, 0xff },
    };

    static inline unsigned int socinfo_to_major(u32 socinfo)
    @@ -81,13 +82,14 @@ static inline unsigned int socinfo_to_misc(u32 socinfo)

    static const char *socinfo_to_package_id(u32 socinfo)
    {
    - unsigned int pack = socinfo_to_pack(socinfo) & 0xf0;
    + unsigned int pack = socinfo_to_pack(socinfo);
    unsigned int major = socinfo_to_major(socinfo);
    int i;

    for (i = 0 ; i < ARRAY_SIZE(soc_packages) ; ++i) {
    if (soc_packages[i].major_id == major &&
    - soc_packages[i].pack_id == pack)
    + soc_packages[i].pack_id ==
    + (pack & soc_packages[i].pack_mask))
    return soc_packages[i].name;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:14    [W:2.148 / U:2.920 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site