January 2023 - U-Boot

[PATCH] net: ravb: Drop SoC-specific compatible support
by Marek Vasut 04 Feb '23

04 Feb '23

The current set of U-Boot upstream R-Car Gen3 DTs all contain generic "renesas,etheravb-rcar-gen3" compatible strings, drop the SoC specific compatible string support from U-Boot to reduce size and duplication. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- drivers/net/ravb.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index c28680565fc..5a835cc06ff 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -693,12 +693,6 @@ int ravb_of_to_plat(struct udevice *dev) } static const struct udevice_id ravb_ids[] = { - { .compatible = "renesas,etheravb-r8a7795" }, - { .compatible = "renesas,etheravb-r8a7796" }, - { .compatible = "renesas,etheravb-r8a77965" }, - { .compatible = "renesas,etheravb-r8a77970" }, - { .compatible = "renesas,etheravb-r8a77990" }, - { .compatible = "renesas,etheravb-r8a77995" }, { .compatible = "renesas,etheravb-rcar-gen3" }, { } }; -- 2.39.0

2 1

[PATCH 00/14] QCS404: Add ethernet and I2C drivers
by Sumit Garg 04 Feb '23

04 Feb '23

Patch#1 is a fix for QCS404 system memory map to not map reserved memory regions as an occasional system hang is observed. Rest of the patches add support for Qualcomm ethernet and I2C drivers specifically tested on QCS404 SoC. Sumit Garg (14): qcs404: sysmap: Don't map reserved memory ranges qcs404-evb: Enable msm_gpio driver support clocks: qcs404: Add support for ethernet clocks pinctrl: qcs404: Enable ethernet pinmux options pinctrl-snapdragon: Get rid of custom drive-strength values net: dwc_eth_qos: Make eqos_get_tick_clk_rate callback optional net: dwc_eth_qos: Allow platform to override tx/rx_fifo_sz net: dwc_eth_qos: Add Qcom ethernet driver glue layer dts: qcs404-evb: Add ethernet controller node clock-snapdragon: Add clk_rcg_set_rate() with mnd_width=0 clocks: qcs404: Add support for I2C clocks pinctrl: qcs404: Enable I2C pinmux options i2c: Add support for Qualcomm I2C driver dts: qcs404-evb: Add I2C controller nodes arch/arm/dts/dragonboard410c.dts | 3 +- arch/arm/dts/dragonboard820c.dts | 3 +- arch/arm/dts/qcom-ipq4019.dtsi | 1 - arch/arm/dts/qcs404-evb.dts | 200 +++++- arch/arm/mach-snapdragon/clock-qcs404.c | 118 ++++ arch/arm/mach-snapdragon/clock-snapdragon.c | 24 + arch/arm/mach-snapdragon/clock-snapdragon.h | 2 + .../include/mach/sysmap-qcs404.h | 31 + arch/arm/mach-snapdragon/pinctrl-qcs404.c | 13 + arch/arm/mach-snapdragon/pinctrl-snapdragon.c | 8 +- arch/arm/mach-snapdragon/sysmap-qcs404.c | 14 +- configs/qcs404evb_defconfig | 1 + drivers/i2c/Kconfig | 6 + drivers/i2c/Makefile | 1 + drivers/i2c/qup_i2c.c | 592 +++++++++++++++++ drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 35 +- drivers/net/dwc_eth_qos.h | 4 + drivers/net/dwc_eth_qos_qcom.c | 612 ++++++++++++++++++ .../dt-bindings/pinctrl/pinctrl-snapdragon.h | 22 - 21 files changed, 1658 insertions(+), 40 deletions(-) create mode 100644 drivers/i2c/qup_i2c.c create mode 100644 drivers/net/dwc_eth_qos_qcom.c delete mode 100644 include/dt-bindings/pinctrl/pinctrl-snapdragon.h -- 2.34.1

4 22

[PATCH 1/9] clk: imx8mp: Add EQoS MAC clock
by Marek Vasut 04 Feb '23

04 Feb '23

Add clock for the DWMAC EQoS block. This is used among other things to configure the MII clock via DM CLK. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "Ariel D'Alessandro" <ariel.dalessandro(a)collabora.com> Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Andrey Zhizhikin <andrey.zhizhikin(a)leica-geosystems.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tommaso Merciai <tommaso.merciai(a)amarulasolutions.com> Cc: u-boot(a)lists.denx.de --- drivers/clk/imx/clk-imx8mp.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index ffbc1d1ba9f..6dda0403e35 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -70,6 +70,14 @@ static const char *imx8mp_i2c6_sels[] = {"clock-osc-24m", "sys_pll1_160m", "sys_ "sys_pll3_out", "audio_pll1_out", "video_pll1_out", "audio_pll2_out", "sys_pll1_133m", }; +static const char *imx8mp_enet_qos_sels[] = {"clock-osc-24m", "sys_pll2_125m", "sys_pll2_50m", + "sys_pll2_100m", "sys_pll1_160m", "audio_pll1_out", + "video_pll1_out", "clk_ext4", }; + +static const char *imx8mp_enet_qos_timer_sels[] = {"clock-osc-24m", "sys_pll2_100m", "audio_pll1_out", + "clk_ext1", "clk_ext2", "clk_ext3", + "clk_ext4", "video_pll1_out", }; + static const char *imx8mp_usdhc1_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m", "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", }; @@ -250,6 +258,8 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_DRAM_APB, imx8m_clk_composite_critical("dram_apb", imx8mp_dram_apb_sels, base + 0xa080)); clk_dm(IMX8MP_CLK_I2C5, imx8m_clk_composite("i2c5", imx8mp_i2c5_sels, base + 0xa480)); clk_dm(IMX8MP_CLK_I2C6, imx8m_clk_composite("i2c6", imx8mp_i2c6_sels, base + 0xa500)); + clk_dm(IMX8MP_CLK_ENET_QOS, imx8m_clk_composite("enet_qos", imx8mp_enet_qos_sels, base + 0xa880)); + clk_dm(IMX8MP_CLK_ENET_QOS_TIMER, imx8m_clk_composite("enet_qos_timer", imx8mp_enet_qos_timer_sels, base + 0xa900)); clk_dm(IMX8MP_CLK_ENET_REF, imx8m_clk_composite("enet_ref", imx8mp_enet_ref_sels, base + 0xa980)); clk_dm(IMX8MP_CLK_ENET_TIMER, imx8m_clk_composite("enet_timer", imx8mp_enet_timer_sels, base + 0xaa00)); clk_dm(IMX8MP_CLK_ENET_PHY_REF, imx8m_clk_composite("enet_phy_ref", imx8mp_enet_phy_ref_sels, base + 0xaa80)); @@ -292,10 +302,13 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_I2C2_ROOT, imx_clk_gate4("i2c2_root_clk", "i2c2", base + 0x4180, 0)); clk_dm(IMX8MP_CLK_I2C3_ROOT, imx_clk_gate4("i2c3_root_clk", "i2c3", base + 0x4190, 0)); clk_dm(IMX8MP_CLK_I2C4_ROOT, imx_clk_gate4("i2c4_root_clk", "i2c4", base + 0x41a0, 0)); + clk_dm(IMX8MP_CLK_QOS_ROOT, imx_clk_gate4("qos_root_clk", "ipg_root", base + 0x42c0, 0)); + clk_dm(IMX8MP_CLK_QOS_ENET_ROOT, imx_clk_gate4("qos_enet_root_clk", "ipg_root", base + 0x42e0, 0)); clk_dm(IMX8MP_CLK_QSPI_ROOT, imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0)); clk_dm(IMX8MP_CLK_I2C5_ROOT, imx_clk_gate2("i2c5_root_clk", "i2c5", base + 0x4330, 0)); clk_dm(IMX8MP_CLK_I2C6_ROOT, imx_clk_gate2("i2c6_root_clk", "i2c6", base + 0x4340, 0)); clk_dm(IMX8MP_CLK_SIM_ENET_ROOT, imx_clk_gate4("sim_enet_root_clk", "enet_axi", base + 0x4400, 0)); + clk_dm(IMX8MP_CLK_ENET_QOS_ROOT, imx_clk_gate4("enet_qos_root_clk", "sim_enet_root_clk", base + 0x43b0, 0)); clk_dm(IMX8MP_CLK_UART1_ROOT, imx_clk_gate4("uart1_root_clk", "uart1", base + 0x4490, 0)); clk_dm(IMX8MP_CLK_UART2_ROOT, imx_clk_gate4("uart2_root_clk", "uart2", base + 0x44a0, 0)); clk_dm(IMX8MP_CLK_UART3_ROOT, imx_clk_gate4("uart3_root_clk", "uart3", base + 0x44b0, 0)); -- 2.39.0

4 16

[PATCH 1/3] net: ftmac100: change driver name from nds32_mac to ftmac100
by Sergei Antonov 04 Feb '23

04 Feb '23

So it will be named similarly to the related ftgmac100 driver. The old name 'nds32_mac' is not referred to anywhere in U-Boot. Signed-off-by: Sergei Antonov <saproj(a)gmail.com> --- drivers/net/ftmac100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index c30ace96bb13..b3da9479ea5e 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -434,7 +434,7 @@ static const struct udevice_id ftmac100_ids[] = { }; U_BOOT_DRIVER(ftmac100) = { - .name = "nds32_mac", + .name = "ftmac100", .id = UCLASS_ETH, .of_match = ftmac100_ids, .bind = ftmac100_bind, -- 2.34.1

2 7

[PATCH v2 1/3] net: ftmac100: change driver name from nds32_mac to ftmac100
by Sergei Antonov 04 Feb '23

04 Feb '23

So it will be named similarly to the related ftgmac100 driver. The old name 'nds32_mac' is not referred to anywhere in U-Boot. Signed-off-by: Sergei Antonov <saproj(a)gmail.com> Reviewed-by: Ramon Fried <rfried.dev(a)gmail.com> --- v1 -> v2: no change drivers/net/ftmac100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index c30ace96bb13..b3da9479ea5e 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -434,7 +434,7 @@ static const struct udevice_id ftmac100_ids[] = { }; U_BOOT_DRIVER(ftmac100) = { - .name = "nds32_mac", + .name = "ftmac100", .id = UCLASS_ETH, .of_match = ftmac100_ids, .bind = ftmac100_bind, -- 2.34.1

3 5

[PATCH] drivers: net: fsl_ls_mdio: prevent a NULL pointer dereference
by Ioana Ciornei 03 Feb '23

03 Feb '23

Prevent a NULL pointer dereference in the probe path by checking the return valud of dev_read_addr_ptr() against NULL. Signed-off-by: Ioana Ciornei <ioana.ciornei(a)nxp.com> --- drivers/net/fsl_ls_mdio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c index f213e0dd8590..fce73937502d 100644 --- a/drivers/net/fsl_ls_mdio.c +++ b/drivers/net/fsl_ls_mdio.c @@ -124,6 +124,9 @@ static int fsl_ls_mdio_probe(struct udevice *dev) struct memac_mdio_controller *regs; priv->regs_base = dev_read_addr_ptr(dev); + if (!priv->regs_base) + return -ENODEV; + regs = (struct memac_mdio_controller *)(priv->regs_base); memac_setbits_32(&regs->mdio_stat, -- 2.25.1

3 2

[PATCH 0/7] drivers: net: fsl-mc: cleanup coding style
by Ioana Ciornei 03 Feb '23

03 Feb '23

This patch set tries to cleanup the mc.c source file a bit. The first two patches remove an useless assignment and a brake statement. Then we fix some debug logs by making sure that we do not print decimal values with a 0x prefix. Patches 4-7 just clean-up the coding style a bit and also some of the checkpatch warnings. Ioana Ciornei (7): drivers: net: fsl-mc: remove useless assignment of variable drivers: net: fsl-mc: remove an useless break statement drivers: net: fsl-mc: do not prefix decimal values with 0x drivers: net: fsl-mc: remove the initialisation of global variables drivers: net: fsl-mc: remove explicit cast drivers: net: fsl-mc: align parameters to the open paranthesis drivers: net: fsl-mc: do not use multiple blank lines drivers/net/fsl-mc/mc.c | 55 +++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 32 deletions(-) -- 2.25.1

3 17

[PATCH] net: tftp: Fix for DATA ACK for block count out of order
by seanedmond＠linux.microsoft.com 03 Feb '23

03 Feb '23

From: Sean Edmond <seanedmond(a)linux.microsoft.com> In rfc7440, if an ACK is not received by the server or if the last data block in a window is dropped, the server will timeout and retransmit the window. In this case, the block count received will be less than the internal block count. In this case, the client should not ACK. ACK should only be sent if the received block count is greater than the expected block count. Signed-off-by: Sean Edmond <seanedmond(a)linux.microsoft.com> --- net/tftp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/tftp.c b/net/tftp.c index c780c33f37..51e062bddf 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -592,6 +592,14 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, debug("Received unexpected block: %d, expected: %d\n", ntohs(*(__be16 *)pkt), (ushort)(tftp_cur_block + 1)); + /* + * Only ACK if the block count received is greater than + * the expected block count, otherwise skip ACK. + * (required to properly handle the server retransmitting + * the window) + */ + if ((ushort)(tftp_cur_block + 1) - (short)(ntohs(*(__be16 *)pkt)) > 0) + break; /* * If one packet is dropped most likely * all other buffers in the window -- 2.39.0

3 2

[PATCH] net: ipv6: fix alignment errors on ARM
by Sergei Antonov 03 Feb '23

03 Feb '23

Commands "ping6" and "tftpboot ... -ipv6" did not work on ARM because machine code expects 4-byte alignment and some structures from net6.h are not aligned in memory. Fix by adding __packed, since it is already used in this file. Signed-off-by: Sergei Antonov <saproj(a)gmail.com> --- include/net6.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net6.h b/include/net6.h index 9b3de028e6dc..2d7c5a096046 100644 --- a/include/net6.h +++ b/include/net6.h @@ -24,7 +24,7 @@ struct in6_addr { #define s6_addr in6_u.u6_addr8 #define s6_addr16 in6_u.u6_addr16 #define s6_addr32 in6_u.u6_addr32 -}; +} __packed; #define IN6ADDRSZ sizeof(struct in6_addr) #define INETHADDRSZ sizeof(net_ethaddr) @@ -62,7 +62,7 @@ struct ip6_hdr { u8 hop_limit; struct in6_addr saddr; struct in6_addr daddr; -}; +} __packed; #define IP6_HDR_SIZE (sizeof(struct ip6_hdr)) /* struct udp_hdr - User Datagram Protocol header */ @@ -164,7 +164,7 @@ struct icmp6hdr { #define icmp6_addrconf_managed icmp6_dataun.u_nd_ra.managed #define icmp6_addrconf_other icmp6_dataun.u_nd_ra.other #define icmp6_rt_lifetime icmp6_dataun.u_nd_ra.rt_lifetime -}; +} __packed; extern struct in6_addr const net_null_addr_ip6; /* NULL IPv6 address */ extern struct in6_addr net_gateway6; /* Our gateways IPv6 address */ -- 2.34.1

3 4

[PATCH] net: ipv6: Fixed IPv6 string to address conversion off-by-one error
by emohandesi＠linux.microsoft.com 03 Feb '23

03 Feb '23

From: Ehsan Mohandesi <emohandesi(a)microsoft.com> One extra character was being checked in the IPv6 string which caused the last character of the address to be neither '\0' nor ':'. This raises an error condition and causes the function to always return an error. This issue was resolved by this fix. Signed-off-by: Ehsan Mohandesi <emohandesi(a)microsoft.com> --- net/tftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index c780c33..328fd90 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -837,7 +837,7 @@ void tftp_start(enum proto_t protocol) e = strchr(net_boot_file_name, ']'); len = e - s; if (s && e) { - string_to_ip6(s + 1, len, &tftp_remote_ip6); + string_to_ip6(s + 1, len - 1, &tftp_remote_ip6); strlcpy(tftp_filename, e + 2, MAX_LEN); } else { strlcpy(tftp_filename, net_boot_file_name, MAX_LEN); -- 1.8.3.1

3 2