[U-Boot] [upstream-release] [PATCH 3/3] armv8: fsl-layerscape: avoid DT fixup warning

[Bharat Bhushan]

> -----Original Message-----
> From: upstream-release-bounces at linux.nxdi.nxp.com <upstream-release-
> bounces at linux.nxdi.nxp.com> On Behalf Of laurentiu.tudor at nxp.com
> Sent: Wednesday, January 30, 2019 5:31 PM
> To: u-boot at lists.denx.de; Prabhakar Kushwaha
> <prabhakar.kushwaha at nxp.com>; York Sun <york.sun at nxp.com>
> Cc: Laurentiu Tudor <laurentiu.tudor at nxp.com>
> Subject: [upstream-release] [PATCH 3/3] armv8: fsl-layerscape: avoid DT
> fixup warning
> 
> From: Laurentiu Tudor <laurentiu.tudor at nxp.com>
> 
> sec_firmware reserves JR3 for it's own usage and deletes the JR3 node from
> the device tree. This causes this warning to be issued when doing the device
> tree fixup:

Do you think it is fair to assume that firmware will always reserve JR3? 

Thanks
-Bharat

> 
> WARNING could not find node fsl,sec-v4.0-job-ring: FDT_ERR_NOTFOUND.
> 
> Fix it by excluding the device tree fixup for the JR reserved by sec_firmware.
> 
> Signed-off-by: Laurentiu Tudor <laurentiu.tudor at nxp.com>
> ---
>  arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> index e7a8801262..f971af8d26 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
> @@ -9,6 +9,7 @@
>  #include <asm/types.h>
>  #include <fsl_qbman.h>
>  #include <fsl_sec.h>
> +#include <asm/armv8/sec_firmware.h>
> 
>  struct icid_id_table {
>  	const char *compat;
> @@ -98,7 +99,13 @@ void fdt_fixup_icid(void *blob);
>  		CONFIG_SYS_FSL_SEC_ADDR)
> 
>  #define SET_SEC_JR_ICID_ENTRY(jr_num, streamid) \
> -	SET_ICID_ENTRY("fsl,sec-v4.0-job-ring", streamid, \
> +	SET_ICID_ENTRY( \
> +		(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT && \
> +		(FSL_SEC_JR##jr_num##_OFFSET ==  \
> +			SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
> +			? NULL \
> +			: "fsl,sec-v4.0-job-ring"), \
> +		streamid, \
>  		(((streamid) << 16) | (streamid)), \
>  		offsetof(ccsr_sec_t, jrliodnr[jr_num].ls) + \
>  		CONFIG_SYS_FSL_SEC_ADDR, \
> --
> 2.17.1
> 
> _______________________________________________
> upstream-release mailing list
> upstream-release at linux.nxdi.nxp.com
> https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flin
> ux.nxdi.nxp.com%2Fmailman%2Flistinfo%2Fupstream-
> release&data=02%7C01%7Cbharat.bhushan%40nxp.com%7C13292681c
> 0d54b7bf07e08d686aaa051%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7
> C0%7C636844464719708439&sdata=XaF8UOqcTBaARb3wQuQjE%2BY7u
> 4VspHD2qodYvvrXXw8%3D&reserved=0