From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1451573-1517181198-2-1063732025713256392 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181198; b=kDyJn3S2ghkfoGPRfppPn9tEnrAOp8ppa8m3jYKXzOMUjCF RW4uP2+HbUi9S9v99JUz1FiWt+P9t3miv/0Zz5usKDJ20cnCBlyLaEQA0+vIGHcm sQQCaSVIOKEo2ETXbUzyLhMUZtP5YIkChdUfmp9234DnRQz9+VOFiuOmVYMU7Hfi X7xPg5GWSJCw7Jl1e72eoSZtwqJQz/OjJ9Qb+OLipFQBNfYLbSaYFPHo52Aa64/x jdEK5q6Qov4YQDu7p5x6T3ZDfCzdJ1pAcEDLC88lYj9yjnW+VCdSOKlgcLhKeMsT nedRfjC4Fhh4JFzQMzeWxpvWglw69WB8WEoxUcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181198; bh=zL4AWm 1nNW2PHCq8v8i6FiOyRLrsIJ/yfZ5A9GRaBuo=; b=lwBdVfCFMuafP9VIp7EAWd r60e/pXZ33V5xGyHB8HH6/kaJVbgmle8o3t1EomiheDvk7k/HuVw40/lw3rqXdFB pAnaXJzByQRq3WgiDL0gqcYvHB7xK1nUhi/tngW5Id/Bmfy6DAA7f3gSrBZ9ZmZ2 avrnvIxAUWSUJpw4CgwZ4VZfO3ZVZm1WK23unSMzt4pnM0Ap/QOLgrm0shVsbYyP Gp/RF3tJDBvwvKEB8W2niL29+nkeDQl6BXZMoeVjMRD7QW/AZlMTiA0XATfXr1q0 o2MEx4BqqiXqU8Y1URFjTuH+LiIDGiNRCPr16roLL8+2ZUAtDpEKfAu+LtP1PtQA == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=osGFyHGd x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=osGFyHGd x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753454AbeA1XNO (ORCPT ); Sun, 28 Jan 2018 18:13:14 -0500 Received: from mail-bn3nam01on0125.outbound.protection.outlook.com ([104.47.33.125]:13020 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752651AbeA1W0X (ORCPT ); Sun, 28 Jan 2018 17:26:23 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnaud Patard , Arnaud Patard , Kevin Hilman , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 029/100] meson-gx-socinfo: Fix package id parsing Thread-Topic: [PATCH AUTOSEL for 4.14 029/100] meson-gx-socinfo: Fix package id parsing Thread-Index: AQHTmIcDaAx17Q0+YkOSkqe1NfSPwg== Date: Sun, 28 Jan 2018 22:26:16 +0000 Message-ID: <20180128222547.7398-29-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1004;6:xZ8SvSsf/rmrdmkqEYYUkhAxBOdRzTVls2gW/O5YNmlw5t0ojU3iFmplFPh/EQvueQQTwItyXteX1oUDHK38xa4wDpjownLRgCE2+BbH93YuT0Z7fR6ToE9+SvVr+0iIIwTYDYBi+G0pVf6GNCaPKcn3oJxwUSmXI98NYyXCgQYCu4/T9jApnnfzMw2VxkJbYc3Z4GkaOoxnxFsKxDLy5B8pweFFMUDts5uPvhdMu06PXwg/PdfNtveu4IfqcA1FnyOvj6bUtJtC2KTl+UPd+933bXriUeU1Vh6inamqxBfrcUVBlV3PAoTHWUXxVu7Rbg6Vr+upXaWYzKIHAvAHqwbN2KpsdeJeAzX6622PU48O2/wbyTBmuDjtie2yyLrX;5:9I7li7poTbsA8bSYlusyBKhFmBD0Q/HnBqi+Oom2p/XBpmcNlC7NuMYwlATbH/EMxFsIQeDO38CiADxkjrK0iRssRQfqlXtR0q+laEgXGX2vxSUCNOObr2TwGbMA11ntLO6YiX1qilWbQ1wiikXxTDOXmB9JRedM3gQ0SVISitA=;24:m04l1/JvYGWMx5kmCN+28P3P4QR9QTrQYxbNWslB6mrfMP0ETj1qWhHG86z2KQPI10EJ7BR8HFk/6BQNcp3AxUhbhoCCwtHPYVojKG9GsoU=;7:p/nYARRiDtN9QTST6pWU7xSAEVEm8tQ1LijVItpP5QMY/MaxBg1IoPrTRjwYh85JEJjDdZ3Sncfwjiu6GEaUVwyOglhkNsknGTQZ/htJYePgYwjCoNofK3AQGCboMUCsBlwntt5W5MOdAlwXSO+sEYdoKQKPtBCUtOYcUPYBvXS2ROWfFNE0h2RjAC3j9d4Nync1jRv9bu6VRIwpdtENDutEBrtkd5jucKDbcaseFjqSVjwdHdb72xZW/6Se+jvJ x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-forefront-antispam-report: SFV:SKI;SCL:-1;SFV:NSPM;SFS:(10019020)(346002)(396003)(376002)(39380400002)(39860400002)(366004)(199004)(189003)(2501003)(6486002)(186003)(110136005)(5660300001)(106356001)(97736004)(68736007)(6512007)(5250100002)(316002)(53936002)(66066001)(99286004)(2950100002)(575784001)(86362001)(54906003)(22452003)(6436002)(26005)(102836004)(25786009)(10090500001)(76176011)(8676002)(10290500003)(14454004)(6506007)(86612001)(8936002)(81156014)(2900100001)(81166006)(1076002)(107886003)(478600001)(3280700002)(2906002)(72206003)(7736002)(305945005)(105586002)(36756003)(3846002)(3660700001)(6116002)(4326008)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1004;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 59141bc0-c4b7-4199-3810-08d5669e26ed x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1004; x-ms-traffictypediagnostic: MW2PR2101MB1004: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1004;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1004; x-forefront-prvs: 05669A7924 x-microsoft-antispam-message-info: mvAEptePdU78us+5DlWzMAk1pvP/U0aHnlinPMfVBab0zI4GVjhniGpdBL+OZV7t0mSfVUvZMe0jdvRk/cHnjg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59141bc0-c4b7-4199-3810-08d5669e26ed X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:16.9967 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1004 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Arnaud Patard [ 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 =3D (readl(assist_hw_rev) >> 8) & 0xff; meson_cpu_version[MESON_CPU_VERSION_LVL_MINOR] =3D ver; ver =3D (readl(assist_hw_rev) >> 16) & 0xff; meson_cpu_version[MESON_CPU_VERSION_LVL_PACK] =3D 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") Signed-off-by: Arnaud Patard Acked-by: Neil Armstrong Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- drivers/soc/amlogic/meson-gx-socinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/m= eson-gx-socinfo.c index 89f4cf507be6..f2d8c3c53ea4 100644 --- a/drivers/soc/amlogic/meson-gx-socinfo.c +++ b/drivers/soc/amlogic/meson-gx-socinfo.c @@ -20,8 +20,8 @@ #define AO_SEC_SOCINFO_OFFSET AO_SEC_SD_CFG8 =20 #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) =20 static const struct meson_gx_soc_id { --=20 2.11.0