bcm4908: backport Ethernet driver fixes from the 5.12
The most noticeable one is fix for RX stopping on high traffic. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
		| @@ -1,7 +1,10 @@ | |||||||
| From d7dfbcba0437955ccbe4c6db736526d528f27720 Mon Sep 17 00:00:00 2001 | From 14b3b46a67f78ade99eafcbf320105615e948569 Mon Sep 17 00:00:00 2001 | ||||||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||||||
| Date: Fri, 12 Feb 2021 16:06:00 +0100 | Date: Fri, 12 Feb 2021 16:21:35 +0100 | ||||||
| Subject: [PATCH] net: broadcom: bcm4908_enet: set MTU on open & on request | Subject: [PATCH] net: broadcom: bcm4908_enet: set MTU on open & on request | ||||||
|  | MIME-Version: 1.0 | ||||||
|  | Content-Type: text/plain; charset=UTF-8 | ||||||
|  | Content-Transfer-Encoding: 8bit | ||||||
| 
 | 
 | ||||||
| Hardware comes up with default max frame size set to 1518. When using it | Hardware comes up with default max frame size set to 1518. When using it | ||||||
| with switch it results in actual Ethernet MTU 1492: | with switch it results in actual Ethernet MTU 1492: | ||||||
| @@ -13,6 +16,9 @@ traffic (MTU 1500). | |||||||
| Define maximum possible Ethernet overhead and always set MAC max frame | Define maximum possible Ethernet overhead and always set MAC max frame | ||||||
| length accordingly. This change fixes handling Ethernet frames of length | length accordingly. This change fixes handling Ethernet frames of length | ||||||
| 1506 - 1514. | 1506 - 1514. | ||||||
|  | 
 | ||||||
|  | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||||||
|  | Signed-off-by: David S. Miller <davem@davemloft.net> | ||||||
| ---
 | ---
 | ||||||
