Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af4a233 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Jeff Kirsher
Browse files

e1000: remove workaround for Errata 23 from jumbo alloc 



According to the comment, errata 23 says that the memory we allocate
can't cross a 64KiB boundary. In case of jumbo frames we allocate
complete pages which can never cross the 64KiB boundary because
PAGE_SIZE should be a multiple of 64KiB so we stop either before the
boundary or start after it but never cross it. Furthermore the check
seems bogus because it looks at skb->data which is not seen by the HW
at all because we only pass the DMA address of the page we allocated. So
I *think* the workaround is not required here.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ba9e186f

drivers/net/ethernet/intel/e1000/e1000_main.c

+0 −24
Original line number Diff line number Diff line
@@ -4391,30 +4391,6 @@ e1000_alloc_jumbo_rx_buffers(struct e1000_adapter *adapter, 
			break;

		}



		/* Fix for errata 23, can't cross 64kB boundary */

		if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {

			struct sk_buff *oldskb = skb;

			e_err(rx_err, "skb align check failed: %u bytes at "

			      "%p\n", bufsz, skb->data);

			/* Try again, without freeing the previous */

			skb = netdev_alloc_skb_ip_align(netdev, bufsz);

			/* Failed allocation, critical failure */

			if (!skb) {

				dev_kfree_skb(oldskb);

				adapter->alloc_rx_buff_failed++;

				break;

			}



			if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) {

				/* give up */

				dev_kfree_skb(skb);

				dev_kfree_skb(oldskb);

				break; /* while (cleaned_count--) */

			}



			/* Use new allocation */

			dev_kfree_skb(oldskb);

		}

		buffer_info->skb = skb;

		buffer_info->length = adapter->rx_buffer_len;

check_page: