Merge branch 'for-next/net' into next

Author: saschahauer

commands/Makefile

@@ -151,5 +151,5 @@ obj-$(CONFIG_CMD_TUTORIAL)	+= tutorial.o
 obj-$(CONFIG_CMD_STACKSMASH)	+= stacksmash.o
 obj-$(CONFIG_CMD_PARTED)	+= parted.o
 obj-$(CONFIG_CMD_EFI_HANDLE_DUMP)	+= efi_handle_dump.o
-
+obj-$(CONFIG_CMD_HOST)		+= host.o
 UBSAN_SANITIZE_ubsan.o := y

commands/host.c

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <common.h>
+#include <command.h>
+#include <net.h>
+
+static int do_host(int argc, char *argv[])
+{
+	IPaddr_t ip;
+	int ret;
+	char *hostname, *varname = NULL;
+
+	if (argc < 2)
+		return COMMAND_ERROR_USAGE;
+
+	hostname = argv[1];
+
+	if (argc > 2)
+		varname = argv[2];
+
+	ret = resolv(argv[1], &ip);
+	if (ret) {
+		printf("unknown host %s\n", hostname);
+		return 1;
+	}
+
+	if (varname)
+		setenv_ip(varname, ip);
+	else
+		printf("%s is at %pI4\n", hostname, &ip);
+
+	return 0;
+}
+
+BAREBOX_CMD_START(host)
+	.cmd		= do_host,
+	BAREBOX_CMD_DESC("resolve a hostname")
+	BAREBOX_CMD_OPTS("<HOSTNAME> [VARIABLE]")
+	BAREBOX_CMD_GROUP(CMD_GRP_NET)
+BAREBOX_CMD_END

drivers/net/ag71xx.c

@@ -384,7 +384,7 @@ static void ag71xx_ether_halt(struct eth_device *edev)
 	}
 }
 
-static int ag71xx_ether_rx(struct eth_device *edev)
+static void ag71xx_ether_rx(struct eth_device *edev)
 {
 	struct ag71xx *priv = edev->priv;
 	ag7240_desc_t *f;
@@ -418,8 +418,6 @@ static int ag71xx_ether_rx(struct eth_device *edev)
 		ag71xx_wr(priv, AG71XX_REG_RX_DESC, virt_to_phys(f));
 		ag71xx_wr(priv, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
 	}
-
-	return work_done;
 }
 
 static int ag71xx_ether_send(struct eth_device *edev, void *packet, int length)

drivers/net/ar231x.c

@@ -193,7 +193,7 @@ static int ar231x_eth_open(struct eth_device *edev)
 			ar231x_adjust_link, 0, PHY_INTERFACE_MODE_MII);
 }
 
-static int ar231x_eth_recv(struct eth_device *edev)
+static void ar231x_eth_recv(struct eth_device *edev)
 {
 	struct ar231x_eth_priv *priv = edev->priv;
 
@@ -221,7 +221,6 @@ static int ar231x_eth_recv(struct eth_device *edev)
 		ar231x_flash_rxdsc(rxdsc);
 	}
 	priv->kill_rx_ring = 0;
-	return 0;
 }
 
 static int ar231x_eth_send(struct eth_device *edev, void *packet,

drivers/net/arc_emac.c

@@ -264,7 +264,7 @@ static int arc_emac_send(struct eth_device *edev, void *data, int length)
 	return 0;
 }
 
-static int arc_emac_recv(struct eth_device *edev)
+static void arc_emac_recv(struct eth_device *edev)
 {
 	struct arc_emac_priv *priv = edev->priv;
 	unsigned int work_done;
@@ -307,8 +307,6 @@ static int arc_emac_recv(struct eth_device *edev)
 
 		rxbd->info = cpu_to_le32(FOR_EMAC | PKTSIZE);
 	}
-
-	return work_done;
 }
 
 static void arc_emac_halt(struct eth_device *edev)

drivers/net/at91_ether.c

@@ -205,14 +205,14 @@ static int at91_ether_send(struct eth_device *edev, void *packet, int length)
 	return 0;
 }
 
-static int at91_ether_rx(struct eth_device *edev)
+static void at91_ether_rx(struct eth_device *edev)
 {
 	struct ether_device *etdev = to_ether(edev);
 	int size;
 	struct rbf_t *rbfp = etdev->rbfp;
 
 	if (!(rbfp->addr & RBF_OWNER))
-		return 0;
+		return;
 
 	size = rbfp->size & RBF_SIZE;
 
@@ -230,8 +230,6 @@ static int at91_ether_rx(struct eth_device *edev)
 
 	at91_emac_write(AT91_EMAC_RSR,
 		at91_emac_read(AT91_EMAC_RSR) | AT91_EMAC_RSR_REC);
-
-	return size;
 }
 
 static void at91_ether_halt (struct eth_device *edev)

drivers/net/bcmgenet.c

@@ -309,7 +309,7 @@ static int bcmgenet_gmac_eth_send(struct eth_device *edev, void *packet, int len
 	return 0;
 }
 
