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

Commit 8942a6d5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bcmgenet-next' 



Florian Fainelli says:

====================
net: bcmgenet: checkpatch fixes

This patch series contains cleanups for CHECK and WARNINGS reported by
checkpatch.pl. I removed one patch from this series since Joe reported
this was a false positive due to me not using the latest version.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f5220d63 c489be08

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+135 −150
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@ 
 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */



#define pr_fmt(fmt)				"bcmgenet: " fmt
@@ -342,8 +333,7 @@ static inline u32 bcmgenet_tdma_ring_readl(struct bcmgenet_priv *priv, 
}



static inline void bcmgenet_tdma_ring_writel(struct bcmgenet_priv *priv,

						unsigned int ring,

						u32 val,

					     unsigned int ring, u32 val,

					     enum dma_ring_reg r)

{

	__raw_writel(val, priv->base + GENET_TDMA_REG_OFF +
@@ -361,8 +351,7 @@ static inline u32 bcmgenet_rdma_ring_readl(struct bcmgenet_priv *priv, 
}



static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv,

						unsigned int ring,

						u32 val,

					     unsigned int ring, u32 val,

					     enum dma_ring_reg r)

{

	__raw_writel(val, priv->base + GENET_RDMA_REG_OFF +
@@ -630,7 +619,6 @@ static void bcmgenet_get_drvinfo(struct net_device *dev, 
	strlcpy(info->driver, "bcmgenet", sizeof(info->driver));

	strlcpy(info->version, "v2.0", sizeof(info->version));

	info->n_stats = BCMGENET_STATS_LEN;



}



static int bcmgenet_get_sset_count(struct net_device *dev, int string_set)
@@ -643,8 +631,8 @@ static int bcmgenet_get_sset_count(struct net_device *dev, int string_set) 
	}

}



static void bcmgenet_get_strings(struct net_device *dev,

				u32 stringset, u8 *data)

static void bcmgenet_get_strings(struct net_device *dev, u32 stringset,

				 u8 *data)

{

	int i;
@@ -678,8 +666,8 @@ static void bcmgenet_update_mib_counters(struct bcmgenet_priv *priv) 
		case BCMGENET_STAT_RUNT:

			if (s->type != BCMGENET_STAT_MIB_RX)

				offset = BCMGENET_STAT_OFFSET;

			val = bcmgenet_umac_readl(priv, UMAC_MIB_START +

								j + offset);

			val = bcmgenet_umac_readl(priv,

						  UMAC_MIB_START + j + offset);

			break;

		case BCMGENET_STAT_MISC:

			val = bcmgenet_umac_readl(priv, s->reg_offset);
@@ -865,16 +853,16 @@ static inline void bcmgenet_tx_ring16_int_enable(struct bcmgenet_priv *priv, 
static inline void bcmgenet_tx_ring_int_enable(struct bcmgenet_priv *priv,

					       struct bcmgenet_tx_ring *ring)

{

	bcmgenet_intrl2_1_writel(priv,

			(1 << ring->index), INTRL2_CPU_MASK_CLEAR);

	bcmgenet_intrl2_1_writel(priv, (1 << ring->index),

				 INTRL2_CPU_MASK_CLEAR);

	priv->int1_mask &= ~(1 << ring->index);

}



static inline void bcmgenet_tx_ring_int_disable(struct bcmgenet_priv *priv,

						struct bcmgenet_tx_ring *ring)

{

	bcmgenet_intrl2_1_writel(priv,

			(1 << ring->index), INTRL2_CPU_MASK_SET);

	bcmgenet_intrl2_1_writel(priv, (1 << ring->index),

				 INTRL2_CPU_MASK_SET);

	priv->int1_mask |= (1 << ring->index);

}
@@ -1112,8 +1100,9 @@ static int bcmgenet_put_tx_csum(struct net_device *dev, struct sk_buff *skb) 
			tx_csum_info |= STATUS_TX_CSUM_LV;

			if (ip_proto == IPPROTO_UDP && ip_ver == ETH_P_IP)

				tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;

		} else

		} else {

			tx_csum_info = 0;

		}



		status->tx_csum_info = tx_csum_info;

	}
