From: Jon Nettleton jon@solid-run.com

Both ping_receive and arp_receive would transmit a received packet back out using its original point. This causes problems with certain network cards that add a custom header to the packet. Specifically the mvneta driver for the Armada series boards has a 2 byte Marvell header that is bypassed and passed along to the system, but that 2 byte offset now causes a misalignment if it is attempted to be sent back out.

Rather than changing the driver to memcpy all the received packets to cache aligned buffers we instead change the two offending network commands to copy the packet into a cache aligned net_tx_packet before sending it back out.

This fixes occasional messages like:

CACHE: Misaligned operation at range [3fc01082, 3fc010c2]

Signed-off-by: Jon Nettleton jon@solid-run.com Signed-off-by: Baruch Siach baruch@tkos.co.il --- 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 990b771c9211..b8a71684cd76 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); return;

case ARPOP_REPLY: /* arp reply */ diff --git a/net/ping.c b/net/ping.c index 5464f2f785fe..3e5461a36a02 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;*/

On 28.05.2018 08:33, Baruch Siach wrote:

From: Jon Nettleton jon@solid-run.com

This makes sure the DMA buffers are properly aligned for the hardware.

Signed-off-by: Jon Nettleton jon@solid-run.com Signed-off-by: Baruch Siach baruch@tkos.co.il

---

drivers/net/mvneta.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 7036b517b445..fc16986a00d6 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1025,6 +1025,9 @@ static int mvneta_rxq_init(struct mvneta_port *pp, if (rxq->descs == NULL) return -ENOMEM;

• BUG_ON(rxq->descs !=

• PTR_ALIGN(rxq->descs, ARCH_DMA_MINALIGN));
  

Not sure if this really "bugs" in U-Boot, but please use WARN_ON instead. IIRC, the usage of BUG_ON is not recommended in Linux anymore. And warning instead of completely crashing is definitely better in this case.

Other than this:

Reviewed-by: Stefan Roese sr@denx.de

Thanks, Stefan

rxq->last_desc = rxq->size - 1;

/* Set Rx descriptors queue starting address */ @@ -1061,6 +1064,9 @@ static int mvneta_txq_init(struct mvneta_port *pp, if (txq->descs == NULL) return -ENOMEM;

• BUG_ON(txq->descs !=

• PTR_ALIGN(txq->descs, ARCH_DMA_MINALIGN));
  

• txq->last_desc = txq->size - 1;

  /* Set maximum bandwidth for enabled TXQs */

@@ -1694,18 +1700,20 @@ static int mvneta_probe(struct udevice *dev) * be active. Make this area DMA safe by disabling the D-cache */ if (!buffer_loc.tx_descs) {

• u32 size;
  

• /* Align buffer area for descs and rx_buffers to 1MiB */ bd_space = memalign(1 << MMU_SECTION_SHIFT, BD_SPACE); mmu_set_region_dcache_behaviour((phys_addr_t)bd_space, BD_SPACE, DCACHE_OFF); buffer_loc.tx_descs = (struct mvneta_tx_desc *)bd_space;

• size = roundup(MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc),
  

• 		ARCH_DMA_MINALIGN);
  

  buffer_loc.rx_descs = (struct mvneta_rx_desc *)

• 	((phys_addr_t)bd_space +
  

• 	 MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc));
  

• buffer_loc.rx_buffers = (phys_addr_t)
  

• 	(bd_space +
  

• 	 MVNETA_MAX_TXD * sizeof(struct mvneta_tx_desc) +
  

• 	 MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc));
  

• 	((phys_addr_t)bd_space + size);
  

• size += roundup(MVNETA_MAX_RXD * sizeof(struct mvneta_rx_desc),
  

• 		ARCH_DMA_MINALIGN);
  

• buffer_loc.rx_buffers = (phys_addr_t)(bd_space + size);
  

  }

  pp->base = (void __iomem *)pdata->iobase;