From 14ed7c1a21e30cf70219057d2696d97fea8ee7b1 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Fri, 17 May 2019 21:52:40 +0200 Subject: [PATCH] Revert dynamically fix up TX buffer alignment with padding --- .../patches-4.14/962-fix_up_tx_buffer.patch | 66 ------------------- 1 file changed, 66 deletions(-) delete mode 100644 root/target/linux/brcm2708/patches-4.14/962-fix_up_tx_buffer.patch diff --git a/root/target/linux/brcm2708/patches-4.14/962-fix_up_tx_buffer.patch b/root/target/linux/brcm2708/patches-4.14/962-fix_up_tx_buffer.patch deleted file mode 100644 index 893faee7..00000000 --- a/root/target/linux/brcm2708/patches-4.14/962-fix_up_tx_buffer.patch +++ /dev/null @@ -1,66 +0,0 @@ -From dfb8fa6937612f8239a109685ede188a7d98295c Mon Sep 17 00:00:00 2001 -From: P33M -Date: Wed, 1 May 2019 17:04:32 +0100 -Subject: [PATCH] smsc95xx: dynamically fix up TX buffer alignment with padding - bytes - -dwc_otg requires a 32-bit aligned buffer start address, otherwise -expensive bounce buffers are used. The LAN951x hardware can skip up to -3 bytes between the TX header and the start of frame data, which can -be used to force alignment of the URB passed to dwc_otg. - -As found in https://github.com/raspberrypi/linux/issues/2924 ---- - drivers/net/usb/smsc95xx.c | 12 +++++++----- - drivers/net/usb/smsc95xx.h | 2 +- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index a5bbec75f22dc..c087b6d75753e 100644 ---- a/drivers/net/usb/smsc95xx.c -+++ b/drivers/net/usb/smsc95xx.c -@@ -2082,7 +2082,9 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, - struct sk_buff *skb, gfp_t flags) - { - bool csum = skb->ip_summed == CHECKSUM_PARTIAL; -- int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM : SMSC95XX_TX_OVERHEAD; -+ unsigned int align_bytes = -((uintptr_t)skb->data) & 0x3; -+ int overhead = csum ? SMSC95XX_TX_OVERHEAD_CSUM + align_bytes -+ : SMSC95XX_TX_OVERHEAD + align_bytes; - u32 tx_cmd_a, tx_cmd_b; - - /* We do not advertise SG, so skbs should be already linearized */ -@@ -2116,16 +2118,16 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev, - } - } - -- skb_push(skb, 4); -- tx_cmd_b = (u32)(skb->len - 4); -+ skb_push(skb, 4 + align_bytes); -+ tx_cmd_b = (u32)(skb->len - 4 - align_bytes); - if (csum) - tx_cmd_b |= TX_CMD_B_CSUM_ENABLE; - cpu_to_le32s(&tx_cmd_b); - memcpy(skb->data, &tx_cmd_b, 4); - - skb_push(skb, 4); -- tx_cmd_a = (u32)(skb->len - 8) | TX_CMD_A_FIRST_SEG_ | -- TX_CMD_A_LAST_SEG_; -+ tx_cmd_a = (u32)(skb->len - 8 - align_bytes) | TX_CMD_A_FIRST_SEG_ | -+ (align_bytes << 16) | TX_CMD_A_LAST_SEG_; - cpu_to_le32s(&tx_cmd_a); - memcpy(skb->data, &tx_cmd_a, 4); - -diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h -index cfc704f3a4608..55f9f03e1a0c9 100644 ---- a/drivers/net/usb/smsc95xx.h -+++ b/drivers/net/usb/smsc95xx.h -@@ -21,7 +21,7 @@ - #define _SMSC95XX_H - - /* Tx command words */ --#define TX_CMD_A_DATA_OFFSET_ (0x001F0000) /* Data Start Offset */ -+#define TX_CMD_A_DATA_OFFSET_ (0x00030000) /* Data Start Offset */ - #define TX_CMD_A_FIRST_SEG_ (0x00002000) /* First Segment */ - #define TX_CMD_A_LAST_SEG_ (0x00001000) /* Last Segment */ - #define TX_CMD_A_BUF_SIZE_ (0x000007FF) /* Buffer Size */