generic/starfive: Enable Starfive JH7110 platform preferred boot hart implementation
v3 cover generic/starfive: Enable Starfive JH7110 platform preferred boot hart implementation
This is patchset to enable Starfive JH7110 platform preferred boot hart implementation.
Anup Patel (2):
lib: sbi: Allow platform to influence cold boot HART selection
platform: generic: Allow platform_override to select cold boot HART
Wei Liang Lim (1):
generic/starfive: Add Starfive JH7110 platform implementation
include/sbi/sbi_platform.h | 20 +++++++++++++++ lib/sbi/sbi_init.c | 7 +++-- platform/generic/Kconfig | 4 +++ platform/generic/configs/defconfig | 1 + platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++ platform/generic/starfive/jh7110.c | 27 ++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 +++++ 8 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 platform/generic/starfive/jh7110.c create mode 100644 platform/generic/starfive/objects.mk
Signature · 1 line
2.25.1
PATCH v3 1/3 lib: sbi: Allow platform to influence cold boot HART selection
From: Anup Patel <[email protected]>
We add an optional cold_boot_allowed() platform callback which allows platform support to decide which HARTs can do cold boot initialization.
If this platform callback is not available then any HART can do cold boot initialization.
--- include/sbi/sbi_platform.h | 20 ++++++++++++++++++++ lib/sbi/sbi_init.c | 7 +++++-- 2 files changed, 25 insertions(+), 2 deletions(-)
include/sbi/sbi_platform.h +20 -0
@@ -65,6 +65,9 @@ enum sbi_platform_features {/** Platform functions */ struct sbi_platform_operations { +/* Check if specified HART is allowed to do cold boot */ +bool (*cold_boot_allowed)(u32 hartid); +/* Platform nascent initialization */ int (*nascent_init)(void );
@@ -356,6 +359,23 @@ static inline bool sbi_platform_hart_invalid(const struct sbi_platform *plat,return FALSE; } +/** +* Check whether given HART is allowed to do cold boot +* +* @param plat pointer to struct sbi_platform +* @param hartid HART ID +* +* @return TRUE if HART is allowed to do cold boot and FALSE otherwise +*/ +static inline bool sbi_platform_cold_boot_allowed ( +const struct sbi_platform *plat, +u32 hartid) +{ +if (plat &&sbi_platform_ops (plat)->cold_boot_allowed) +return sbi_platform_ops (plat)->cold_boot_allowed (hartid); +return TRUE; +} +/** * Nascent (very early) initialization for current HART *
lib/sbi/sbi_init.c +5 -2
@@ -498,8 +498,11 @@ void __noreturn sbi_init(struct sbi_scratch *scratch)* HARTs which satisfy above condition. */ -if (next_mode_supported &&atomic_xchg (&coldboot_lottery,1 ) ==0 ) - coldboot = TRUE; +if (sbi_platform_cold_boot_allowed (plat, hartid)) { +if (next_mode_supported && +atomic_xchg (&coldboot_lottery,1 ) ==0 ) + coldboot = TRUE; + }/* * Do platform specific nascent (very early) initialization so
Signature · 1 line
2.25.1
PATCH v3 2/3 platform: generic: Allow platform_override to select cold boot HART
In reply to Wei Liang LimFrom: Anup Patel <[email protected]>
We add a generic platform override callback to allow platform specific selection of cold boot HART.
--- platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++++ 2 files changed, 10 insertions(+)
platform/generic/include/platform_override.h +1 -0
@@ -18,6 +18,7 @@ struct platform_override {const struct fdt_match *match_table;u64 (*features)(const struct fdt_match *match);u64 (*tlbr_flush_limit)(const struct fdt_match *match); +bool (*cold_boot_allowed)(u32 hartid,const struct fdt_match *match);int (*early_init)(bool cold_boot,const struct fdt_match *match);int (*final_init)(bool cold_boot,const struct fdt_match *match);void (*early_exit)(const struct fdt_match *match);
platform/generic/platform.c +9 -0
@@ -122,6 +122,14 @@ fail:wfi (); } +static bool generic_cold_boot_allowed (u32 hartid) +{ +if (generic_plat && generic_plat->cold_boot_allowed) +return generic_plat && generic_plat->cold_boot_allowed ( + hartid, generic_plat_match); +return TRUE; +} +static int generic_nascent_init (void ) {if (platform_has_mlevel_imsic)
@@ -261,6 +269,7 @@ static int generic_console_init(void) }const struct sbi_platform_operations platform_ops = { + .cold_boot_allowed = generic_cold_boot_allowed, .nascent_init = generic_nascent_init, .early_init = generic_early_init, .final_init = generic_final_init,
Signature · 1 line
2.25.1
PATCH v3 2/3 platform: generic: Allow platform_override to select cold boot HART
Quoted 29 lines · Wei Liang Lim
From: Anup Patel <[email protected]>
We add a generic platform override callback to allow platform specific selection of cold boot HART.
Signed-off-by Anup Patel <[email protected]>--- platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++++ 2 files changed, 10 insertions(+)platform/generic/include/platform_override.h +1
-0@@ -18,6 +18,7 @@ struct platform_override {const struct fdt_match *match_table;u64 (*features)(const struct fdt_match *match);u64 (*tlbr_flush_limit)(const struct fdt_match *match); +bool (*cold_boot_allowed)(u32 hartid,const struct fdt_match *match);int (*early_init)(bool cold_boot,const struct fdt_match *match);int (*final_init)(bool cold_boot,const struct fdt_match *match);void (*early_exit)(const struct fdt_match *match);platform/generic/platform.c +0
-0
platform/generic/platform.c fail: · line 129
Quoted 8 lines
platform/generic/platform.c +5
-0@@ -122,6 +122,14 @@ fail:wfi (); } +static bool generic_cold_boot_allowed (u32 hartid) +{ +if (generic_plat && generic_plat->cold_boot_allowed) +return generic_plat && generic_plat->cold_boot_allowed ( + hartid, generic_plat_match);
There is a typo here. This line should be:
"return generic_plat->cold_boot_allowed(hartid, generic_plat_match);"
Quoted 15 lines
platform/generic/platform.c +4
-1+return TRUE; +} +static int generic_nascent_init (void ) {if (platform_has_mlevel_imsic)@@ -261,6 +269,7 @@ static int generic_console_init(void) }const struct sbi_platform_operations platform_ops = { + .cold_boot_allowed = generic_cold_boot_allowed, .nascent_init = generic_nascent_init, .early_init = generic_early_init, .final_init = generic_final_init, --
Quoted 2 lines
2.25.1
Regards,
Anup
PATCH v3 3/3 generic/starfive: Add Starfive JH7110 platform implementation
In reply to Wei Liang LimAdd Starfive JH7110 platform implementation
--- platform/generic/Kconfig | 4 ++++ platform/generic/configs/defconfig | 1 + platform/generic/starfive/jh7110.c | 27 +++++++++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 ++++++ 4 files changed, 38 insertions(+) create mode 100644 platform/generic/starfive/jh7110.c create mode 100644 platform/generic/starfive/objects.mk
platform/generic/Kconfig +4 -0
@@ -41,4 +41,8 @@ config PLATFORM_SIFIVE_FU740 depends on FDT_RESET && FDT_I2C default n +config PLATFORM_STARFIVE_JH7110 + bool "StarFive JH7110 support" + default n + endif
platform/generic/configs/defconfig +1 -0
@@ -2,6 +2,7 @@ CONFIG_PLATFORM_ALLWINNER_D1=y CONFIG_PLATFORM_ANDES_AE350=y CONFIG_PLATFORM_SIFIVE_FU540=y CONFIG_PLATFORM_SIFIVE_FU740=y +CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y CONFIG_FDT_I2C=y
platform/generic/starfive/jh7110.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 StarFive +* +* Authors: +* Wei Liang Lim <[email protected]> +*/ + +#include <platform_override.h> +#include <sbi_utils/fdt/fdt_helper.h> + +static bool starfive_cold_boot_allowed (u32 hartid, +const struct fdt_match *match) +{ +return (hartid ==1 ); +} + +static const struct fdt_match starfive_jh7110_match[] = { + { .compatible ="starfive,jh7110" }, + { }, +}; + +const struct platform_override starfive_jh7110 = { + .match_table = starfive_jh7110_match, + .cold_boot_allowed = starfive_cold_boot_allowed, +};
platform/generic/starfive/objects.mk new file +6 -0
@@ -0,0 +1,6 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# + +carray-platform_override_modules-$(CONFIG_PLATFORM_STARFIVE_JH7110) += starfive_jh7110 +platform-objs-$(CONFIG_PLATFORM_STARFIVE_JH7110) += starfive/jh7110.o
Signature · 1 line
2.25.1
PATCH v3 3/3 generic/starfive: Add Starfive JH7110 platform implementation
Quoted 6 lines · Wei Liang Lim
Add Starfive JH7110 platform implementation
Signed-off-by Wei Liang Lim <[email protected]>Reviewed-by Chee Hong Ang <[email protected]>Reviewed-by Jun Liang Tan <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 87 lines
--- platform/generic/Kconfig | 4 ++++ platform/generic/configs/defconfig | 1 + platform/generic/starfive/jh7110.c | 27 +++++++++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 ++++++ 4 files changed, 38 insertions(+) create mode 100644 platform/generic/starfive/jh7110.c create mode 100644 platform/generic/starfive/objects.mkplatform/generic/Kconfig +4
-0@@ -41,4 +41,8 @@ config PLATFORM_SIFIVE_FU740 depends on FDT_RESET && FDT_I2C default n +config PLATFORM_STARFIVE_JH7110 + bool "StarFive JH7110 support" + default n + endifplatform/generic/configs/defconfig +1
-0@@ -2,6 +2,7 @@ CONFIG_PLATFORM_ALLWINNER_D1=y CONFIG_PLATFORM_ANDES_AE350=y CONFIG_PLATFORM_SIFIVE_FU540=y CONFIG_PLATFORM_SIFIVE_FU740=y +CONFIG_PLATFORM_STARFIVE_JH7110=y CONFIG_FDT_GPIO=y CONFIG_FDT_GPIO_SIFIVE=y CONFIG_FDT_I2C=yplatform/generic/starfive/jh7110.c new file +27
-0@@ -0,0 +1,27 @@ +/* +* SPDX-License-Identifier: BSD-2-Clause +* +* Copyright (c) 2022 StarFive +* +* Authors: +* Wei Liang Lim <[email protected]> +*/ + +#include <platform_override.h> +#include <sbi_utils/fdt/fdt_helper.h> + +static bool starfive_cold_boot_allowed (u32 hartid, +const struct fdt_match *match) +{ +return (hartid ==1 ); +} + +static const struct fdt_match starfive_jh7110_match[] = { + { .compatible ="starfive,jh7110" }, + { }, +}; + +const struct platform_override starfive_jh7110 = { + .match_table = starfive_jh7110_match, + .cold_boot_allowed = starfive_cold_boot_allowed, +};platform/generic/starfive/objects.mk new file +6
-1@@ -0,0 +1,6 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# + +carray-platform_override_modules-$(CONFIG_PLATFORM_STARFIVE_JH7110) += starfive_jh7110 +platform-objs-$(CONFIG_PLATFORM_STARFIVE_JH7110) += starfive/jh7110.o --2.25.1
--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
Anup Patel
Appliedv3 cover generic/starfive: Enable Starfive JH7110 platform preferred boot hart implementation
In reply to Wei Liang LimQuoted 9 lines · Wei Liang Lim
This is patchset to enable Starfive JH7110 platform preferred boot hart implementation.
Anup Patel (2):
lib: sbi: Allow platform to influence cold boot HART selection
platform: generic: Allowplatform_overrideto select cold boot HARTWei Liang Lim (1):
generic/starfive: Add Starfive JH7110 platform implementation
Applied this series to the riscv/opensbi repo.
Thanks,
Anup
Quoted 21 lines
include/sbi/sbi_platform.h | 20 +++++++++++++++ lib/sbi/sbi_init.c | 7 +++-- platform/generic/Kconfig | 4 +++ platform/generic/configs/defconfig | 1 + platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++ platform/generic/starfive/jh7110.c | 27 ++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 +++++ 8 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 platform/generic/starfive/jh7110.c create mode 100644 platform/generic/starfive/objects.mk--
2.25.1--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi
v3 cover generic/starfive: Enable Starfive JH7110 platform preferred boot hart implementation
Quoted 6 lines · Anup Patel
Quoted 3 lines · Wei Liang Lim
This is patchset to enable Starfive JH7110 platform preferred boot hart implementation.
Quoted 8 lines
Quoted 6 lines
Anup Patel (2):
lib: sbi: Allow platform to influence cold boot HART selection
platform: generic: Allowplatform_overrideto select cold boot HARTWei Liang Lim (1):
generic/starfive: Add Starfive JH7110 platform implementationApplied this series to the riscv/opensbi repo.
Why? I had objections and they said they?d do a v4.
Jess
Quoted 29 lines
Thanks,
AnupQuoted 21 lines
include/sbi/sbi_platform.h | 20 +++++++++++++++ lib/sbi/sbi_init.c | 7 +++-- platform/generic/Kconfig | 4 +++ platform/generic/configs/defconfig | 1 + platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++ platform/generic/starfive/jh7110.c | 27 ++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 +++++ 8 files changed, 73 insertions(+), 2 deletions(-)create mode 100644
platform/generic/starfive/jh7110.ccreate mode 100644platform/generic/starfive/objects.mk--
2.25.1--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbiSignature · 3 lines
opensbi mailing list opensbi at lists.infradead.org http://lists.infradead.org/mailman/listinfo/opensbi
v3 cover generic/starfive: Enable Starfive JH7110 platform preferred boot hart implementation
Quoted 12 lines · Jessica Clarke
Quoted 10 lines · Anup Patel
Quoted 7 lines · Wei Liang Lim
This is patchset to enable Starfive JH7110 platform preferred boot hart implementation.
Anup Patel (2):
lib: sbi: Allow platform to influence cold boot HART selection
platform: generic: Allowplatform_overrideto select cold boot HART
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Wei Liang Lim (1):
generic/starfive: Add Starfive JH7110 platform implementationApplied this series to the riscv/opensbi repo.
Why? I had objections and they said they?d do a v4.
Ahh, my bad. I overlooked comments on the PATCH3.
I have removed these patches from riscv/opensbi and I will re-consider it after OpenSBI v1.2 release.
Regards,
Anup
Quoted 33 lines
Jess
Quoted 29 lines
Thanks,
AnupQuoted 13 lines
include/sbi/sbi_platform.h | 20 +++++++++++++++ lib/sbi/sbi_init.c | 7 +++-- platform/generic/Kconfig | 4 +++ platform/generic/configs/defconfig | 1 + platform/generic/include/platform_override.h | 1 + platform/generic/platform.c | 9 +++++++ platform/generic/starfive/jh7110.c | 27 ++++++++++++++++++++ platform/generic/starfive/objects.mk | 6 +++++ 8 files changed, 73 insertions(+), 2 deletions(-)create mode 100644
platform/generic/starfive/jh7110.ccreate mode 100644platform/generic/starfive/objects.mkQuoted 8 lines
--
2.25.1--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi