ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
PATCH 1/1 ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
v2018.01 commit e23eb942ad103f ("ARM: rmobile: Stop using rcar-common/common.c on Gen3") removed board/renesas/rcar-common/common.c from the build chain. The reasoning is that calling arch_preboot_os() is no more needed.
However, we use this file as a place for R-Car common features / functionalities, shared by both Renesas reference targets and any custom R-Car boards. Without such file, we have to duplicate lots of code into board-specific *.c files.
Restore rcar-common/common.c and zap the unneeded arch_preboot_os(). No functional change intended.
--- board/renesas/rcar-common/common.c | 53 ------------------------------ board/renesas/salvator-x/Makefile | 2 +- board/renesas/ulcb/Makefile | 2 +- 3 files changed, 2 insertions(+), 55 deletions(-)
board/renesas/rcar-common/common.c +0 -53
@@ -8,57 +8,4 @@*/ #include <common.h> -#include <asm/io.h> -#include <asm/arch/sys_proto.h> #include <asm/arch/rmobile.h> -#include <asm/arch/rcar-mstp.h> - -#define TSTR0 0x04 -#define TSTR0_STR0 0x01 - -static struct mstp_ctl mstptbl[] = { - {SMSTPCR0 ,MSTP0_BITS ,CONFIG_SMSTP0_ENA , -RMSTPCR0 ,MSTP0_BITS ,CONFIG_RMSTP0_ENA }, - {SMSTPCR1 ,MSTP1_BITS ,CONFIG_SMSTP1_ENA , -RMSTPCR1 ,MSTP1_BITS ,CONFIG_RMSTP1_ENA }, - {SMSTPCR2 ,MSTP2_BITS ,CONFIG_SMSTP2_ENA , -RMSTPCR2 ,MSTP2_BITS ,CONFIG_RMSTP2_ENA }, - {SMSTPCR3 ,MSTP3_BITS ,CONFIG_SMSTP3_ENA , -RMSTPCR3 ,MSTP3_BITS ,CONFIG_RMSTP3_ENA }, - {SMSTPCR4 ,MSTP4_BITS ,CONFIG_SMSTP4_ENA , -RMSTPCR4 ,MSTP4_BITS ,CONFIG_RMSTP4_ENA }, - {SMSTPCR5 ,MSTP5_BITS ,CONFIG_SMSTP5_ENA , -RMSTPCR5 ,MSTP5_BITS ,CONFIG_RMSTP5_ENA }, -#ifdef CONFIG_RCAR_GEN3 - {SMSTPCR6 ,MSTP6_BITS ,CONFIG_SMSTP6_ENA , -RMSTPCR6 ,MSTP6_BITS ,CONFIG_RMSTP6_ENA }, -#endif - {SMSTPCR7 ,MSTP7_BITS ,CONFIG_SMSTP7_ENA , -RMSTPCR7 ,MSTP7_BITS ,CONFIG_RMSTP7_ENA }, - {SMSTPCR8 ,MSTP8_BITS ,CONFIG_SMSTP8_ENA , -RMSTPCR8 ,MSTP8_BITS ,CONFIG_RMSTP8_ENA }, - {SMSTPCR9 ,MSTP9_BITS ,CONFIG_SMSTP9_ENA , -RMSTPCR9 ,MSTP9_BITS ,CONFIG_RMSTP9_ENA }, - {SMSTPCR10 ,MSTP10_BITS ,CONFIG_SMSTP10_ENA , -RMSTPCR10 ,MSTP10_BITS ,CONFIG_RMSTP10_ENA }, - {SMSTPCR11 ,MSTP11_BITS ,CONFIG_SMSTP1_ENA , -RMSTPCR11 ,MSTP11_BITS ,CONFIG_RMSTP11_ENA }, -}; - -void arch_preboot_os (void ) -{ -int i; - -/* stop TMU0 */ -mstp_clrbits_le32 (TMU_BASE +TSTR0 ,TMU_BASE +TSTR0 ,TSTR0_STR0 ); - -/* Stop module clock */ -for (i =0 ; i <ARRAY_SIZE (mstptbl); i++) { -mstp_setclrbits_le32 ((uintptr_t )mstptbl[i].s_addr, - mstptbl[i].s_dis, - mstptbl[i].s_ena); -mstp_setclrbits_le32 ((uintptr_t )mstptbl[i].r_addr, - mstptbl[i].r_dis, - mstptbl[i].r_ena); - } -}
board/renesas/salvator-x/Makefile +1 -1
@@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := salvator-x.o +obj-y := salvator-x.o ../rcar-common/common.o
board/renesas/ulcb/Makefile +1 -1
@@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := ulcb.o cpld.o +obj-y := ulcb.o cpld.o ../rcar-common/common.o
Signature · 1 line
2.21.0
PATCH 1/1 ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
Quoted 72 lines · Eugeniu Rosca
v2018.01 commit
e23eb942ad103f("ARM: rmobile: Stop usingrcar-common/common.con Gen3") removedboard/renesas/rcar-common/common.cfrom the build chain. The reasoning is that callingarch_preboot_os()is no more needed.However, we use this file as a place for R-Car common features / functionalities, shared by both Renesas reference targets and any custom R-Car boards. Without such file, we have to duplicate lots of code into board-specific *.c files.
Restore
rcar-common/common.cand zap the unneededarch_preboot_os(). No functional change intended.Signed-off-by Eugeniu Rosca <[email protected]>--- board/renesas/rcar-common/common.c | 53 ------------------------------ board/renesas/salvator-x/Makefile | 2 +- board/renesas/ulcb/Makefile | 2 +- 3 files changed, 2 insertions(+), 55 deletions(-)board/renesas/rcar-common/common.c +0
-43@@ -8,57 +8,4 @@*/ #include <common.h> -#include <asm/io.h> -#include <asm/arch/sys_proto.h> #include <asm/arch/rmobile.h> -#include <asm/arch/rcar-mstp.h> - -#define TSTR0 0x04 -#define TSTR0_STR0 0x01 - -static struct mstp_ctl mstptbl[] = { - {SMSTPCR0 ,MSTP0_BITS ,CONFIG_SMSTP0_ENA , -RMSTPCR0 ,MSTP0_BITS ,CONFIG_RMSTP0_ENA }, - {SMSTPCR1 ,MSTP1_BITS ,CONFIG_SMSTP1_ENA , -RMSTPCR1 ,MSTP1_BITS ,CONFIG_RMSTP1_ENA }, - {SMSTPCR2 ,MSTP2_BITS ,CONFIG_SMSTP2_ENA , -RMSTPCR2 ,MSTP2_BITS ,CONFIG_RMSTP2_ENA }, - {SMSTPCR3 ,MSTP3_BITS ,CONFIG_SMSTP3_ENA , -RMSTPCR3 ,MSTP3_BITS ,CONFIG_RMSTP3_ENA }, - {SMSTPCR4 ,MSTP4_BITS ,CONFIG_SMSTP4_ENA , -RMSTPCR4 ,MSTP4_BITS ,CONFIG_RMSTP4_ENA }, - {SMSTPCR5 ,MSTP5_BITS ,CONFIG_SMSTP5_ENA , -RMSTPCR5 ,MSTP5_BITS ,CONFIG_RMSTP5_ENA }, -#ifdef CONFIG_RCAR_GEN3 - {SMSTPCR6 ,MSTP6_BITS ,CONFIG_SMSTP6_ENA , -RMSTPCR6 ,MSTP6_BITS ,CONFIG_RMSTP6_ENA }, -#endif - {SMSTPCR7 ,MSTP7_BITS ,CONFIG_SMSTP7_ENA , -RMSTPCR7 ,MSTP7_BITS ,CONFIG_RMSTP7_ENA }, - {SMSTPCR8 ,MSTP8_BITS ,CONFIG_SMSTP8_ENA , -RMSTPCR8 ,MSTP8_BITS ,CONFIG_RMSTP8_ENA }, - {SMSTPCR9 ,MSTP9_BITS ,CONFIG_SMSTP9_ENA , -RMSTPCR9 ,MSTP9_BITS ,CONFIG_RMSTP9_ENA }, - {SMSTPCR10 ,MSTP10_BITS ,CONFIG_SMSTP10_ENA , -RMSTPCR10 ,MSTP10_BITS ,CONFIG_RMSTP10_ENA }, - {SMSTPCR11 ,MSTP11_BITS ,CONFIG_SMSTP1_ENA , -RMSTPCR11 ,MSTP11_BITS ,CONFIG_RMSTP11_ENA }, -}; - -void arch_preboot_os (void ) -{ -int i; - -/* stop TMU0 */ -mstp_clrbits_le32 (TMU_BASE +TSTR0 ,TMU_BASE +TSTR0 ,TSTR0_STR0 ); -
board/renesas/rcar-common/common.c line 64
Quoted 10 lines
board/renesas/rcar-common/common.c +0
-10-/* Stop module clock */ -for (i =0 ; i <ARRAY_SIZE (mstptbl); i++) { -mstp_setclrbits_le32 ((uintptr_t )mstptbl[i].s_addr, - mstptbl[i].s_dis, - mstptbl[i].s_ena); -mstp_setclrbits_le32 ((uintptr_t )mstptbl[i].r_addr, - mstptbl[i].r_dis, - mstptbl[i].r_ena); - } -}
This should be a separate patch, one which only removes this code which is unused. Presumably the whole file should just be removed.
Quoted 15 lines
board/renesas/salvator-x/Makefile +1
-1@@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := salvator-x.o +obj-y := salvator-x.o ../rcar-common/common.oboard/renesas/ulcb/Makefile +0
-0
board/renesas/ulcb/Makefile line 9
Quoted 5 lines
board/renesas/ulcb/Makefile +1
-1@@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := ulcb.o cpld.o +obj-y := ulcb.o cpld.o ../rcar-common/common.o
This ends up including an empty file, which is useless.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/1 ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
Quoted 1 line · Marek Vasut
On 4/9/19 5:08 PM, Eugeniu Rosca wrote:
[..]
Quoted 1 line
Quoted 1 line
board/renesas/rcar-common/common.c +0
-0
[..]
Quoted 2 lines
This should be a separate patch, one which only removes this code which is unused. Presumably the whole file should just be removed.
[..]
Quoted 6 lines
board/renesas/ulcb/Makefile line 9
Quoted 4 lines
board/renesas/ulcb/Makefile +1
-1-obj-y := ulcb.o cpld.o +obj-y := ulcb.o cpld.o ../rcar-common/common.oThis ends up including an empty file, which is useless.
Do you plan to push a v2 for
https://patchwork.ozlabs.org/patch/1051603/ ?
If so, board/renesas/rcar-common/common.c might be the perfect place to host the duplicated code, i.e. you will need to re-add board/renesas/rcar-common/common.c to the build chain.
Quoted 4 lines
Signature · 3 lines
-- Best regards, Marek Vasut
Best regards,
Eugeniu.
PATCH 1/1 ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
Quoted 14 lines · Eugeniu Rosca
Quoted 1 line · Marek Vasut
On 4/9/19 5:08 PM, Eugeniu Rosca wrote:
[..]
Quoted 1 line
Quoted 1 line
board/renesas/rcar-common/common.c +0
-0[..]
Quoted 2 lines
This should be a separate patch, one which only removes this code which is unused. Presumably the whole file should just be removed.
[..]
Quoted 2 lines
Quoted 2 lines
board/renesas/ulcb/Makefile +0
-0
Quoted 7 lines
Quoted 4 lines
board/renesas/ulcb/Makefile line 9
Quoted 2 lines
board/renesas/ulcb/Makefile +1
-1-obj-y := ulcb.o cpld.o +obj-y := ulcb.o cpld.o ../rcar-common/common.oThis ends up including an empty file, which is useless.
Do you plan to push a v2 for
https://patchwork.ozlabs.org/patch/1051603/ ?
I was rather thinking of doing a follow-up patch, so that in case something broke, I could bisect it. And maybe this is actually better, since I could apply the patches in this order:
- The DRAM DT config
- The common.c cleanup of this patch
- Perform the deduplication as needed and enable common.c in the build
So can you split the common.c cleanup from this patch so I can use it?
Quoted 12 lines
If so,
board/renesas/rcar-common/common.cmight be the perfect place to host the duplicated code, i.e. you will need to re-addboard/renesas/rcar-common/common.cto the build chain.Quoted 4 lines
Signature · 3 lines
-- Best regards, Marek VasutBest regards,
Eugeniu.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/1 ARM: rmobile: ulcb/salvator-x: re-enable rcar-common/common.c
Quoted 23 lines · Marek Vasut
Quoted 14 lines · Eugeniu Rosca
Quoted 1 line · Marek Vasut
On 4/9/19 5:08 PM, Eugeniu Rosca wrote:
[..]
Quoted 1 line
Quoted 1 line
board/renesas/rcar-common/common.c +0
-0[..]
Quoted 2 lines
This should be a separate patch, one which only removes this code which is unused. Presumably the whole file should just be removed.
[..]
Quoted 2 lines
Quoted 2 lines
board/renesas/ulcb/Makefile +0
-0Quoted 7 lines
Quoted 4 lines
board/renesas/ulcb/Makefile line 9
Quoted 2 lines
board/renesas/ulcb/Makefile +1
-1-obj-y := ulcb.o cpld.o +obj-y := ulcb.o cpld.o ../rcar-common/common.oThis ends up including an empty file, which is useless.
Do you plan to push a v2 for
https://patchwork.ozlabs.org/patch/1051603/ ?
Quoted 6 lines
I was rather thinking of doing a follow-up patch, so that in case something broke, I could bisect it. And maybe this is actually better, since I could apply the patches in this order:
- The DRAM DT config
- Thecommon.ccleanup of this patch
- Perform the deduplication as needed and enablecommon.cin the build
The sequence looks good to me.
Quoted 1 line
So can you split the
common.ccleanup from this patch so I can use it?
Done in https://patchwork.ozlabs.org/patch/1082549/
Quoted 12 lines
Quoted 12 lines
If so,
board/renesas/rcar-common/common.cmight be the perfect place to host the duplicated code, i.e. you will need to re-addboard/renesas/rcar-common/common.cto the build chain.Quoted 4 lines
Signature · 3 lines
-- Best regards, Marek VasutBest regards,
Eugeniu.