[U-Boot] [PATCH] armv8: sec_firmware: Remove JR3 from device tree node in all cases

[York Sun]

On 02/09/2018 01:11 AM, Ruchika Gupta wrote:
> JR3 was getting removed from device tree only if random number generation
> was successful. However, if SEC firmware is present,JR3 should be removed
> from device tree node irrespective of the random seed generation as
> SEC firmware reserves it for it's use. Not removing it in case of random
> number generation failure causes the kernel to crash.
> 
> Random number generation was being called twice. This is not required.
> If SEC firmware is running, SIP call can be made to the SEC firmware to
> get the random number. This call itself would return failure if function
> is not supported. Duplicate calling of random number generation function
> has been removed
> 
> Signed-off-by: Ruchika Gupta <ruchika.gupta at nxp.com>
> ---
>  arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 ++--
>  arch/arm/cpu/armv8/sec_firmware.c       | 5 +++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> index 80af318..6a19f4d 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c
> @@ -415,8 +415,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
>  		ccsr_sec_t __iomem *sec;
>  
>  #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
> -		if (fdt_fixup_kaslr(blob))
> -			fdt_fixup_remove_jr(blob);
> +		fdt_fixup_remove_jr(blob);
> +		fdt_fixup_kaslr(blob);
>  #endif
>  
>  		sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
> diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
> index b56ea78..ebf41b5 100644
> --- a/arch/arm/cpu/armv8/sec_firmware.c
> +++ b/arch/arm/cpu/armv8/sec_firmware.c
> @@ -320,7 +320,6 @@ bool sec_firmware_support_hwrng(void)
>  {
>  	uint8_t rand[8];
>  	if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) {
> -		if (!sec_firmware_get_random(rand, 8))

You didn't remove variable rand above, causing compiling warning on
multiple targets.

York