From patchwork Mon May 29 03:37:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 99960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1270906vqr; Sun, 28 May 2023 21:21:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ67aPqmh74TNTl+Ti6nj5GgPITLLxtTLiNZBhl7QBMh9jKwLhxxNfF2D7wPDO8p+TqjVRwE X-Received: by 2002:a17:902:eacb:b0:1af:a2a4:8386 with SMTP id p11-20020a170902eacb00b001afa2a48386mr11040241pld.38.1685334094197; Sun, 28 May 2023 21:21:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685334094; cv=pass; d=google.com; s=arc-20160816; b=u6DOQH+4IWJc+f2zG39x7sc8qsVvoZPiSeERXLcNa4Ev+yWLXTAGpFQnJyqCpOH1vZ HSfPCDPxyD/bivJbXa3qhCW33oHDH554LezLQJs5JXpKTfIGF/HIO4jR0vteRFUzIlXX //6fK05E9RsHHrQ9eDyrM58iEKa4z91ZzT+EjJ+K0QJQyVA0V6ACfiGwcN5L05G7Oe2z DbzadTZmPOhPBX2ofFzwcNfZFKB8phYoCkQ6OLQm1B0/PSj9bb2BknOm0hJ5EG2z8tAt MS163uR8ZwiEA7hh9bX+VTjkJY20H90DF2RMAw9SkSL1KrR2h6xzjoZbYbAiE3MIvjDJ rbsA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=fd38Kl2ClLiMiFbV3cYfMRQW8iLtWgNhLpeOsiNEcmA=; b=ut0I2y8/3lkLpyWXEgn9dyf4koeZlajYjYTZuhX3j70hfd2knnTXxC6Ce38wc6GcCP PTGD+TnAECN171xKPjFyfKVHQQaZqq4mLy62z52OpVtrtAdBl/CCDHI5SUmjeW8brkRK 3F9buUK83QzIv4XP3D5VsGc6YUw7DfBfg95YM8PFS/H5gIW7XGiMQxMasEMyqn0UAcQM WJpEtfghRmFUqmEGRkIjJd0e3gJUL3hwogVCHindIC9/y2ofW9siXET976CT/H/IkuuL S0D0aP9RHTrZdKkxV4LH+p5edABRduTYlYyvyUd9QxTAiu7Ovh/d3o2aXhpYegZR4Yc+ cogQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=Kj0eIehC; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m19-20020a170902bb9300b001ae5e755a12si3789118pls.186.2023.05.28.21.21.17; Sun, 28 May 2023 21:21:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=Kj0eIehC; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230153AbjE2DcZ (ORCPT + 99 others); Sun, 28 May 2023 23:32:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjE2DcX (ORCPT ); Sun, 28 May 2023 23:32:23 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8105AF for ; Sun, 28 May 2023 20:32:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=co715FO7nKT4nDKueSdvkCrD1jS3A9sG8LhATrytt/QXDy2WDDdY4YFqgy9ALUIfnuM0nxx2y3H8Qj56oaTszFGnDWF8r6tZaXR+Ps9VHhIHgiJ38AZE9gMOCd0qF1qXg/IR9YOa0KMOoX4t05V3qmoKVn5Qp43gE1xs2aYbq47Jl1IkW3acSG+1ghLZHJMOHMZKopnOSgHqBATuO1uet6dnPB2zirv/C69thkZzVxCAk8YlHtr5csnb5m0BTuRzJ+te0DGzJ+1U4s+UuIwkQJaK9aplzq6j2WAeQG05Gdh/KPF08tiR2ULoLEtI+Rz+FOVUx/bxd7+2IuurOQ43LA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fd38Kl2ClLiMiFbV3cYfMRQW8iLtWgNhLpeOsiNEcmA=; b=mFZ0+fEIfcUozIWNUsU5Zn8ZTscYO5a0Ighd++Tik44UnoFLzh3Xr0Uh0D1FCH8hBBFRU4y/xLIToZb6287yAEUa9yMB2ozBCqLWpvZC2oh7kThgN2EGr00dX47wgJUHOWtYUGvuTiBWCBa8A3fe1rQzlHNGCLuKN4txlVfdK9xK4jqavn/5V/lGmwWIoJ4sVnql8lyXVdvwP5dJV4lqwpJ3f2/90n8YIorO1/GWwJamDSrkMTehxRnORTa5G8dZ1D/dqmykmYdkcJO3y2XQ4ngNtKlnlV2eaqvMYrvBt+Mzgth3c9n5l5Sy2a46EHTF5khBPZreF92HiHYU3NACxw== 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=fd38Kl2ClLiMiFbV3cYfMRQW8iLtWgNhLpeOsiNEcmA=; b=Kj0eIehCyEEFPpd51WlRGhAJjbbwxFGSCMdtQd6kfPmjtuB8q1mIy4XFfw26N9FPKlNVd80xM7dUXxuUxfrCExfxQdl4g3cDtKmEvwAT4iAfbfYWz3vsaqVAuqCWcfiNI4wdFnoosraqKuEUrY3uliGCu8xyD7OhSgrq5u0463E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AS8PR04MB9062.eurprd04.prod.outlook.com (2603:10a6:20b:445::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 03:32:16 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4%7]) with mapi id 15.20.6433.020; Mon, 29 May 2023 03:32:16 +0000 From: "Peng Fan (OSS)" To: shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peng Fan , Rasmus Villemoes Subject: [PATCH V4 1/2] soc: imx: Correct i.MX8MP soc device Date: Mon, 29 May 2023 11:37:09 +0800 Message-Id: <20230529033710.4098568-1-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 X-ClientProxiedBy: SI2PR01CA0033.apcprd01.prod.exchangelabs.com (2603:1096:4:192::23) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AS8PR04MB9062:EE_ X-MS-Office365-Filtering-Correlation-Id: f6df57f7-516a-4307-2b16-08db5ff54cbb X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GnOtliBr953Vd+okPkpCOD52er3juNLZT8QNyiR/4Cyel043T1zXqDWo2r1ilZrvAV/+QNeNeSoesK2fTJEcf/2g6VhLXJg/5DJLDbb0DtTVikB+ZJoXrF2qwR0qWyXVs92SeosNQp8YG5+91C42Os19wMea2GvWvXLPcEXwWFdtju5gCleN4tLOHZ3tk8I0nP4YfYzSI0/J214DW34iyEMq7Bjh4I5DTYRlViYSmNP1B6UH2GpHAjGWS0u/F5u/W8t1cbuRwejSjG+BFh3pzLur2Qn8w0+sxRavcPiHcE+znAD7sVzQ/K7RSvHS0rSLhZZGGaNH2OKJqAfAGOwlnY9HU592zpQn/do8oTzKPxxDNaZdPAs7JM1PzYsrWev3oPGFM/eWf2YbAmxqP8Sxj1+rEUahyhx8SDsqRT9XJbDRVzl/DQhNp1eJ27SL/FMrFduZDaLsrNZ9CE+kJSMFXUM2Nv3bzwn3vSr100L+pY3r1psJa5050KZZ7OwpNWBaVjVCM3POgUwBG7jbupqaQ6g9NOWIUANvrm5Nc9LGdqKqgg1uql5QpYPL7j7WAAEdK7BTUBUCYOXMN8hwTS4GpYPu+Qrasi8CRte30oNUDsQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199021)(66946007)(4326008)(66556008)(66476007)(83380400001)(5660300002)(86362001)(52116002)(38350700002)(41300700001)(38100700002)(186003)(2616005)(8936002)(8676002)(6486002)(2906002)(966005)(6512007)(6666004)(6506007)(316002)(26005)(1076003)(478600001)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h/cdEjhxMA3hg9d0iTIN9eGwL9CuXVRxYKimeQ3f3sDKaJ8dbKB9mTC5vEHvubO+Y3kkOg175FYhq6qOUTXuYwotPGyW8Jqu3EqwkHZ0ASvVspWIJBnaLG5NRmg3EOucJJ0zw9ys3KBDbifVnQ8btnbPVWpFXHcQnX7SdN6p+OgZn5N+hhY0PM9cMJ6CFn4Ent18aIOFemoLRboz58bjDbyKsFDAd/OnPbkDmEnnta68OqhT2l3bcp6S0Jl9y/lAXFGFSCXzxl4V/fwlNaNY/hAfZsYhfsp1nsaH+BWX3+be5RF4j541MfeY3hLkQKCwJBS2z7ohS2tZe6zrSWG/I3ojg7iaaGTPsbepN48LuBL8LiuON7HsFh6WLT3KprHECFj57bM5o766IjEp0PohOE8lcZQhEZXmVS44COczFXiLhXV3/NrPFI9PDo2gQtKbcX4qEFL3UDzBk72Ns4zA1Q4L8NOOJGUD2zjbgfKg9iNQ9t2KYtc9OShso5ZgRjaG9nSGVm/mkLnfKynHOvO3OU6acPAHJ8APx30KfF77sjYTRMitNUn7ucmDv6PRtn7YoZLnMpnNdqz4HFVot+IXaY2ZnxTVeeZuGjFpl38MatGsNC0z83TyrusxQRZ+Sy5o814DivVZtegs86FtWW8kVuqr0rh7KLlDhhd0VCLJ3+hUYyR8XADD8cy3csSLG7Nru2dN9dnvR+MSj7WccQ0emtplhgvScTLmWd4qahsahFLRgsevOj9MbzUJbu3QXIO1TxygqOq0h1DJTWqqbNovYcgYdCGjiqT2TvpKTvpWZhqFz9bWn5su4kjR9fAATVMY+PVOxTC75gH/XWVtDyVdqLKPRVCrRx0rICFezcgqNqOmhhaetBhHD9LdWmwliuP/5EP6Z1b/IhkI90Bmt31No4WmsH4mDNsA7/gF9zbo22SRm6e4GsAlAwj9TG3IbNb32Py7xjCpABSbBXQeS8CwP3+QVNM/iE0CutpqM7VjVC1mYNQoTsgauX9GnGBsuKNUQ/zGFR9gvhUOmw2yFTvSQ9NF47kZLJz1e6uZlsUNq6Hjm4nJXTrx3Yd9V7xa6t0UItZv1y24YIdnUSyOHO+3S5eDEpTBYLswg4f+gJ+wFI3ilYROGPhDOlXfDGviMfH90+ZNQNY++Pmb9/Enddet52idMcjD2MwLyaVQY7JaHY9vOtf+nOr3+BUjhx1XeD6pePmO7uoKnDHBwwOVzvZj78GviEPlzJ18/4iKMjaB1Cw919X7NvtVjCEdb2pWmYpCGiC2cYm8pomfPBl1A849T9mdk7S5q1Tza/WH2iFpemwzVe/J3zybQ6njd4gzYLURJrc73v+HxNreskUX8aJRM+cUZeb3ZrKPgl3/W3eSCiV6vk87INQbZiAC3rmWH2SLqdSKDNCLa55hoJMJ+wQSbCcFo2YG8Mp+5vh67tepS1p8l2Sb/BS1DJLs7GuAjf1mWV07URvsBNtdoTpvrLCPCSjAymSpUpNnccqZ4ZN6cSsGyxZxVvMoFbY3E83Bn+/M8L+hqV2AeoD+fpAX5dHZKuuHa8VuZ142yB1ul7gPEcFb7qPaBApDQG5UVh7Rf8a4 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6df57f7-516a-4307-2b16-08db5ff54cbb X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 03:32:16.4086 (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: TwO7O5VSYvlboVkTVpbUv7EibSPEHtexeRzqgBMQ8Sjw0w+fXVqGptW0TES0rF8JatGE9z2rQJPl93SVhJdTMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9062 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767200883137549848?= X-GMAIL-MSGID: =?utf-8?q?1767200883137549848?= From: Peng Fan i.MX8MP UID is actually 128bits and partitioned into two parts, with 1st 64bits at 0x410 and 0x420, with 2nd 64bits at 0xE00 and 0xE10. So introduce soc_uid_h for the higher 64bits Fixes: 18f662a73862 ("soc: imx: Add i.MX8MP SoC driver support") Reported-by: Rasmus Villemoes Closes: https://lore.kernel.org/all/fe5e2b36-6a8e-656c-a4a6-13a47f4871af@prevas.dk/ Signed-off-by: Peng Fan --- V4: New patch drivers/soc/imx/soc-imx8m.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index 1dcd243df567..be26bbdac9fa 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -24,6 +24,7 @@ #define OCOTP_UID_HIGH 0x420 #define IMX8MP_OCOTP_UID_OFFSET 0x10 +#define IMX8MP_OCOTP_UID_HIGH 0xE00 /* Same as ANADIG_DIGPROG_IMX7D */ #define ANADIG_DIGPROG_IMX8MM 0x800 @@ -34,6 +35,7 @@ struct imx8_soc_data { }; static u64 soc_uid; +static u64 soc_uid_h; #ifdef CONFIG_HAVE_ARM_SMCCC static u32 imx8mq_soc_revision_from_atf(void) @@ -114,6 +116,12 @@ static void __init imx8mm_soc_uid(void) soc_uid <<= 32; soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset); + if (offset) { + soc_uid_h = readl_relaxed(ocotp_base + IMX8MP_OCOTP_UID_HIGH + 0x10); + soc_uid_h <<= 32; + soc_uid_h |= readl_relaxed(ocotp_base + IMX8MP_OCOTP_UID_HIGH); + } + iounmap(ocotp_base); of_node_put(np); } @@ -212,7 +220,12 @@ static int __init imx8_soc_init(void) goto free_soc; } - soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); + if (soc_uid_h) + soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX%016llX", + soc_uid_h, soc_uid); + else + soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); + if (!soc_dev_attr->serial_number) { ret = -ENOMEM; goto free_rev; From patchwork Mon May 29 03:37:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 100022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1284693vqr; Sun, 28 May 2023 22:05:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Kk7zghbTMoj7fI7935EfDtGHae6mQ+Px2JzwfLkS/B3cdjOIWr4nm+WC7I5aLiHRnCof8 X-Received: by 2002:a05:6a20:2445:b0:10f:1f0:9b43 with SMTP id t5-20020a056a20244500b0010f01f09b43mr6901046pzc.6.1685336740943; Sun, 28 May 2023 22:05:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685336740; cv=pass; d=google.com; s=arc-20160816; b=zgu6S6qiX+bOT9dJwO8jEUdZDDRZpvYqCXWWkgFRdXpTTDysao6WgfBOLTO4hJXbBH GbF/sErsfTkx48CHOk2bxz2GQd2EZ/qsnDqzijMq5lwSMmGcld7c8MTZ/wJS8iHzP+jI fN9tHqhEPBv48z+v6y1xLtbeHajR3PxPFdXDkL4tdo538gUCji+Nk6ZV2NtG8vD75RFx lL9AlvRPoog4IFgTiHC6eZeXTN8ru5UEVNAk+mp17pdDgBq0A6eymc/HdeLOjLjCU20q RBSsnYnXjSjdmSYQgJojokSxFwrFHSckM923hyPoqqKkEfH6nNU5JAAoft4R5PRDQl6X ejIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WygF8UKVBDOhjT69LiO0Nj23hx2TT7EIU3V9qalOWNU=; b=qEmwgt0kreDXqNC4mVbVzjayUF+FndJTfd5Qjo6CMv92u+aPf9IzBY//fitT5fE4Xf ERW0DHCdYTsiKV8r/pTTswcn/hmq44IJn1IBoPqhZnMdFVEZCl9Rz+hbttfL2Vom+3bn lSmMzgNdISvwbnfKnTsopITQDPSgfX1700B+eFJLcjs7h7DpazegIljw/4UMEE1pmrmB mA5njUwVMOsy1JJw7l/7Hx0T1EwoJTjr/eF9BKPRpFa0EbQ8CGnwKgs5viGLhItkeGYl jdNQlBmrcCn+5j6wKJKsuzUgdCzNrO4AZsjj0CR2TEMjmm+MUOGpPvN3Y/V0Stiw2Umg GFmQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=RompO3PA; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i192-20020a636dc9000000b005348464b81fsi2541441pgc.371.2023.05.28.22.05.28; Sun, 28 May 2023 22:05:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=RompO3PA; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbjE2Dce (ORCPT + 99 others); Sun, 28 May 2023 23:32:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjE2Dc1 (ORCPT ); Sun, 28 May 2023 23:32:27 -0400 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2078.outbound.protection.outlook.com [40.107.7.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE000B1 for ; Sun, 28 May 2023 20:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMvA4sg1yKnONkOUfHdpTSxnB7nZ9YLJlvByPAWto02UEykyHdu2q586lymRWhvhmXRm9zVsM0rifi8iDQ6NuZlH9A+iqJ0p0aaaed18YuTsyDp33UE6qm83f84ciV+2dzqtgDKtdPTJH9BODbWR8ecDknp8ECr0ZXFRO05p+4JzIaZ2Asls111/IcWTMnDArfftoKcpiBsGCn8M5+lp2/WWX3zaTulegjPvujsxnlcGEc1qwaxM7OQ1nlTaAmFSv8tuwnlA1CeW5IHIGzy7prsPbyoG0s1p5+4OFjx08wRTf+ofxTeG60Pu0ifGrIUN4XQL7pRpj8ckNJODReYtiA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WygF8UKVBDOhjT69LiO0Nj23hx2TT7EIU3V9qalOWNU=; b=E/BZ7gnrG+bDMT68RKYRdd3JsMaZan0Xax8adWcl7RKg0wjhQ9QnVwpC25ctTOoinn6ihfB0F6OjGQJbOO65U9HvolrcSCnnHH/aZPAzJ5cUn83JbCmJGzH1IQrBpxzneRFJW+LkjmZLfOI2T97p8pVIwqapKxHRQu7tKfgymJmGShH0rZwnnNo31cu90av3GS6DrCWoAFTTaBxGop0I8OmWPdiblMcY6XJ0Wk7Kul+vENAT5sDyAYXBdzPXbnvVxuH15q5XjYxcTtEoY32lNy5aHEUmJ4L6V/CI9iHqWMhenRMaUXuprggZ+4fHo4DpvyWhd5BYuu9MsOVUCCo8nw== 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=WygF8UKVBDOhjT69LiO0Nj23hx2TT7EIU3V9qalOWNU=; b=RompO3PAvnkWE5hSNEYYBYTRuD6Q24k1tWufg6DBX/JEmGb4ZSFLlIryXgi8dM8tPML8azaLik++fbujlW0umLt8cWKBCX+vVz4U4F05IRAagG/ErWP/ICDjN+NARgAWIFq2TCzP/2kxQO3RYPumGpoM097PmwsgXQ+yI7bXfXU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AS8PR04MB9062.eurprd04.prod.outlook.com (2603:10a6:20b:445::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 03:32:22 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::b999:f2c6:a8cc:7b4%7]) with mapi id 15.20.6433.020; Mon, 29 May 2023 03:32:22 +0000 From: "Peng Fan (OSS)" To: shawnguo@kernel.org, s.hauer@pengutronix.de Cc: kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peng Fan Subject: [PATCH V4 2/2] soc: imx: support i.MX93 soc device Date: Mon, 29 May 2023 11:37:10 +0800 Message-Id: <20230529033710.4098568-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230529033710.4098568-1-peng.fan@oss.nxp.com> References: <20230529033710.4098568-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0033.apcprd01.prod.exchangelabs.com (2603:1096:4:192::23) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AS8PR04MB9062:EE_ X-MS-Office365-Filtering-Correlation-Id: 97949180-f691-421f-bd6d-08db5ff55087 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d8YwaAWaamd337L0C+RvKXMN3ojjQ1JhH4GhBmec4yN1XZqMiuDUdOSL6mXN1hNfBWo9MtCK6cs5fJW4AC8yROfi3BDO2ys81geaL6kJVF/20NL/ZRsZbGPrQsYrYVwb+t6ulz7nWEPHYSZERK/uMQuGv3wTJfJ9FUkLHi3L+B1wj8Vk+P2PE8IO8KzR65CvlrR7mQERX3j4Wuj1ra6qiSo/U2Jy+LHkG49atQ9SSMZ28l+4hpRr87dl5C1IOS9Su1fQJ/zIVAOH6wDhLiOEZ4GoqXhpkKm09DBv5l9OWMDz2dh4aL4TKcmZ6v986vL40BpE2lVKna+T1cN34pKmXqco+1/Ck2DtVzgYOGnaXpRBluUK3U0K3UgTPDJsDCrrzn0V1BtCtJM9G2yOMS0Fdr2Cmtl6HtxGjXSbAAFfzjdK+05j7fJ3DrLTJ4bKWs3iUx7Wc9m0Sc1SMBNIt92isjsSQKnh1gNgV+Dbu1uKwWgt6uGGaEIz1zvhqxB2QL81GlBw4O6lv5ZP+7LU0IPTQdEF1Lj4yQauosf43UqhQ89QQ+HWQzgoDZOd6ImGLZGB+wdL6u8yMYRMZkXtg3+fevv8RUkZg0g5p8WAbhsJXi2bDdf7F+m0jOg9Ejd9FhcS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(376002)(396003)(366004)(39860400002)(451199021)(66946007)(4326008)(66556008)(66476007)(83380400001)(5660300002)(86362001)(52116002)(38350700002)(41300700001)(38100700002)(186003)(2616005)(8936002)(8676002)(6486002)(2906002)(6512007)(6666004)(6506007)(316002)(26005)(1076003)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ysjKQJU8q9uPlzeTU6jgzMi8nrHrb3rV+I/8+X4t2eKl9ILXWFyeoS5yLj6+5njYQq3vjgPsPODlcJ1pOo6KPt6i3D1OIaPpzG3d31BYCSaz2FANJoke1ll3VaJESUBx6UdSkEfAP7X2N+r+dAlhHfORghajr25NZyzk7fKc/+5mHqUuXA4doGfMZD22QvrtSLHmQMwGljxlPK+XdKTsIXD3WvnJuvAgo5JfrMsglY7CJk+/rldDquKLiT6ddyj/tvsW7ggL8hl2ET4tSIMYa28yHR7akDNDcdA9vZqSurSpxd6kzsWVuC2GS0JtZbtjVam2LS0B1XtqgZnk4VqpOtVjWJQwSHfltCcq+YXXG8H7s3+Ytaa8h5srwE5MjeueE2O6S8yhAgWZri2EeGsuMNpPtNvWMb9Mpk75ksz3oJf21/qIyMF41lBO7X67G4hg476bgoH7NjLTHYfQFfC7q3vYOwHKv3s6nai1bCRf0Hyl0RZ0rrCaO8nC13KAisPnEpvsguWez1VLWVJDOHwvTcUc0CuXwTnQttUgfTqaoBgLpukVS0hYCnlbUNpcV3kf/EMEwykObESG2z0YNwhcHKGmnedCbS9v/5RjzJ3n77IQOKLNr9KXf0qxq+VajOAtK2UNGyV+6ifVz30OE7OTlDyQab8ZgBOb1oQMRlW+FS5P8g09h4xlkIObY0Rrj+Y5Tlb5qIe+Gm6uYru5DXdckf9gYCE1b1JxJrQOYjVqIhKrO+BAtvtpXrsB2lh2lzPT8IP0ImrPhaS3SUgUCXDBVLoZBPicaDtk3F810U/ga9UTPf4bN6iMXcuKJIlvHW6zigDfQEg4ePdx4kA7ROUICFXsaxWNEm/rDBxv69KToVsY674J8RWJaCytDr5EI2nan6jSeltvm7LYJIjiGk3weXkaVjXa3/ePGQk4DXqSZXUH/Ub0RJ57P8KRk5/lFrSRvQBqFDrdXQR0zrabssMuzStFq4y5JRh56cBKIYWlAZ0lMeHHKiJZPgwbhtTv4IVTnGUEsyiNt8kObURuDZgjxEiV8XdZ/rzH3X/C9Vx9WlLFMgk0UbP8ro27DIGXnVQ+rQTZpRk6Zvx2OHlQ0LuVVeEqlxxad/gIymJnza91Nd4Y6eX2/nsHdit0/F2wWgXhq1+JTo+w4f0AbqNOkgM1ewDeLd5oxLLrAbpotmVwCyoG9604H2CkepHvmql68zP/uT2oeqf5jsUl7FE8uX2leUOq48XRXZRHwnIaLeVwcCuhmgMoj3sXJeT183JVHfxjsFpJSKu4UWg6youivzL+BsO9IFjlK5UBGKGdbKzOhkqALIxhSGY379PnVhKu8sP2/4rTRbA+RTTtpDx7SpkrHpDRGq1zjqY9VR8VLMlg4HDSTbtmjzsg8Y4t2DlpLAH7wUooYtvRYVnMRaCh7SfaeAdNGkR54unyOZOyy86LLn6OzybNd2ByNu4Akyad6/E2MymFTHMIf/9/hcrrpXTvIZ39mXbGmi13g19IuWsEnKNJ8Q6vXMb3a/9Kz8dvS7CCguhGmmo+2UTz4FFCDRdJroYxbl7E4pnl2mBF20NLp4Ob+iKOF5cM6YDMEUjxw13t X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97949180-f691-421f-bd6d-08db5ff55087 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 03:32:22.8120 (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: o7ADwiLtEjyoHc3b+B2ZLCHWCS7vDlvSqWutno5fXV9bDMhNkhUMtURBE1ofBmUNXkFPad/QhKPKLiMuHE3JDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9062 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767203658898863739?= X-GMAIL-MSGID: =?utf-8?q?1767203658898863739?= From: Peng Fan i.MX93 Device Unique ID(UID) is in eFuse that could be read through OCOTP Fuse Shadow Block. i.MX93 UID is 128 bits long. The overall logic is similar as i.MX8M, so reuse soc-imx8m driver for i.MX93. Signed-off-by: Peng Fan --- V4: With patch 1 included, the soc_uid_h moved to patch 1 V3: Update commit log Drop uneeded {} V2: The ocotp yaml has got R-b from DT maintainer drivers/soc/imx/Makefile | 2 +- drivers/soc/imx/soc-imx8m.c | 57 ++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/drivers/soc/imx/Makefile b/drivers/soc/imx/Makefile index a28c44a1f16a..83aff181ae51 100644 --- a/drivers/soc/imx/Makefile +++ b/drivers/soc/imx/Makefile @@ -7,5 +7,5 @@ obj-$(CONFIG_IMX_GPCV2_PM_DOMAINS) += gpcv2.o obj-$(CONFIG_SOC_IMX8M) += soc-imx8m.o obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8m-blk-ctrl.o obj-$(CONFIG_IMX8M_BLK_CTRL) += imx8mp-blk-ctrl.o -obj-$(CONFIG_SOC_IMX9) += imx93-src.o imx93-pd.o +obj-$(CONFIG_SOC_IMX9) += soc-imx8m.o imx93-src.o imx93-pd.o obj-$(CONFIG_IMX9_BLK_CTRL) += imx93-blk-ctrl.o diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index be26bbdac9fa..cca207b90110 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -26,8 +26,11 @@ #define IMX8MP_OCOTP_UID_OFFSET 0x10 #define IMX8MP_OCOTP_UID_HIGH 0xE00 +#define IMX93_OCOTP_UID_OFFSET 0x80c0 + /* Same as ANADIG_DIGPROG_IMX7D */ #define ANADIG_DIGPROG_IMX8MM 0x800 +#define ANADIG_DIGPROG_IMX93 0x800 struct imx8_soc_data { char *name; @@ -149,6 +152,53 @@ static u32 __init imx8mm_soc_revision(void) return rev; } +static void __init imx93_soc_uid(void) +{ + void __iomem *ocotp_base; + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx93-ocotp"); + if (!np) + return; + + ocotp_base = of_iomap(np, 0); + WARN_ON(!ocotp_base); + + soc_uid = readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x8); + soc_uid <<= 32; + soc_uid |= readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0xC); + + soc_uid_h = readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x0); + soc_uid_h <<= 32; + soc_uid_h |= readl_relaxed(ocotp_base + IMX93_OCOTP_UID_OFFSET + 0x4); + + iounmap(ocotp_base); + of_node_put(np); +} + +static u32 __init imx93_soc_revision(void) +{ + struct device_node *np; + void __iomem *anatop_base; + u32 rev; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx93-anatop"); + if (!np) + return 0; + + anatop_base = of_iomap(np, 0); + WARN_ON(!anatop_base); + + rev = readl_relaxed(anatop_base + ANADIG_DIGPROG_IMX93); + + iounmap(anatop_base); + of_node_put(np); + + imx93_soc_uid(); + + return rev; +} + static const struct imx8_soc_data imx8mq_soc_data = { .name = "i.MX8MQ", .soc_revision = imx8mq_soc_revision, @@ -169,11 +219,17 @@ static const struct imx8_soc_data imx8mp_soc_data = { .soc_revision = imx8mm_soc_revision, }; +static const struct imx8_soc_data imx93_soc_data = { + .name = "i.MX93", + .soc_revision = imx93_soc_revision, +}; + static __maybe_unused const struct of_device_id imx8_soc_match[] = { { .compatible = "fsl,imx8mq", .data = &imx8mq_soc_data, }, { .compatible = "fsl,imx8mm", .data = &imx8mm_soc_data, }, { .compatible = "fsl,imx8mn", .data = &imx8mn_soc_data, }, { .compatible = "fsl,imx8mp", .data = &imx8mp_soc_data, }, + { .compatible = "fsl,imx93", .data = &imx93_soc_data, }, { } }; @@ -225,7 +281,6 @@ static int __init imx8_soc_init(void) soc_uid_h, soc_uid); else soc_dev_attr->serial_number = kasprintf(GFP_KERNEL, "%016llX", soc_uid); - if (!soc_dev_attr->serial_number) { ret = -ENOMEM; goto free_rev;