kernel: bgmac: update backport patch

This adds some more bgmac patches from mainline kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38637 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 250 insertions, 13 deletions

diff --git a/target/linux/generic/patches-3.12/770-bgmac-backport.patch b/target/linux/generic/patches-3.12/770-bgmac-backport.patch
new file mode 100644
index 0000000000..68489f5c7b
--- /dev/null
+++ b/target/linux/generic/patches-3.12/770-bgmac-backport.patch
@@ -0,0 +1,237 @@
+patches for bgmac backported from net-next/master
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -149,6 +149,8 @@ static netdev_tx_t bgmac_dma_tx_add(stru
+ 	dma_desc->ctl0 = cpu_to_le32(ctl0);
+ 	dma_desc->ctl1 = cpu_to_le32(ctl1);
+ 
++	netdev_sent_queue(net_dev, skb->len);
++
+ 	wmb();
+ 
+ 	/* Increase ring->end to point empty slot. We tell hardware the first
+@@ -178,6 +180,7 @@ static void bgmac_dma_tx_free(struct bgm
+ 	struct device *dma_dev = bgmac->core->dma_dev;
+ 	int empty_slot;
+ 	bool freed = false;
++	unsigned bytes_compl = 0, pkts_compl = 0;
+ 
+ 	/* The last slot that hardware didn't consume yet */
+ 	empty_slot = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_STATUS);
+@@ -195,6 +198,9 @@ static void bgmac_dma_tx_free(struct bgm
+ 					 slot->skb->len, DMA_TO_DEVICE);
+ 			slot->dma_addr = 0;
+ 
++			bytes_compl += slot->skb->len;
++			pkts_compl++;
++
+ 			/* Free memory! :) */
+ 			dev_kfree_skb(slot->skb);
+ 			slot->skb = NULL;
+@@ -208,6 +214,8 @@ static void bgmac_dma_tx_free(struct bgm
+ 		freed = true;
+ 	}
+ 
++	netdev_completed_queue(bgmac->net_dev, pkts_compl, bytes_compl);
++
+ 	if (freed && netif_queue_stopped(bgmac->net_dev))
+ 		netif_wake_queue(bgmac->net_dev);
+ }
+@@ -244,31 +252,59 @@ static int bgmac_dma_rx_skb_for_slot(str
+ 				     struct bgmac_slot_info *slot)
+ {
+ 	struct device *dma_dev = bgmac->core->dma_dev;
++	struct sk_buff *skb;
++	dma_addr_t dma_addr;
+ 	struct bgmac_rx_header *rx;
+ 
+ 	/* Alloc skb */
+-	slot->skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
+-	if (!slot->skb)
++	skb = netdev_alloc_skb(bgmac->net_dev, BGMAC_RX_BUF_SIZE);
++	if (!skb)
+ 		return -ENOMEM;
+ 
+ 	/* Poison - if everything goes fine, hardware will overwrite it */
+-	rx = (struct bgmac_rx_header *)slot->skb->data;
++	rx = (struct bgmac_rx_header *)skb->data;
+ 	rx->len = cpu_to_le16(0xdead);
+ 	rx->flags = cpu_to_le16(0xbeef);
+ 
+ 	/* Map skb for the DMA */
+-	slot->dma_addr = dma_map_single(dma_dev, slot->skb->data,
+-					BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
+-	if (dma_mapping_error(dma_dev, slot->dma_addr)) {
++	dma_addr = dma_map_single(dma_dev, skb->data,
++				  BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++	if (dma_mapping_error(dma_dev, dma_addr)) {
+ 		bgmac_err(bgmac, "DMA mapping error\n");
++		dev_kfree_skb(skb);
+ 		return -ENOMEM;
+ 	}
++
++	/* Update the slot */
++	slot->skb = skb;
++	slot->dma_addr = dma_addr;
++
+ 	if (slot->dma_addr & 0xC0000000)
+ 		bgmac_warn(bgmac, "DMA address using 0xC0000000 bit(s), it may need translation trick\n");
+ 
+ 	return 0;
+ }
+ 
++static void bgmac_dma_rx_setup_desc(struct bgmac *bgmac,
++				    struct bgmac_dma_ring *ring, int desc_idx)
++{
++	struct bgmac_dma_desc *dma_desc = ring->cpu_base + desc_idx;
++	u32 ctl0 = 0, ctl1 = 0;
++
++	if (desc_idx == ring->num_slots - 1)
++		ctl0 |= BGMAC_DESC_CTL0_EOT;
++	ctl1 |= BGMAC_RX_BUF_SIZE & BGMAC_DESC_CTL1_LEN;
++	/* Is there any BGMAC device that requires extension? */
++	/* ctl1 |= (addrext << B43_DMA64_DCTL1_ADDREXT_SHIFT) &
++	 * B43_DMA64_DCTL1_ADDREXT_MASK;
++	 */
++
++	dma_desc->addr_low = cpu_to_le32(lower_32_bits(ring->slots[desc_idx].dma_addr));
++	dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr));
++	dma_desc->ctl0 = cpu_to_le32(ctl0);
++	dma_desc->ctl1 = cpu_to_le32(ctl1);
++}
++
+ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
+ 			     int weight)
+ {
+@@ -287,7 +323,6 @@ static int bgmac_dma_rx_read(struct bgma
+ 		struct device *dma_dev = bgmac->core->dma_dev;
+ 		struct bgmac_slot_info *slot = &ring->slots[ring->start];
+ 		struct sk_buff *skb = slot->skb;
+-		struct sk_buff *new_skb;
+ 		struct bgmac_rx_header *rx;
+ 		u16 len, flags;
+ 
+@@ -300,38 +335,51 @@ static int bgmac_dma_rx_read(struct bgma
+ 		len = le16_to_cpu(rx->len);
+ 		flags = le16_to_cpu(rx->flags);
+ 
+-		/* 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",
+-				  ring->start);
+-		} else {
++		do {
++			dma_addr_t old_dma_addr = slot->dma_addr;
++			int err;
++
++			/* 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",
++					  ring->start);
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
++			}
++
+ 			/* Omit CRC. */
+ 			len -= ETH_FCS_LEN;
+ 
+-			new_skb = netdev_alloc_skb_ip_align(bgmac->net_dev, len);
+-			if (new_skb) {
+-				skb_put(new_skb, len);
+-				skb_copy_from_linear_data_offset(skb, BGMAC_RX_FRAME_OFFSET,
+-								 new_skb->data,
+-								 len);
+-				skb_checksum_none_assert(skb);
+-				new_skb->protocol =
+-					eth_type_trans(new_skb, bgmac->net_dev);
+-				netif_receive_skb(new_skb);
+-				handled++;
+-			} else {
+-				bgmac->net_dev->stats.rx_dropped++;
+-				bgmac_err(bgmac, "Allocation of skb for copying packet failed!\n");
++			/* Prepare new skb as replacement */
++			err = bgmac_dma_rx_skb_for_slot(bgmac, slot);
++			if (err) {
++				/* Poison the old skb */
++				rx->len = cpu_to_le16(0xdead);
++				rx->flags = cpu_to_le16(0xbeef);
++
++				dma_sync_single_for_device(dma_dev,
++							   slot->dma_addr,
++							   BGMAC_RX_BUF_SIZE,
++							   DMA_FROM_DEVICE);
++				break;
+ 			}
++			bgmac_dma_rx_setup_desc(bgmac, ring, ring->start);
+ 
+-			/* Poison the old skb */
+-			rx->len = cpu_to_le16(0xdead);
+-			rx->flags = cpu_to_le16(0xbeef);
+-		}
+-
+-		/* Make it back accessible to the hardware */
+-		dma_sync_single_for_device(dma_dev, slot->dma_addr,
+-					   BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++			/* Unmap old skb, we'll pass it to the netfif */
++			dma_unmap_single(dma_dev, old_dma_addr,
++					 BGMAC_RX_BUF_SIZE, DMA_FROM_DEVICE);
++
++			skb_put(skb, BGMAC_RX_FRAME_OFFSET + len);
++			skb_pull(skb, BGMAC_RX_FRAME_OFFSET);
++
++			skb_checksum_none_assert(skb);
++			skb->protocol = eth_type_trans(skb, bgmac->net_dev);
++			netif_receive_skb(skb);
++			handled++;
++		} while (0);
+ 
+ 		if (++ring->start >= BGMAC_RX_RING_SLOTS)
+ 			ring->start = 0;
+@@ -495,8 +543,6 @@ err_dma_free:
+ static void bgmac_dma_init(struct bgmac *bgmac)
+ {
+ 	struct bgmac_dma_ring *ring;
+-	struct bgmac_dma_desc *dma_desc;
+-	u32 ctl0, ctl1;
+ 	int i;
+ 
+ 	for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) {
+@@ -529,23 +575,8 @@ static void bgmac_dma_init(struct bgmac
+ 		if (ring->unaligned)
+ 			bgmac_dma_rx_enable(bgmac, ring);
+ 
+-		for (j = 0, dma_desc = ring->cpu_base; j < ring->num_slots;
+-		     j++, dma_desc++) {
+-			ctl0 = ctl1 = 0;
+-
+-			if (j == ring->num_slots - 1)
+-				ctl0 |= BGMAC_DESC_CTL0_EOT;
+-			ctl1 |= BGMAC_RX_BUF_SIZE & BGMAC_DESC_CTL1_LEN;
+-			/* Is there any BGMAC device that requires extension? */
+-			/* ctl1 |= (addrext << B43_DMA64_DCTL1_ADDREXT_SHIFT) &
+-			 * B43_DMA64_DCTL1_ADDREXT_MASK;
+-			 */
+-
+-			dma_desc->addr_low = cpu_to_le32(lower_32_bits(ring->slots[j].dma_addr));
+-			dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[j].dma_addr));
+-			dma_desc->ctl0 = cpu_to_le32(ctl0);
+-			dma_desc->ctl1 = cpu_to_le32(ctl1);
+-		}
++		for (j = 0; j < ring->num_slots; j++)
++			bgmac_dma_rx_setup_desc(bgmac, ring, j);
+ 
+ 		bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX,
+ 			    ring->index_base +
+@@ -988,6 +1019,8 @@ static void bgmac_chip_reset(struct bgma
+ 	bgmac_miiconfig(bgmac);
+ 	bgmac_phy_init(bgmac);
+ 
++	netdev_reset_queue(bgmac->net_dev);
++
+ 	bgmac->int_status = 0;
+ }
+ 
diff --git a/target/linux/generic/patches-3.12/771-bgmac-phylib.patch b/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
index 2d1db3f9e9..9f2584ec53 100644
--- a/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
+++ b/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
@@ -5,7 +5,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1219,27 +1219,14 @@ static int bgmac_set_mac_address(struct
+@@ -1252,27 +1252,14 @@ static int bgmac_set_mac_address(struct
  static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
@@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  }
  
  static const struct net_device_ops bgmac_netdev_ops = {
-@@ -1261,61 +1248,16 @@ static int bgmac_get_settings(struct net
+@@ -1294,61 +1281,16 @@ static int bgmac_get_settings(struct net
  {
  	struct bgmac *bgmac = netdev_priv(net_dev);
  
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  static void bgmac_get_drvinfo(struct net_device *net_dev,
  			      struct ethtool_drvinfo *info)
-@@ -1326,6 +1268,7 @@ static void bgmac_get_drvinfo(struct net
+@@ -1359,6 +1301,7 @@ static void bgmac_get_drvinfo(struct net
  
  static const struct ethtool_ops bgmac_ethtool_ops = {
  	.get_settings		= bgmac_get_settings,
@@ -112,7 +112,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	.get_drvinfo		= bgmac_get_drvinfo,
  };
  
-@@ -1344,10 +1287,36 @@ static int bgmac_mii_write(struct mii_bu
+@@ -1377,10 +1320,36 @@ static int bgmac_mii_write(struct mii_bu
  	return bgmac_phy_write(bus->priv, mii_id, regnum, value);
  }
  
@@ -149,7 +149,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
  	mii_bus = mdiobus_alloc();
  	if (!mii_bus)
-@@ -1378,7 +1347,28 @@ static int bgmac_mii_register(struct bgm
+@@ -1411,7 +1380,28 @@ static int bgmac_mii_register(struct bgm
  
  	bgmac->mii_bus = mii_bus;
  
diff --git a/target/linux/generic/patches-3.12/772-bgmac-add-supprot-for-BCM4707.patch b/target/linux/generic/patches-3.12/772-bgmac-add-supprot-for-BCM4707.patch
index b903875e78..eb1708a2c4 100644
--- a/target/linux/generic/patches-3.12/772-bgmac-add-supprot-for-BCM4707.patch
+++ b/target/linux/generic/patches-3.12/772-bgmac-add-supprot-for-BCM4707.patch
@@ -4,7 +4,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -856,6 +856,8 @@ static void bgmac_speed(struct bgmac *bg
+@@ -887,6 +887,8 @@ static void bgmac_speed(struct bgmac *bg
  		set |= BGMAC_CMDCFG_ES_100;
  	if (speed & BGMAC_SPEED_1000)
  		set |= BGMAC_CMDCFG_ES_1000;
@@ -13,7 +13,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	if (!bgmac->full_duplex)
  		set |= BGMAC_CMDCFG_HD;
  	bgmac_cmdcfg_maskset(bgmac, mask, set, true);
-@@ -863,13 +865,28 @@ static void bgmac_speed(struct bgmac *bg
+@@ -894,13 +896,28 @@ static void bgmac_speed(struct bgmac *bg
  
  static void bgmac_miiconfig(struct bgmac *bgmac)
  {
@@ -48,7 +48,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	}
  }
  
-@@ -915,7 +932,8 @@ static void bgmac_chip_reset(struct bgma
+@@ -946,7 +963,8 @@ static void bgmac_chip_reset(struct bgma
  
  	bcma_core_enable(core, flags);
  
@@ -58,7 +58,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  		bgmac_set(bgmac, BCMA_CLKCTLST, 1 << 8);
  		bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24,
  				 1000);
-@@ -936,10 +954,13 @@ static void bgmac_chip_reset(struct bgma
+@@ -967,10 +985,13 @@ static void bgmac_chip_reset(struct bgma
  			et_swtype &= 0x0f;
  			et_swtype <<= 4;
  			sw_type = et_swtype;
@@ -75,7 +75,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
  				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;
  		}
-@@ -1044,12 +1065,15 @@ static void bgmac_enable(struct bgmac *b
+@@ -1077,12 +1098,15 @@ static void bgmac_enable(struct bgmac *b
  		break;
  	}
  
diff --git a/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
index b3273969ed..e5ec78d59f 100644
--- a/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.12/773-bgmac-add-srab-switch.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #include <bcm47xx_nvram.h>
  
  static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1410,6 +1411,17 @@ static void bgmac_mii_unregister(struct
+@@ -1443,6 +1444,17 @@ static void bgmac_mii_unregister(struct
  	mdiobus_free(mii_bus);
  }
  
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /**************************************************
   * BCMA bus ops
   **************************************************/
-@@ -1509,6 +1521,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1542,6 +1554,16 @@ static int bgmac_probe(struct bcma_devic
  		goto err_dma_free;
  	}
  
@@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  	err = register_netdev(bgmac->net_dev);
  	if (err) {
  		bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1538,6 +1560,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1571,6 +1593,10 @@ static void bgmac_remove(struct bcma_dev
  {
  	struct bgmac *bgmac = bcma_get_drvdata(core);