* [PATCH] arm64: layerscape: Support SYSRESET
@ 2022-09-26 16:47 Sean Anderson
2022-10-09 2:38 ` Peng Fan
0 siblings, 1 reply; 2+ messages in thread
From: Sean Anderson @ 2022-09-26 16:47 UTC (permalink / raw)
To: Priyanka Jain, Peng Fan, u-boot
Cc: Rajesh Bhagat, Mingkai Hu, Pramod Kumar, Ran Wang, Sean Anderson
CONFIG_SYSRESET provides its own implementation of reset_cpu. Disable
our version when it is enabled.
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index c989a43cbeb..487c0ed5539 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1229,6 +1229,7 @@ int timer_init(void)
return 0;
}
+#if !CONFIG_IS_ENABLED(SYSRESET)
__efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR;
void __efi_runtime reset_cpu(void)
@@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void)
scfg_out32(rstcr, val);
#endif
}
+#endif
#if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET)
--
2.35.1.1320.gc452695387.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] arm64: layerscape: Support SYSRESET
2022-09-26 16:47 [PATCH] arm64: layerscape: Support SYSRESET Sean Anderson
@ 2022-10-09 2:38 ` Peng Fan
0 siblings, 0 replies; 2+ messages in thread
From: Peng Fan @ 2022-10-09 2:38 UTC (permalink / raw)
To: Sean Anderson, Priyanka Jain, u-boot
Cc: Rajesh Bhagat, Mingkai Hu, Pramod Kumar, Ran Wang
On 9/27/2022 12:47 AM, Sean Anderson wrote:
> CONFIG_SYSRESET provides its own implementation of reset_cpu. Disable
> our version when it is enabled.
>
> Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Queued in fsl-qoriq/next
Thanks,
Peng.
> ---
>
> arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> index c989a43cbeb..487c0ed5539 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
> @@ -1229,6 +1229,7 @@ int timer_init(void)
> return 0;
> }
>
> +#if !CONFIG_IS_ENABLED(SYSRESET)
> __efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR;
>
> void __efi_runtime reset_cpu(void)
> @@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void)
> scfg_out32(rstcr, val);
> #endif
> }
> +#endif
>
> #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-09 2:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-26 16:47 [PATCH] arm64: layerscape: Support SYSRESET Sean Anderson
2022-10-09 2:38 ` Peng Fan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.