* [PATCH 1/1] riscv: set fdtfile on VisionFive 2
@ 2023-09-07 11:21 Heinrich Schuchardt
2023-09-13 11:25 ` Leo Liang
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Heinrich Schuchardt @ 2023-09-07 11:21 UTC (permalink / raw)
To: Rick Chen, Leo, Yanhong Wang; +Cc: u-boot, Heinrich Schuchardt
Multiple revisions of the StarFive VisionFive 2 board exist. They can be
identified by reading their EEPROM.
Linux uses two differently named device-tree files. To load the correct
device-tree we need to set $fdtfile to the device-tree file name that
matches the board revision.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
arch/riscv/Kconfig | 1 +
.../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++-
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 6771d8d919..1c62c2345b 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED
config TARGET_STARFIVE_VISIONFIVE2
bool "Support StarFive VisionFive2 Board"
+ select BOARD_LATE_INIT
config TARGET_TH1520_LPI4A
bool "Support Sipeed's TH1520 Lichee PI 4A Board"
diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
index d609262b67..05d8d2d657 100644
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -5,14 +5,20 @@
*/
#include <common.h>
-#include <asm/io.h>
-#include <asm/sections.h>
#include <cpu_func.h>
#include <dm.h>
+#include <env.h>
+#include <asm/arch/eeprom.h>
+#include <asm/io.h>
+#include <asm/sections.h>
#include <linux/bitops.h>
#define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000
#define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
+#define FDTFILE_VISIONFIVE2_1_2A \
+ "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
+#define FDTFILE_VISIONFIVE2_1_3B \
+ "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
/* enable U74-mc hart1~hart4 prefetcher */
static void enable_prefetcher(void)
@@ -33,6 +39,31 @@ static void enable_prefetcher(void)
}
}
+/**
+ * set_fdtfile() - set the $fdtfile variable based on the board revision
+ */
+static void set_fdtfile(void)
+{
+ u8 version;
+ const char *fdtfile;
+
+ version = get_pcb_revision_from_eeprom();
+ switch (version) {
+ case 'a':
+ case 'A':
+ fdtfile = FDTFILE_VISIONFIVE2_1_2A;
+ break;
+
+ case 'b':
+ case 'B':
+ default:
+ fdtfile = FDTFILE_VISIONFIVE2_1_3B;
+ break;
+ };
+
+ env_set("fdtfile", fdtfile);
+}
+
int board_init(void)
{
enable_caches();
@@ -41,6 +72,14 @@ int board_init(void)
return 0;
}
+int board_late_init(void)
+{
+ if (CONFIG_IS_ENABLED(ID_EEPROM))
+ set_fdtfile();
+
+ return 0;
+}
+
void *board_fdt_blob_setup(int *err)
{
*err = 0;
--
2.40.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] riscv: set fdtfile on VisionFive 2
2023-09-07 11:21 [PATCH 1/1] riscv: set fdtfile on VisionFive 2 Heinrich Schuchardt
@ 2023-09-13 11:25 ` Leo Liang
2023-09-21 20:29 ` Milan P. Stanić
2023-09-22 13:54 ` Shengyu Qu
2 siblings, 0 replies; 5+ messages in thread
From: Leo Liang @ 2023-09-13 11:25 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: Rick Chen, Yanhong Wang, u-boot
On Thu, Sep 07, 2023 at 01:21:28PM +0200, Heinrich Schuchardt wrote:
> Multiple revisions of the StarFive VisionFive 2 board exist. They can be
> identified by reading their EEPROM.
>
> Linux uses two differently named device-tree files. To load the correct
> device-tree we need to set $fdtfile to the device-tree file name that
> matches the board revision.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
> arch/riscv/Kconfig | 1 +
> .../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++-
> 2 files changed, 42 insertions(+), 2 deletions(-)
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] riscv: set fdtfile on VisionFive 2
2023-09-07 11:21 [PATCH 1/1] riscv: set fdtfile on VisionFive 2 Heinrich Schuchardt
2023-09-13 11:25 ` Leo Liang
@ 2023-09-21 20:29 ` Milan P. Stanić
2023-09-22 13:54 ` Shengyu Qu
2 siblings, 0 replies; 5+ messages in thread
From: Milan P. Stanić @ 2023-09-21 20:29 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: Rick Chen, Leo, Yanhong Wang, u-boot
On Thu, 2023-09-07 at 13:21, Heinrich Schuchardt wrote:
> Multiple revisions of the StarFive VisionFive 2 board exist. They can be
> identified by reading their EEPROM.
>
> Linux uses two differently named device-tree files. To load the correct
> device-tree we need to set $fdtfile to the device-tree file name that
> matches the board revision.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
Tested-by: Milan P. Stanić <mps@arvanta.net>
> ---
> arch/riscv/Kconfig | 1 +
> .../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++-
> 2 files changed, 42 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 6771d8d919..1c62c2345b 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED
>
> config TARGET_STARFIVE_VISIONFIVE2
> bool "Support StarFive VisionFive2 Board"
> + select BOARD_LATE_INIT
>
> config TARGET_TH1520_LPI4A
> bool "Support Sipeed's TH1520 Lichee PI 4A Board"
> diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
> index d609262b67..05d8d2d657 100644
> --- a/board/starfive/visionfive2/starfive_visionfive2.c
> +++ b/board/starfive/visionfive2/starfive_visionfive2.c
> @@ -5,14 +5,20 @@
> */
>
> #include <common.h>
> -#include <asm/io.h>
> -#include <asm/sections.h>
> #include <cpu_func.h>
> #include <dm.h>
> +#include <env.h>
> +#include <asm/arch/eeprom.h>
> +#include <asm/io.h>
> +#include <asm/sections.h>
> #include <linux/bitops.h>
>
> #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000
> #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
> +#define FDTFILE_VISIONFIVE2_1_2A \
> + "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
> +#define FDTFILE_VISIONFIVE2_1_3B \
> + "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
>
> /* enable U74-mc hart1~hart4 prefetcher */
> static void enable_prefetcher(void)
> @@ -33,6 +39,31 @@ static void enable_prefetcher(void)
> }
> }
>
> +/**
> + * set_fdtfile() - set the $fdtfile variable based on the board revision
> + */
> +static void set_fdtfile(void)
> +{
> + u8 version;
> + const char *fdtfile;
> +
> + version = get_pcb_revision_from_eeprom();
> + switch (version) {
> + case 'a':
> + case 'A':
> + fdtfile = FDTFILE_VISIONFIVE2_1_2A;
> + break;
> +
> + case 'b':
> + case 'B':
> + default:
> + fdtfile = FDTFILE_VISIONFIVE2_1_3B;
> + break;
> + };
> +
> + env_set("fdtfile", fdtfile);
> +}
> +
> int board_init(void)
> {
> enable_caches();
> @@ -41,6 +72,14 @@ int board_init(void)
> return 0;
> }
>
> +int board_late_init(void)
> +{
> + if (CONFIG_IS_ENABLED(ID_EEPROM))
> + set_fdtfile();
> +
> + return 0;
> +}
> +
> void *board_fdt_blob_setup(int *err)
> {
> *err = 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] riscv: set fdtfile on VisionFive 2
2023-09-07 11:21 [PATCH 1/1] riscv: set fdtfile on VisionFive 2 Heinrich Schuchardt
2023-09-13 11:25 ` Leo Liang
2023-09-21 20:29 ` Milan P. Stanić
@ 2023-09-22 13:54 ` Shengyu Qu
2023-09-25 11:43 ` Leo Liang
2 siblings, 1 reply; 5+ messages in thread
From: Shengyu Qu @ 2023-09-22 13:54 UTC (permalink / raw)
To: Heinrich Schuchardt, Rick Chen, Leo, Yanhong Wang; +Cc: wiagn233, u-boot, mps
Hello Leo,
This patch seems only landed in next branch, not master. It is seriously
needed to make visionfive 2 working properly. Could you merge it to
master branch?
Best regards,
Shengyu
> Multiple revisions of the StarFive VisionFive 2 board exist. They can be
> identified by reading their EEPROM.
>
> Linux uses two differently named device-tree files. To load the correct
> device-tree we need to set $fdtfile to the device-tree file name that
> matches the board revision.
>
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
> Tested-by: Milan P. Stanić <mps@arvanta.net>
> ---
> arch/riscv/Kconfig | 1 +
> .../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++-
> 2 files changed, 42 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index 6771d8d919..1c62c2345b 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED
>
> config TARGET_STARFIVE_VISIONFIVE2
> bool "Support StarFive VisionFive2 Board"
> + select BOARD_LATE_INIT
>
> config TARGET_TH1520_LPI4A
> bool "Support Sipeed's TH1520 Lichee PI 4A Board"
> diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
> index d609262b67..05d8d2d657 100644
> --- a/board/starfive/visionfive2/starfive_visionfive2.c
> +++ b/board/starfive/visionfive2/starfive_visionfive2.c
> @@ -5,14 +5,20 @@
> */
>
> #include <common.h>
> -#include <asm/io.h>
> -#include <asm/sections.h>
> #include <cpu_func.h>
> #include <dm.h>
> +#include <env.h>
> +#include <asm/arch/eeprom.h>
> +#include <asm/io.h>
> +#include <asm/sections.h>
> #include <linux/bitops.h>
>
> #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000
> #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
> +#define FDTFILE_VISIONFIVE2_1_2A \
> + "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
> +#define FDTFILE_VISIONFIVE2_1_3B \
> + "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
>
> /* enable U74-mc hart1~hart4 prefetcher */
> static void enable_prefetcher(void)
> @@ -33,6 +39,31 @@ static void enable_prefetcher(void)
> }
> }
>
> +/**
> + * set_fdtfile() - set the $fdtfile variable based on the board revision
> + */
> +static void set_fdtfile(void)
> +{
> + u8 version;
> + const char *fdtfile;
> +
> + version = get_pcb_revision_from_eeprom();
> + switch (version) {
> + case 'a':
> + case 'A':
> + fdtfile = FDTFILE_VISIONFIVE2_1_2A;
> + break;
> +
> + case 'b':
> + case 'B':
> + default:
> + fdtfile = FDTFILE_VISIONFIVE2_1_3B;
> + break;
> + };
> +
> + env_set("fdtfile", fdtfile);
> +}
> +
> int board_init(void)
> {
> enable_caches();
> @@ -41,6 +72,14 @@ int board_init(void)
> return 0;
> }
>
> +int board_late_init(void)
> +{
> + if (CONFIG_IS_ENABLED(ID_EEPROM))
> + set_fdtfile();
> +
> + return 0;
> +}
> +
> void *board_fdt_blob_setup(int *err)
> {
> *err = 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] riscv: set fdtfile on VisionFive 2
2023-09-22 13:54 ` Shengyu Qu
@ 2023-09-25 11:43 ` Leo Liang
0 siblings, 0 replies; 5+ messages in thread
From: Leo Liang @ 2023-09-25 11:43 UTC (permalink / raw)
To: Shengyu Qu; +Cc: Heinrich Schuchardt, Rick Chen, Yanhong Wang, u-boot, mps
On Fri, Sep 22, 2023 at 09:54:23PM +0800, Shengyu Qu wrote:
> Hello Leo,
>
> This patch seems only landed in next branch, not master. It is seriously
>
> needed to make visionfive 2 working properly. Could you merge it to
>
> master branch?
>
> Best regards,
>
> Shengyu
>
Hi Shengyu,
Got it!
Will do ASAP!
Best regards,
Leo
> > Multiple revisions of the StarFive VisionFive 2 board exist. They can be
> > identified by reading their EEPROM.
> >
> > Linux uses two differently named device-tree files. To load the correct
> > device-tree we need to set $fdtfile to the device-tree file name that
> > matches the board revision.
> >
> > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> > Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
> > Tested-by: Milan P. Stanić <mps@arvanta.net>
> > ---
> > arch/riscv/Kconfig | 1 +
> > .../visionfive2/starfive_visionfive2.c | 43 ++++++++++++++++++-
> > 2 files changed, 42 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > index 6771d8d919..1c62c2345b 100644
> > --- a/arch/riscv/Kconfig
> > +++ b/arch/riscv/Kconfig
> > @@ -26,6 +26,7 @@ config TARGET_SIFIVE_UNMATCHED
> > config TARGET_STARFIVE_VISIONFIVE2
> > bool "Support StarFive VisionFive2 Board"
> > + select BOARD_LATE_INIT
> > config TARGET_TH1520_LPI4A
> > bool "Support Sipeed's TH1520 Lichee PI 4A Board"
> > diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
> > index d609262b67..05d8d2d657 100644
> > --- a/board/starfive/visionfive2/starfive_visionfive2.c
> > +++ b/board/starfive/visionfive2/starfive_visionfive2.c
> > @@ -5,14 +5,20 @@
> > */
> > #include <common.h>
> > -#include <asm/io.h>
> > -#include <asm/sections.h>
> > #include <cpu_func.h>
> > #include <dm.h>
> > +#include <env.h>
> > +#include <asm/arch/eeprom.h>
> > +#include <asm/io.h>
> > +#include <asm/sections.h>
> > #include <linux/bitops.h>
> > #define JH7110_L2_PREFETCHER_BASE_ADDR 0x2030000
> > #define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
> > +#define FDTFILE_VISIONFIVE2_1_2A \
> > + "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
> > +#define FDTFILE_VISIONFIVE2_1_3B \
> > + "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"
> > /* enable U74-mc hart1~hart4 prefetcher */
> > static void enable_prefetcher(void)
> > @@ -33,6 +39,31 @@ static void enable_prefetcher(void)
> > }
> > }
> > +/**
> > + * set_fdtfile() - set the $fdtfile variable based on the board revision
> > + */
> > +static void set_fdtfile(void)
> > +{
> > + u8 version;
> > + const char *fdtfile;
> > +
> > + version = get_pcb_revision_from_eeprom();
> > + switch (version) {
> > + case 'a':
> > + case 'A':
> > + fdtfile = FDTFILE_VISIONFIVE2_1_2A;
> > + break;
> > +
> > + case 'b':
> > + case 'B':
> > + default:
> > + fdtfile = FDTFILE_VISIONFIVE2_1_3B;
> > + break;
> > + };
> > +
> > + env_set("fdtfile", fdtfile);
> > +}
> > +
> > int board_init(void)
> > {
> > enable_caches();
> > @@ -41,6 +72,14 @@ int board_init(void)
> > return 0;
> > }
> > +int board_late_init(void)
> > +{
> > + if (CONFIG_IS_ENABLED(ID_EEPROM))
> > + set_fdtfile();
> > +
> > + return 0;
> > +}
> > +
> > void *board_fdt_blob_setup(int *err)
> > {
> > *err = 0;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-25 11:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-07 11:21 [PATCH 1/1] riscv: set fdtfile on VisionFive 2 Heinrich Schuchardt
2023-09-13 11:25 ` Leo Liang
2023-09-21 20:29 ` Milan P. Stanić
2023-09-22 13:54 ` Shengyu Qu
2023-09-25 11:43 ` Leo Liang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox