On devices that have their first network interface provided by a FPGA, the initialization of further interfaces will fail if the FPGA is not yet programmed. This leads to problems during factory setup when the data is supposed to be loaded over secondary netowork interfaces.

To avoid this, use the uclass_{first,next}_device_check functions to initialize as many ethernet devices as possible.

Signed-off-by: Mario Six mario.six@gdsys.cc --- net/eth-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 240b596534..2877700ff4 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -396,7 +396,7 @@ int eth_initialize(void) * This is accomplished by attempting to probe each device and calling * their write_hwaddr() operation. */ - uclass_first_device(UCLASS_ETH, &dev); + uclass_first_device_check(UCLASS_ETH, &dev); if (!dev) { printf("No ethernet found.\n"); bootstage_error(BOOTSTAGE_ID_NET_ETH_START); @@ -425,7 +425,7 @@ int eth_initialize(void)

eth_write_hwaddr(dev);

- uclass_next_device(&dev); + uclass_next_device_check(&dev); num_devices++; } while (dev);

-- 2.16.1

Bus translations should be applied when reading the address of the sgmii phy registers from the DT. Use ofnode_get_addr_index instead of the plain ofnode_read_u32_default to fix this.

Signed-off-by: Mario Six mario.six@gdsys.cc --- drivers/net/tsec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 6829e32dae..7a7ae1dccc 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -797,8 +797,9 @@ int tsec_probe(struct udevice *dev)

parent = ofnode_get_parent(phandle_args.node); if (ofnode_valid(parent)) { - int reg = ofnode_read_u32_default(parent, "reg", 0); - priv->phyregs_sgmii = (struct tsec_mii_mng *)(reg + 0x520); + int reg = ofnode_get_addr_index(parent, 0); + + priv->phyregs_sgmii = (struct tsec_mii_mng *)reg; } else { debug("No parent node for PHY?\n"); return -ENOENT;

For certain boards, having CONFIG_PHY_MARVELL in the defconfig will result in a redefinition warning, because it is also defined in config_phylib_all_drivers.h.

Add a check to stop this redefinition, but keep it for those boards that still don't have it in their defconfig.

Signed-off-by: Mario Six mario.six@gdsys.cc --- include/config_phylib_all_drivers.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/include/config_phylib_all_drivers.h b/include/config_phylib_all_drivers.h index 496ef58db0..264f220c5f 100644 --- a/include/config_phylib_all_drivers.h +++ b/include/config_phylib_all_drivers.h @@ -15,7 +15,9 @@ #ifdef CONFIG_PHYLIB

#define CONFIG_PHY_VITESSE +#ifndef CONFIG_PHY_MARVELL #define CONFIG_PHY_MARVELL +#endif #define CONFIG_PHY_BROADCOM #define CONFIG_PHY_DAVICOM #define CONFIG_PHY_REALTEK

On Wed, Mar 28, 2018 at 7:38 AM, Mario Six mario.six@gdsys.cc wrote:

Make sure that TX packets are always cache-aligned.

Signed-off-by: Mario Six mario.six@gdsys.cc

net/arp.c | 3 ++- net/ping.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/arp.c b/net/arp.c index 4c79e09ccb..191434f5e2 100644 --- a/net/arp.c +++ b/net/arp.c @@ -182,7 +182,8 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) (net_read_ip(&arp->ar_spa).s_addr & net_netmask.s_addr)) udelay(5000); #endif

•           net_send_packet((uchar *)et, eth_hdr_size + ARP_HDR_SIZE);
  

•           memcpy(net_tx_packet, et, eth_hdr_size + ARP_HDR_SIZE);
  

•           net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);
  

Rather than always incurring a copy here, why not have the device driver that requires this do the copy?

            return;

    case ARPOP_REPLY:               /* arp reply */

diff --git a/net/ping.c b/net/ping.c index 9508cf1160..db14209bf6 100644 --- a/net/ping.c +++ b/net/ping.c @@ -107,7 +107,8 @@ void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) icmph->type = ICMP_ECHO_REPLY; icmph->checksum = 0; icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE);

•           net_send_packet((uchar *)et, eth_hdr_size + len);
  

•           memcpy(net_tx_packet, et, eth_hdr_size + len);
  

•           net_send_packet(net_tx_packet, eth_hdr_size + len);
            return;
  

/* default: return;*/ -- 2.16.1

---

U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot