| Message ID | dcEaD5-kc_SzXGz7v_bxIV4C3Rqg0b0x2bWGjCclG5pS_sL_tWoxtWu7VQqu_2SOx0LN3h9bHcaqsa_l-PiOQAMkZpiJ9G4SQta-kfPDuJw=@protonmail.com |
|---|---|
| State | Accepted |
| Commit | 7ebf7e77c0616ef0d2f58cc1684c230f656bd3d6 |
| Delegated to: | Andes |
| Headers | show |
| Series | [1/2,v5] board: starfive: support Pine64 Star64 board | expand |
On Wed, May 22, 2024 at 12:13 PM H Bell <dmoo_dv@protonmail.com> wrote: > > Similar to the Milk-V Mars, The Star64 board contains few differences to the > VisionFive 2 boards, so can be part of the same U-boot build. > > Signed-off-by: Henry Bell <dmoo_dv@protonmail.com> > Cc: ycliang@andestech.com > Cc: heinrich.schuchardt@canonical.com > --- > > Changes since v1 > > - Fix typos on naming > - Create pine64_star64 struct to be populated with PHY values once confirmed > > Changes since v2 > > - Set delays to 0 > - Add missing 10/100/1000 clocks across the two devices > - Set all uA values to 2910 > > Changes since v3 > > - Rebase against d678a59d2d > > Changes since v4 > > - Fix up delay values > --- > board/starfive/visionfive2/spl.c | 89 +++++++++++++++++++ > .../visionfive2/starfive_visionfive2.c | 4 + > 2 files changed, 93 insertions(+) > > diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c > index b555189556..b794b73b6b 100644 > --- a/board/starfive/visionfive2/spl.c > +++ b/board/starfive/visionfive2/spl.c > @@ -86,6 +86,43 @@ static const struct starfive_vf2_pro starfive_verb[] = { > "tx-internal-delay-ps", "0"}, > }; > > +static const struct starfive_vf2_pro star64_pine64[] = { > + {"/soc/ethernet@16030000", "starfive,tx-use-rgmii-clk", NULL}, > + {"/soc/ethernet@16040000", "starfive,tx-use-rgmii-clk", NULL}, > + > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,tx-clk-adj-enabled", NULL}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,tx-clk-10-inverted", NULL}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,tx-clk-100-inverted", NULL}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,tx-clk-1000-inverted", NULL}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,rx-clk-drv-microamp", "2910"}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "motorcomm,rx-data-drv-microamp", "2910"}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "rx-internal-delay-ps", "1900"}, > + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", > + "tx-internal-delay-ps", "1500"}, > + > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "motorcomm,tx-clk-adj-enabled", NULL}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "motorcomm,tx-clk-10-inverted", NULL}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "motorcomm,tx-clk-100-inverted", NULL}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "motorcomm,rx-clk-drv-microamp", "2910"}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "motorcomm,rx-data-drv-microamp", "2910"}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "rx-internal-delay-ps", "0"}, > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > + "tx-internal-delay-ps", "300"}, Note this 300uS value for tx-internal-delay-ps differs from pre-loaded firmware on Star64: ethernet-phy@1 tx_delay_sel = <0x00>; I would prefer to this (even if it is wrong) same as the pre-loaded firmware has done. Tuning patches can be applied in some future series. Is there a noticeable difference in function to change this value from how the pre-loaded firmware does this? > +}; > + > void spl_fdt_fixup_mars(void *fdt) > { > static const char compat[] = "milkv,mars\0starfive,jh7110"; > @@ -250,6 +287,56 @@ void spl_fdt_fixup_version_b(void *fdt) > } > } > > +void spl_fdt_fixup_star64(void *fdt) > +{ > + static const char compat[] = "pine64,star64\0starfive,jh7110"; > + u32 phandle; > + u8 i; > + int offset; > + int ret; > + > + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); > + fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", > + "Pine64 Star64"); > + > + /* gmac0 */ > + offset = fdt_path_offset(fdt, "/soc/clock-controller@17000000"); > + phandle = fdt_get_phandle(fdt, offset); > + offset = fdt_path_offset(fdt, "/soc/ethernet@16030000"); > + > + fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); > + fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX); > + fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); > + fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", > + JH7110_AONCLK_GMAC0_RMII_RTX); > + > + /* gmac1 */ > + offset = fdt_path_offset(fdt, "/soc/clock-controller@13020000"); > + phandle = fdt_get_phandle(fdt, offset); > + offset = fdt_path_offset(fdt, "/soc/ethernet@16040000"); > + > + fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); > + fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX); > + fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); > + fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", > + JH7110_SYSCLK_GMAC1_RMII_RTX); > + > + for (i = 0; i < ARRAY_SIZE(star64_pine64); i++) { > + offset = fdt_path_offset(fdt, star64_pine64[i].path); > + > + if (star64_pine64[i].value) > + ret = fdt_setprop_u32(fdt, offset, star64_pine64[i].name, > + dectoul(star64_pine64[i].value, NULL)); > + else > + ret = fdt_setprop_empty(fdt, offset, star64_pine64[i].name); > + > + if (ret) { > + pr_err("%s set prop %s fail.\n", __func__, star64_pine64[i].name); > + break; > + } > + } > +} > + > void spl_perform_fixups(struct spl_image_info *spl_image) > { > u8 version; > @@ -278,6 +365,8 @@ void spl_perform_fixups(struct spl_image_info *spl_image) > spl_fdt_fixup_version_b(spl_image->fdt_addr); > break; > }; > + } else if (!strncmp(product_id, "STAR64", 6)) { > + spl_fdt_fixup_star64(spl_image->fdt_addr); > } else { > pr_err("Unknown product %s\n", product_id); > }; > diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c > index 6be5348962..f6114602f8 100644 > --- a/board/starfive/visionfive2/starfive_visionfive2.c > +++ b/board/starfive/visionfive2/starfive_visionfive2.c > @@ -27,6 +27,8 @@ DECLARE_GLOBAL_DATA_PTR; > "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb" > #define FDTFILE_VISIONFIVE2_1_3B \ > "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb" > +#define FDTFILE_PINE64_STAR64 \ > + "starfive/jh7110-pine64-star64.dtb" > > /* enable U74-mc hart1~hart4 prefetcher */ > static void enable_prefetcher(void) > @@ -87,6 +89,8 @@ static void set_fdtfile(void) > fdtfile = FDTFILE_VISIONFIVE2_1_3B; > break; > } > + } else if (!strncmp(product_id, "STAR64", 6)) { > + fdtfile = FDTFILE_PINE64_STAR64; > } else { > log_err("Unknown product\n"); > return; > -- > 2.44.0 > > With that note about phy1 tx-internal-delay-ps (I have no Star64 to test myself) Reviewed-by: E Shattow <lucent@gmail.com>
On Wednesday, May 22nd, 2024 at 9:40 PM, E Shattow <lucent@gmail.com> wrote: > On Wed, May 22, 2024 at 12:13?PM H Bell dmoo_dv@protonmail.com wrote: > > > + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", > > + "tx-internal-delay-ps", "300"}, > > > Note this 300uS value for tx-internal-delay-ps differs from > pre-loaded firmware on Star64: > ethernet-phy@1 tx_delay_sel = <0x00>; > > > I would prefer to this (even if it is wrong) same as the pre-loaded > firmware has done. Tuning patches can be applied in some > future series. Is there a noticeable difference in function to change > this value from how the pre-loaded firmware does this? I agree that it should stick to the pre-loaded firmware wherever possible but I found that using the 0 value on the tx_delay_sel meant that the device would not properly send packets over the network (and would not get granted an IP over DHCP), and found (going in steps of 150) that 300 worked.
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index b555189556..b794b73b6b 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -86,6 +86,43 @@ static const struct starfive_vf2_pro starfive_verb[] = { "tx-internal-delay-ps", "0"}, }; +static const struct starfive_vf2_pro star64_pine64[] = { + {"/soc/ethernet@16030000", "starfive,tx-use-rgmii-clk", NULL}, + {"/soc/ethernet@16040000", "starfive,tx-use-rgmii-clk", NULL}, + + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,tx-clk-adj-enabled", NULL}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,tx-clk-10-inverted", NULL}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,tx-clk-100-inverted", NULL}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,tx-clk-1000-inverted", NULL}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,rx-clk-drv-microamp", "2910"}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "motorcomm,rx-data-drv-microamp", "2910"}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "rx-internal-delay-ps", "1900"}, + {"/soc/ethernet@16030000/mdio/ethernet-phy@0", + "tx-internal-delay-ps", "1500"}, + + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "motorcomm,tx-clk-adj-enabled", NULL}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "motorcomm,tx-clk-10-inverted", NULL}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "motorcomm,tx-clk-100-inverted", NULL}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "motorcomm,rx-clk-drv-microamp", "2910"}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "motorcomm,rx-data-drv-microamp", "2910"}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "rx-internal-delay-ps", "0"}, + {"/soc/ethernet@16040000/mdio/ethernet-phy@1", + "tx-internal-delay-ps", "300"}, +}; + void spl_fdt_fixup_mars(void *fdt) { static const char compat[] = "milkv,mars\0starfive,jh7110"; @@ -250,6 +287,56 @@ void spl_fdt_fixup_version_b(void *fdt) } } +void spl_fdt_fixup_star64(void *fdt) +{ + static const char compat[] = "pine64,star64\0starfive,jh7110"; + u32 phandle; + u8 i; + int offset; + int ret; + + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); + fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", + "Pine64 Star64"); + + /* gmac0 */ + offset = fdt_path_offset(fdt, "/soc/clock-controller@17000000"); + phandle = fdt_get_phandle(fdt, offset); + offset = fdt_path_offset(fdt, "/soc/ethernet@16030000"); + + fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); + fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_AONCLK_GMAC0_TX); + fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); + fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", + JH7110_AONCLK_GMAC0_RMII_RTX); + + /* gmac1 */ + offset = fdt_path_offset(fdt, "/soc/clock-controller@13020000"); + phandle = fdt_get_phandle(fdt, offset); + offset = fdt_path_offset(fdt, "/soc/ethernet@16040000"); + + fdt_setprop_u32(fdt, offset, "assigned-clocks", phandle); + fdt_appendprop_u32(fdt, offset, "assigned-clocks", JH7110_SYSCLK_GMAC1_TX); + fdt_setprop_u32(fdt, offset, "assigned-clock-parents", phandle); + fdt_appendprop_u32(fdt, offset, "assigned-clock-parents", + JH7110_SYSCLK_GMAC1_RMII_RTX); + + for (i = 0; i < ARRAY_SIZE(star64_pine64); i++) { + offset = fdt_path_offset(fdt, star64_pine64[i].path); + + if (star64_pine64[i].value) + ret = fdt_setprop_u32(fdt, offset, star64_pine64[i].name, + dectoul(star64_pine64[i].value, NULL)); + else + ret = fdt_setprop_empty(fdt, offset, star64_pine64[i].name); + + if (ret) { + pr_err("%s set prop %s fail.\n", __func__, star64_pine64[i].name); + break; + } + } +} + void spl_perform_fixups(struct spl_image_info *spl_image) { u8 version; @@ -278,6 +365,8 @@ void spl_perform_fixups(struct spl_image_info *spl_image) spl_fdt_fixup_version_b(spl_image->fdt_addr); break; }; + } else if (!strncmp(product_id, "STAR64", 6)) { + spl_fdt_fixup_star64(spl_image->fdt_addr); } else { pr_err("Unknown product %s\n", product_id); }; diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c index 6be5348962..f6114602f8 100644 --- a/board/starfive/visionfive2/starfive_visionfive2.c +++ b/board/starfive/visionfive2/starfive_visionfive2.c @@ -27,6 +27,8 @@ DECLARE_GLOBAL_DATA_PTR; "starfive/jh7110-starfive-visionfive-2-v1.2a.dtb" #define FDTFILE_VISIONFIVE2_1_3B \ "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb" +#define FDTFILE_PINE64_STAR64 \ + "starfive/jh7110-pine64-star64.dtb" /* enable U74-mc hart1~hart4 prefetcher */ static void enable_prefetcher(void) @@ -87,6 +89,8 @@ static void set_fdtfile(void) fdtfile = FDTFILE_VISIONFIVE2_1_3B; break; } + } else if (!strncmp(product_id, "STAR64", 6)) { + fdtfile = FDTFILE_PINE64_STAR64; } else { log_err("Unknown product\n"); return;
Similar to the Milk-V Mars, The Star64 board contains few differences to the VisionFive 2 boards, so can be part of the same U-boot build. Signed-off-by: Henry Bell <dmoo_dv@protonmail.com> Cc: ycliang@andestech.com Cc: heinrich.schuchardt@canonical.com --- Changes since v1 - Fix typos on naming - Create pine64_star64 struct to be populated with PHY values once confirmed Changes since v2 - Set delays to 0 - Add missing 10/100/1000 clocks across the two devices - Set all uA values to 2910 Changes since v3 - Rebase against d678a59d2d Changes since v4 - Fix up delay values --- board/starfive/visionfive2/spl.c | 89 +++++++++++++++++++ .../visionfive2/starfive_visionfive2.c | 4 + 2 files changed, 93 insertions(+)