* [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
@ 2021-12-17 19:47 Adam Ford
2022-01-11 14:22 ` Adam Ford
0 siblings, 1 reply; 6+ messages in thread
From: Adam Ford @ 2021-12-17 19:47 UTC (permalink / raw)
To: u-boot; +Cc: marex, aford, Adam Ford
Instead of a custom cpu_reset function, use the sysreset_psci
instead to reduce redundant code clutter.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
index df6044a429..4b41c6fdaa 100644
--- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
+++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
@@ -6,7 +6,6 @@
#include <common.h>
#include <asm/global_data.h>
#include <asm/io.h>
-#include <asm/arch/rcar-mstp.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -18,15 +17,6 @@ int board_init(void)
return 0;
}
-#define RST_BASE 0xE6160000
-#define RST_CA57RESCNT (RST_BASE + 0x40)
-#define RST_CODE 0xA5A5000F
-
-void reset_cpu(void)
-{
- writel(RST_CODE, RST_CA57RESCNT);
-}
-
#if IS_ENABLED(CONFIG_MULTI_DTB_FIT)
int board_fit_config_name_match(const char *name)
{
diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig
index 6c48c3b8c9..55d4982721 100644
--- a/configs/rzg2_beacon_defconfig
+++ b/configs/rzg2_beacon_defconfig
@@ -70,6 +70,8 @@ CONFIG_SCIF_CONSOLE=y
CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_RENESAS_RPC_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_PSCI=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_EHCI_HCD=y
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
2021-12-17 19:47 [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI Adam Ford
@ 2022-01-11 14:22 ` Adam Ford
2022-01-22 17:50 ` Adam Ford
0 siblings, 1 reply; 6+ messages in thread
From: Adam Ford @ 2022-01-11 14:22 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Marek Vasut, Adam Ford-BE
On Fri, Dec 17, 2021 at 1:48 PM Adam Ford <aford173@gmail.com> wrote:
>
> Instead of a custom cpu_reset function, use the sysreset_psci
> instead to reduce redundant code clutter.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
Marek,
Gentle ping on this one.
>
> diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> index df6044a429..4b41c6fdaa 100644
> --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> @@ -6,7 +6,6 @@
> #include <common.h>
> #include <asm/global_data.h>
> #include <asm/io.h>
> -#include <asm/arch/rcar-mstp.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -18,15 +17,6 @@ int board_init(void)
> return 0;
> }
>
> -#define RST_BASE 0xE6160000
> -#define RST_CA57RESCNT (RST_BASE + 0x40)
> -#define RST_CODE 0xA5A5000F
> -
> -void reset_cpu(void)
> -{
> - writel(RST_CODE, RST_CA57RESCNT);
> -}
> -
> #if IS_ENABLED(CONFIG_MULTI_DTB_FIT)
> int board_fit_config_name_match(const char *name)
> {
> diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig
> index 6c48c3b8c9..55d4982721 100644
> --- a/configs/rzg2_beacon_defconfig
> +++ b/configs/rzg2_beacon_defconfig
> @@ -70,6 +70,8 @@ CONFIG_SCIF_CONSOLE=y
> CONFIG_SPI=y
> CONFIG_DM_SPI=y
> CONFIG_RENESAS_RPC_SPI=y
> +CONFIG_SYSRESET=y
> +CONFIG_SYSRESET_PSCI=y
> CONFIG_USB=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_EHCI_HCD=y
> --
> 2.32.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
2022-01-11 14:22 ` Adam Ford
@ 2022-01-22 17:50 ` Adam Ford
2022-01-22 22:12 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Adam Ford @ 2022-01-22 17:50 UTC (permalink / raw)
To: U-Boot Mailing List; +Cc: Marek Vasut, Adam Ford-BE, Tom Rini
On Tue, Jan 11, 2022 at 8:22 AM Adam Ford <aford173@gmail.com> wrote:
>
> On Fri, Dec 17, 2021 at 1:48 PM Adam Ford <aford173@gmail.com> wrote:
> >
> > Instead of a custom cpu_reset function, use the sysreset_psci
> > instead to reduce redundant code clutter.
> >
> > Signed-off-by: Adam Ford <aford173@gmail.com>
>
> Marek,
>
> Gentle ping on this one.
>
> >
+ Tom
Any change you can apply this one since it only affects my boards?
adam
> > diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> > index df6044a429..4b41c6fdaa 100644
> > --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> > +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c
> > @@ -6,7 +6,6 @@
> > #include <common.h>
> > #include <asm/global_data.h>
> > #include <asm/io.h>
> > -#include <asm/arch/rcar-mstp.h>
> >
> > DECLARE_GLOBAL_DATA_PTR;
> >
> > @@ -18,15 +17,6 @@ int board_init(void)
> > return 0;
> > }
> >
> > -#define RST_BASE 0xE6160000
> > -#define RST_CA57RESCNT (RST_BASE + 0x40)
> > -#define RST_CODE 0xA5A5000F
> > -
> > -void reset_cpu(void)
> > -{
> > - writel(RST_CODE, RST_CA57RESCNT);
> > -}
> > -
> > #if IS_ENABLED(CONFIG_MULTI_DTB_FIT)
> > int board_fit_config_name_match(const char *name)
> > {
> > diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig
> > index 6c48c3b8c9..55d4982721 100644
> > --- a/configs/rzg2_beacon_defconfig
> > +++ b/configs/rzg2_beacon_defconfig
> > @@ -70,6 +70,8 @@ CONFIG_SCIF_CONSOLE=y
> > CONFIG_SPI=y
> > CONFIG_DM_SPI=y
> > CONFIG_RENESAS_RPC_SPI=y
> > +CONFIG_SYSRESET=y
> > +CONFIG_SYSRESET_PSCI=y
> > CONFIG_USB=y
> > CONFIG_USB_XHCI_HCD=y
> > CONFIG_USB_EHCI_HCD=y
> > --
> > 2.32.0
> >
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
2022-01-22 17:50 ` Adam Ford
@ 2022-01-22 22:12 ` Marek Vasut
2022-01-22 23:50 ` Adam Ford
0 siblings, 1 reply; 6+ messages in thread
From: Marek Vasut @ 2022-01-22 22:12 UTC (permalink / raw)
To: Adam Ford, U-Boot Mailing List; +Cc: Adam Ford-BE, Tom Rini
On 1/22/22 18:50, Adam Ford wrote:
> On Tue, Jan 11, 2022 at 8:22 AM Adam Ford <aford173@gmail.com> wrote:
>>
>> On Fri, Dec 17, 2021 at 1:48 PM Adam Ford <aford173@gmail.com> wrote:
>>>
>>> Instead of a custom cpu_reset function, use the sysreset_psci
>>> instead to reduce redundant code clutter.
>>>
>>> Signed-off-by: Adam Ford <aford173@gmail.com>
>>
>> Marek,
>>
>> Gentle ping on this one.
>>
>>>
>
> + Tom
>
> Any change you can apply this one since it only affects my boards?
Last time I checked, the CI did not pass.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
2022-01-22 22:12 ` Marek Vasut
@ 2022-01-22 23:50 ` Adam Ford
2022-01-23 2:00 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Adam Ford @ 2022-01-22 23:50 UTC (permalink / raw)
To: Marek Vasut; +Cc: U-Boot Mailing List, Adam Ford-BE, Tom Rini
On Sat, Jan 22, 2022 at 4:12 PM Marek Vasut <marex@denx.de> wrote:
>
> On 1/22/22 18:50, Adam Ford wrote:
> > On Tue, Jan 11, 2022 at 8:22 AM Adam Ford <aford173@gmail.com> wrote:
> >>
> >> On Fri, Dec 17, 2021 at 1:48 PM Adam Ford <aford173@gmail.com> wrote:
> >>>
> >>> Instead of a custom cpu_reset function, use the sysreset_psci
> >>> instead to reduce redundant code clutter.
> >>>
> >>> Signed-off-by: Adam Ford <aford173@gmail.com>
> >>
> >> Marek,
> >>
> >> Gentle ping on this one.
> >>
> >>>
> >
> > + Tom
> >
> > Any change you can apply this one since it only affects my boards?
>
> Last time I checked, the CI did not pass.
Is there a log you can direct me to review? It's building fine for me
against the current 'master'
adam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI
2022-01-22 23:50 ` Adam Ford
@ 2022-01-23 2:00 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2022-01-23 2:00 UTC (permalink / raw)
To: Adam Ford; +Cc: U-Boot Mailing List, Adam Ford-BE, Tom Rini
On 1/23/22 00:50, Adam Ford wrote:
> On Sat, Jan 22, 2022 at 4:12 PM Marek Vasut <marex@denx.de> wrote:
>>
>> On 1/22/22 18:50, Adam Ford wrote:
>>> On Tue, Jan 11, 2022 at 8:22 AM Adam Ford <aford173@gmail.com> wrote:
>>>>
>>>> On Fri, Dec 17, 2021 at 1:48 PM Adam Ford <aford173@gmail.com> wrote:
>>>>>
>>>>> Instead of a custom cpu_reset function, use the sysreset_psci
>>>>> instead to reduce redundant code clutter.
>>>>>
>>>>> Signed-off-by: Adam Ford <aford173@gmail.com>
>>>>
>>>> Marek,
>>>>
>>>> Gentle ping on this one.
>>>>
>>>>>
>>>
>>> + Tom
>>>
>>> Any change you can apply this one since it only affects my boards?
>>
>> Last time I checked, the CI did not pass.
>
> Is there a log you can direct me to review? It's building fine for me
> against the current 'master'
It seems the pipeline just passed, so it must've been another
intermittent error.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-23 2:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-17 19:47 [PATCH] arm: rmobile: rzg2_beacon: Migrate reset to SYSRESET_PSCI Adam Ford
2022-01-11 14:22 ` Adam Ford
2022-01-22 17:50 ` Adam Ford
2022-01-22 22:12 ` Marek Vasut
2022-01-22 23:50 ` Adam Ford
2022-01-23 2:00 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox