Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fsl-layerscape: dpaa: fix fsl-mc status in fdt with bootefi

Browse source 
fsl-mc lazyapply command applies dpl from efi_exit_boot_services().
Status of fsl-mc node in working fdt is updated at this stage.
However, an efi application like grub may already have copied the fdt.
So the updates to fdt done at efi_exit_boot_services() may not be
visible to the OS. Fix it by updating fdt earlier if fsl-mc lazyapply
command is used.

Fixes: b7b8410a8f (ls2080: Exit dpaa only right before exiting U-Boot)
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Mian Yousaf Kaukab 2018-12-18 14:01:17 +01:00 • committed by York Sun
parent 5b994e85a5
commit 7e96804975
6 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/freescale/ls1088a/ls1088a.c
View file

@ -658,7 +658,8 @@ void fdt_fixup_board_enet(void *fdt)
return; return;
} }
if ((get_mc_boot_status() == 0) && (get_dpl_apply_status() == 0)) if (get_mc_boot_status() == 0 &&
(is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
fdt_status_okay(fdt, offset); fdt_status_okay(fdt, offset);
else else
fdt_status_fail(fdt, offset); fdt_status_fail(fdt, offset);

3
board/freescale/ls2080a/ls2080a.c
View file

@ -89,7 +89,8 @@ void fdt_fixup_board_enet(void *fdt)
return; return;
} }
if ((get_mc_boot_status() == 0) && (get_dpl_apply_status() == 0)) if (get_mc_boot_status() == 0 &&
(is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
fdt_status_okay(fdt, offset); fdt_status_okay(fdt, offset);
else else
fdt_status_fail(fdt, offset); fdt_status_fail(fdt, offset);

3
board/freescale/ls2080aqds/ls2080aqds.c
View file

@ -294,7 +294,8 @@ void fdt_fixup_board_enet(void *fdt)
return; return;
} }
if ((get_mc_boot_status() == 0) && (get_dpl_apply_status() == 0)) if (get_mc_boot_status() == 0 &&
(is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
fdt_status_okay(fdt, offset); fdt_status_okay(fdt, offset);
else else
fdt_status_fail(fdt, offset); fdt_status_fail(fdt, offset);

3
board/freescale/ls2080ardb/ls2080ardb.c
View file

@ -330,7 +330,8 @@ void fdt_fixup_board_enet(void *fdt)
return; return;
} }
if ((get_mc_boot_status() == 0) && (get_dpl_apply_status() == 0)) if (get_mc_boot_status() == 0 &&
(is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0))
fdt_status_okay(fdt, offset); fdt_status_okay(fdt, offset);
else else
fdt_status_fail(fdt, offset); fdt_status_fail(fdt, offset);

5
drivers/net/fsl-mc/mc.c
View file

@ -834,6 +834,11 @@ int get_dpl_apply_status(void)
return mc_dpl_applied; return mc_dpl_applied;
} }
int is_lazy_dpl_addr_valid(void)
{
return !!mc_lazy_dpl_addr;
}
/* /*
* Return the MC address of private DRAM block. * Return the MC address of private DRAM block.
* As per MC design document, MC initial base address * As per MC design document, MC initial base address

1
include/fsl-mc/fsl_mc.h
View file

@ -54,6 +54,7 @@ struct mc_ccsr_registers {
void fdt_fsl_mc_fixup_iommu_map_entry(void *blob); void fdt_fsl_mc_fixup_iommu_map_entry(void *blob);
int get_mc_boot_status(void); int get_mc_boot_status(void);
int get_dpl_apply_status(void); int get_dpl_apply_status(void);
int is_lazy_dpl_addr_valid(void);
#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET #ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
int get_aiop_apply_status(void); int get_aiop_apply_status(void);
#endif #endif