From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A93D9CD68E3 for ; Tue, 10 Oct 2023 02:39:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YVCZN6UbEt0US9QVQ5Q3EPPkGAYQIxoh9UHZeehXV5w=; b=Ph9vT1RmGbEsnM WAzi7WsNbO7vtE3m/9FE6PBM8NNyBkkjANgvXCBUDcjXINR38cls9VqOXGdEcrCcJWenjj3/X27FG GBJFYdf3A5BUheqzIw+wBiITpUEBZWdnQgLjBWZkJt1qMNf1/68aY6bmgk8JkP30O7vXg7U/NWpRp Ipvk11yXQKsVxkA1RuJi4mU8XIAFz1UKTRe1dsLcT9sPhd2cG8UF2o9hFEQptUJb9YR9GDlDepGyE j4je/b6qbKDcsZ42mEqhW4rO67sPy8SVCy/uszMsei5QRqSwoU0I5TuI55cbMpn2NK1K9xCN+QJJ3 W/n03IYm+TalIwgmt25Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qq2eb-00C8Oh-1V; Tue, 10 Oct 2023 02:39:25 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qq2eY-00C8MM-1R for linux-arm-kernel@lists.infradead.org; Tue, 10 Oct 2023 02:39:23 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 9AE91CE1B57; Tue, 10 Oct 2023 02:39:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D828C433C7; Tue, 10 Oct 2023 02:38:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696905541; bh=CRpJbftkNFaCLIPhcQgckrIB5Pwz8ytV6P5nMBDZFL4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dIzthgWUBODnznko5YErlVcsGedhd4oY4a9Qr7s0B5IlEk4BpX9UoKGJo+YhGhsGv eSO7SMHMfcNWH2PkQOMQhYTdHD8TrhcaFJeg1ob81gv3cM6rMruQma/5uYbleHwd1z 4ri+9+3xw+5MwzSimg7xWPexOQN2LZUYpmR1rKByTJe/bECUFglyQkmpNkMDm0wCIt l4zHkXL7oL/6DJiWTLHc9a9D53onKl7/4pxv7qQdjtIjxGGglfls0yk0fwteVHDSJB HJPR0ecyKTn+pv1aKALP8N4jJve51q3pJ5+s2OWIZRXNoAxiXjxeyG20C3sDP4omb1 SW9Wi5UPTDHgw== Date: Tue, 10 Oct 2023 10:38:51 +0800 From: Shawn Guo To: "Peng Fan (OSS)" Cc: s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: Re: [PATCH] soc: imx8mp: support 128 bits UID Message-ID: <20231010023851.GN819755@dragon> References: <20231008083808.1517132-1-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231008083808.1517132-1-peng.fan@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231009_193922_687605_14E00213 X-CRM114-Status: GOOD ( 22.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, Oct 08, 2023 at 04:38:08PM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > Current driver only supports 64bits UID for i.MX8MP, but > i.MX8MP UID is actually 128bits, the high 64bits is at 0xE00. > So update driver to support it. > > Signed-off-by: Peng Fan > --- > drivers/soc/imx/soc-imx8m.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c > index ec87d9d878f3..5dcc227d41c0 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 Lowercase for hex values just like other macros in the file? > > /* 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) > @@ -122,8 +124,15 @@ 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); > + } > + > clk_disable_unprepare(clk); > clk_put(clk); > + Unrelated change. > iounmap(ocotp_base); > of_node_put(np); > } > @@ -222,7 +231,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); > + } Unnecessary braces for single statement. Also it would be nice to have a newline here. Shawn > if (!soc_dev_attr->serial_number) { > ret = -ENOMEM; > goto free_rev; > -- > 2.37.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel