From patchwork Fri Feb 2 08:06:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacky Bai X-Patchwork-Id: 868529 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="RWFdPavy"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="q4F2lxVu"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zXqKt6FCyz9sBW for ; Fri, 2 Feb 2018 19:05:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=o3bFZxBXDp324srmQ2H4Jf0rSRuyIA+dI1qgtr/Rd/4=; b=RWFdPavyZJxK7m bc5Ue9bkLZ3Vo3/ausomOU+i24xpyHJQQqBHvjoOoAu86dUxi8OrOodnJ8joLdBQc6dAYqVcbg9Zg vea04rmDxYocGV+6T2sOKdegPKRY5VsXW1/9xK/fTr9hnE53G+q3i9asX5Ex8ncryf1xKlcfpBLDU DanF7nQM6f0AVFLtWrVxSXGxXTEhVe162OkKUSET2SIdM4kmfAdmbYbDa84UoLJZWveT0VMwlDhfn /2KuaimwUI6dS8UEW22Jvc9Q1iPyysRMWnO6bbGzlBFEZvwwWZTesAGNw5mKfvZ6FqkMgo6tWq02a HoKqHPkbQ5QpseUokXPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ehWLe-0007FI-3D; Fri, 02 Feb 2018 08:05:26 +0000 Received: from mail-am5eur03on0604.outbound.protection.outlook.com ([2a01:111:f400:fe08::604] helo=EUR03-AM5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ehWLY-000796-I3 for linux-arm-kernel@lists.infradead.org; Fri, 02 Feb 2018 08:05:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ovGPunJKEC5eRuNTL3DviBWttWgYm9pACkbrlXhXavU=; b=q4F2lxVu/7wC8yZ050EuEuRb/VVXxyAaZORRYxEkqyEXXc4Lq+Pzqz7lXnfBsEcNYniEdz/2wXPoE1AL59bd/FzWK4JDWjOAghpmQbjJNodCop4unyyIVWBpk6+2bVnBI0VLSr5oEOpXaZi4zDMzSGY4aI2l6DhRht5agE7PEk4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ping.bai@nxp.com; Received: from localhost.localdomain (92.121.68.129) by DB6PR04MB3109.eurprd04.prod.outlook.com (2603:10a6:6:c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Fri, 2 Feb 2018 08:05:02 +0000 From: Bai Ping To: shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com Subject: [PATCH v2] ARM: imx: Improve the soc revision calculation flow Date: Fri, 2 Feb 2018 16:06:27 +0800 Message-Id: <1517558787-12858-1-git-send-email-ping.bai@nxp.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::22) To DB6PR04MB3109.eurprd04.prod.outlook.com (2603:10a6:6:c::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7fcb6fb2-d959-4e96-6e98-08d56a13ab7d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR04MB3109; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3109; 3:if6yaI1k+sreNLxGYeaFq3TEVrZWUiDTkKTYLN3y2MpGJgTec6nLSKsIEX7cxxAF6SHPaeWWtpYY+Gt5XNIpHV4s0r4xg27KkWG9q5LvBc/feKxZnsJFxfEfdX89z0tRtY6gZyGLBPADl9penJhabRG+Iwkurc1FOwOpnhom2IoFC8u8W3KaJp913TzyvqzgfhG8/yLcZk+x2FuO6/hIedDT+YDi+Z9amEgtzQrMrpzaW3/tuYtNqXpU/8sht0aG; 25:etxCusDE05fP5p+KQ2yEfNogk2magj3B5BCqyCCMgn3FEM8HSRfBQ9xmBhst4fV0jyjZ20I0qu9RVhBxDNJ9y4+o7gelHxR74CcwsF4TQOm2lsopNHeI8I1JuAy1j7CIj6fp1AWGV+teKP3Z+X3V8wx+Icpz8trmDjvYhUBR0k7dD7lYymQKjli0lHgXHL4G+reRouSf9WVp68ZVsi7NnC/PQUKtzKyHGAK9C8AID1+8d98cfDgOfvP76iWPDgdiAavJ1p5oFvdBmApPe3Qr6NiDkcq6kK++qQfW4nryxDPIVt7LtBirDl6pWv61igxDVVrQbyNTPOar1MUwLWXOwg==; 31:s9O+877xfxdWtyaeOHPOmhKLyj+72QQmmLYcRfj4l3dVmaSBuFCvpoe/bTsEZhsjNzcmYmNFJLgTY9lXG00cR+IlWiqI0UjWAo9NTYK14SKEQSMPJ8kpUFZL9/oAIAVuzDt6zilM+9O3B9mb1lGUkBFQ83+/QEYEJ6exoNTokryti56ruP5PbSmvMx+LGcJB2M8gBD6V6i8jha/BXxr/PZN15+YwwR2A6mWq3YGeRfw= X-MS-TrafficTypeDiagnostic: DB6PR04MB3109: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3109; 20:3DZ2Ue3OtWfKJ/5KEhVBHIoqq1sFe9Auxs9YQe6NQalVfTqdd1Pq0bLz4/iZcmRAYtqwCVqStovEXL+k5SA3NulpEJzzAb/JRCWHz/TOpG5gtcNq/9UeG8yExt5B2yBSUSaJhAwbjRkZLAaO7DrCJt2cgO6xlQuerEqma/M6ejRxKzOizKVC2DrmLCBpCjsL3BXAU4GizJntesME2wn7anytL/oJBvAIytsmhrb/iiyp2juYSAHOLZELkZPXfeMyAGv61M1Cc4acw0O1iScYdjYCe2guj6rgAkBjoa+9BTfIgcAG2jX47bJCG9uIaK1JLIYQ68MwgoQY56stqDvomc2oTQt/CyUFTw/qiRf37CbXD7Ocioc0VhV8D5314Eq7XfzsdmeK2czeHAVsLZWyVXza+cR1ZCIJFVPT9OkuJqA51hPERZCO1QmLRmuDfc/VuzwgEIpJKy8BO6CzM179X6H4bWhASY55xJWyufWoDtYwuBmrDX2uOd1TiA1qD7vh; 4:qzvvhsAr8pIiCWG6L8oIi4qg1H2XNFAJpa/JGRTCXYVzH0bTJXET4lsldGMFs773wkAEjL4opdrJ0QHpmrfpACYlmNjSrQp1Ly+RjXWhkM948Zc5+hqJYD4EaJgEkykbSR6TfFd7/FaSENLNPa69M4q8QSJdKrNoWSJLH5VsuMXn0Xj3KdTNxZjPpR2AktW6WDWswHL0ELUjJd8RyA2DEQewVi7TfQm49THlfL3ylFJQleMOfRT6bt2TIfkyrl06od5wZCNJVFhLdwl0Wmyo038LpJkzAv6mEKpj/0/J2KX9HY8vqX0AbNuVygdJC93q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231101)(2400082)(944501161)(93006095)(93001095)(6055026)(6041288)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB6PR04MB3109; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3109; X-Forefront-PRVS: 05715BE7FD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6069001)(396003)(39860400002)(376002)(346002)(366004)(39380400002)(43544003)(189003)(199004)(36756003)(386003)(8676002)(105586002)(8936002)(52116002)(316002)(81156014)(50226002)(51416003)(6116002)(106356001)(81166006)(2906002)(3846002)(6636002)(68736007)(6506007)(5660300001)(478600001)(97736004)(4326008)(6512007)(86362001)(6666003)(6486002)(50466002)(48376002)(66066001)(39060400002)(305945005)(16526019)(16586007)(53936002)(7736002)(186003)(25786009)(47776003)(26005)(25903002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3109; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR04MB3109; 23:NqBtQhC7nFzrvojFqMwV0r1zTazP365tFPce4toFo?= Msh56RavXUJ1M8NZDGKZ2hEkF48N7WP7QhlgDktDF1hM12UKAS3Cc0jm4i8mC58mI8loCYshBZPhvGF2iPTfXrmF6nCyn85sI6lFdFOwxAuwZg9p+XdWmoYQGgS+0OC8t5Rj7xHs0hqbqd5HXL0q1QmlWdYhOAb6airqVtOcFrjPKFlfPbtZTmtvzgfjW1WiNdOos/bqowmmu7nZ5Vqlj3osbZLpuHBSflSnUj2MdCoBmYykW51yUQhlC6BkLtdrXtN4jz+JjM2pWAgxL/BWNxMm/I5klUlU+xCuY6XAD0UOY0Q012Hd8uuIYKCB7W3GTXdzXlB8YzF2lBr60OhWuGx9j/DI/bqOVFX+4wbPQbCq3/Efhcar8PU5NkVw3HHZQ2fGpZUmZTAq/gFbr9BmytKtxTazOmRcoHOrfEqNtuleKE3+ye4+W9RhQ7oDcpE2GK7BJ312QjY5MUv9Q1cXdjb9SEZz79FabDkCFMTVCW0ZVJ6yOoB63UgohQFd2nTFF8ExCGVnLv0cLOYipfN//8lYNh4Oo8YOvQyKy74D8nf50BZ0DJ8DwSSQghXOAqhonR6L0BTVK0xh6kouLk0xEeFqA+ZBxRERE90QlMjDMX5WPQKCrDEnaT91EhUERc1EnGdJ3q0APJ1g44UZGW6p6knDYDSDlf2or03v2oBMSt7q057Wy1UnIgaXoHMJPbtO5pc5nPfwvkpB1iPJx4ytiKYy0ditJE/4QnKWhE9pq7MfstDKPV42DDj+YkfnM0iG03Hg/ENJ3duLWt9Go4ioRtCd9C1oXsofOQft/MocaqLqBPjEyCQc5x4yhwHmEyqU2oMPJ5x2r3ztoPFnPKh3pw4O1VH7lGOvnzS76xIUEv5utlGrTuWIC3luWfcZ4sJ8Mp7XJu3JbhesElxxQwpcNdRhjR3NBJerWdFAviusnohHU8Kp4pYf5FI0PFtb0Mm3rvV0nWj/wQXIlMeO0/KSs33pE/KmjWGdgK4R46pWpp8b5YvM7TEFMfv0dbnb4HzvsM88DnxcjeX4YWdftuFrFL6/MrQ5XtmSgC0AaaLfDUhZukXjrjHKfyI1722Ia4XiOnI9uTIG4hMbI8Bhtv3iWdH X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3109; 6:tBvHK9g71EzAUJyUZ2cqFK4fzsIF43p3qsey/Aq7x6YJCUVFJXmAQ7aaUqnozdhYCH4smuYGcVVr5S+9SXeLm588Ix3KoEEQ3etbpe08/3HLdSuFM8XVIfpM2IRrPR28wg3JCKPWteSK1LH1Z5bNUpIJw5TNEp4Ek17TEhI6ZhyTM8OvXcIBrxSFsr24y7jzBW3SwVHSbiXr+ijdJQY+yuLfJ0UCR+bgbsI7lxUx/MWLioDIeml0ZNnc9b26VQFnv7Pf07lJuhAkF4L0aqsjnjgHhgFMKGDE7iFQOCmooLO8Du8zi3+IIrpxeMs9ZfuwOyLjwqwMeItdAACzm7M195Kv7bX9qq0C+gpqoA+VrQw=; 5:vOjcyoxTvc8NuqAjspP7ubhAFK+lO6g+flUM89hlLoBFfLkAJj1ytSosDQTOty0r3JLmHHATYboU7Rjytsug/eBijmKl3XFTmDEok5PJYzBGNmAHFYoe+LyZUl6gm6f8ElPIkgHRzIbCC4FqZxTgaD2P8NTiAS0TkkOnRjw5j8w=; 24:B9NbwgK/OMqIuZUpuoocY56dtu8BtpGbDpvMn/oDjtG7VnhCucyslkzgpCv6id+9IBjPVmOE8IxCd4ONFubuiRPXPNIyj5xrHYHwW7OQGDA=; 7:emX6mMsWuOn/4HKv6Y+OzMrzDkOm5eiw9MxFGsYKvXofkTTsroLEqfVJxfJZotEejYBOObuG8iwW2bMWHQxRB8uQ/ZILvof2m8RY4Mxk468qsAig/b+AZoihViZytNB44VtJZvDnY05Tq7ZwkBCO0D99d3j/fiKGfq3yqjBnQr6NarzogplMDikZs+/1IAOY+LqYla18Z8BTyf4lVX1Tmot7kSd9797zK+hsSl+BR26AqafQarl+IcIxBL8xBKIH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2018 08:05:02.4652 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7fcb6fb2-d959-4e96-6e98-08d56a13ab7d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3109 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe08:0:0:0:604 listed in] [list.dnswl.org] 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, jacky.baip@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On our i.MX6 SOC, the DIGPROG register is used for representing the SOC ID and silicon revision. The revision has two part: MAJOR and MINOR. each is represented in 8 bits in the register. bits [15:8]: reflect the MAJOR part of the revision; bits [7:0]: reflect the MINOR part of the revision; In our linux kernel, the soc revision is represented in 8 bits. MAJOR part and MINOR each occupy 4 bits. previous method does NOT take care about the MAJOR part in DIGPROG register. So reformat the revision read from the HW to be compatible with the revision format used in kernel. Signed-off-by: Bai Ping Tested-by: Christoph Fritz --- v2: - remove redundant line - use u8 instead of u16 for 'major_part'&'minor_part' variables --- arch/arm/mach-imx/anatop.c | 56 ++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c index 649a84c..61f3d94 100644 --- a/arch/arm/mach-imx/anatop.c +++ b/arch/arm/mach-imx/anatop.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. + * Copyright 2017-2018 NXP. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -116,6 +117,7 @@ void __init imx_init_revision_from_anatop(void) unsigned int revision; u32 digprog; u16 offset = ANADIG_DIGPROG; + u8 major_part, minor_part; np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop"); anatop_base = of_iomap(np, 0); @@ -127,45 +129,25 @@ void __init imx_init_revision_from_anatop(void) digprog = readl_relaxed(anatop_base + offset); iounmap(anatop_base); - switch (digprog & 0xff) { - case 0: - /* - * For i.MX6QP, most of the code for i.MX6Q can be resued, - * so internally, we identify it as i.MX6Q Rev 2.0 - */ - if (digprog >> 8 & 0x01) - revision = IMX_CHIP_REVISION_2_0; - else - revision = IMX_CHIP_REVISION_1_0; - break; - case 1: - revision = IMX_CHIP_REVISION_1_1; - break; - case 2: - revision = IMX_CHIP_REVISION_1_2; - break; - case 3: - revision = IMX_CHIP_REVISION_1_3; - break; - case 4: - revision = IMX_CHIP_REVISION_1_4; - break; - case 5: - /* - * i.MX6DQ TO1.5 is defined as Rev 1.3 in Data Sheet, marked - * as 'D' in Part Number last character. - */ - revision = IMX_CHIP_REVISION_1_5; - break; - default: + /* + * On i.MX7D digprog value match linux version format, so + * it needn't map again and we can use register value directly. + */ + if (of_device_is_compatible(np, "fsl,imx7d-anatop")) { + revision = digprog & 0xff; + } else { /* - * Fail back to return raw register value instead of 0xff. - * It will be easy to know version information in SOC if it - * can't be recognized by known version. And some chip's (i.MX7D) - * digprog value match linux version format, so it needn't map - * again and we can use register value directly. + * MAJOR: [15:8], the major silicon revison; + * MINOR: [7: 0], the minor silicon revison; + * + * please refer to the i.MX RM for the detailed + * silicon revison bit define. + * format the major part and minor part to match the + * linux kernel soc version format. */ - revision = digprog & 0xff; + major_part = (digprog >> 8) & 0xf; + minor_part = digprog & 0xf; + revision = ((major_part + 1) << 4) | minor_part; } mxc_set_cpu_type(digprog >> 16 & 0xff);