From: Rafał Miłecki Date: Wed, 17 Aug 2016 10:54:49 +0000 (+0200) Subject: kernel: bgmac: backport 3 remaining small fixes X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7264df388616d2fa21d4cb97336e7e2afe3759ad;p=openwrt%2Fstaging%2Flynxis.git kernel: bgmac: backport 3 remaining small fixes This makes bgmac in sync with upstream verison. Signed-off-by: Rafał Miłecki --- diff --git a/target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch b/target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch new file mode 100644 index 0000000000..e0431c1235 --- /dev/null +++ b/target/linux/generic/patches-4.4/076-0001-net-ethernet-bgmac-Fix-return-value-check-in-bgmac_p.patch @@ -0,0 +1,26 @@ +From 12c2e32f14da857b58af281b029d4549d24c3292 Mon Sep 17 00:00:00 2001 +From: Wei Yongjun +Date: Tue, 12 Jul 2016 00:17:28 +0000 +Subject: [PATCH] net: ethernet: bgmac: Fix return value check in bgmac_probe() + +In case of error, the function devm_ioremap_resource() returns ERR_PTR() +and never returns NULL. The NULL test in the return value check should be +replaced with IS_ERR(). + +Signed-off-by: Wei Yongjun +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/broadcom/bgmac-platform.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bgmac-platform.c ++++ b/drivers/net/ethernet/broadcom/bgmac-platform.c +@@ -141,7 +141,7 @@ static int bgmac_probe(struct platform_d + } + + bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs); +- if (!bgmac->plat.idm_base) { ++ if (IS_ERR(bgmac->plat.idm_base)) { + dev_err(&pdev->dev, "Unable to map idm resource\n"); + return PTR_ERR(bgmac->plat.idm_base); + } diff --git a/target/linux/generic/patches-4.4/076-0002-net-ethernet-bgmac-Remove-redundant-dev_err-call-in-.patch b/target/linux/generic/patches-4.4/076-0002-net-ethernet-bgmac-Remove-redundant-dev_err-call-in-.patch new file mode 100644 index 0000000000..479094830e --- /dev/null +++ b/target/linux/generic/patches-4.4/076-0002-net-ethernet-bgmac-Remove-redundant-dev_err-call-in-.patch @@ -0,0 +1,42 @@ +From ce3a380dddd0cb16cb3d8d947b69657d7646c121 Mon Sep 17 00:00:00 2001 +From: Wei Yongjun +Date: Wed, 13 Jul 2016 12:46:57 +0000 +Subject: [PATCH] net: ethernet: bgmac: Remove redundant dev_err call in + bgmac_probe() + +There is a error message within devm_ioremap_resource +already, so remove the dev_err call to avoid redundant +error message. + +Signed-off-by: Wei Yongjun +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/broadcom/bgmac-platform.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bgmac-platform.c ++++ b/drivers/net/ethernet/broadcom/bgmac-platform.c +@@ -129,10 +129,8 @@ static int bgmac_probe(struct platform_d + } + + bgmac->plat.base = devm_ioremap_resource(&pdev->dev, regs); +- if (IS_ERR(bgmac->plat.base)) { +- dev_err(&pdev->dev, "Unable to map base resource\n"); ++ if (IS_ERR(bgmac->plat.base)) + return PTR_ERR(bgmac->plat.base); +- } + + regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base"); + if (!regs) { +@@ -141,10 +139,8 @@ static int bgmac_probe(struct platform_d + } + + bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs); +- if (IS_ERR(bgmac->plat.idm_base)) { +- dev_err(&pdev->dev, "Unable to map idm resource\n"); ++ if (IS_ERR(bgmac->plat.idm_base)) + return PTR_ERR(bgmac->plat.idm_base); +- } + + bgmac->read = platform_bgmac_read; + bgmac->write = platform_bgmac_write; diff --git a/target/linux/generic/patches-4.4/076-0003-net-bgmac-Fix-infinite-loop-in-bgmac_dma_tx_add.patch b/target/linux/generic/patches-4.4/076-0003-net-bgmac-Fix-infinite-loop-in-bgmac_dma_tx_add.patch new file mode 100644 index 0000000000..3834e64cd3 --- /dev/null +++ b/target/linux/generic/patches-4.4/076-0003-net-bgmac-Fix-infinite-loop-in-bgmac_dma_tx_add.patch @@ -0,0 +1,27 @@ +From e86663c475d384ab5f46cb5637e9b7ad08c5c505 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Fri, 15 Jul 2016 15:42:52 -0700 +Subject: [PATCH] net: bgmac: Fix infinite loop in bgmac_dma_tx_add() + +Nothing is decrementing the index "i" while we are cleaning up the +fragments we could not successful transmit. + +Fixes: 9cde94506eacf ("bgmac: implement scatter/gather support") +Reported-by: coverity (CID 1352048) +Signed-off-by: Florian Fainelli +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -207,7 +207,7 @@ err_dma: + dma_unmap_single(dma_dev, slot->dma_addr, skb_headlen(skb), + DMA_TO_DEVICE); + +- while (i > 0) { ++ while (i-- > 0) { + int index = (ring->end + i) % BGMAC_TX_RING_SLOTS; + struct bgmac_slot_info *slot = &ring->slots[index]; + u32 ctl1 = le32_to_cpu(ring->cpu_base[index].ctl1);