Add support for Ethernet Boot on SK-AM62
Subsystems (6)
v6 cover Add support for Ethernet Boot on SK-AM62
This series enables Ethernet Boot on SK-AM62 device.
This series is based on commit 'f4f845b85926' of origin/next branch of U-Boot.
Link to v5:
https://lore.kernel.org/r/[email protected]/
Logs for Ethernet Boot for AM625-SK:
https://gist.github.com/chintanv133/464782796a9a60b9f5a49e674c5fc31a
Changes from v5 to v6:
- Updated function "k3_ringacc_ring_reset_raw" in [PATCH v5 04/10] to reset only ring size field in ring configuration register as pointed out by Alexander Sverdlin.
- Added a new patch [PATCH 05/11] to reset only qmode in "k3_ringacc_ring_reconfig_qmode_raw" function as it was resetting other fields in ring configuration register.
- Moved function to enable cache before probing CPSW driver as suggested by Andrew.
- Added Reviewed-by tags from Alexander Sverdlin and Sumit Garg.
Chintan Vankar (3):
common: spl: spl: Init DRAM size in R5/A53 SPL
soc: ti: k3-navss-ringacc: Fix reconfiguration of qmode API
arm64: dts: ti: k3-am62x-sk-common: Add bootph-all property in
phy_gmii_sel node
Kishon Vijay Abraham I (6):
firmware: ti_sci: Add No-OP for "RX_FL_CFG"
soc: ti: k3-navss-ringacc: Initialize base address of ring cfg
registers
dma: ti: k3-udma: Add support for native configuration of chan/flow
arm: mach-k3: am62x: am625_init: Probe AM65 CPSW NUSS
configs: am62: Add configs for enabling ETHBOOT in R5SPL
configs: am62: Enable configs required for Ethboot
Siddharth Vadapalli (1):
arm: dts: k3-am625-r5-sk: Enable DM services for main_pktdma
Vignesh Raghavendra (1):
soc: ti: k3-navss-ringacc: Fix reset ring API
arch/arm/dts/k3-am625-r5-sk.dts | 5 ++++ arch/arm/mach-k3/am62x/am625_init.c | 9 +++++++ common/spl/spl.c | 2 +- configs/am62x_evm_a53_ethboot_defconfig | 17 +++++++++++++ configs/am62x_evm_r5_ethboot_defconfig | 25 +++++++++++++++++++ drivers/dma/ti/k3-udma.c | 6 +++++ drivers/firmware/ti_sci.c | 8 +++++- drivers/soc/ti/k3-navss-ringacc-u-boot.c | 11 ++++++-- drivers/soc/ti/k3-navss-ringacc.c | 17 ++++++++++++- .../src/arm64/ti/k3-am62x-sk-common.dtsi | 4 +++ 10 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 configs/am62x_evm_a53_ethboot_defconfig create mode 100644 configs/am62x_evm_r5_ethboot_defconfig
Signature · 1 line
2.34.1
PATCH v6 1/11 common: spl: spl: Init DRAM size in R5/A53 SPL
Initialize DRAM size in SPL stage since networking requires DDR to be initialized.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- No changes.
common/spl/spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
common/spl/spl.c +1 -1
@@ -718,7 +718,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)initr_watchdog ();if (IS_ENABLED (CONFIG_SPL_OS_BOOT ) ||CONFIG_IS_ENABLED (HANDOFF ) || -IS_ENABLED (CONFIG_SPL_ATF )) +IS_ENABLED (CONFIG_SPL_ATF ) ||IS_ENABLED (CONFIG_SPL_NET ))dram_init_banksize ();if (CONFIG_IS_ENABLED (PCI ) && !(gd->flags &GD_FLG_DM_DEAD )) {
Signature · 1 line
2.34.1
PATCH v6 2/11 firmware: ti_sci: Add No-OP for "RX_FL_CFG"
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
RX_FL_CFG message should not be forwarded to TIFS and should be handled within R5 SPL (when DM services are not available). Add a no-op function to not handle RX_FL_CFG messages.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added a Reviewed-by tag from Alexander Sverdlin.
drivers/firmware/ti_sci.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/firmware/ti_sci.c +7 -1
@@ -2450,6 +2450,12 @@ fail:return ret; } +static int ti_sci_cmd_rm_udmap_rx_flow_cfg_noop (const struct ti_sci_handle *handle, +const struct ti_sci_msg_rm_udmap_flow_cfg *params) +{ +return 0 ; +} +/** * ti_sci_cmd_set_fwl_region() - Request for configuring a firewall region * @handle: pointer to TI SCI handle
@@ -2895,7 +2901,7 @@ static __maybe_unused int ti_sci_dm_probe(struct udevice *dev) udmap_ops = &ops->rm_udmap_ops; udmap_ops->tx_ch_cfg = ti_sci_cmd_rm_udmap_tx_ch_cfg; udmap_ops->rx_ch_cfg = ti_sci_cmd_rm_udmap_rx_ch_cfg; - udmap_ops->rx_flow_cfg = ti_sci_cmd_rm_udmap_rx_flow_cfg; + udmap_ops->rx_flow_cfg = ti_sci_cmd_rm_udmap_rx_flow_cfg_noop;return ret; }
Signature · 1 line
2.34.1
PATCH v6 3/11 soc: ti: k3-navss-ringacc: Initialize base address of ring cfg registers
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
Initialize base address of ring config registers required to natively setup ring cfg registers in the absence of Device Manager (DM) services at R5 SPL stage. Since register property is defined as "ring" for PKTDMA and "cfg" for UDMA, configure base address of ring configuration register accordingly.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added a Reviewed-by tag from Alexander Sverdlin.
drivers/soc/ti/k3-navss-ringacc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/soc/ti/k3-navss-ringacc.c +16 -1
@@ -1028,8 +1028,8 @@ static int k3_nav_ringacc_init(struct udevice *dev, struct k3_nav_ringacc *ringastruct k3_nav_ringacc *k3_ringacc_dmarings_init (struct udevice *dev,struct k3_ringacc_init_data *data) { +void __iomem *base_rt, *base_cfg;struct k3_nav_ringacc *ringacc; -void __iomem *base_rt;int i; ringacc =devm_kzalloc (dev,sizeof (*ringacc),GFP_KERNEL );
@@ -1047,6 +1047,20 @@ struct k3_nav_ringacc *k3_ringacc_dmarings_init(struct udevice *dev,if (!base_rt)return ERR_PTR (-EINVAL ); +/* +* Since register property is defined as "ring" for PKTDMA and +* "cfg" for UDMA, configure base address of ring configuration +* register accordingly. +*/ + base_cfg =dev_remap_addr_name (dev,"ring" ); +pr_debug ("ring %p\n" , base_cfg); +if (!base_cfg) { + base_cfg =dev_remap_addr_name (dev,"cfg" ); +pr_debug ("cfg %p\n" , base_cfg); +if (!base_cfg) +return ERR_PTR (-EINVAL ); + } + ringacc->rings = devm_kzalloc(dev, sizeof(*ringacc->rings) * ringacc->num_rings * 2,
@@ -1061,6 +1075,7 @@ struct k3_nav_ringacc *k3_ringacc_dmarings_init(struct udevice *dev,for (i =0 ; i < ringacc->num_rings; i++) {struct k3_nav_ring *ring = &ringacc->rings[i]; + ring->cfg = base_cfg +KNAV_RINGACC_CFG_REGS_STEP * i; ring->rt = base_rt +K3_DMARING_RING_RT_REGS_STEP * i; ring->parent = ringacc; ring->ring_id = i;
Signature · 1 line
2.34.1
PATCH v6 4/11 soc: ti: k3-navss-ringacc: Fix reset ring API
In reply to Chintan VankarFrom: Vignesh Raghavendra <[email protected]>
Expectation of k3_ringacc_ring_reset_raw() is to reset the ring to requested size and not to 0. Fix this.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Updated function "k3_ringacc_ring_reset_raw" to reset only ring size field in ring configuration register as pointed out by Alexander Sverdlin.
drivers/soc/ti/k3-navss-ringacc-u-boot.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/soc/ti/k3-navss-ringacc-u-boot.c +8 -1
@@ -25,9 +25,16 @@ struct k3_nav_ring_cfg_regs {#define KNAV_RINGACC_CFG_RING_SIZE_ELSIZE_MASK GENMASK(26, 24)#define KNAV_RINGACC_CFG_RING_SIZE_ELSIZE_SHIFT (24) +#define KNAV_RINGACC_CFG_RING_SIZE_MASK GENMASK(19, 0) +static void k3_ringacc_ring_reset_raw (struct k3_nav_ring *ring) { -writel (0 , &ring->cfg->size); +u32 reg; + + reg =readl (&ring->cfg->size); + reg &= ~KNAV_RINGACC_CFG_RING_SIZE_MASK ; + reg |= ring->size; +writel (reg, &ring->cfg->size); }static void k3_ringacc_ring_reconfig_qmode_raw (struct k3_nav_ring *ring,enum k3_nav_ring_mode mode)
Signature · 1 line
2.34.1
Re: [PATCH v6 04/11] soc: ti: k3-navss-ringacc: Fix reset ring API
Hi Chintan!
Quoted 8 lines · Chintan Vankar
From: Vignesh Raghavendra <[email protected]>
Expectation of
k3_ringacc_ring_reset_raw()is to reset the ring to requested size and not to 0. Fix this.Signed-off-by Vignesh Raghavendra <[email protected]>Signed-off-by Siddharth Vadapalli <[email protected]>Signed-off-by Chintan Vankar <[email protected]>
Thanks for quick rework!
Quoted 35 lines
---
Link to v5:
https://lore.kernel.org/r/[email protected]/Changes from v5 to v6:
- Updated function "k3_ringacc_ring_reset_raw" to reset only ring size field in ring configuration register as pointed out by Alexander Sverdlin.drivers/soc/ti/k3-navss-ringacc-u-boot.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)drivers/soc/ti/k3-navss-ringacc-u-boot.c +0
-0@@ -25,9 +25,16 @@ struct k3_nav_ring_cfg_regs { #define KNAV_RINGACC_CFG_RING_SIZE_ELSIZE_MASK GENMASK(26, 24) #define KNAV_RINGACC_CFG_RING_SIZE_ELSIZE_SHIFT (24)drivers/soc/ti/k3-navss-ringacc-u-boot.c +2
-0+#define KNAV_RINGACC_CFG_RING_SIZE_MASK GENMASK(19, 0) +static void
k3_ringacc_ring_reset_raw(struct k3_nav_ring *ring){drivers/soc/ti/k3-navss-ringacc-u-boot.c +6
-1-writel (0 , &ring->cfg->size); +u32 reg; + + reg =readl (&ring->cfg->size); + reg &= ~KNAV_RINGACC_CFG_RING_SIZE_MASK ; + reg |= ring->size; +writel (reg, &ring->cfg->size);}
static voidk3_ringacc_ring_reconfig_qmode_raw(struct k3_nav_ring *ring, enum k3_nav_ring_mode mode)
Signature · 3 lines
Alexander Sverdlin Siemens AG www.siemens.com
PATCH v6 5/11 soc: ti: k3-navss-ringacc: Fix reconfiguration of qmode API
In reply to Chintan VankarFunction "k3_ringacc_ring_reconfig_qmode_raw()" should reset qmode to requested value and should not update other fields in ring configuration register.
---
This patch is newely added in this series.
drivers/soc/ti/k3-navss-ringacc-u-boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/ti/k3-navss-ringacc-u-boot.c +1 -1
@@ -42,7 +42,7 @@ static void k3_ringacc_ring_reconfig_qmode_raw(struct k3_nav_ring *ring, enum k3u32 val; val =readl (&ring->cfg->size); - val &=KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ; + val &= ~KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ; val |= mode <<KNAV_RINGACC_CFG_RING_SIZE_QMODE_SHIFT ;writel (val, &ring->cfg->size); }
Signature · 1 line
2.34.1
Re: [PATCH v6 05/11] soc: ti: k3-navss-ringacc: Fix reconfiguration of qmode API
Quoted 7 lines · Chintan Vankar
Function "
k3_ringacc_ring_reconfig_qmode_raw()" should reset qmode to requested value and should not update other fields in ring configuration register.Signed-off-by Chintan Vankar <[email protected]>---
Thanks for fix this up:
Quoted 18 lines
This patch is newely added in this series.
drivers/soc/ti/k3-navss-ringacc-u-boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/soc/ti/k3-navss-ringacc-u-boot.c +1
-1@@ -42,7 +42,7 @@ static void k3_ringacc_ring_reconfig_qmode_raw(struct k3_nav_ring *ring, enum k3u32 val; val =readl (&ring->cfg->size); - val &=KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ; + val &= ~KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ; val |= mode <<KNAV_RINGACC_CFG_RING_SIZE_QMODE_SHIFT ;writel (val, &ring->cfg->size); }
Signature · 2 lines
Regards Vignesh
Sverdlin, Alexander
Reviewed-byRe: [PATCH v6 05/11] soc: ti: k3-navss-ringacc: Fix reconfiguration of qmode API
Hi!
Quoted 5 lines · Vignesh Raghavendra
Quoted 4 lines · Chintan Vankar
Function "
k3_ringacc_ring_reconfig_qmode_raw()" should reset qmode to requested value and should not update other fields in ring configuration register.
Quoted 9 lines
Quoted 3 lines
Signed-off-by Chintan Vankar <[email protected]>---
Thanks for fix this up:
Reviewed-by Vignesh Raghavendra <[email protected]>
Quoted 18 lines
Quoted 18 lines
This patch is newely added in this series.
drivers/soc/ti/k3-navss-ringacc-u-boot.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/soc/ti/k3-navss-ringacc-u-boot.c +0
-0@@ -42,7 +42,7 @@ static void k3_ringacc_ring_reconfig_qmode_raw(struct k3_nav_ring *ring, enum k3 u32 val;
val =readl(&ring->cfg->size);drivers/soc/ti/k3-navss-ringacc-u-boot.c +1
-1- val &=KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ; + val &= ~KNAV_RINGACC_CFG_RING_SIZE_QMODE_MASK ;val |= mode <<
KNAV_RINGACC_CFG_RING_SIZE_QMODE_SHIFT;writel(val, &ring->cfg->size);
}
Signature · 3 lines
Alexander Sverdlin Siemens AG www.siemens.com
PATCH v6 6/11 dma: ti: k3-udma: Add support for native configuration of chan/flow
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
In absence of Device Manager (DM) services such as at R5 SPL stage, driver will have to natively setup TCHAN/RCHAN/RFLOW cfg registers. Existing UDMA driver performed the above mentioned configuration for UDMA. Add similar configuration for PKTDMA here.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added Reviewed-by tag from Alexander Sverdlin.
drivers/dma/ti/k3-udma.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/dma/ti/k3-udma.c +6 -0
@@ -2118,6 +2118,9 @@ static int bcdma_tisci_tx_channel_config(struct udma_chan *uc)if (ret)dev_err (ud->dev,"tchan%d cfg failed %d\n" , tchan->id, ret); +if (IS_ENABLED (CONFIG_K3_DM_FW )) +udma_alloc_tchan_raw (uc); +return ret; }
@@ -2166,6 +2169,9 @@ static int pktdma_tisci_rx_channel_config(struct udma_chan *uc)dev_err (ud->dev,"flow%d config failed: %d\n" , uc->rflow->id, ret); +if (IS_ENABLED (CONFIG_K3_DM_FW )) +udma_alloc_rchan_raw (uc); +return ret; }
Signature · 1 line
2.34.1
PATCH v6 7/11 arm: mach-k3: am62x: am625_init: Probe AM65 CPSW NUSS
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
In order to support Ethernet boot on AM62x, probe AM65 CPSW NUSS driver in board_init_f().
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added Reviewed-by tag from Alexander Sverdlin.
arch/arm/mach-k3/am62x/am625_init.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/mach-k3/am62x/am625_init.c +9 -0
@@ -282,6 +282,15 @@ void board_init_f(ulong dummy) }spl_enable_cache (); +if (IS_ENABLED (CONFIG_SPL_ETH ) &&IS_ENABLED (CONFIG_TI_AM65_CPSW_NUSS ) && +spl_boot_device () ==BOOT_DEVICE_ETHERNET ) { +struct udevice *cpswdev; + +if (uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (am65_cpsw_nuss), + &cpswdev)) +printf ("Failed to probe am65_cpsw_nuss driver\n" ); + } +fixup_a53_cpu_freq_by_speed_grade (); }
Signature · 1 line
2.34.1
PATCH v6 8/11 configs: am62: Add configs for enabling ETHBOOT in R5SPL
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
Add configs for enabling ETHBOOT in R5SPL.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- No changes.
configs/am62x_evm_r5_ethboot_defconfig | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 configs/am62x_evm_r5_ethboot_defconfig
configs/am62x_evm_r5_ethboot_defconfig new file +25 -0
@@ -0,0 +1,25 @@ +#include<configs/am62x_evm_r5_defconfig> + +CONFIG_ARM=y +CONFIG_ARCH_K3=y +CONFIG_SOC_K3_AM625=y +CONFIG_TARGET_AM625_R5_EVM=y +CONFIG_DEFAULT_DEVICEC_TREE="k3-am625-r5-sk" +CONFIG_SPL_GPIO=y +CONFIG_SPL_MMC=n +CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 +CONFIG_SPL_BSS_MAX_SIZE=0X3100 +CONFIG_SPL_DMA=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_ETH=y +CONFIG_SPL_I2C=y +CONFIG_SPL_NET=y +CONFIG_SPL_NET_VCI_STRING="AM62X U-Boot R5 SPL" +CONFIG_CMD_DHCP=y +CONFIG_SPL_SYSCON=y +CONFIG_DMA_CHANNELS=y +CONFIG_TI_K3_NAVSS_UDMA=y +CONFIG_DM_I2C=y +CONFIG_PHY_TI_DP83867=y +CONFIG_TI_AM65_CPSW_NUSS=y
Signature · 1 line
2.34.1
PATCH v6 9/11 configs: am62: Enable configs required for Ethboot
In reply to Chintan VankarFrom: Kishon Vijay Abraham I <[email protected]>
Enable config options needed to support Ethernet boot on AM62x SK.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- No changes.
configs/am62x_evm_a53_ethboot_defconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 configs/am62x_evm_a53_ethboot_defconfig
configs/am62x_evm_a53_ethboot_defconfig new file +17 -0
@@ -0,0 +1,17 @@ +#include <configs/am62x_evm_a53_defconfig> + +CONFIG_ARM=y +CONFIG_ARCH_K3=y +CONFIG_SOC_K3_AM625=y +CONFIG_TARGET_AM625_A53_EVM=y +CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am625-sk" +CONFIG_SPL_STACK_R_ADDR=0x83000000 +CONFIG_SPL_SIZE_LIMIT=0x80000 +CONFIG_SPL_DRIVERS_MISC=y +CONFIG_SPL_BOARD_INIT=y +CONFIG_SPL_DMA=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_ETH=y +CONFIG_SPL_NET=y +CONFIG_SPL_NET_VCI_STRING="AM62X U-Boot A53 SPL" +CONFIG_SPL_SYSCON=y
Signature · 1 line
2.34.1
PATCH v6 10/11 arm: dts: k3-am625-r5-sk: Enable DM services for main_pktdma
In reply to Chintan VankarFrom: Siddharth Vadapalli <[email protected]>
Enable DM services for main_pktdma during R5 SPL stage.
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added Reviewed-by tag from Alexander Sverdlin.
arch/arm/dts/k3-am625-r5-sk.dts | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/dts/k3-am625-r5-sk.dts +5 -0
@@ -83,3 +83,8 @@ reg = <0x00 0x0fc40000 0x00 0x100>, <0x00 0x60000000 0x00 0x08000000>; }; + +&main_pktdma { + ti,sci = <&dm_tifs>; + bootph-all; +};
Signature · 1 line
2.34.1
PATCH v6 11/11 arm64: dts: ti: k3-am62x-sk-common: Add bootph-all property in phy_gmii_sel node
In reply to Chintan VankarAdd missing bootph-all property for CPSW MAC's PHY node phy_gmii_sel.
[ upstream commit: ba50141137fae205a731005e70687f4a52289050 ]
(cherry picked from commit 2bdd1743a9f6515efe7c3648a25d63b4a9ce4a10)
---
Link to v5:
https://lore.kernel.org/r/[email protected]/
Changes from v5 to v6:
- Added Reviewed-by tag from Sumit Garg.
dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi +4 -0
@@ -128,6 +128,10 @@ }; }; +&phy_gmii_sel { + bootph-all; +}; + &main_pmx0 { /* First pad number is ALW package and second is AMC package */ main_uart0_pins_default: main-uart0-default-pins {
Signature · 1 line
2.34.1
Quoted 9 lines · Chintan Vankar
This series enables Ethernet Boot on SK-AM62 device.
This series is based on commit '
f4f845b85926' of origin/next branch of U-Boot.Link to v5:
https://lore.kernel.org/r/[email protected]/[...]
Applied to u-boot/next, thanks!
Signature · 1 line
Tom