From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 19 Dec 2025 11:49:57 +0100 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 1vWY3Z-00DAwf-03 for lore@lore.pengutronix.de; Fri, 19 Dec 2025 11:49:57 +0100 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 1vWY3Y-0000Xg-CW for lore@pengutronix.de; Fri, 19 Dec 2025 11:49:56 +0100 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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JPRChxesYtYioNkRxk57q/f7cmFLfIWwFsyiqNA2+R0=; b=TBmcl8fd/I731LJW9Hl0QJx5Yi 23lkrbSyEl6gA90G+Vpi0awTBEWVHy5Zo+ku5p0YBYlDMIf+k8Jj/HXg0aWnjQSSk3qy/lJR16NS+ 5B1yzpuEaqpj3hoiCgz3eF3rr67i5DvJ34qlgLBeuI2se3JomJkguy+wpIzEfTzXEmFKdnlzUgfkH QaIFiir8cej7laiD1jyVNh6Eu8zEVrvSP/aRUg2topQyGy6KIDR3o4mni77m0Olfu9+KcZjBVxFQN O66ZuSiINQz7Fo3Kz7avjuOVlyizghFD4zMgZZNxfHHKHJRcGX4ZwtanncJq1pqArEkFzt/pPSkL0 YpYEZOhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWY2t-0000000A9f8-3p2T; Fri, 19 Dec 2025 10:49:15 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWY2r-0000000A9dV-2YxI for barebox@bombadil.infradead.org; Fri, 19 Dec 2025 10:49:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Cc:To:In-Reply-To:References:Message-Id :Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender :Reply-To:Content-ID:Content-Description; bh=JPRChxesYtYioNkRxk57q/f7cmFLfIWwFsyiqNA2+R0=; b=S9eREo2u+hKOGaMi5ZD3JDQgGQ c/6Mi4R8g7jYf/LhpP1FAqEecaTHZk4UmNejAG/poZk+n5QX7ppY8Ezz+RIO7Dz4fa8w2makotGMM qUv13MK0gDf61Ez1fLdfMlAi/cU3k1vvOAZKySOy/tTOL/+XI9mSsjUBtuRZjUVoCeVG3I7BWNz2g jrLsUq6zeIVZQiCunsg/xEUW1SedcK7eQ9j4LRiQVnpe3HjFz7DiFremgNud84VGyrPEwCS59OFh+ JpLxtT94I0Cu5ge50iLzh9L4M9d9mbtn0E//4rutSGzQsyWl9UgAxMf9cWJucixHHKO+BQJ7WD1Og CsMgANUA==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by casper.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWY2m-00000007SGe-2a1Y for barebox@lists.infradead.org; Fri, 19 Dec 2025 10:49:12 +0000 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vWY2l-0000Cr-QG; Fri, 19 Dec 2025 11:49:07 +0100 From: Fabian Pflug Date: Fri, 19 Dec 2025 11:49:01 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251219-v2025-11-0-topic-imx6-field-return-v3-3-690fdeb78978@pengutronix.de> References: <20251219-v2025-11-0-topic-imx6-field-return-v3-0-690fdeb78978@pengutronix.de> In-Reply-To: <20251219-v2025-11-0-topic-imx6-field-return-v3-0-690fdeb78978@pengutronix.de> To: Marco Felsch , BAREBOX , Lucas Stach , Ahmad Fatoum Cc: Fabian Pflug X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251219_104908_787653_19E0FDDC X-CRM114-Status: GOOD ( 11.62 ) 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=-3.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v3 3/5] i.MX: HAB: extend field_return support to imx6 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) Extend the helper for imx_fuse_burn with support for i.MX6 devices. Create a helper function for i.MX8 and i.MX6 rom the old i.MX8M function, as they all share the same pattern. Reviewed-by: Marco Felsch Signed-off-by: Fabian Pflug --- drivers/hab/hab.c | 34 +++++++++++++++++++++------------- include/mach/imx/ocotp-fusemap.h | 1 + 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c index 1c747e8a3e..de0a6c73d6 100644 --- a/drivers/hab/hab.c +++ b/drivers/hab/hab.c @@ -256,13 +256,7 @@ static int imx8m_hab_revoke_key_ocotp(unsigned key_idx) return ret; } -/* - * The fuse pattern for i.MX8M Plus is 0x28001401, but bit 2 is already set from factory. - * This means when field return is set, the fuse word value reads 0x28001405 - */ -#define MX8MP_FIELD_RETURN_PATTERN 0x28001401 - -static int imx8m_hab_field_return_ocotp(void) +static int imx_hab_field_return_ocotp(uint32_t field, unsigned int value) { int ret; @@ -274,13 +268,26 @@ static int imx8m_hab_field_return_ocotp(void) if (ret == 1) return -EINVAL; - if (cpu_is_mx8mp()) - ret = imx_ocotp_write_field(MX8MP_OCOTP_FIELD_RETURN, - MX8MP_FIELD_RETURN_PATTERN); - else - ret = imx_ocotp_write_field(MX8M_OCOTP_FIELD_RETURN, 1); + return imx_ocotp_write_field(field, value); +} - return ret; +static int imx6_hab_field_return_ocotp(void) +{ + return imx_hab_field_return_ocotp(MX6_OCOTP_FIELD_RETURN, 1); +} + +/* + * The fuse pattern for i.MX8M Plus is 0x28001401, but bit 2 is already set from factory. + * This means when field return is set, the fuse word value reads 0x28001405 + */ +#define MX8MP_FIELD_RETURN_PATTERN 0x28001401 + +static int imx8m_hab_field_return_ocotp(void) +{ + if (cpu_is_mx8mp()) + return imx_hab_field_return_ocotp(MX8MP_OCOTP_FIELD_RETURN, + MX8MP_FIELD_RETURN_PATTERN); + return imx_hab_field_return_ocotp(MX8M_OCOTP_FIELD_RETURN, 1); } struct imx_hab_ops { @@ -310,6 +317,7 @@ static struct imx_hab_ops imx6_hab_ops_ocotp = { .device_locked_down = imx6_hab_device_locked_down_ocotp, .permanent_write_enable = imx_hab_permanent_write_enable_ocotp, .print_status = imx6_hab_print_status, + .field_return = imx6_hab_field_return_ocotp, }; static struct imx_hab_ops imx8m_hab_ops_ocotp = { diff --git a/include/mach/imx/ocotp-fusemap.h b/include/mach/imx/ocotp-fusemap.h index ae10dcef2a..3fd9d6df24 100644 --- a/include/mach/imx/ocotp-fusemap.h +++ b/include/mach/imx/ocotp-fusemap.h @@ -103,6 +103,7 @@ #define MX8M_OCOTP_TZASC_EN (OCOTP_WORD(0x480) | OCOTP_BIT(11) | OCOTP_WIDTH(1)) #define MX8MP_OCOTP_ROM_NO_LOG (OCOTP_WORD(0x480) | OCOTP_BIT(22) | OCOTP_WIDTH(1)) #define MX8M_OCOTP_RECOVERY_SDMMC_BOOT_DIS (OCOTP_WORD(0x490) | OCOTP_BIT(23) | OCOTP_WIDTH(1)) +#define MX6_OCOTP_FIELD_RETURN (OCOTP_WORD(0x6E0) | OCOTP_BIT(0) | OCOTP_WIDTH(1)) #define MX8M_OCOTP_FIELD_RETURN (OCOTP_WORD(0x630) | OCOTP_BIT(0) | OCOTP_WIDTH(1)) #define MX8MP_OCOTP_FIELD_RETURN (OCOTP_WORD(0x630) | OCOTP_BIT(0) | OCOTP_WIDTH(32)) #define MX8M_OCOTP_SRK_REVOKE (OCOTP_WORD(0x670) | OCOTP_BIT(0) | OCOTP_WIDTH(4)) -- 2.47.3