-static int bcmgenet_gmac_eth_recv(struct eth_device *edev)
+static void bcmgenet_gmac_eth_recv(struct eth_device *edev)
 {
 	struct bcmgenet_eth_priv *priv = edev->priv;
 	void *desc_base = priv->mac_reg + GENET_RX_OFF + priv->rx_index * DMA_DESC_SIZE;
@@ -318,7 +318,7 @@ static int bcmgenet_gmac_eth_recv(struct eth_device *edev)
 	dma_addr_t addr;
 
 	if (prod_index == priv->c_index)
-		return -EAGAIN;
+		return;
 
 	length = readl(desc_base + DMA_DESC_LENGTH_STATUS);
 	length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
@@ -343,8 +343,6 @@ static int bcmgenet_gmac_eth_recv(struct eth_device *edev)
 	/* Forward our descriptor pointer, wrapping around if needed. */
 	if (++priv->rx_index >= RX_DESCS)
 		priv->rx_index = 0;
-
-	return 0;
 }
 
 static void rx_descs_init(struct bcmgenet_eth_priv *priv)

drivers/net/cpsw.c

@@ -1048,7 +1048,7 @@ static int cpsw_send(struct eth_device *edev, void *packet, int length)
 	return ret;
 }
 
-static int cpsw_recv(struct eth_device *edev)
+static void cpsw_recv(struct eth_device *edev)
 {
 	struct cpsw_slave *slave = edev->priv;
 	struct cpsw_priv *priv = slave->cpsw;
@@ -1062,8 +1062,6 @@ static int cpsw_recv(struct eth_device *edev)
 		dma_sync_single_for_device(priv->dev, dma, len, DMA_FROM_DEVICE);
 		cpdma_submit(priv, &priv->rx_chan, buffer, dma, PKTSIZE, 0);
 	}
-
-	return 0;
 }
 
 static void cpsw_slave_init_data(struct cpsw_slave *slave, int slave_num,

drivers/net/cs8900.c

@@ -278,7 +278,7 @@ static int cs8900_send(struct eth_device *dev, void *eth_data,
 	return 0;
 }
 
-static int cs8900_recv(struct eth_device *dev)
+static void cs8900_recv(struct eth_device *dev)
 {
 	struct cs8900_priv *priv = (struct cs8900_priv *)dev->priv;
 	int len = 0;
@@ -289,21 +289,20 @@ static int cs8900_recv(struct eth_device *dev)
 	status = cs8900_ior(priv, PP_REG_RXEVENT);
 	if ((status & RXEVENT_RXOK) == 0) {
 		/* No packet received. */
-		return 0;
+		return;
 	}
 
 	status = readw(priv->regs + CS8900_RTDATA0);
 	len = readw(priv->regs + CS8900_RTDATA0);
 
-	for (addr = (u16 *)priv->rx_buf, i = len >> 1; i > 0; i--) {
-		*addr++ = readw(priv->regs + CS8900_RTDATA0);
+	if (len <= PKTSIZE) {
+		for (addr = (u16 *)priv->rx_buf, i = (len + 1) >> 1; i > 0; i--)
+			*addr++ = readw(priv->regs + CS8900_RTDATA0);
+		net_receive(dev, priv->rx_buf, len);
+	} else {
+		for (addr = (u16 *)priv->rx_buf, i = (len + 1) >> 1; i > 0; i--)
+			(void)readw(priv->regs + CS8900_RTDATA0);
 	}
-	if (len & 1) {
-		*addr++ = readw(priv->regs + CS8900_RTDATA0);
-	}
-	net_receive(dev, priv->rx_buf, len);
-
-	return len;
 }
 
 static void cs8900_halt(struct eth_device *dev)

drivers/net/davinci_emac.c

@@ -457,21 +457,19 @@ static int davinci_emac_send(struct eth_device *edev, void *packet, int length)
 /*
  * This function handles receipt of a packet from the network
  */
-static int davinci_emac_recv(struct eth_device *edev)
+static void davinci_emac_recv(struct eth_device *edev)
 {
 	struct davinci_emac_priv *priv = edev->priv;
 	void __iomem *rx_curr_desc, *curr_desc, *tail_desc;
 	unsigned char *pkt;
-	int status, len, ret = -1;
+	int status, len;
 
 	dev_dbg(priv->dev, "+ emac_recv\n");
 
 	rx_curr_desc = priv->emac_rx_active_head;
 	status = readl(rx_curr_desc + EMAC_DESC_PKT_FLAG_LEN);
-	if (status & EMAC_CPPI_OWNERSHIP_BIT) {
-		ret = 0;
+	if (status & EMAC_CPPI_OWNERSHIP_BIT)
 		goto out;
-	}
 
 	if (status & EMAC_CPPI_RX_ERROR_FRAME) {
 		/* Error in packet - discard it and requeue desc */
@@ -483,7 +481,6 @@ static int davinci_emac_recv(struct eth_device *edev)
 		dma_sync_single_for_cpu(priv->dev, (unsigned long)pkt, len, DMA_FROM_DEVICE);
 		net_receive(edev, pkt, len);
 		dma_sync_single_for_device(priv->dev, (unsigned long)pkt, len, DMA_FROM_DEVICE);
-		ret = len;
 	}
 
 	/* Ack received packet descriptor */
@@ -529,8 +526,6 @@ static int davinci_emac_recv(struct eth_device *edev)
 
 out:
 	dev_dbg(priv->dev, "- emac_recv\n");
-
-	return ret;
 }
 
 static int davinci_emac_probe(struct device *dev)