From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 14 Jun 2024 12:17:20 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sI3zk-005sOx-1u for lore@lore.pengutronix.de; Fri, 14 Jun 2024 12:17:20 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sI3zj-0005JS-RA for lore@pengutronix.de; Fri, 14 Jun 2024 12:17:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=xe4fKjN/Mnb+UDHIobOkYfhEQgHn44+unZXqGw0w4bg=; b=BcAnEOWS3fjlWajklajy4LePub Ee8/fKlXffnM2W+goJywS9y+jc1zL/Q6yXi2Yb8OuFAy3NHGo8y5aX3o2vm1XllLzJ/HOJMSubh1k 8K0SRHobkxaZB4TjMiQaTY34v7r1+47TrEipprBoJu4NqUW/6Q9MJb7AigKyDthP34/Va+J1VYqLZ NwvePeIxtHU6JqlqEnt81eKZI5iYXfScu3SdipbXrHPlUNNZCkMYC9WrlY7QS2Vqg1anw0e65n2Q6 BNlzBJJHC9ykZW2Y2Bzxn4e0MwkZv+96UWZfqJhzxKcJH3omtm/1lLWfYn5jzOa3CtSLv5HveFIWl XXxhCbmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI3z1-00000002NBd-2jQm; Fri, 14 Jun 2024 10:16:35 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI3yy-00000002NAY-1LFy for barebox@lists.infradead.org; Fri, 14 Jun 2024 10:16:34 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sI3yu-0005Fx-UP; Fri, 14 Jun 2024 12:16:28 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sI3yu-002FAu-Hi; Fri, 14 Jun 2024 12:16:28 +0200 Received: from mfe by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sI3yu-00AOpb-1W; Fri, 14 Jun 2024 12:16:28 +0200 Date: Fri, 14 Jun 2024 12:16:28 +0200 From: Marco Felsch To: Sascha Hauer Cc: barebox@lists.infradead.org Message-ID: <20240614101628.lecbhz335vwoova5@pengutronix.de> References: <20240613130944.264396-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240614_031632_477357_C85B5B0F X-CRM114-Status: GOOD ( 26.48 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 1/9] i.MX: HABv4: fix SRK_LOCK for i.MX8M devices X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On 24-06-14, Sascha Hauer wrote: > On Thu, Jun 13, 2024 at 03:09:36PM +0200, Marco Felsch wrote: > > All current known i.MX8M devices: i.MX8MQ, i.MX8MP, i.MX8MN, i.MX8MM use > > an other fuse to lock the SRK hash. Fix this by refactoring > > This looks a bit inaccurate or misleading. What you want to say is that > all known i.MX8M devices use the same fuse to lock the SRK hash, but > it's another one than used on i.MX6. You're right, shall I send a v2? Regards, Marco > > Sascha > > > imx_hab_write_srk_hash_ocotp() and make the lock fusing device specific. > > > > Fixes: 6c4d5bb5acfe ("i.MX: HABv4: implement interface for i.MX8MQ") > > Signed-off-by: Marco Felsch > > --- > > drivers/hab/hab.c | 34 +++++++++++++++++++++++++++++--- > > include/mach/imx/ocotp-fusemap.h | 1 + > > 2 files changed, 32 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c > > index ed091058d8fb..28a091841a69 100644 > > --- a/drivers/hab/hab.c > > +++ b/drivers/hab/hab.c > > @@ -128,7 +128,7 @@ static int imx_hab_read_srk_hash_ocotp(u8 *__srk) > > return 0; > > } > > > > -static int imx_hab_write_srk_hash_ocotp(const u8 *__newsrk, unsigned flags) > > +static int imx_hab_write_srk_hash_ocotp(const u8 *__newsrk) > > { > > u32 *newsrk = (u32 *)__newsrk; > > int ret, i; > > @@ -139,6 +139,17 @@ static int imx_hab_write_srk_hash_ocotp(const u8 *__newsrk, unsigned flags) > > return ret; > > } > > > > + return 0; > > +} > > + > > +static int imx6_hab_write_srk_hash_ocotp(const u8 *newsrk, unsigned flags) > > +{ > > + int ret; > > + > > + ret = imx_hab_write_srk_hash_ocotp(newsrk); > > + if (ret) > > + return ret; > > + > > if (flags & IMX_SRK_HASH_WRITE_LOCK) { > > ret = imx_ocotp_write_field(OCOTP_SRK_LOCK, 1); > > if (ret < 0) > > @@ -148,6 +159,23 @@ static int imx_hab_write_srk_hash_ocotp(const u8 *__newsrk, unsigned flags) > > return 0; > > } > > > > +static int imx8m_hab_write_srk_hash_ocotp(const u8 *newsrk, unsigned flags) > > +{ > > + int ret; > > + > > + ret = imx_hab_write_srk_hash_ocotp(newsrk); > > + if (ret) > > + return ret; > > + > > + if (flags & IMX_SRK_HASH_WRITE_LOCK) { > > + ret = imx_ocotp_write_field(MX8M_OCOTP_SRK_LOCK, 1); > > + if (ret < 0) > > + return ret; > > + } > > + > > + return 0; > > +} > > + > > static int imx_hab_permanent_write_enable_ocotp(int enable) > > { > > return imx_ocotp_permanent_write(enable); > > @@ -222,7 +250,7 @@ static struct imx_hab_ops imx_hab_ops_iim = { > > }; > > > > static struct imx_hab_ops imx6_hab_ops_ocotp = { > > - .write_srk_hash = imx_hab_write_srk_hash_ocotp, > > + .write_srk_hash = imx6_hab_write_srk_hash_ocotp, > > .read_srk_hash = imx_hab_read_srk_hash_ocotp, > > .lockdown_device = imx6_hab_lockdown_device_ocotp, > > .device_locked_down = imx6_hab_device_locked_down_ocotp, > > @@ -231,7 +259,7 @@ static struct imx_hab_ops imx6_hab_ops_ocotp = { > > }; > > > > static struct imx_hab_ops imx8m_hab_ops_ocotp = { > > - .write_srk_hash = imx_hab_write_srk_hash_ocotp, > > + .write_srk_hash = imx8m_hab_write_srk_hash_ocotp, > > .read_srk_hash = imx_hab_read_srk_hash_ocotp, > > .lockdown_device = imx8m_hab_lockdown_device_ocotp, > > .device_locked_down = imx8m_hab_device_locked_down_ocotp, > > diff --git a/include/mach/imx/ocotp-fusemap.h b/include/mach/imx/ocotp-fusemap.h > > index 823273895502..c4f94e61e8f8 100644 > > --- a/include/mach/imx/ocotp-fusemap.h > > +++ b/include/mach/imx/ocotp-fusemap.h > > @@ -54,6 +54,7 @@ > > #define OCOTP_GP2 (OCOTP_WORD(0x670) | OCOTP_BIT(0) | OCOTP_WIDTH(32)) > > #define OCOTP_PAD_SETTINGS (OCOTP_WORD(0x6d0) | OCOTP_BIT(0) | OCOTP_WIDTH(6)) > > /* i.MX8M moved the security related fuses */ > > +#define MX8M_OCOTP_SRK_LOCK (OCOTP_WORD(0x400) | OCOTP_BIT(9) | OCOTP_WIDTH(1)) > > #define MX8M_OCOTP_SEC_CONFIG_1 (OCOTP_WORD(0x470) | OCOTP_BIT(25) | OCOTP_WIDTH(1)) > > #define MX8MQ_OCOTP_DIR_BT_DIS (OCOTP_WORD(0x470) | OCOTP_BIT(27) | OCOTP_WIDTH(1)) > > > > -- > > 2.39.2 > > > > > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | >