November 2020 - U-Boot

[PATCH v2 00/21] Add support for MMC higher speed modes for TI's am65x, j721e and j7200 platforms
by Faiz Abbas 21 Jan '21

21 Jan '21

The following patches add support for higher speeds in the SD card and eMMC for TI's am65x, j721e, j7200 platforms. With these patches, the following max speeds are supported: j721e: DDR50, HS200 j7200: SDR104, HS200 am65x: SDR104*, HS200 v2: 1. Added patches to support UHS modes for the SD card even in am654x platforms. 2. Fixed an issue with patch 1 that was breaking builds on some platforms. * There's an issue with the am65x base board such that the power cycle circuit to the card takes way longer than the wait time in mmc core. Until this is fixed, am654x-evm and -idk will only support High speed mode at 3.3V (see patch 20) but this shouldn't block us from adding UHS modes in the dtsi as well as in the configs so other boards can still take advantage of the higher speed. UHS modes have been tested by adding the appropriate delay in the power cycle circuit. Link to v1: https://patchwork.ozlabs.org/project/uboot/list/?series=206622 Faiz Abbas (21): mmc: sdhci: Add helper functions for UHS modes mmc: am654_sdhci: Unconditionally switch off DLL in the beginning of ios_post() mmc: am654_sdhci: Convert flag fields to BIT macro mmc: am654_sdhci: Add flag for PHY calibration mmc: am654_sdhci: Add support for AM65x SR2.0 mmc: am654_sdhci: Add support for input tap delay mmc: am654_sdhci: Add support for writing to clkbuf_sel mmc: am654_sdhci: Add support for software tuning mmc: am654_sdhci: Fix HISPD bit configuration in some lower speed modes mmc: am654_sdhci: Use sdhci_set_control_reg() arm: dts: k3-am65: Fix mmc nodes arm: dts: k3-j721e-main: Update otap-delay values arm: dts: k3-j721e-common-proc-board: Add support for UHS modes for SD card arm: dts: k3-j7200-main: Add support for gpio0 arm: dts: k3-j7200-common-proc-board: Enable support for UHS modes configs: j721e_evm: Add support for UHS modes configs: j7200_evm: Add support for UHS modes i2c: Makefile: Add SPL_DM_I2C_GPIO arm: dts: k3-am65-main: Add itapdly and clkbuf-sel values arm: dts: k3-am654-base-board: Limit Sd card to High speed modes configs: am65x_evm: Add configs for UHS modes arch/arm/dts/k3-am65-main.dtsi | 31 ++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 67 +-- arch/arm/dts/k3-am654-base-board.dts | 26 ++ arch/arm/dts/k3-am654-r5-base-board.dts | 20 +- arch/arm/dts/k3-j7200-common-proc-board.dts | 49 ++- arch/arm/dts/k3-j7200-main.dtsi | 23 ++ .../arm/dts/k3-j7200-r5-common-proc-board.dts | 15 + arch/arm/dts/k3-j721e-common-proc-board.dts | 32 ++ arch/arm/dts/k3-j721e-main.dtsi | 8 +- configs/am65x_evm_a53_defconfig | 8 + configs/am65x_evm_r5_defconfig | 2 + configs/j7200_evm_a72_defconfig | 8 + configs/j7200_evm_r5_defconfig | 1 + configs/j721e_evm_a72_defconfig | 8 + configs/j721e_evm_r5_defconfig | 1 + drivers/i2c/Makefile | 2 +- drivers/mmc/Kconfig | 1 + drivers/mmc/am654_sdhci.c | 384 +++++++++++++----- drivers/mmc/sdhci.c | 51 +++ include/sdhci.h | 1 + 20 files changed, 564 insertions(+), 174 deletions(-) -- 2.17.1

4 30

[PATCH v4 00/23] Add support for MediaTek MT7620 SoC - v4
by Weijie Gao 21 Jan '21

21 Jan '21

This series will add support for MediaTek MT7620 SoC with two reference boards and related drivers. The MediaTek MT7620 is a 2x2 802.11n WiSoC integrating a MIPS 24KEc processor running at a maximum frequency of 620MHz. This chip can be found in many wireless routers. This series add all basic drivers which are useful in u-boot, like usb, sdhc, ethernet, spi and serial. Booting from NAND is currently unsupported. Thanks, Weijie v4 changes: - Remove unused code in drivers/serial/serial.c - Fix plat->cfg.f_max of mtk-sd driver v3 changes: - Use bool instead of int in for mt7620_spi_set_cs() mt7620_spi.c - Add detail comments for mt7620_wdt_expire_now() in mt7620_wdt.c - Remove duplicated dev field in mt7620-usb-phy.c - Add fixes for mtk-sd (fix sclk cycles shift value, assign plat->cfg.f_max) v2 changes: - Remove non-DM code from mt7620-serial driver, and use of-platdata instead - Fix dev_err related compilation error - Add expire_now for mt7620-wdt - Remove use of common.h Weijie Gao (23): mips: dts: switch to board defines for dtb for mtmips mips: mtmips: move mt7628 related Kconfig into mt7628 subdirectory mips: mtmips: select SYSRESET for mt7628 only mips: mtmips: fix dram size detection in dram_init mips: enable _machine_restart for spl mips: mtmips: add support to initialize SDRAM mips: mtmips: add support for MediaTek MT7620 SoC mips: mtmips: add two reference boards for mt7620 configs: mtmips: refresh for mt7628 based boards serial: add uart driver for MediaTek MT7620 SoC clk: add clock driver for MediaTek MT7620 SoC reset: mtmips: add reset controller support for MediaTek MT7620 SoC pinctrl: mtmips: add support for MediaTek MT7620 SoC watchdog: add watchdog driver for MediaTek MT7620 SoC gpio: add GPIO controller driver for MediaTek MT7620 SoC spi: add spi controller support for MediaTek MT7620 SoC phy: add USB PHY driver for MediaTek MT7620 SoC net: add ethernet driver for MediaTek MT7620 SoC mmc: mtk-sd: fix sclk cycles shift value mmc: mtk-sd: add pad control settings for MediaTek MT7620/MT76x8 SoCs mmc: mtk-sd: assign plat->cfg.f_max with a correct value reset: reset-mtmips: add DM_FLAG_PRE_RELOC flag MAINTAINERS: add maintainer for MediaTek MIPS platform MAINTAINERS | 23 + arch/mips/Kconfig | 1 - arch/mips/cpu/cpu.c | 2 +- arch/mips/dts/Makefile | 7 +- arch/mips/dts/mediatek,mt7620-mt7530-rfb.dts | 100 ++ arch/mips/dts/mediatek,mt7620-rfb.dts | 97 ++ arch/mips/dts/mt7620-u-boot.dtsi | 14 + arch/mips/dts/mt7620.dtsi | 296 ++++ arch/mips/mach-mtmips/Kconfig | 72 +- arch/mips/mach-mtmips/Makefile | 1 + arch/mips/mach-mtmips/cpu.c | 5 +- arch/mips/mach-mtmips/ddr_init.c | 59 + arch/mips/mach-mtmips/include/mach/ddr.h | 4 + .../mach-mtmips/include/mach/mt7620-sysc.h | 54 + arch/mips/mach-mtmips/mt7620/Kconfig | 71 + arch/mips/mach-mtmips/mt7620/Makefile | 10 + arch/mips/mach-mtmips/mt7620/dram.c | 113 ++ arch/mips/mach-mtmips/mt7620/init.c | 193 +++ arch/mips/mach-mtmips/mt7620/lowlevel_init.S | 53 + arch/mips/mach-mtmips/mt7620/mt7620.h | 103 ++ arch/mips/mach-mtmips/mt7620/serial.c | 36 + arch/mips/mach-mtmips/mt7620/sysc.c | 172 +++ arch/mips/mach-mtmips/mt7628/Kconfig | 53 + board/mediatek/mt7620/Kconfig | 12 + board/mediatek/mt7620/MAINTAINERS | 9 + board/mediatek/mt7620/Makefile | 3 + board/mediatek/mt7620/board.c | 6 + .../gardena-smart-gateway-mt7688_defconfig | 1 + configs/linkit-smart-7688_defconfig | 1 + configs/mt7620_mt7530_rfb_defconfig | 58 + configs/mt7620_rfb_defconfig | 76 + configs/mt7628_rfb_defconfig | 1 + configs/vocore2_defconfig | 1 + drivers/clk/mtmips/Makefile | 1 + drivers/clk/mtmips/clk-mt7620.c | 159 +++ drivers/gpio/Kconfig | 8 + drivers/gpio/Makefile | 1 + drivers/gpio/mt7620_gpio.c | 146 ++ drivers/mmc/mtk-sd.c | 136 +- drivers/net/Kconfig | 12 + drivers/net/Makefile | 1 + drivers/net/mt7620-eth.c | 1222 +++++++++++++++++ drivers/phy/Kconfig | 7 + drivers/phy/Makefile | 1 + drivers/phy/mt7620-usb-phy.c | 110 ++ drivers/pinctrl/mtmips/Kconfig | 9 + drivers/pinctrl/mtmips/Makefile | 1 + drivers/pinctrl/mtmips/pinctrl-mt7620.c | 200 +++ drivers/reset/reset-mtmips.c | 1 + drivers/serial/Kconfig | 20 + drivers/serial/Makefile | 1 + drivers/serial/serial_mt7620.c | 246 ++++ drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/mt7620_spi.c | 281 ++++ drivers/watchdog/Kconfig | 7 + drivers/watchdog/Makefile | 1 + drivers/watchdog/mt7620_wdt.c | 142 ++ include/configs/mt7620.h | 46 + include/dt-bindings/clock/mt7620-clk.h | 40 + include/dt-bindings/reset/mt7620-reset.h | 35 + 61 files changed, 4477 insertions(+), 72 deletions(-) create mode 100644 arch/mips/dts/mediatek,mt7620-mt7530-rfb.dts create mode 100644 arch/mips/dts/mediatek,mt7620-rfb.dts create mode 100644 arch/mips/dts/mt7620-u-boot.dtsi create mode 100644 arch/mips/dts/mt7620.dtsi create mode 100644 arch/mips/mach-mtmips/include/mach/mt7620-sysc.h create mode 100644 arch/mips/mach-mtmips/mt7620/Kconfig create mode 100644 arch/mips/mach-mtmips/mt7620/Makefile create mode 100644 arch/mips/mach-mtmips/mt7620/dram.c create mode 100644 arch/mips/mach-mtmips/mt7620/init.c create mode 100644 arch/mips/mach-mtmips/mt7620/lowlevel_init.S create mode 100644 arch/mips/mach-mtmips/mt7620/mt7620.h create mode 100644 arch/mips/mach-mtmips/mt7620/serial.c create mode 100644 arch/mips/mach-mtmips/mt7620/sysc.c create mode 100644 arch/mips/mach-mtmips/mt7628/Kconfig create mode 100644 board/mediatek/mt7620/Kconfig create mode 100644 board/mediatek/mt7620/MAINTAINERS create mode 100644 board/mediatek/mt7620/Makefile create mode 100644 board/mediatek/mt7620/board.c create mode 100644 configs/mt7620_mt7530_rfb_defconfig create mode 100644 configs/mt7620_rfb_defconfig create mode 100644 drivers/clk/mtmips/clk-mt7620.c create mode 100644 drivers/gpio/mt7620_gpio.c create mode 100644 drivers/net/mt7620-eth.c create mode 100644 drivers/phy/mt7620-usb-phy.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mt7620.c create mode 100644 drivers/serial/serial_mt7620.c create mode 100644 drivers/spi/mt7620_spi.c create mode 100644 drivers/watchdog/mt7620_wdt.c create mode 100644 include/configs/mt7620.h create mode 100644 include/dt-bindings/clock/mt7620-clk.h create mode 100644 include/dt-bindings/reset/mt7620-reset.h -- 2.17.1

2 29

[PATCH v3 0/7] mtd: spi-nor: Add support for Cypress s25hl-t/s25hs-t
by tkuw584924＠gmail.com 21 Jan '21

21 Jan '21

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> The S25HL-T/S25HS-T family is the Cypress Semper Flash with Quad SPI. The datasheet can be found in https://community.cypress.com/docs/DOC-15165 Tested on Xilinx Zynq-7000 FPGA board. Takahiro Kuwano (7): mtd: spi-nor: Add Cypress manufacturer ID mtd: spi-nor-ids: Add Cypress s25hl-t/s25hs-t mtd: spi-nor: Add support for volatile QE bit mtd: spi-nor-core: Add Cypress manufacturer ID in set_4byte mtd: spi-nor-core: Add overlaid sector erase feature mtd: spi-nor-core: Add fixups for Cypress s25hl-t/s25hs-t mtd: spi-nor-tiny: Add fixups for Cypress s25hl-t/s25hs-t drivers/mtd/spi/spi-nor-core.c | 178 +++++++++++++++++++++++++++++++++ drivers/mtd/spi/spi-nor-ids.c | 24 +++++ drivers/mtd/spi/spi-nor-tiny.c | 73 ++++++++++++++ include/linux/mtd/spi-nor.h | 3 + 4 files changed, 278 insertions(+) --- Changes since v3: - Split into multiple patches Changes since v2: - Fixed typo in comment for spansion_overlaid_erase() - Fixed expressions for addr and len check in spansion_overlaid_erase() - Added device ID check to make the changes effective for S25 only - Added nor->setup() and fixup hooks based on the following patches https://patchwork.ozlabs.org/project/uboot/patch/20200904153500.3569-7-p.ya… https://patchwork.ozlabs.org/project/uboot/patch/20200904153500.3569-8-p.ya… https://patchwork.ozlabs.org/project/uboot/patch/20200904153500.3569-9-p.ya… -- 2.25.1

2 8

[PATCH] Fix squashfs failing to load sparse files
by Campbell Suter 20 Jan '21

20 Jan '21

SquashFS supports sprase blocks in files - that is, if a given block is composed only of zeros, it's not written to the output file to save space and it's on-disk length field is set to zero to indicate that. Previously the squashfs driver did not recognise that, and would attempt to read and decompress a zero-sized block, which obviously failed. The following command may be used to create a file for testing: cat <(dd if=/dev/urandom of=/dev/stdout bs=1M count=1) \ <(dd if=/dev/zero of=/dev/stdout bs=1M count=1) \ <(dd if=/dev/urandom of=/dev/stdout bs=1k count=200) >test_file Signed-off-by: Campbell Suter <campbell(a)snapit.group> --- fs/squashfs/sqfs.c | 54 ++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 608a2bb454..2516d920f8 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -1309,7 +1309,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, { char *dir = NULL, *fragment_block, *datablock = NULL, *data_buffer = NULL; char *fragment = NULL, *file = NULL, *resolved, *data; - u64 start, n_blks, table_size, data_offset, table_offset; + u64 start, n_blks, table_size, data_offset, table_offset, sparse_size; int ret, j, i_number, datablk_count = 0; struct squashfs_super_block *sblk = ctxt.sblk; struct squashfs_fragment_block_entry frag_entry; @@ -1443,28 +1443,43 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz); - data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz); + /* Don't load any data for sparse blocks */ + if (finfo.blk_sizes[j] == 0) { + n_blks = 0; + table_offset = 0; + data_buffer = NULL; + data = NULL; + } else { + data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz); - if (!data_buffer) { - ret = -ENOMEM; - goto out; - } + if (!data_buffer) { + ret = -ENOMEM; + goto out; + } - ret = sqfs_disk_read(start, n_blks, data_buffer); - if (ret < 0) { - /* - * Possible causes: too many data blocks or too large - * SquashFS block size. Tip: re-compile the SquashFS - * image with mksquashfs's -b <block_size> option. - */ - printf("Error: too many data blocks to be read.\n"); - goto out; - } + ret = sqfs_disk_read(start, n_blks, data_buffer); + if (ret < 0) { + /* + * Possible causes: too many data blocks or too large + * SquashFS block size. Tip: re-compile the SquashFS + * image with mksquashfs's -b <block_size> option. + */ + printf("Error: too many data blocks to be read.\n"); + goto out; + } - data = data_buffer + table_offset; + data = data_buffer + table_offset; + } /* Load the data */ - if (SQFS_COMPRESSED_BLOCK(finfo.blk_sizes[j])) { + if (finfo.blk_sizes[j] == 0) { + /* This is a sparse block */ + sparse_size = get_unaligned_le32(&sblk->block_size); + if ((*actread + sparse_size) > len) + sparse_size = len - *actread; + memset(buf + *actread, 0, sparse_size); + *actread += sparse_size; + } else if (SQFS_COMPRESSED_BLOCK(finfo.blk_sizes[j])) { dest_len = get_unaligned_le32(&sblk->block_size); ret = sqfs_decompress(&ctxt, datablock, &dest_len, data, table_size); @@ -1483,7 +1498,8 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, } data_offset += table_size; - free(data_buffer); + if (data_buffer) + free(data_buffer); data_buffer = NULL; if (*actread >= len) break; -- 2.28.0

2 1

[PATCH 0/4] fs: btrfs: coverity fixes
by Qu Wenruo 20 Jan '21

20 Jan '21

Most of the coverity reports are at least a good hint to us to improve the code style. Although there are some false alerts, but it's really hard to teach coverity to be a real human (yet), thus fix the warning even it's just false alerts. Qu Wenruo (4): fs: btrfs: inode: handle uninitialized type before returning it fs: btrfs: volumes: prevent overflow for multiplying fs: btrfs: initialize @ret to 0 to prevent uninitialized return value fs: btrfs: initialize @ii in show_dir() to make coverity happy fs/btrfs/btrfs.c | 4 ++-- fs/btrfs/inode.c | 6 +++++- fs/btrfs/volumes.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) -- 2.29.1

3 17

[PATCH 1/1] Dockerfile: compile QEMU for Nokia N900 emulation
by Heinrich Schuchardt 20 Jan '21

20 Jan '21

For the Nokia N900 emulation we need a special QEMU version. Up to now we compile it in the Gitlab runner. By compiling it in Docker we can reduce the Gitlab job duration. To avoid naming conflicts the QEMU binary is stored as /opt/qemu/bin/qemu-system-n900. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index 209e008..bc3cdee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -171,6 +171,16 @@ RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu +# Compile QEMU for Nokia N900 emulation +# Last working commit is 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 +RUN git clone https://git.linaro.org/qemu/qemu-linaro.git /tmp/qemu && \ + cd /tmp/qemu && \ + git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 && \ + ./configure --enable-system --target-list=arm-softmmu --disable-sdl --disable-gtk --disable-curses --audio-drv-list= --audio-card-list= --disable-werror --disable-xen --disable-xen-pci-passthrough --disable-brlapi --disable-vnc --disable-curl --disable-slirp --disable-kvm --disable-user --disable-linux-user --disable-bsd-user --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio --disable-cap-ng --disable-attr --disable-blobs --disable-docs --disable-spice --disable-libiscsi --disable-smartcard-nss --disable-usb-redir --disable-guest-agent --disable-seccomp --disable-glusterfs --disable-nptl --disable-fdt && \ + make -j$(nproc) && \ + cp arm-softmmu/qemu-system-arm /opt/qemu/bin/qemu-system-n900 && \ + rm -rf /tmp/qemu + # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot RUN useradd -m -U uboot -- 2.27.0

2 4

[PATCH 00/10] setexpr: Correct various bugs and add tests plus string support
by Simon Glass 20 Jan '21

20 Jan '21

This command has several bugs that were discovered in trying to get zboot to make use of regular expression substitution: - reads the wrong values with 'setexpr.l' or 'setexpr' on 64-bit machines - buffer overflow of main string buffer - buffer overflow of 'new' string buffer - produces the wrong string in some cases when using back references This series corrects these bugs and adds regression tests for them. It also adds several other tests for the command and the core logic of setexpr. Finally, with Chrome OS boot it is necessary to read a command-line string from memory, process it with a regex and then provide it to the zboot command. So this series adds support for these features, as well as string concatenation. This series is available at u-boot-dm/sete-working Simon Glass (10): test: Add some tests for setexpr command: Add constants for cmd_get_data_size string / error setexpr: Add explicit support for 32- and 64-bit ints test: Add some setexpr regex tests setexpr: Split the core logic into its own function setexpr: Add some tests for buffer overflow and backref setexpr: Correct dropping of final unmatched string setexpr: Correct buffer overflow bug and enable tests setexpr: Convert to use a struct for values setexpr: Add support for strings cmd/itest.c | 4 +- cmd/mem.c | 2 +- cmd/setexpr.c | 336 ++++++++++++++++++++++++------------ common/command.c | 4 +- include/command.h | 43 ++++- include/test/suites.h | 2 + test/cmd/Makefile | 1 + test/cmd/setexpr.c | 384 ++++++++++++++++++++++++++++++++++++++++++ test/cmd_ut.c | 3 + 9 files changed, 664 insertions(+), 115 deletions(-) create mode 100644 test/cmd/setexpr.c -- 2.29.1.341.ge80a0c044ae-goog

5 37

[PATCH] net: tftp: Fix incorrect tftp_next_ack on no OACK
by Harm Berntsen 19 Jan '21

19 Jan '21

When the tftp server did not send any OACK, the tftp_next_ack variable was not set to the correct value . As the server was transmitting blocks we generated a lot of 'Received unexpected block: $n, expected $n+1' error messages. Depending on the timeout setting the transfer could still complete though. Signed-off-by: Harm Berntsen <harm.berntsen(a)nedap.com> CC: Ramon Fried <rfried.dev(a)gmail.com> --- net/tftp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index 6fdb1a821a..9371d7ef2c 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -624,8 +624,10 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, tftp_cur_block++; tftp_cur_block %= TFTP_SEQUENCE_SIZE; - if (tftp_state == STATE_SEND_RRQ) + if (tftp_state == STATE_SEND_RRQ) { debug("Server did not acknowledge any options!\n"); + tftp_next_ack = tftp_windowsize; + } if (tftp_state == STATE_SEND_RRQ || tftp_state == STATE_OACK || tftp_state == STATE_RECV_WRQ) { -- 2.29.2

3 2

[PATCH] net: Do not respond to ICMP_ECHO_REQUEST if we do not have an IP address
by David Rivshin 19 Jan '21

19 Jan '21

From: David Rivshin <DRivshin(a)allworx.com> While doing DHCP the interface IP is set to 0.0.0.0. This causes the check in net.c on dst_ip to be effectively skipped, and all IP datagrams are accepted up the IP stack. In the case of an ICMP_ECHO_REQUEST for the matching MAC address (regardless of destination IP), the result is that an ICMP_ECHO_REPLY is sent. The source address of the ICMP_ECHO_REPLY is 0.0.0.0, which is an illegal source address. This can happen in common practice with the following sequence: DHCP (U-Boot or OS) acquires IP address 10.0.0.1 System reboots U-Boot starts DHCP and send DHCP DISCOVER DHCP server decides to OFFER 10.0.0.1 again (perhaps because of existing lease or manual configuration) DHCP server tries to PING 10.0.0.1 to see if anyone is squatting on it DHCP server still has our MAC address in its ARP table for 10.0.0.1 U-Boot receives PING, and responds with an illegal source address This may further result in a the DHCP server seeing the response as confirmation that someone is squatting on 10.0.0.1, and picking a new IP address from the pool to try again Signed-off-by: David Rivshin <drivshin(a)allworx.com> --- net/ping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ping.c b/net/ping.c index 0e33660f6c..075df3663f 100644 --- a/net/ping.c +++ b/net/ping.c @@ -90,6 +90,9 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) net_set_state(NETLOOP_SUCCESS); return; case ICMP_ECHO_REQUEST: + if (net_ip.s_addr == 0) + return; + eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP); debug_cond(DEBUG_DEV_PKT, base-commit: 050acee119b3757fee3bd128f55d720fdd9bb890 -- 2.26.2

2 1

[PATCH] net: e1000: implement eth_write_hwaddr for DM_ETH
by Sebastian Reichel 19 Jan '21

19 Jan '21

From: Ian Ray <ian.ray(a)ge.com> Implement programming MAC address to the hardware also for device model configuration. Fixes: b565b18a294f ("board: ge: bx50v3: Enable DM for PCI and ethernet") Signed-off-by: Ian Ray <ian.ray(a)ge.com> Signed-off-by: Sebastian Reichel <sebastian.reichel(a)collabora.com> --- drivers/net/e1000.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 8e6c755f6416..4e81b89220ae 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -869,7 +869,6 @@ e1000_read_eeprom(struct e1000_hw *hw, uint16_t offset, return E1000_SUCCESS; } -#ifndef CONFIG_DM_ETH /****************************************************************************** * e1000_write_eeprom_srwr - Write to Shadow Ram using EEWR * @hw: pointer to the HW structure @@ -1035,7 +1034,6 @@ static int32_t e1000_update_eeprom_checksum_i210(struct e1000_hw *hw) out: return ret_val; } -#endif /****************************************************************************** * Verifies that the EEPROM has a valid checksum @@ -5660,13 +5658,24 @@ e1000_poll(struct eth_device *nic) return len ? 1 : 0; } +#endif /* !CONFIG_DM_ETH */ +#ifdef CONFIG_DM_ETH +static int e1000_write_hwaddr(struct udevice *dev) +#else static int e1000_write_hwaddr(struct eth_device *dev) +#endif { #ifndef CONFIG_E1000_NO_NVM - unsigned char *mac = dev->enetaddr; unsigned char current_mac[6]; +#ifdef CONFIG_DM_ETH + struct eth_pdata *plat = dev_get_platdata(dev); + struct e1000_hw *hw = dev_get_priv(dev); + u8 *mac = plat->enetaddr; +#else struct e1000_hw *hw = dev->priv; + u8 *mac = dev->enetaddr; +#endif uint16_t data[3]; int ret_val, i; @@ -5700,6 +5709,7 @@ static int e1000_write_hwaddr(struct eth_device *dev) #endif } +#ifndef CONFIG_DM_ETH /************************************************************************** PROBE - Look for an adapter, this routine's visible to the outside You should omit the last argument struct pci_device * for a non-PCI NIC @@ -5926,6 +5936,7 @@ static const struct eth_ops e1000_eth_ops = { .recv = e1000_eth_recv, .stop = e1000_eth_stop, .free_pkt = e1000_free_pkt, + .write_hwaddr = e1000_write_hwaddr, }; static const struct udevice_id e1000_eth_ids[] = { -- 2.28.0

2 1