Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8b5140 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.92 (9c3fb9cd) into msm-4.9"

parents 46838cf1 427fd219

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 91

SUBLEVEL = 92

EXTRAVERSION =

NAME = Roaring Lionus

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
@@ -707,37 +707,33 @@ static unsigned int __bcm_sysport_tx_reclaim(struct bcm_sysport_priv *priv, 
					     struct bcm_sysport_tx_ring *ring)

{

	struct net_device *ndev = priv->netdev;

	unsigned int c_index, last_c_index, last_tx_cn, num_tx_cbs;

	unsigned int pkts_compl = 0, bytes_compl = 0;

	unsigned int txbds_processed = 0;

	struct bcm_sysport_cb *cb;

	unsigned int txbds_ready;

	unsigned int c_index;

	u32 hw_ind;



	/* 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(priv, 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;

	}



	ring->c_index = c_index;
@@ -1207,6 +1203,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
@@ -638,7 +638,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/fec_main.c

+2 −0
Original line number Diff line number Diff line
@@ -3533,6 +3533,8 @@ fec_drv_remove(struct platform_device *pdev) 
	fec_enet_mii_remove(fep);

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	if (of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

	of_node_put(fep->phy_node);