From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 18 Dec 2025 18:37:18 +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 1vWHwE-00Cukt-0t for lore@lore.pengutronix.de; Thu, 18 Dec 2025 18:37:18 +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 1vWHwD-0007je-Lg for lore@pengutronix.de; Thu, 18 Dec 2025 18:37:18 +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=04Vx8vPYlp/yTk83koNAPQdtTJWB38/Sp+SN7dQif80=; b=nGaD+Zzt37kYmWUOI2L37d2rPR XPE0E0OZicTsvSZkd78MIIQypVR1yuEzhGQpk2OP8p8jTzvUCGWfQ9mG2okGOM6cxP8OAjbPFOZDR hD3YbEh9XudMCXSn/A5DDcySuMiOX0ShAlZOjzOF2bMn95wLvqnF84BaWbDtZ/cLtvi5FZ13GU/QL SDGbCvqnvdShMXTDq8oZMWS1RyYjdtkLaKGJE5dECDLIzGqBGwBGrS/3gWgtVMINbqA2Ns4GkbpK8 GjDwZ9mT0Dtr20mHoDAkVTyNrQpTcAA3Jw43xvitgNizikZiqgVXl7cq24bRQRFYVK9pq6zOTh8BY MtyPtvmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWHvm-00000008vxx-11eZ; Thu, 18 Dec 2025 17:36:50 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWHvk-00000008vwR-2fsg for barebox@bombadil.infradead.org; Thu, 18 Dec 2025 17:36:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; 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=04Vx8vPYlp/yTk83koNAPQdtTJWB38/Sp+SN7dQif80=; b=FvQKrY24dklxESea8/S83g/Ydy Nv2a+VQC2oAxrcTcsUPgRpVTlBTOcfkWoNLkUvxVdHnxMnj5bS+Pyge8QiIJx5I+l2BrkEYHs2KuI HnzbL0x7KDgZXiFI1v4T+wnC+xlBwcDVLPwD6lrswGy8+RC9wlmHHtulfdoaOhnUZ+639TIyoNmNz RVzhywyiO98RGTA68TH1pzOC1cYi56qkijPutHhaa3HNe+MzKfghZ1MnLEy8gxbWB3S1RNxhu2ERZ 1OJ7nwe1X5p0vjWXnyrK37Xqu+RY1VzgZni7emyN6+ko1jhBe9d3VAmLYC8G0LFly0WBZSCBayaZi nC1lnhlw==; Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWH4D-00000009IdC-44WY for barebox@lists.infradead.org; Thu, 18 Dec 2025 16:41:33 +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 1vWHve-0007Si-1A; Thu, 18 Dec 2025 18:36:42 +0100 From: Fabian Pflug Date: Thu, 18 Dec 2025 18:36:30 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251218-v2025-11-0-topic-imx6-field-return-v1-3-3781143198d6@pengutronix.de> References: <20251218-v2025-11-0-topic-imx6-field-return-v1-0-3781143198d6@pengutronix.de> In-Reply-To: <20251218-v2025-11-0-topic-imx6-field-return-v1-0-3781143198d6@pengutronix.de> To: BAREBOX Cc: Marco Felsch , Fabian Pflug X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251218_164130_100790_5926E109 X-CRM114-Status: GOOD ( 11.24 ) 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 3/4] 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. Signed-off-by: Fabian Pflug --- drivers/hab/hab.c | 10 ++++++---- include/mach/imx/ocotp-fusemap.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c index 1c747e8a3e..281645f79e 100644 --- a/drivers/hab/hab.c +++ b/drivers/hab/hab.c @@ -262,7 +262,7 @@ static int imx8m_hab_revoke_key_ocotp(unsigned key_idx) */ #define MX8MP_FIELD_RETURN_PATTERN 0x28001401 -static int imx8m_hab_field_return_ocotp(void) +static int imx_hab_field_return_ocotp(void) { int ret; @@ -274,7 +274,9 @@ static int imx8m_hab_field_return_ocotp(void) if (ret == 1) return -EINVAL; - if (cpu_is_mx8mp()) + if (cpu_is_mx6()) + ret = imx_ocotp_write_field(MX6_OCOTP_FIELD_RETURN, 1); + else if (cpu_is_mx8mp()) ret = imx_ocotp_write_field(MX8MP_OCOTP_FIELD_RETURN, MX8MP_FIELD_RETURN_PATTERN); else @@ -282,7 +284,6 @@ static int imx8m_hab_field_return_ocotp(void) return ret; } - struct imx_hab_ops { int (*write_srk_hash)(const u8 *srk, unsigned flags); int (*read_srk_hash)(u8 *srk); @@ -310,6 +311,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 = imx_hab_field_return_ocotp, }; static struct imx_hab_ops imx8m_hab_ops_ocotp = { @@ -320,7 +322,7 @@ static struct imx_hab_ops imx8m_hab_ops_ocotp = { .permanent_write_enable = imx_hab_permanent_write_enable_ocotp, .print_status = imx8m_hab_print_status, .revoke_key = imx8m_hab_revoke_key_ocotp, - .field_return = imx8m_hab_field_return_ocotp, + .field_return = imx_hab_field_return_ocotp, }; static int imx_ahab_write_srk_hash(const u8 *__newsrk, unsigned flags) 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