|  drivers/net/ethernet/broadcom/bcm4908_enet.c | 31 ++++++++++++++++---- |  drivers/net/ethernet/broadcom/bcm4908_enet.c | 31 ++++++++++++++++---- | ||||||
|  1 file changed, 25 insertions(+), 6 deletions(-) |  1 file changed, 25 insertions(+), 6 deletions(-) | ||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | From 4dc7f09b8becfa35a55430a49d95acf19f996e6b Mon Sep 17 00:00:00 2001 | ||||||
|  | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||||||
|  | Date: Wed, 24 Feb 2021 16:18:41 +0100 | ||||||
|  | Subject: [PATCH] net: broadcom: bcm4908_enet: fix RX path possible mem leak | ||||||
|  | MIME-Version: 1.0 | ||||||
|  | Content-Type: text/plain; charset=UTF-8 | ||||||
|  | Content-Transfer-Encoding: 8bit | ||||||
|  |  | ||||||
|  | After filling RX ring slot with new skb it's required to free old skb. | ||||||
|  | Immediately on error or later in the net subsystem. | ||||||
|  |  | ||||||
|  | Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller driver") | ||||||
|  | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||||||
|  | Acked-by: Florian Fainelli <f.fainelli@gmail.com> | ||||||
|  | Link: https://lore.kernel.org/r/20210224151842.2419-1-zajec5@gmail.com | ||||||
|  | Signed-off-by: Jakub Kicinski <kuba@kernel.org> | ||||||
|  | --- | ||||||
|  |  drivers/net/ethernet/broadcom/bcm4908_enet.c | 1 + | ||||||
|  |  1 file changed, 1 insertion(+) | ||||||
|  |  | ||||||
|  | --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | @@ -570,6 +570,7 @@ static int bcm4908_enet_poll(struct napi | ||||||
|  |   | ||||||
|  |  		if (len < ETH_ZLEN || | ||||||
|  |  		    (ctl & (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) != (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) { | ||||||
|  | +			kfree_skb(slot.skb); | ||||||
|  |  			enet->netdev->stats.rx_dropped++; | ||||||
|  |  			break; | ||||||
|  |  		} | ||||||
| @@ -0,0 +1,31 @@ | |||||||
|  | From 4d9274cee40b6a20dd6148c6c81c6733c2678cbc Mon Sep 17 00:00:00 2001 | ||||||
|  | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||||||
|  | Date: Wed, 24 Feb 2021 16:18:42 +0100 | ||||||
|  | Subject: [PATCH] net: broadcom: bcm4908_enet: fix NAPI poll returned value | ||||||
|  | MIME-Version: 1.0 | ||||||
|  | Content-Type: text/plain; charset=UTF-8 | ||||||
|  | Content-Transfer-Encoding: 8bit | ||||||
|  |  | ||||||
|  | Missing increment was resulting in poll function always returning 0 | ||||||
|  | instead of amount of processed packets. | ||||||
|  |  | ||||||
|  | Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller driver") | ||||||
|  | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||||||
|  | Acked-by: Florian Fainelli <f.fainelli@gmail.com> | ||||||
|  | Link: https://lore.kernel.org/r/20210224151842.2419-2-zajec5@gmail.com | ||||||
|  | Signed-off-by: Jakub Kicinski <kuba@kernel.org> | ||||||
|  | --- | ||||||
|  |  drivers/net/ethernet/broadcom/bcm4908_enet.c | 2 ++ | ||||||
|  |  1 file changed, 2 insertions(+) | ||||||
|  |  | ||||||
|  | --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | @@ -583,6 +583,8 @@ static int bcm4908_enet_poll(struct napi | ||||||
|  |   | ||||||
|  |  		enet->netdev->stats.rx_packets++; | ||||||
|  |  		enet->netdev->stats.rx_bytes += len; | ||||||
|  | + | ||||||
|  | +		handled++; | ||||||
|  |  	} | ||||||
|  |   | ||||||
|  |  	if (handled < weight) { | ||||||
| @@ -0,0 +1,34 @@ | |||||||
|  | From d313d16bbaea0f11a2e98f04a6c678b43c208915 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> | ||||||
|  | Date: Fri, 26 Feb 2021 14:20:38 +0100 | ||||||
|  | Subject: [PATCH] net: broadcom: bcm4908_enet: enable RX after processing | ||||||
|  |  packets | ||||||
|  | MIME-Version: 1.0 | ||||||
|  | Content-Type: text/plain; charset=UTF-8 | ||||||
|  | Content-Transfer-Encoding: 8bit | ||||||
|  |  | ||||||
|  | When receiving a lot of packets hardware may run out of free | ||||||
|  | descriptiors and stop RX ring. Enable it every time after handling | ||||||
|  | received packets. | ||||||
|  |  | ||||||
|  | Fixes: 4feffeadbcb2 ("net: broadcom: bcm4908enet: add BCM4908 controller driver") | ||||||
|  | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | ||||||
|  | Acked-by: Florian Fainelli <f.fainelli@gmail.com> | ||||||
|  | Link: https://lore.kernel.org/r/20210226132038.29849-1-zajec5@gmail.com | ||||||
|  | Signed-off-by: Jakub Kicinski <kuba@kernel.org> | ||||||
|  | --- | ||||||
|  |  drivers/net/ethernet/broadcom/bcm4908_enet.c | 3 +++ | ||||||
|  |  1 file changed, 3 insertions(+) | ||||||
|  |  | ||||||
|  | --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c | ||||||
|  | @@ -592,6 +592,9 @@ static int bcm4908_enet_poll(struct napi | ||||||
|  |  		bcm4908_enet_intrs_on(enet); | ||||||
|  |  	} | ||||||
|  |   | ||||||
|  | +	/* Hardware could disable ring if it run out of descriptors */ | ||||||
|  | +	bcm4908_enet_dma_rx_ring_enable(enet, &enet->rx_ring); | ||||||
|  | + | ||||||
|  |  	return handled; | ||||||
|  |  } | ||||||
|  |   | ||||||
		Reference in New Issue
	
	Block a user
	 Rafał Miłecki
					Rafał Miłecki