Merge tag 'u-boot-stm32-20190723' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm

[oweals/u-boot.git] / arch / arm / mach-stm32mp / bsec.c

diff --git a/arch/arm/mach-stm32mp/bsec.c b/arch/arm/mach-stm32mp/bsec.c
index 8c5a299104d05330975827e67513199d894a804c..80183668856e859afa3d097dd6b9a7861cb5c831 100644 (file)
--- a/arch/arm/mach-stm32mp/bsec.c
+++ b/arch/arm/mach-stm32mp/bsec.c
@@ -7,9 +7,9 @@
 #include <dm.h>
 #include <misc.h>
 #include <asm/io.h>
-#include <linux/iopoll.h>
 #include <asm/arch/stm32mp1_smc.h>
 #include <linux/arm-smccc.h>
+#include <linux/iopoll.h>
 
 #define BSEC_OTP_MAX_VALUE             95
 
@@ -171,7 +171,7 @@ static int bsec_shadow_register(u32 base, u32 otp)
                ret = bsec_power_safmem(base, true);
                if (ret)
                        return ret;
-               power_up = 1;
+               power_up = true;
        }
        /* set BSEC_OTP_CTRL_OFF with the otp value*/
        writel(otp | BSEC_READ, base + BSEC_OTP_CTRL_OFF);
@@ -358,12 +358,13 @@ static int stm32mp_bsec_read(struct udevice *dev, int offset,
        bool shadow = true;
        int nb_otp = size / sizeof(u32);
        int otp;
+       unsigned int offs = offset;
 
-       if (offset >= STM32_BSEC_OTP_OFFSET) {
-               offset -= STM32_BSEC_OTP_OFFSET;
+       if (offs >= STM32_BSEC_OTP_OFFSET) {
+               offs -= STM32_BSEC_OTP_OFFSET;
                shadow = false;
        }
-       otp = offset / sizeof(u32);
+       otp = offs / sizeof(u32);
 
        if (otp < 0 || (otp + nb_otp - 1) > BSEC_OTP_MAX_VALUE) {
                dev_err(dev, "wrong value for otp, max value : %i\n",
@@ -393,12 +394,13 @@ static int stm32mp_bsec_write(struct udevice *dev, int offset,
        bool shadow = true;
        int nb_otp = size / sizeof(u32);
        int otp;
+       unsigned int offs = offset;
 
-       if (offset >= STM32_BSEC_OTP_OFFSET) {
-               offset -= STM32_BSEC_OTP_OFFSET;
+       if (offs >= STM32_BSEC_OTP_OFFSET) {
+               offs -= STM32_BSEC_OTP_OFFSET;
                shadow = false;
        }
-       otp = offset / sizeof(u32);
+       otp = offs / sizeof(u32);
 
        if (otp < 0 || (otp + nb_otp - 1) > BSEC_OTP_MAX_VALUE) {
                dev_err(dev, "wrong value for otp, max value : %d\n",
@@ -433,6 +435,21 @@ static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev)
        return 0;
 }
 
+#ifndef CONFIG_STM32MP1_TRUSTED
+static int stm32mp_bsec_probe(struct udevice *dev)
+{
+       int otp;
+       struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev);
+
+       /* update unlocked shadow for OTP cleared by the rom code */
+       for (otp = 57; otp <= BSEC_OTP_MAX_VALUE; otp++)
+               if (!bsec_read_SR_lock(plat->base, otp))
+                       bsec_shadow_register(plat->base, otp);
+
+       return 0;
+}
+#endif
+
 static const struct udevice_id stm32mp_bsec_ids[] = {
        { .compatible = "st,stm32mp15-bsec" },
        {}
@@ -445,4 +462,7 @@ U_BOOT_DRIVER(stm32mp_bsec) = {
        .ofdata_to_platdata = stm32mp_bsec_ofdata_to_platdata,
        .platdata_auto_alloc_size = sizeof(struct stm32mp_bsec_platdata),
        .ops = &stm32mp_bsec_ops,
+#ifndef CONFIG_STM32MP1_TRUSTED
+       .probe = stm32mp_bsec_probe,
+#endif
 };