@@ -1182,7 +1171,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) 
	for (i = 0; i < nr_frags; i++) {

		ret = bcmgenet_xmit_frag(dev,

					 &skb_shinfo(skb)->frags[i],

				(i == nr_frags - 1) ? DMA_EOP : 0, ring);

					 (i == nr_frags - 1) ? DMA_EOP : 0,

					 ring);

		if (ret) {

			ret = NETDEV_TX_OK;

			goto out;
@@ -1209,16 +1199,14 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) 
}





static int bcmgenet_rx_refill(struct bcmgenet_priv *priv,

				struct enet_cb *cb)

static int bcmgenet_rx_refill(struct bcmgenet_priv *priv, struct enet_cb *cb)

{

	struct device *kdev = &priv->pdev->dev;

	struct sk_buff *skb;

	dma_addr_t mapping;

	int ret;



	skb = netdev_alloc_skb(priv->dev,

				priv->rx_buf_len + SKB_ALIGNMENT);

	skb = netdev_alloc_skb(priv->dev, priv->rx_buf_len + SKB_ALIGNMENT);

	if (!skb)

		return -ENOMEM;
@@ -1266,8 +1254,7 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, 
	unsigned int p_index;

	unsigned int chksum_ok = 0;



	p_index = bcmgenet_rdma_ring_readl(priv,

			DESC_INDEX, RDMA_PROD_INDEX);

	p_index = bcmgenet_rdma_ring_readl(priv, DESC_INDEX, RDMA_PROD_INDEX);

	p_index &= DMA_P_INDEX_MASK;



	if (p_index < priv->rx_c_index)
@@ -1281,7 +1268,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, 


	while ((rxpktprocessed < rxpkttoprocess) &&

	       (rxpktprocessed < budget)) {



		/* Unmap the packet contents such that we can use the

		 * RSV from the 64 bytes descriptor when enabled and save

		 * a 32-bits register read
@@ -1292,12 +1278,14 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, 
				 priv->rx_buf_len, DMA_FROM_DEVICE);



		if (!priv->desc_64b_en) {

			dma_length_status = dmadesc_get_length_status(priv,

			dma_length_status =

				dmadesc_get_length_status(priv,

							  priv->rx_bds +

							  (priv->rx_read_ptr *

							   DMA_DESC_SIZE));

		} else {

			struct status_64 *status;



			status = (struct status_64 *)skb->data;

			dma_length_status = status->length_status;

		}
@@ -1310,8 +1298,8 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, 


		netif_dbg(priv, rx_status, dev,

			  "%s:p_ind=%d c_ind=%d read_ptr=%d len_stat=0x%08x\n",

			__func__, p_index, priv->rx_c_index, priv->rx_read_ptr,

			dma_length_status);

			  __func__, p_index, priv->rx_c_index,

			  priv->rx_read_ptr, dma_length_status);



		rxpktprocessed++;
@@ -1327,7 +1315,7 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_priv *priv, 


		if (unlikely(!(dma_flag & DMA_EOP) || !(dma_flag & DMA_SOP))) {

			netif_err(priv, rx_status, dev,

					"Droping fragmented packet!\n");

				  "dropping fragmented packet!\n");

			dev->stats.rx_dropped++;

			dev->stats.rx_errors++;

			dev_kfree_skb_any(cb->skb);
@@ -1420,7 +1408,6 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv) 
		ret = bcmgenet_rx_refill(priv, cb);

		if (ret)

			break;



	}



	return ret;
@@ -1446,8 +1433,7 @@ static void bcmgenet_free_rx_buffers(struct bcmgenet_priv *priv) 
	}

}



static void umac_enable_set(struct bcmgenet_priv *priv, u32 mask,

				bool enable)

static void umac_enable_set(struct bcmgenet_priv *priv, u32 mask, bool enable)

{

	u32 reg;
@@ -1523,7 +1509,8 @@ static int init_umac(struct bcmgenet_priv *priv) 
	bcmgenet_umac_writel(priv, 0, UMAC_CMD);

	/* clear tx/rx counter */

	bcmgenet_umac_writel(priv,

		MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT, UMAC_MIB_CTRL);

			     MIB_RESET_RX | MIB_RESET_TX | MIB_RESET_RUNT,

			     UMAC_MIB_CTRL);

	bcmgenet_umac_writel(priv, 0, UMAC_MIB_CTRL);



	bcmgenet_umac_writel(priv, ENET_MAX_MTU_SIZE, UMAC_MAX_FRAME_LEN);
@@ -1543,11 +1530,11 @@ static int init_umac(struct bcmgenet_priv *priv) 
	dev_dbg(kdev, "%s:Enabling RXDMA_BDONE interrupt\n", __func__);



	/* Monitor cable plug/unpluged event for internal PHY */

	if (phy_is_internal(priv->phydev))

	if (phy_is_internal(priv->phydev)) {

		cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP);

	else if (priv->ext_phy)

	} else if (priv->ext_phy) {

		cpu_mask_clear |= (UMAC_IRQ_LINK_DOWN | UMAC_IRQ_LINK_UP);

	else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

	} else if (priv->phy_interface == PHY_INTERFACE_MODE_MOCA) {

		reg = bcmgenet_bp_mc_get(priv);

		reg |= BIT(priv->hw_params->bp_in_en_shift);
@@ -1563,8 +1550,7 @@ static int init_umac(struct bcmgenet_priv *priv) 
	if (priv->hw_params->flags & GENET_HAS_MDIO_INTR)

		cpu_mask_clear |= UMAC_IRQ_MDIO_DONE | UMAC_IRQ_MDIO_ERROR;



	bcmgenet_intrl2_0_writel(priv, cpu_mask_clear,

		INTRL2_CPU_MASK_CLEAR);

	bcmgenet_intrl2_0_writel(priv, cpu_mask_clear, INTRL2_CPU_MASK_CLEAR);



	/* Enable rx/tx engine.*/

	dev_dbg(kdev, "done init umac\n");
@@ -1616,8 +1602,8 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv, 
				  TDMA_FLOW_PERIOD);

	/* Unclassified traffic goes to ring 16 */

	bcmgenet_tdma_ring_writel(priv, index,

			((size << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH),

			DMA_RING_BUF_SIZE);

				  ((size << DMA_RING_SIZE_SHIFT) |

				   RX_BUF_LENGTH), DMA_RING_BUF_SIZE);



	first_bd = write_ptr;
