aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-02-18 00:36:28 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-02-28 17:50:46 +0100
commit1e95f9b3ea8375931bf82b8d102b9410d6eafcfa (patch)
tree41f419aadf177b18011f3f76cca4acc013130799 /target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch
parent53ab9865c2b91bc6a239b2adee800dc52875b6bc (diff)
downloadupstream-1e95f9b3ea8375931bf82b8d102b9410d6eafcfa.tar.gz
upstream-1e95f9b3ea8375931bf82b8d102b9410d6eafcfa.tar.bz2
upstream-1e95f9b3ea8375931bf82b8d102b9410d6eafcfa.zip
ath79: Make upstream ag71xx driver work
* Fix some bugs in the driver * Add missing clock and reset references in dts * Rename mdio-bus to mdio so the driver find it Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch')
-rw-r--r--target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch b/target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch
new file mode 100644
index 0000000000..6631cb8e17
--- /dev/null
+++ b/target/linux/ath79/patches-5.4/200-ag71xx-Handle-allocation-errors-in-ag71xx_rings_init.patch
@@ -0,0 +1,61 @@
+From 2cee757eaf5cc6175bc0ac7b0b808794124ec40a Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 17 Feb 2020 23:40:14 +0100
+Subject: [PATCH 1/3] ag71xx: Handle allocation errors in ag71xx_rings_init()
+
+Free the allocated resources in ag71xx_rings_init() in case
+ag71xx_ring_rx_init() returns an error.
+
+This is only a potential problem, I did not ran into this one.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
+---
+ drivers/net/ethernet/atheros/ag71xx.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/ethernet/atheros/ag71xx.c
++++ b/drivers/net/ethernet/atheros/ag71xx.c
+@@ -1133,6 +1133,7 @@ static int ag71xx_rings_init(struct ag71
+ struct ag71xx_ring *tx = &ag->tx_ring;
+ struct ag71xx_ring *rx = &ag->rx_ring;
+ int ring_size, tx_size;
++ int ret;
+
+ ring_size = BIT(tx->order) + BIT(rx->order);
+ tx_size = BIT(tx->order);
+@@ -1145,9 +1146,8 @@ static int ag71xx_rings_init(struct ag71
+ ring_size * AG71XX_DESC_SIZE,
+ &tx->descs_dma, GFP_KERNEL);
+ if (!tx->descs_cpu) {
+- kfree(tx->buf);
+- tx->buf = NULL;
+- return -ENOMEM;
++ ret = -ENOMEM;
++ goto err_free_buf;
+ }
+
+ rx->buf = &tx->buf[tx_size];
+@@ -1155,7 +1155,21 @@ static int ag71xx_rings_init(struct ag71
+ rx->descs_dma = tx->descs_dma + tx_size * AG71XX_DESC_SIZE;
+
+ ag71xx_ring_tx_init(ag);
+- return ag71xx_ring_rx_init(ag);
++ ret = ag71xx_ring_rx_init(ag);
++ if (ret)
++ goto err_free_dma;
++
++ return 0;
++
++err_free_dma:
++ dma_free_coherent(&ag->pdev->dev, ring_size * AG71XX_DESC_SIZE,
++ tx->descs_cpu, tx->descs_dma);
++ rx->buf = NULL;
++err_free_buf:
++ kfree(tx->buf);
++ tx->buf = NULL;
++
++ return ret;
+ }
+
+ static void ag71xx_rings_free(struct ag71xx *ag)