diff options
| author | Ye Li <ye.li@nxp.com> | 2020-07-06 20:31:56 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2022-04-06 18:04:01 +0800 |
| commit | 0698cd4606293283268b41a3b0a6f33012e9e89f (patch) | |
| tree | 9e093b80d21486e049e4ffc89276fb081116c717 /arch/arm/mach-imx/imx8m/soc.c | |
| parent | 424f634efed371fea183e56f18df40741eccf671 (diff) | |
MLK-24377 imx8mq: Remove clearing mfg prot private key
In patch "MLK-22749 imx8mq: Add workaround to fix sticky bits lock up",
we clear the manufactory protection private key to workaround
the HAB issue. According to detail analysis in KBL-5961, this action
is not needed. HAB will clear the key according the unlock command in CSF.
- if the HDMI FW CSF signature does not include the Unlock command related
to MFG feature, the MPPrivK is cleared.
- if the HDMI FW CSF signature contains this Unlock command, the MPPrivK
clearing decision is postponed to the next CSF signature.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 8dafcbcb10274f0fdd9271e559dca427e0b880bf)
(cherry picked from commit 88040b01d4ac96675dbae4fdf939e56fc25bd098)
(cherry picked from commit 16ed4a7ac5a9c74c5156e589beb74db47c637a1c)
(cherry picked from commit 7c5846f2a5f8eb3be0c07b8c5c1853378b6b2088)
Diffstat (limited to 'arch/arm/mach-imx/imx8m/soc.c')
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 57150d7fbb..ea46394e4e 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -562,9 +562,6 @@ static void secure_lockup(void) clock_enable(CCGR_OCOTP, 1); setbits_le32(&ocotp->sw_sticky, 0x6); /* Lock up field return and SRK revoke */ writel(0x80000000, &ocotp->scs_set); /* Lock up SCS */ - - /* Clear mfg prot private key in CAAM */ - setbits_le32((ulong)(CONFIG_SYS_FSL_SEC_ADDR + 0xc), 0x08000000); #else /* Check the Unique ID, if it is matched with UID config, then allow to leave sticky bits unlocked */ if (!is_uid_matched(CONFIG_IMX_UNIQUE_ID)) |