net: tilegx driver bugfix (be explicit about percpu queue number) (9b4c341b) · Commits · e / devices / android_kernel_teracube_mt6765

drivers/net/ethernet/tile/tilegx.c

+15 −8

Original line number	Original line	Diff line number	Diff line
	@@ -123,6 +123,7 @@ struct tile_net_comps {

	/* The transmit wake timer for a given cpu and echannel. */		/* The transmit wake timer for a given cpu and echannel. */
	struct tile_net_tx_wake {		struct tile_net_tx_wake {
			int tx_queue_idx;
	struct hrtimer timer;		struct hrtimer timer;
	struct net_device *dev;		struct net_device *dev;
	};		};
	@@ -573,12 +574,14 @@ static void add_comp(gxio_mpipe_equeue_t *equeue,
	comps->comp_next++;		comps->comp_next++;
	}		}

	static void tile_net_schedule_tx_wake_timer(struct net_device *dev)		static void tile_net_schedule_tx_wake_timer(struct net_device *dev,
			int tx_queue_idx)
	{		{
	struct tile_net_info *info = &__get_cpu_var(per_cpu_info);		struct tile_net_info *info = &per_cpu(per_cpu_info, tx_queue_idx);
	struct tile_net_priv *priv = netdev_priv(dev);		struct tile_net_priv *priv = netdev_priv(dev);
			struct tile_net_tx_wake *tx_wake = &info->tx_wake[priv->echannel];

	hrtimer_start(&info->tx_wake[priv->echannel].timer,		hrtimer_start(&tx_wake->timer,
	ktime_set(0, TX_TIMER_DELAY_USEC * 1000UL),		ktime_set(0, TX_TIMER_DELAY_USEC * 1000UL),
	HRTIMER_MODE_REL_PINNED);		HRTIMER_MODE_REL_PINNED);
	}		}
	@@ -587,7 +590,7 @@ static enum hrtimer_restart tile_net_handle_tx_wake_timer(struct hrtimer *t)
	{		{
	struct tile_net_tx_wake *tx_wake =		struct tile_net_tx_wake *tx_wake =
	container_of(t, struct tile_net_tx_wake, timer);		container_of(t, struct tile_net_tx_wake, timer);
	netif_wake_subqueue(tx_wake->dev, smp_processor_id());		netif_wake_subqueue(tx_wake->dev, tx_wake->tx_queue_idx);
	return HRTIMER_NORESTART;		return HRTIMER_NORESTART;
	}		}

	@@ -1218,6 +1221,7 @@ static int tile_net_open(struct net_device *dev)

	hrtimer_init(&tx_wake->timer, CLOCK_MONOTONIC,		hrtimer_init(&tx_wake->timer, CLOCK_MONOTONIC,
	HRTIMER_MODE_REL);		HRTIMER_MODE_REL);
			tx_wake->tx_queue_idx = cpu;
	tx_wake->timer.function = tile_net_handle_tx_wake_timer;		tx_wake->timer.function = tile_net_handle_tx_wake_timer;
	tx_wake->dev = dev;		tx_wake->dev = dev;
	}		}
	@@ -1291,6 +1295,7 @@ static inline void tile_net_frag_buf(skb_frag_t f)
	* stop the queue and schedule the tx_wake timer.		* stop the queue and schedule the tx_wake timer.
	*/		*/
	static s64 tile_net_equeue_try_reserve(struct net_device *dev,		static s64 tile_net_equeue_try_reserve(struct net_device *dev,
			int tx_queue_idx,
	struct tile_net_comps *comps,		struct tile_net_comps *comps,
	gxio_mpipe_equeue_t *equeue,		gxio_mpipe_equeue_t *equeue,
	int num_edescs)		int num_edescs)
	@@ -1313,8 +1318,8 @@ static s64 tile_net_equeue_try_reserve(struct net_device *dev,
	}		}

	/* Still nothing; give up and stop the queue for a short while. */		/* Still nothing; give up and stop the queue for a short while. */
	netif_stop_subqueue(dev, smp_processor_id());		netif_stop_subqueue(dev, tx_queue_idx);
	tile_net_schedule_tx_wake_timer(dev);		tile_net_schedule_tx_wake_timer(dev, tx_queue_idx);
	return -1;		return -1;
	}		}

	@@ -1580,7 +1585,8 @@ static int tile_net_tx_tso(struct sk_buff skb, struct net_device dev)
	local_irq_save(irqflags);		local_irq_save(irqflags);

	/* Try to acquire a completion entry and an egress slot. */		/* Try to acquire a completion entry and an egress slot. */
	slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);		slot = tile_net_equeue_try_reserve(dev, skb->queue_mapping, comps,
			equeue, num_edescs);
	if (slot < 0) {		if (slot < 0) {
	local_irq_restore(irqflags);		local_irq_restore(irqflags);
	return NETDEV_TX_BUSY;		return NETDEV_TX_BUSY;
	@@ -1674,7 +1680,8 @@ static int tile_net_tx(struct sk_buff skb, struct net_device dev)
	local_irq_save(irqflags);		local_irq_save(irqflags);

	/* Try to acquire a completion entry and an egress slot. */		/* Try to acquire a completion entry and an egress slot. */
	slot = tile_net_equeue_try_reserve(dev, comps, equeue, num_edescs);		slot = tile_net_equeue_try_reserve(dev, skb->queue_mapping, comps,
			equeue, num_edescs);
	if (slot < 0) {		if (slot < 0) {
	local_irq_restore(irqflags);		local_irq_restore(irqflags);
	return NETDEV_TX_BUSY;		return NETDEV_TX_BUSY;