Message ID | 20210114072810.11873-8-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 79e0217a8ea85706547130668f4ace0ffd6248d4 |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com 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=OUo/hmoR; 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 4DGk8R2857z9sVX for <incoming@patchwork.ozlabs.org>; Thu, 14 Jan 2021 23:27:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DB1C8278F; Thu, 14 Jan 2021 13:25:57 +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="OUo/hmoR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8C1B826F5; Thu, 14 Jan 2021 07:59:27 +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=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::622]) (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 137D78270F for <u-boot@lists.denx.de>; Thu, 14 Jan 2021 07:59:25 +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=ZU4aOypvBtS+7xt42dyRhvr0npzyD1oanArZQt1CW7ZYB1QjnEkkoZUSVUv1QiWBTn33e2o9E1DtFYYWio0j9uQVWpLjvzeQF7+nDbTVbkx5mYvUfqPS9aU9HM/g77Zv1Mn/6vrdRwdL1kKpTb1j0mb28gl7JoAW8Q8jwx5vDnCeBc6MAkQ/mPm9wjty+rVefoh5lBqXws+BL2VtT0rZ/SvroXgkYPZUpboAeggs2A8K7dHxlPGrrWvsbvTbb39hlgUXY3o/rTwyH2S+npV7b7Ye7NUIjTaeJ7b814VAzx/1aVYE21bJz4QaeytEnKvBJwG2ftK9gZ4M1SfE78kw/g== 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=xG1sIAbT98xPkFFFnHuoW924w2FY3XTArPUZldj5P9c=; b=Atpkxjp5OxRqUpT7ydTTSaxEhCs/A+dsQxmlbZT791wsmHg3b+r/vcZlxHbhVCcLgEqQXu427NwisRJihfB2nXi7riCwcdh/QaWArSNmwAh2ZIuC3prmSfcr5htNGvPqB/Z18YMmQfG7UA5QyIeIX5mVPZfXsJKnlsoFAQaIxfw153UtTWqN71MjhdJZpZbDdROFywltJ7V/FmMpbF8ee6RBLpBtwIbB5gtkuXeXSNFEz6d7OIDvH7Z8sd2hz/ty9yI1TXGyxaNWwyrrj36MHxLB8BkR45XKs+uJt4B6O8BFo+j5XTKgmcK4mgPinScx8PVL7wBMGxuzAkdt4EKntQ== 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=xG1sIAbT98xPkFFFnHuoW924w2FY3XTArPUZldj5P9c=; b=OUo/hmoRT1UJQFtDu0Frmjtmo55t6H2JS0FfDS2N69aGjNzdpsq0IhP04MggPgg3Rt9EmWnhFo4FWkq/bUs4RN1plQj/sKAifSGup4P2VctM+EQBozmftRANyTlNkgYXEnF3uUez9kltMabgePNmfSKXcrCbZSJ4NLc4w/SfrC0= 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 DB8PR04MB7179.eurprd04.prod.outlook.com (2603:10a6:10:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Thu, 14 Jan 2021 06:59:23 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c964:9:850a:fc5%10]) with mapi id 15.20.3742.012; Thu, 14 Jan 2021 06:59:23 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 08/13] imx: Fix market segment fuse offset on iMX8MP Date: Thu, 14 Jan 2021 15:28:05 +0800 Message-Id: <20210114072810.11873-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210114072810.11873-1-peng.fan@oss.nxp.com> References: <20210114072810.11873-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) 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 SG2PR03CA0144.apcprd03.prod.outlook.com (2603:1096:4:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.6 via Frontend Transport; Thu, 14 Jan 2021 06:59:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 68c4de96-d689-4bda-6c98-08d8b859ecd3 X-MS-TrafficTypeDiagnostic: DB8PR04MB7179: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB8PR04MB71791AF1183120EDCD93A57AC9A80@DB8PR04MB7179.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eEDMZGRQzg9nUDu+NReMK4QqmWpjQfAFPoQnT2QjRzlNKAOqIEE0C3o/jwTlRdp/3FmFbjEN3QG2gmNwdT+lAVj915kVFSQBeGEqgr5rpuLWB6O+IfjR4AJaf0XjUa1tCjijTwgR7lMTXHOcADf41ifI9LXET4ZCRy0D1cPhmCFZA3ml1OXDFj447b/YnI313u3wcMT8ghm9rbBczKfhukORyKZaWw0amEysPVE9ZAet0JAZrdmcCRpfB5EEdx8TZd7PqydWxM7nL6bswrKcR14zET7hs7jlPGturvoNfGLrVB88/tYi7bIhefssa33XL3Xhqlm62LHYuKtN0IrBVCROPcwQvh+J7GQ0xbAmc4aSY0/G+DLlWg3DdY20Ea1+l1KYoWsvO95V9bMd38QYmxQtVY+tdd2AoiasJsEUP7i9JiJS8+KyRNpx4tDqVrpf 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)(396003)(39860400002)(376002)(366004)(346002)(136003)(86362001)(4326008)(6512007)(186003)(8676002)(66476007)(52116002)(956004)(54906003)(6506007)(478600001)(6666004)(6486002)(16526019)(26005)(316002)(2906002)(66946007)(8936002)(66556008)(5660300002)(1076003)(2616005)(83380400001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: L/urBR9rItpN4RPM0CqIrw29ClV3td9X5IYdK0MKG4CGelWx/lMZygAX4y3FEyZ0sFpBy1/FVUyEgP15QZ55CaFWOZ0iY9ivWJHlZJw9ySX9DTvRLyFGHWYXh08VkS8DKzHvGYVG5EQs5XiHCSJnzKFQxptLB7GXkl0sk4Kej/Q48SsQDeS2UdaGjLxKXKr1p+U+VpdZpFmJ3hhKf8L5arSvhxKPlU2Rk7zCxTyoRS+byPjvH3kZU4UUBhW4KpdVdoHiSMIDQbbA85yuDwDCIJTjyAe2/X9Xgj1frZTAO6Y+SvFdIO9BYyW86h2h4Cwg3Kswk2/Ve4+IIzqXPygcVXUaiqFGEKEJx7Xa/N9s8d0ERHVE0iHldAuLY4jH1bQXpuQSW2efpvdBiIqh+sSt9fiWxDrnxn1ar2ewwZMYVGmtxzg+rjEDjIpnOKAz7iRM1bjkb/yfuJGS19KA+fQzV+X4EY0NxnIDSYmWs1F2Q0D8DPcTlwO4wNwaPS8UZL5a3m4q2tETwkSYre2qWndErtJ0o6Dsbv68O1jtcKJ0xEpgA71xqcTTSzu8TC6XvTl0yWbtqfAj6gD1KAy/yIqs9uqKYbXiT+upxNSOG7SNXeWjpyjyq01sKAmGjQNKayAl4EHTS/J1iDRweaHuV0IT8eH20S9gfqWvlQUwNHnNOwfmwQi9QfY3Mn4MBecS7tfho6MRN6WvFfxjb64E/sWA3LOQ+AOD+Nl7LvMu6LoB+VzgIDxqedTLPlIzh728xmWGlNstttLhOj/SYwvXY5bkth2H+cGC0bEXnS6nu0RNjtYqfY4iIP5srkkcMNEGOPUxEdEb+s0rYuZ0yxbI22L0k5HCw3O+VVOhm53tx/eiYCw2Yg8tSQf2LPMkHI9m2e0lfC91aULYO/9UDL0zpBep+Aa9uVS3agjvEAVvMmppO1wQwHRXkE9mF3Q1TF/+TOYfzPQMq8vvlyRVkaLL5jYmFUaENVseEKhdl+rirRRbIaJIOyDOBqbctWF/orFloREd X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2021 06:59:23.6644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-Network-Message-Id: 68c4de96-d689-4bda-6c98-08d8b859ecd3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5XU9LvJ+y3kTUQfn3lqvFRkT1V92gIhRyFFqCdKPhzseegqTueC6ZFO8z9WAHsfWyk1UPzoeR35CitLMnbfHRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7179 X-Mailman-Approved-At: Thu, 14 Jan 2021 13:25:35 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
[01/13] imx: lowlevel: implement armv8_el2_to_aarch32
|
expand
|
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index a4d8f101b6..425d0f0327 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -385,6 +385,9 @@ u32 get_cpu_speed_grade_hz(void) */ #define OCOTP_TESTER3_TEMP_SHIFT 6 +/* iMX8MP uses OCOTP_TESTER3[6:5] for Market segment */ +#define IMX8MP_OCOTP_TESTER3_TEMP_SHIFT 5 + u32 get_cpu_temp_grade(int *minc, int *maxc) { struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; @@ -394,7 +397,10 @@ u32 get_cpu_temp_grade(int *minc, int *maxc) uint32_t val; val = readl(&fuse->tester3); - val >>= OCOTP_TESTER3_TEMP_SHIFT; + if (is_imx8mp()) + val >>= IMX8MP_OCOTP_TESTER3_TEMP_SHIFT; + else + val >>= OCOTP_TESTER3_TEMP_SHIFT; val &= 0x3; if (minc && maxc) {