From 6bfb1a4b11f9c941b29b1faed4d818ccbc9ce539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Thu, 23 Apr 2015 12:30:51 +0000
Subject: kernel: backport few bgmac patches to 4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I still need to test following patch before backporting:
bgmac: leave interrupts disabled as long as there is work to do

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45571
---
 .../775-bgmac-check-length-of-received-frame.patch | 39 ----------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch

(limited to 'target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch')

diff --git a/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch b/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch
deleted file mode 100644
index 883c77b..0000000
--- a/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2d12a9abf3f81de5b51852e3cfcba8cedac82642 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 6 Dec 2013 01:14:52 +0100
-Subject: [PATCH] bgmac: check length of received frame
-
----
- drivers/net/ethernet/broadcom/bgmac.c |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -361,6 +361,27 @@ static int bgmac_dma_rx_read(struct bgma
- 			dma_addr_t old_dma_addr = slot->dma_addr;
- 			int err;
- 
-+			if (len > BGMAC_RX_MAX_FRAME_SIZE) {
-+				struct bgmac_dma_desc *dma_desc = ring->cpu_base + ring->start;
-+
-+				bgmac_err(bgmac, "Hardware reported invalid packet length %d for slot %d!\n", len, ring->start);
-+				bgmac_err(bgmac, "flags: 0x%04X\n", flags);
-+				bgmac_err(bgmac, "ctl0: 0x%08X\tctl1: 0x%08X\n", le32_to_cpu(dma_desc->ctl0), le32_to_cpu(dma_desc->ctl1));
-+
-+				bgmac_err(bgmac, "   BGMAC_DMA_RX_CTL: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_CTL));
-+				bgmac_err(bgmac, " BGMAC_DMA_RX_INDEX: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX));
-+				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGLO: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGLO));
-+				bgmac_err(bgmac, "BGMAC_DMA_RX_RINGHI: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_RINGHI));
-+				bgmac_err(bgmac, "BGMAC_DMA_RX_STATUS: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_STATUS));
-+				bgmac_err(bgmac, " BGMAC_DMA_RX_ERROR: 0x%08X\n", bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_RX_ERROR));
-+
-+				dma_sync_single_for_device(dma_dev,
-+							   slot->dma_addr,
-+							   BGMAC_RX_BUF_SIZE,
-+							   DMA_FROM_DEVICE);
-+				break;
-+			}
-+
- 			/* Check for poison and drop or pass the packet */
- 			if (len == 0xdead && flags == 0xbeef) {
- 				bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
-- 
cgit v1.1