Commit b6e99acc authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents 4332ceb0 9a2e216d

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 31

SUBLEVEL = 32

EXTRAVERSION =

NAME = Petit Gorille

drivers/net/ethernet/arc/emac_rockchip.c

+4 −2
Original line number Diff line number Diff line
@@ -169,8 +169,10 @@ static int emac_rockchip_probe(struct platform_device *pdev) 
	/* Optional regulator for PHY */

	priv->regulator = devm_regulator_get_optional(dev, "phy");

	if (IS_ERR(priv->regulator)) {

		if (PTR_ERR(priv->regulator) == -EPROBE_DEFER)

			return -EPROBE_DEFER;

		if (PTR_ERR(priv->regulator) == -EPROBE_DEFER) {

			err = -EPROBE_DEFER;

			goto out_clk_disable;

		}

		dev_err(dev, "no regulator found\n");

		priv->regulator = NULL;

	}

drivers/net/ethernet/broadcom/bcmsysport.c

+15 −18
Original line number Diff line number Diff line
@@ -855,10 +855,12 @@ static void bcm_sysport_tx_reclaim_one(struct bcm_sysport_tx_ring *ring, 
static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv,

					     struct bcm_sysport_tx_ring *ring)

{

	unsigned int c_index, last_c_index, last_tx_cn, num_tx_cbs;

	unsigned int pkts_compl = 0, bytes_compl = 0;

	struct net_device *ndev = priv->netdev;

	unsigned int txbds_processed = 0;

	struct bcm_sysport_cb *cb;

	unsigned int txbds_ready;

	unsigned int c_index;

	u32 hw_ind;



	/* Clear status before servicing to reduce spurious interrupts */
@@ -871,29 +873,23 @@ static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv, 
	/* Compute how many descriptors have been processed since last call */

	hw_ind = tdma_readl(priv, TDMA_DESC_RING_PROD_CONS_INDEX(ring->index));

	c_index = (hw_ind >> RING_CONS_INDEX_SHIFT) & RING_CONS_INDEX_MASK;

	ring->p_index = (hw_ind & RING_PROD_INDEX_MASK);



	last_c_index = ring->c_index;

	num_tx_cbs = ring->size;



	c_index &= (num_tx_cbs - 1);



	if (c_index >= last_c_index)

		last_tx_cn = c_index - last_c_index;

	else

		last_tx_cn = num_tx_cbs - last_c_index + c_index;

	txbds_ready = (c_index - ring->c_index) & RING_CONS_INDEX_MASK;



	netif_dbg(priv, tx_done, ndev,

		  "ring=%d c_index=%d last_tx_cn=%d last_c_index=%d\n",

		  ring->index, c_index, last_tx_cn, last_c_index);

		  "ring=%d old_c_index=%u c_index=%u txbds_ready=%u\n",

		  ring->index, ring->c_index, c_index, txbds_ready);



	while (last_tx_cn-- > 0) {

		cb = ring->cbs + last_c_index;

	while (txbds_processed < txbds_ready) {

		cb = &ring->cbs[ring->clean_index];

		bcm_sysport_tx_reclaim_one(ring, cb, &bytes_compl, &pkts_compl);



		ring->desc_count++;

		last_c_index++;

		last_c_index &= (num_tx_cbs - 1);

		txbds_processed++;



		if (likely(ring->clean_index < ring->size - 1))

			ring->clean_index++;

		else

			ring->clean_index = 0;

	}



	u64_stats_update_begin(&priv->syncp);
@@ -1406,6 +1402,7 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, 
	netif_tx_napi_add(priv->netdev, &ring->napi, bcm_sysport_tx_poll, 64);

	ring->index = index;

	ring->size = size;

	ring->clean_index = 0;

	ring->alloc_size = ring->size;

	ring->desc_cpu = p;

	ring->desc_count = ring->size;

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ struct bcm_sysport_tx_ring { 
	unsigned int	desc_count;	/* Number of descriptors */

	unsigned int	curr_desc;	/* Current descriptor */

	unsigned int	c_index;	/* Last consumer index */

	unsigned int	p_index;	/* Current producer index */

	unsigned int	clean_index;	/* Current clean index */

	struct bcm_sysport_cb *cbs;	/* Transmit control blocks */

	struct dma_desc	*desc_cpu;	/* CPU view of the descriptor */

	struct bcm_sysport_priv *priv;	/* private context backpointer */

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+4 −4
Original line number Diff line number Diff line
@@ -2022,7 +2022,6 @@ static inline int dpaa_xmit(struct dpaa_priv *priv, 
	}



	if (unlikely(err < 0)) {

		percpu_stats->tx_errors++;

		percpu_stats->tx_fifo_errors++;

		return err;

	}
@@ -2292,7 +2291,6 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, 
	vaddr = phys_to_virt(addr);

	prefetch(vaddr + qm_fd_get_offset(fd));



	fd_format = qm_fd_get_format(fd);

	/* The only FD types that we may receive are contig and S/G */

	WARN_ON((fd_format != qm_fd_contig) && (fd_format != qm_fd_sg));
@@ -2325,8 +2323,10 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal, 


	skb_len = skb->len;



	if (unlikely(netif_receive_skb(skb) == NET_RX_DROP))

	if (unlikely(netif_receive_skb(skb) == NET_RX_DROP)) {

		percpu_stats->rx_dropped++;

		return qman_cb_dqrr_consume;

	}



	percpu_stats->rx_packets++;

	percpu_stats->rx_bytes += skb_len;
@@ -2860,7 +2860,7 @@ static int dpaa_remove(struct platform_device *pdev) 
	struct device *dev;

	int err;



	dev = &pdev->dev;

	dev = pdev->dev.parent;

	net_dev = dev_get_drvdata(dev);



	priv = netdev_priv(net_dev);