Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (a4657141) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/tg3.c

+28 −23

Original line number	Diff line number	Diff line
		@@ -68,8 +68,8 @@

		#define DRV_MODULE_NAME "tg3"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "3.64"
		#define DRV_MODULE_RELDATE "July 31, 2006"
		#define DRV_MODULE_VERSION "3.65"
		#define DRV_MODULE_RELDATE "August 07, 2006"

		#define TG3_DEF_MAC_MODE 0
		#define TG3_DEF_RX_MODE 0
		@@ -123,9 +123,6 @@
		TG3_RX_RCB_RING_SIZE(tp))
		#define TG3_TX_RING_BYTES (sizeof(struct tg3_tx_buffer_desc) * \
		TG3_TX_RING_SIZE)
		#define TX_BUFFS_AVAIL(TP) \
		((TP)->tx_pending - \
		(((TP)->tx_prod - (TP)->tx_cons) & (TG3_TX_RING_SIZE - 1)))
		#define NEXT_TX(N) (((N) + 1) & (TG3_TX_RING_SIZE - 1))

		#define RX_PKT_BUF_SZ (1536 + tp->rx_offset + 64)
		@@ -2987,6 +2984,13 @@ static void tg3_tx_recover(struct tg3 *tp)
		spin_unlock(&tp->lock);
		}

		static inline u32 tg3_tx_avail(struct tg3 *tp)
		{
		smp_mb();
		return (tp->tx_pending -
		((tp->tx_prod - tp->tx_cons) & (TG3_TX_RING_SIZE - 1)));
		}

		/* Tigon3 never reports partial packet sends. So we do not
		* need special logic to handle SKBs that have not had all
		* of their frags sent yet, like SunGEM does.
		@@ -3038,12 +3042,20 @@ static void tg3_tx(struct tg3 *tp)

		tp->tx_cons = sw_idx;

		if (unlikely(netif_queue_stopped(tp->dev))) {
		spin_lock(&tp->tx_lock);
		/* Need to make the tx_cons update visible to tg3_start_xmit()
		* before checking for netif_queue_stopped(). Without the
		* memory barrier, there is a small possibility that tg3_start_xmit()
		* will miss it and cause the queue to be stopped forever.
		*/
		smp_mb();

		if (unlikely(netif_queue_stopped(tp->dev) &&
		(tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))) {
		netif_tx_lock(tp->dev);
		if (netif_queue_stopped(tp->dev) &&
		(TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH))
		(tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH))
		netif_wake_queue(tp->dev);
		spin_unlock(&tp->tx_lock);
		netif_tx_unlock(tp->dev);
		}
		}

		@@ -3101,7 +3113,6 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key,
		if (skb == NULL)
		return -ENOMEM;

		skb->dev = tp->dev;
		skb_reserve(skb, tp->rx_offset);

		mapping = pci_map_single(tp->pdev, skb->data,
		@@ -3274,7 +3285,6 @@ static int tg3_rx(struct tg3 *tp, int budget)
		if (copy_skb == NULL)
		goto drop_it_no_recycle;

		copy_skb->dev = tp->dev;
		skb_reserve(copy_skb, 2);
		skb_put(copy_skb, len);
		pci_dma_sync_single_for_cpu(tp->pdev, dma_addr, len, PCI_DMA_FROMDEVICE);
		@@ -3797,7 +3807,7 @@ static int tg3_start_xmit(struct sk_buff skb, struct net_device dev)
		* interrupt. Furthermore, IRQ processing runs lockless so we have
		* no IRQ context deadlocks to worry about either. Rejoice!
		*/
		if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
		if (unlikely(tg3_tx_avail(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
		if (!netif_queue_stopped(dev)) {
		netif_stop_queue(dev);

		@@ -3893,12 +3903,10 @@ static int tg3_start_xmit(struct sk_buff skb, struct net_device dev)
		tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);

		tp->tx_prod = entry;
		if (unlikely(TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))) {
		spin_lock(&tp->tx_lock);
		if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
		netif_stop_queue(dev);
		if (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH)
		if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
		netif_wake_queue(tp->dev);
		spin_unlock(&tp->tx_lock);
		}

		out_unlock:
		@@ -3920,7 +3928,7 @@ static int tg3_tso_bug(struct tg3 tp, struct sk_buff skb)
		struct sk_buff segs, nskb;

		/* Estimate the number of fragments in the worst case */
		if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->gso_segs * 3))) {
		if (unlikely(tg3_tx_avail(tp) <= (skb_shinfo(skb)->gso_segs * 3))) {
		netif_stop_queue(tp->dev);
		return NETDEV_TX_BUSY;
		}
		@@ -3960,7 +3968,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff skb, struct net_device dev)
		* interrupt. Furthermore, IRQ processing runs lockless so we have
		* no IRQ context deadlocks to worry about either. Rejoice!
		*/
		if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
		if (unlikely(tg3_tx_avail(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {
		if (!netif_queue_stopped(dev)) {
		netif_stop_queue(dev);

		@@ -4110,12 +4118,10 @@ static int tg3_start_xmit_dma_bug(struct sk_buff skb, struct net_device dev)
		tw32_tx_mbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);

		tp->tx_prod = entry;
		if (unlikely(TX_BUFFS_AVAIL(tp) <= (MAX_SKB_FRAGS + 1))) {
		spin_lock(&tp->tx_lock);
		if (unlikely(tg3_tx_avail(tp) <= (MAX_SKB_FRAGS + 1))) {
		netif_stop_queue(dev);
		if (TX_BUFFS_AVAIL(tp) > TG3_TX_WAKEUP_THRESH)
		if (tg3_tx_avail(tp) > TG3_TX_WAKEUP_THRESH)
		netif_wake_queue(tp->dev);
		spin_unlock(&tp->tx_lock);
		}

		out_unlock:
		@@ -11474,7 +11480,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
		tp->grc_mode \|= GRC_MODE_BSWAP_NONFRM_DATA;
		#endif
		spin_lock_init(&tp->lock);
		spin_lock_init(&tp->tx_lock);
		spin_lock_init(&tp->indirect_lock);
		INIT_WORK(&tp->reset_task, tg3_reset_task, tp);

drivers/net/tg3.h

+3 −5

Original line number	Diff line number	Diff line
		@@ -2079,9 +2079,9 @@ struct tg3 {
		* lock: Held during reset, PHY access, timer, and when
		* updating tg3_flags and tg3_flags2.
		*
		* tx_lock: Held during tg3_start_xmit and tg3_tx only
		* when calling netif_[start\|stop]_queue.
		* tg3_start_xmit is protected by netif_tx_lock.
		* netif_tx_lock: Held during tg3_start_xmit. tg3_tx holds
		* netif_tx_lock when it needs to call
		* netif_wake_queue.
		*
		* Both of these locks are to be held with BH safety.
		*
		@@ -2118,8 +2118,6 @@ struct tg3 {
		u32 tx_cons;
		u32 tx_pending;

		spinlock_t tx_lock;

		struct tg3_tx_buffer_desc *tx_ring;
		struct tx_ring_info *tx_buffers;
		dma_addr_t tx_desc_mapping;

include/linux/skbuff.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -1081,7 +1081,7 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
		* the headroom they think they need without accounting for the
		* built in space. The built in space is used for optimisations.
		*
		* %NULL is returned in there is no free memory.
		* %NULL is returned if there is no free memory.
		*/
		static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
		gfp_t gfp_mask)
		@@ -1101,7 +1101,7 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
		* the headroom they think they need without accounting for the
		* built in space. The built in space is used for optimisations.
		*
		* %NULL is returned in there is no free memory. Although this function
		* %NULL is returned if there is no free memory. Although this function
		* allocates memory it can be called from an interrupt.
		*/
		static inline struct sk_buff *dev_alloc_skb(unsigned int length)

net/core/dst.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -95,12 +95,11 @@ static void dst_run_gc(unsigned long dummy)
		dst_gc_timer_inc = DST_GC_INC;
		dst_gc_timer_expires = DST_GC_MIN;
		}
		dst_gc_timer.expires = jiffies + dst_gc_timer_expires;
		#if RT_CACHE_DEBUG >= 2
		printk("dst_total: %d/%d %ld\n",
		atomic_read(&dst_total), delayed, dst_gc_timer_expires);
		#endif
		add_timer(&dst_gc_timer);
		mod_timer(&dst_gc_timer, jiffies + dst_gc_timer_expires);

		out:
		spin_unlock(&dst_lock);

net/core/pktgen.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2149,6 +2149,8 @@ static struct sk_buff fill_packet_ipv4(struct net_device odev,
		skb->mac.raw = ((u8 ) iph) - 14 - pkt_dev->nr_labelssizeof(u32);
		skb->dev = odev;
		skb->pkt_type = PACKET_HOST;
		skb->nh.iph = iph;
		skb->h.uh = udph;

		if (pkt_dev->nfrags <= 0)
		pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
		@@ -2460,6 +2462,8 @@ static struct sk_buff fill_packet_ipv6(struct net_device odev,
		skb->protocol = protocol;
		skb->dev = odev;
		skb->pkt_type = PACKET_HOST;
		skb->nh.ipv6h = iph;
		skb->h.uh = udph;

		if (pkt_dev->nfrags <= 0)
		pgh = (struct pktgen_hdr *)skb_put(skb, datalen);