@@ -1645,7 +1631,7 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv, 
	priv->rx_bd_assign_index = 0;

	priv->rx_c_index = 0;

	priv->rx_read_ptr = 0;

	priv->rx_cbs = kzalloc(priv->num_rx_bds * sizeof(struct enet_cb),

	priv->rx_cbs = kcalloc(priv->num_rx_bds, sizeof(struct enet_cb),

			       GFP_KERNEL);

	if (!priv->rx_cbs)

		return -ENOMEM;
@@ -1660,13 +1646,14 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv, 
	bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_PROD_INDEX);

	bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_CONS_INDEX);

	bcmgenet_rdma_ring_writel(priv, index,

		((size << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH),

		DMA_RING_BUF_SIZE);

				  ((size << DMA_RING_SIZE_SHIFT) |

				   RX_BUF_LENGTH), DMA_RING_BUF_SIZE);

	bcmgenet_rdma_ring_writel(priv, index, 0, DMA_START_ADDR);

	bcmgenet_rdma_ring_writel(priv, index,

				  words_per_bd * size - 1, DMA_END_ADDR);

	bcmgenet_rdma_ring_writel(priv, index,

			(DMA_FC_THRESH_LO << DMA_XOFF_THRESHOLD_SHIFT) |

				  (DMA_FC_THRESH_LO <<

				   DMA_XOFF_THRESHOLD_SHIFT) |

				   DMA_FC_THRESH_HI, RDMA_XON_XOFF_THRESH);

	bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_READ_PTR);
@@ -1786,7 +1773,7 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv) 
	/* Initialize commont TX ring structures */

	priv->tx_bds = priv->base + priv->hw_params->tdma_offset;

	priv->num_tx_bds = TOTAL_DESC;

	priv->tx_cbs = kzalloc(priv->num_tx_bds * sizeof(struct enet_cb),

	priv->tx_cbs = kcalloc(priv->num_tx_bds, sizeof(struct enet_cb),

			       GFP_KERNEL);

	if (!priv->tx_cbs) {

		bcmgenet_fini_dma(priv);
@@ -1798,7 +1785,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv) 


	/* initialize special ring 16 */

	bcmgenet_init_tx_ring(priv, DESC_INDEX, GENET_DEFAULT_BD_CNT,

			priv->hw_params->tx_queues * priv->hw_params->bds_cnt,

			      priv->hw_params->tx_queues *

			      priv->hw_params->bds_cnt,

			      TOTAL_DESC);



	return 0;
@@ -1823,8 +1811,8 @@ static int bcmgenet_poll(struct napi_struct *napi, int budget) 
				  priv->rx_c_index, RDMA_CONS_INDEX);

	if (work_done < budget) {

		napi_complete(napi);

		bcmgenet_intrl2_0_writel(priv,

			UMAC_IRQ_RXDMA_BDONE, INTRL2_CPU_MASK_CLEAR);

		bcmgenet_intrl2_0_writel(priv, UMAC_IRQ_RXDMA_BDONE,

					 INTRL2_CPU_MASK_CLEAR);

	}



	return work_done;
@@ -1904,8 +1892,8 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id) 
		 * Disable interrupt, will be enabled in the poll method.

		 */

		if (likely(napi_schedule_prep(&priv->napi))) {

			bcmgenet_intrl2_0_writel(priv,

				UMAC_IRQ_RXDMA_BDONE, INTRL2_CPU_MASK_SET);

			bcmgenet_intrl2_0_writel(priv, UMAC_IRQ_RXDMA_BDONE,

						 INTRL2_CPU_MASK_SET);

			__napi_schedule(&priv->napi);

		}

	}
@@ -2127,8 +2115,7 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) 
	}



	if (timeout == DMA_TIMEOUT_VAL) {

		netdev_warn(priv->dev,

			"Timed out while disabling TX DMA\n");

		netdev_warn(priv->dev, "Timed out while disabling TX DMA\n");

		ret = -ETIMEDOUT;

	}
@@ -2151,8 +2138,7 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) 
	}



	if (timeout == DMA_TIMEOUT_VAL) {

		netdev_warn(priv->dev,

			"Timed out while disabling RX DMA\n");

		netdev_warn(priv->dev, "Timed out while disabling RX DMA\n");

		ret = -ETIMEDOUT;

	}
@@ -2232,10 +2218,9 @@ static inline void bcmgenet_set_mdf_addr(struct bcmgenet_priv *priv, 
{

	u32 reg;



	bcmgenet_umac_writel(priv,

			addr[0] << 8 | addr[1], UMAC_MDF_ADDR + (*i * 4));

	bcmgenet_umac_writel(priv,

			addr[2] << 24 | addr[3] << 16 |

	bcmgenet_umac_writel(priv, addr[0] << 8 | addr[1],

			     UMAC_MDF_ADDR + (*i * 4));

	bcmgenet_umac_writel(priv, addr[2] << 24 | addr[3] << 16 |

			     addr[4] << 8 | addr[5],

			     UMAC_MDF_ADDR + ((*i + 1) * 4));

	reg = bcmgenet_umac_readl(priv, UMAC_MDF_CTRL);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+4 −14
Original line number Diff line number Diff line
@@ -4,18 +4,8 @@ 
 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 *

 *

 */



#ifndef __BCMGENET_H__

#define __BCMGENET_H__

drivers/net/ethernet/broadcom/genet/bcmmii.c

+15 −24
Original line number Diff line number Diff line
@@ -6,15 +6,6 @@ 
 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 */
@@ -390,7 +381,7 @@ static int bcmgenet_mii_alloc(struct bcmgenet_priv *priv) 
	snprintf(bus->id, MII_BUS_ID_SIZE, "%s-%d",

		 priv->pdev->name, priv->pdev->id);



	bus->irq = kzalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);

	bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);

	if (!bus->irq) {

		mdiobus_free(priv->mii_bus);

		return -ENOMEM;