From patchwork Fri Mar 19 07:57:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1455695 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=SXSC2Hjj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F1wYv5MKRz9sWP for ; Fri, 19 Mar 2021 18:31:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A76082958; Fri, 19 Mar 2021 08:28:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="SXSC2Hjj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A897A82815; Fri, 19 Mar 2021 08:27:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::62e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5BE348290C for ; Fri, 19 Mar 2021 08:27:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GB9KhFZ/K8DXl9dH6kNClKywtBQd6I+iJ0SwYdN/hFlc5YFHyINsx7T/JW20czZ7LgzknaoSdyvHZfWcl2reJ7c9lmkA9/EAqcAT8X0u4l1cpcHLIpp3RkQuTBafo6nMuEHGiVLLpL/0tyE846C4drHP4FjGT+8g2blYDmx4sGiXCz6lN6ATJ5Jse2o05xkqmVVftcGfeYsVCfP7irjdlyuDn2cl4PgyvctXkmZCtWk4iskR//xccsFQ3kzlwaxCekhdmCHD0Rup1IiunoBjhf0Y2g60x4jgnxKsY2ktK1rXe7OIaj98+NLHzmEJSVos7BO5nUBz1JymPecwHTWzow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WNuz3zKj02p8L1vu5/SzKVKHEOFN1P7cnCyFcj/3EsM=; b=n1ja5A75Vq3LeqV7S3zdG/iYLF64ODskPQzm5oMM870QCvHxug6YQwbny9h4c91jt3GseuYF20E1iHF/vp1LheoB8jTKTREYQr6LAn3SZbiWi4Zi5pjV2t9lWD8aiU5AzyxbufkM0McRDWkDo0V5YnjgaGbIoSCFX31hmQVllaUrh4Qz83I5g5razRm3l5YLu5T4QkYTuaqzgv0Lb3TfC+Hvx+0Oonq4keV9o1xiPZNTwnU0BYs3h7je4S+82R9h6B7kkj7kiG9vxn+ZZTStVFYqK6UliAFvB8+3ankH0ekR942mVvtsADa+rIjI5wWVxZz9FpfveOEyMvqLih3NJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WNuz3zKj02p8L1vu5/SzKVKHEOFN1P7cnCyFcj/3EsM=; b=SXSC2HjjXBhQw4B+LVplPU85Jy2kNbwjrDlzvl794DgwGxHcstGChGBeWB+Zj4mRRAlaM1Eps8xAymbmp0xh3odB92ELS79hXmHARbk4paZBz2KGmMFydSv5kMD4LduGUqsbUEgLZ7/imzyxsvub48BAaBJvU1NTc5dyA9aCfKQ= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB6714.eurprd04.prod.outlook.com (2603:10a6:10:10e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Fri, 19 Mar 2021 07:27:35 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3933.032; Fri, 19 Mar 2021 07:27:35 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, Ye Li , Peng Fan Subject: [PATCH 24/26] iMX8MQ: Recognize the B2 revision Date: Fri, 19 Mar 2021 15:57:16 +0800 Message-Id: <20210319075718.14181-25-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210319075718.14181-1-peng.fan@oss.nxp.com> References: <20210319075718.14181-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: MA1PR01CA0170.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:d::20) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by MA1PR01CA0170.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Fri, 19 Mar 2021 07:27:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 4a82cbf4-a1a8-4fcf-cfa8-08d8eaa8770f X-MS-TrafficTypeDiagnostic: DB8PR04MB6714: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oAiXnbzP6/+q+oLGSXG+R1BG6baHrHwJuzUYG5iiTruyDh/3N6txbEisx+JQop9LwTX2HCxTH/blSURKLMgFZgiYMHHkuk3Q4wP2BKX/0WM5zdFs3iLhnM2fIPnYoKdcrGMBmjed521xb+O00JayyoAEMLSq9r6zSNlMQUEiCIMXZefyLHOkzPQ0io875iui46Kt1YzFTqfDzej+PhmvDuEX0NKiS5XkoFK673FnF6DR/Utn27cgaR2AIMQdPjRujU5M7/mAA1VaCiXbEabdXthbU70yKwGi5Me5bRcueugrEH3YQaNRrSgyQTLeMDkAFf7BQcdJO51fB91hcU/5FMT+HvkC7ZGB7CXtC0JhMi2DUBEhndpZeIFCkqqpdmwwfi3PZiTqU4n0bcU3MYbWPUQGpuXYqyVyACljFS1ss7tNM8WAbpRbunNFFtH0xrPgblwNZtogVM0ZcQr/lwQQN7preRKW+i42zHtEME+LDEkszBYZCiSUXKNFGwwgwCorw7yXC8ee2t+CeR7P8Xkiz/qxd4xp2uNAJAPUc56Q73VzfgPTlFKwz8ixoERHiq5kMHD+SKlpOpJUJKW1Eu5x2cD8mANC/Y9uuUt3/uTozC0cOGGf2UWxwiAZh3IxY1EjEuw4U1jktOawcfqINLk82tHCTvoForDSRhL84yGgChJpkDp0OSiJeUx7Lh/p+nHw X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(136003)(376002)(39860400002)(396003)(66946007)(478600001)(52116002)(8936002)(6506007)(38100700001)(186003)(83380400001)(6512007)(86362001)(2616005)(6666004)(6486002)(8676002)(66556008)(26005)(66476007)(2906002)(16526019)(5660300002)(4326008)(956004)(316002)(1076003)(54906003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: nGPLmEAClix7C87tMFfEzyXLzfH2QHGjMDMx27BozBM3RXPwybv7Ja4U0CzUoV8Qewcvsw0ShoKqaORWIeGEy9mzn52Zhz1gpXxmBfXcqu7Tr8YSkUnLj/70U6+QXjgxAIozsv/K5VmPlMjVgnyaNl+n0vKZuKkSLQ+iuTpGs+BDeuU9JQ0Jd8zxvePORoeA7au6T6G1aSW+5YwxezYtLwDvc8ksfZYcJ8q4Fwx0iJl25BDBrPocOFpPBsITbdsRJ+e3ISrkQZh6I8lC6PG8NjTP4pHJJUiXHQ6stEvIi8UIlS0qOBRUH4+VgaqpDSUBYNCjBzfvPDVU04DZoKureBmzq9AZSdfkx0Xi+r2T1+gU6Fzf/T0XYiTXpVE4NgKAT8/yNMFUiB06RWpcDg+8ucZ8JJ+aV5fndNRO8++NfLwhTcPGOr6YMtQKIlpCTFqmtUxxGb6ceKSWSmzkmPjvmRpPZsucrPp7mQ1tJfdwNzitHmoPG1rEzcyGat9HT8MIOFlZrOftR2Mi2aGUbHp1mBbiXRipRpqUnMnQyyIIqpRKo/NrA+3kkKM+dStl3JKm2YwyyOGCKcVbSExH23tvbaf1JFhG0UPjrCzR4YBr8sv5RBk4kb+e15TSb+ippQM4F8IE44QKr/5ri+fj92ii8LAKE9IFuU8eBBb3U9UUqqjZTZtIaAIAg8Yf1kkL1qYliVZrNYC4it+cX+VrTBNM/GdUOApN867BUf8lROQOrXis5rlYgEtjporqHsUajxs1fS7LhoE8BoQOd0t3u2UsHNsK6GpONJV87/35yH+nurTbgY8lMLOCARiod5F6jAxxreTYTBcRFmPabwm963aIV3btZTRXuKprGMy19y+Y+kM/pgH9jDRTpdtSMZbNAYpGJD6U5SimWF6NxJaTjnD5VWBDBHfrrZestJmYvknXK8FVNVrFathLiXDtguVqL/7f6mymnl1CbsHCNExaUqG07aYOXSxpQBD1PA+D/s4E/di72jED7lDreOUTvfXeu0n+jtGuhk0Sg1clSvZ+idLU5DN5nrD0EnIWl4FjwvWfZQiKkLsMovB9UGhcM1G4DVRA5thjdYUSxmyZRivUC5GK6sQ7ZE5s3fL0glFxTFsenyO6YUSqhHN2hBHjk5cIX1S93y9DvzQT6RgILVgARYAEMVAlkUhjVD/CTURnPZiC/otHOR5136CxuicvU/+Vg4sIoeaxpxv65M+RtPkn1+luHziMSS7cn7UrbU9EGs7H5CzGLWTYPHaSK9w2JpiakKHdwAraull9RO8p+MTbca9oLgHhLz2Wi/80zdyYyMUq9lyN+XgiTRRuNEydD1lM94c7SuWg/URI9qY44yyXx+jjCQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a82cbf4-a1a8-4fcf-cfa8-08d8eaa8770f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2021 07:27:35.0233 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dCJYZ2xJEu4aTF5HH60d85kTkkB7sa+Z/uxM12I35dlZib8zzMKjMOfOc2b7cInKo8c/zty/NcP6CTAfSEarOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6714 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean From: Ye Li i.MX8MQ B2 is using same value in OCOTP_READ_FUSE_DATA like B1, so we have to check the ROM verision to distinguish the revision. As we have checked the B1 rev for sticky bits work around in secure boot. So it won't apply on B2. Signed-off-by: Ye Li Reviewed-by: Peng Fan Signed-off-by: Peng Fan --- arch/arm/include/asm/arch-imx/cpu.h | 1 + arch/arm/mach-imx/imx8m/soc.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h index 28244d7671..ef090eb2f2 100644 --- a/arch/arm/include/asm/arch-imx/cpu.h +++ b/arch/arm/include/asm/arch-imx/cpu.h @@ -65,6 +65,7 @@ #define CHIP_REV_1_5 0x15 #define CHIP_REV_2_0 0x20 #define CHIP_REV_2_1 0x21 +#define CHIP_REV_2_2 0x22 #define CHIP_REV_2_5 0x25 #define CHIP_REV_3_0 0x30 diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index c447ea2ab9..573cacb10d 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -410,7 +410,16 @@ u32 get_cpu_rev(void) * 0xff0055aa is magic number for B1. */ if (readl((void __iomem *)(OCOTP_BASE_ADDR + 0x40)) == 0xff0055aa) { - reg = CHIP_REV_2_1; + /* + * B2 uses same DIGPROG and OCOTP_READ_FUSE_DATA value with B1, + * so have to check ROM to distinguish them + */ + rom_version = readl((void __iomem *)ROM_VERSION_B0); + rom_version &= 0xff; + if (rom_version == CHIP_REV_2_2) + reg = CHIP_REV_2_2; + else + reg = CHIP_REV_2_1; } else { rom_version = readl((void __iomem *)ROM_VERSION_A0);