dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-25 20:41:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

arm: stm32mp: bsec: use IS_ENABLED to prevent ifdef

Browse Source 
Use IS_ENABLED to prevent ifdef in bsec driver.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay
2020-07-31 16:31:51 +02:00
committed by Patrice Chotard
parent 06f624f28c
commit 4e9e358fe8
1 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
arch/arm/mach-stm32mp/bsec.c
View File

@@ -74,7 +74,6 @@ static bool bsec_read_lock(u32 address, u32 otp)
return !!(readl(address + bank) & bit); return !!(readl(address + bank) & bit);
} }
#ifndef CONFIG_TFABOOT
/** /**
* bsec_check_error() - Check status of one otp * bsec_check_error() - Check status of one otp
* @base: base address of bsec IP * @base: base address of bsec IP
@@ -279,7 +278,6 @@ static int bsec_program_otp(long base, u32 val, u32 otp)
return ret; return ret;
} }
#endif /* CONFIG_TFABOOT */
/* BSEC MISC driver *******************************************************/ /* BSEC MISC driver *******************************************************/
struct stm32mp_bsec_platdata { struct stm32mp_bsec_platdata {
@@ -288,15 +286,17 @@ struct stm32mp_bsec_platdata {
static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp)
{ {
#ifdef CONFIG_TFABOOT struct stm32mp_bsec_platdata *plat;
return stm32_smc(STM32_SMC_BSEC,
STM32_SMC_READ_OTP,
otp, 0, val);
#else
struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev);
u32 tmp_data = 0; u32 tmp_data = 0;
int ret; int ret;
if (IS_ENABLED(CONFIG_TFABOOT))
return stm32_smc(STM32_SMC_BSEC,
STM32_SMC_READ_OTP,
otp, 0, val);
plat = dev_get_platdata(dev);
/* read current shadow value */ /* read current shadow value */
ret = bsec_read_shadow(plat->base, &tmp_data, otp); ret = bsec_read_shadow(plat->base, &tmp_data, otp);
if (ret) if (ret)
@@ -313,21 +313,22 @@ static int stm32mp_bsec_read_otp(struct udevice *dev, u32 *val, u32 otp)
/* restore shadow value */ /* restore shadow value */
ret = bsec_write_shadow(plat->base, tmp_data, otp); ret = bsec_write_shadow(plat->base, tmp_data, otp);
return ret; return ret;
#endif
} }
static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_read_shadow(struct udevice *dev, u32 *val, u32 otp)
{ {
#ifdef CONFIG_TFABOOT struct stm32mp_bsec_platdata *plat;
return stm32_smc(STM32_SMC_BSEC,
STM32_SMC_READ_SHADOW, if (IS_ENABLED(CONFIG_TFABOOT))
otp, 0, val); return stm32_smc(STM32_SMC_BSEC,
#else STM32_SMC_READ_SHADOW,
struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); otp, 0, val);
plat = dev_get_platdata(dev);
return bsec_read_shadow(plat->base, val, otp); return bsec_read_shadow(plat->base, val, otp);
#endif
} }
static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp) static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp)
@@ -342,33 +343,38 @@ static int stm32mp_bsec_read_lock(struct udevice *dev, u32 *val, u32 otp)
static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp) static int stm32mp_bsec_write_otp(struct udevice *dev, u32 val, u32 otp)
{ {
#ifdef CONFIG_TFABOOT struct stm32mp_bsec_platdata *plat;
return stm32_smc_exec(STM32_SMC_BSEC,
STM32_SMC_PROG_OTP, if (IS_ENABLED(CONFIG_TFABOOT))
otp, val); return stm32_smc_exec(STM32_SMC_BSEC,
#else STM32_SMC_PROG_OTP,
struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); otp, val);
plat = dev_get_platdata(dev);
return bsec_program_otp(plat->base, val, otp); return bsec_program_otp(plat->base, val, otp);
#endif
} }
static int stm32mp_bsec_write_shadow(struct udevice *dev, u32 val, u32 otp) static int stm32mp_bsec_write_shadow(struct udevice *dev, u32 val, u32 otp)
{ {
#ifdef CONFIG_TFABOOT struct stm32mp_bsec_platdata *plat;
return stm32_smc_exec(STM32_SMC_BSEC,
STM32_SMC_WRITE_SHADOW, if (IS_ENABLED(CONFIG_TFABOOT))
otp, val); return stm32_smc_exec(STM32_SMC_BSEC,
#else STM32_SMC_WRITE_SHADOW,
struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); otp, val);
plat = dev_get_platdata(dev);
return bsec_write_shadow(plat->base, val, otp); return bsec_write_shadow(plat->base, val, otp);
#endif
} }
static int stm32mp_bsec_write_lock(struct udevice *dev, u32 val, u32 otp) static int stm32mp_bsec_write_lock(struct udevice *dev, u32 val, u32 otp)
{ {
#ifdef CONFIG_TFABOOT if (!IS_ENABLED(CONFIG_TFABOOT))
return -ENOTSUPP;
if (val == 1) if (val == 1)
return stm32_smc_exec(STM32_SMC_BSEC, return stm32_smc_exec(STM32_SMC_BSEC,
STM32_SMC_WRLOCK_OTP, STM32_SMC_WRLOCK_OTP,
@@ -377,9 +383,6 @@ static int stm32mp_bsec_write_lock(struct udevice *dev, u32 val, u32 otp)
return 0; /* nothing to do */ return 0; /* nothing to do */
return -EINVAL; return -EINVAL;
#else
return -ENOTSUPP;
#endif
} }
static int stm32mp_bsec_read(struct udevice *dev, int offset, static int stm32mp_bsec_read(struct udevice *dev, int offset,
@@ -481,18 +484,21 @@ static int stm32mp_bsec_ofdata_to_platdata(struct udevice *dev)
static int stm32mp_bsec_probe(struct udevice *dev) static int stm32mp_bsec_probe(struct udevice *dev)
{ {
#if !defined(CONFIG_TFABOOT) && !defined(CONFIG_SPL_BUILD)
int otp; int otp;
struct stm32mp_bsec_platdata *plat = dev_get_platdata(dev); struct stm32mp_bsec_platdata *plat;
/* /*
* update unlocked shadow for OTP cleared by the rom code * update unlocked shadow for OTP cleared by the rom code
* only executed in U-Boot proper when TF-A is not used * only executed in U-Boot proper when TF-A is not used
*/ */
for (otp = 57; otp <= BSEC_OTP_MAX_VALUE; otp++)
if (!bsec_read_SR_lock(plat->base, otp)) if (!IS_ENABLED(CONFIG_TFABOOT) && !IS_ENABLED(CONFIG_SPL_BUILD)) {
bsec_shadow_register(plat->base, otp); plat = dev_get_platdata(dev);
#endif
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; return 0;
} }