ravb: factor out register bit twiddling code (568b3ce7) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/net/ethernet/renesas/ravb.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	*		*
	* Copyright (C) 2014-2015 Renesas Electronics Corporation		* Copyright (C) 2014-2015 Renesas Electronics Corporation
	* Copyright (C) 2015 Renesas Solutions Corp.		* Copyright (C) 2015 Renesas Solutions Corp.
	* Copyright (C) 2015 Cogent Embedded, Inc. <source@cogentembedded.com>		* Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
	*		*
	* Based on the SuperH Ethernet driver		* Based on the SuperH Ethernet driver
	*		*
	@@ -837,6 +837,8 @@ static inline void ravb_write(struct net_device *ndev, u32 data,
	iowrite32(data, priv->addr + reg);		iowrite32(data, priv->addr + reg);
	}		}

			void ravb_modify(struct net_device *ndev, enum ravb_reg reg, u32 clear,
			u32 set);
	int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value);		int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value);

	irqreturn_t ravb_ptp_interrupt(struct net_device *ndev);		irqreturn_t ravb_ptp_interrupt(struct net_device *ndev);

drivers/net/ethernet/renesas/ravb_main.c

+27 −41

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	*		*
	* Copyright (C) 2014-2015 Renesas Electronics Corporation		* Copyright (C) 2014-2015 Renesas Electronics Corporation
	* Copyright (C) 2015 Renesas Solutions Corp.		* Copyright (C) 2015 Renesas Solutions Corp.
	* Copyright (C) 2015 Cogent Embedded, Inc. <source@cogentembedded.com>		* Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
	*		*
	* Based on the SuperH Ethernet driver		* Based on the SuperH Ethernet driver
	*		*
	@@ -42,6 +42,12 @@
	NETIF_MSG_RX_ERR \| \		NETIF_MSG_RX_ERR \| \
	NETIF_MSG_TX_ERR)		NETIF_MSG_TX_ERR)

			void ravb_modify(struct net_device *ndev, enum ravb_reg reg, u32 clear,
			u32 set)
			{
			ravb_write(ndev, (ravb_read(ndev, reg) & ~clear) \| set, reg);
			}

	int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value)		int ravb_wait(struct net_device *ndev, enum ravb_reg reg, u32 mask, u32 value)
	{		{
	int i;		int i;
	@@ -59,8 +65,7 @@ static int ravb_config(struct net_device *ndev)
	int error;		int error;

	/* Set config mode */		/* Set config mode */
	ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) \| CCC_OPC_CONFIG,		ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG);
	CCC);
	/* Check if the operating mode is changed to the config mode */		/* Check if the operating mode is changed to the config mode */
	error = ravb_wait(ndev, CSR, CSR_OPS, CSR_OPS_CONFIG);		error = ravb_wait(ndev, CSR, CSR_OPS, CSR_OPS_CONFIG);
	if (error)		if (error)
	@@ -72,13 +77,8 @@ static int ravb_config(struct net_device *ndev)
	static void ravb_set_duplex(struct net_device *ndev)		static void ravb_set_duplex(struct net_device *ndev)
	{		{
	struct ravb_private *priv = netdev_priv(ndev);		struct ravb_private *priv = netdev_priv(ndev);
	u32 ecmr = ravb_read(ndev, ECMR);

	if (priv->duplex) /* Full */		ravb_modify(ndev, ECMR, ECMR_DM, priv->duplex ? ECMR_DM : 0);
	ecmr \|= ECMR_DM;
	else /* Half */
	ecmr &= ~ECMR_DM;
	ravb_write(ndev, ecmr, ECMR);
	}		}

	static void ravb_set_rate(struct net_device *ndev)		static void ravb_set_rate(struct net_device *ndev)
	@@ -131,13 +131,8 @@ static void ravb_mdio_ctrl(struct mdiobb_ctrl *ctrl, u32 mask, int set)
	{		{
	struct ravb_private *priv = container_of(ctrl, struct ravb_private,		struct ravb_private *priv = container_of(ctrl, struct ravb_private,
	mdiobb);		mdiobb);
	u32 pir = ravb_read(priv->ndev, PIR);

	if (set)		ravb_modify(priv->ndev, PIR, mask, set ? mask : 0);
	pir \|= mask;
	else
	pir &= ~mask;
	ravb_write(priv->ndev, pir, PIR);
	}		}

	/* MDC pin control */		/* MDC pin control */
	@@ -393,9 +388,9 @@ static int ravb_dmac_init(struct net_device *ndev)
	ravb_ring_format(ndev, RAVB_NC);		ravb_ring_format(ndev, RAVB_NC);

	#if defined(__LITTLE_ENDIAN)		#if defined(__LITTLE_ENDIAN)
	ravb_write(ndev, ravb_read(ndev, CCC) & ~CCC_BOC, CCC);		ravb_modify(ndev, CCC, CCC_BOC, 0);
	#else		#else
	ravb_write(ndev, ravb_read(ndev, CCC) \| CCC_BOC, CCC);		ravb_modify(ndev, CCC, CCC_BOC, CCC_BOC);
	#endif		#endif

	/* Set AVB RX */		/* Set AVB RX */
	@@ -418,8 +413,7 @@ static int ravb_dmac_init(struct net_device *ndev)
	ravb_write(ndev, TIC_FTE0 \| TIC_FTE1 \| TIC_TFUE, TIC);		ravb_write(ndev, TIC_FTE0 \| TIC_FTE1 \| TIC_TFUE, TIC);

	/* Setting the control will start the AVB-DMAC process. */		/* Setting the control will start the AVB-DMAC process. */
	ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) \| CCC_OPC_OPERATION,		ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_OPERATION);
	CCC);

	return 0;		return 0;
	}		}
	@@ -493,7 +487,7 @@ static void ravb_get_tx_tstamp(struct net_device *ndev)
	break;		break;
	}		}
	}		}
	ravb_write(ndev, ravb_read(ndev, TCCR) \| TCCR_TFR, TCCR);		ravb_modify(ndev, TCCR, TCCR_TFR, TCCR_TFR);
	}		}
	}		}

	@@ -613,13 +607,13 @@ static bool ravb_rx(struct net_device ndev, int quota, int q)
	static void ravb_rcv_snd_disable(struct net_device *ndev)		static void ravb_rcv_snd_disable(struct net_device *ndev)
	{		{
	/* Disable TX and RX */		/* Disable TX and RX */
	ravb_write(ndev, ravb_read(ndev, ECMR) & ~(ECMR_RE \| ECMR_TE), ECMR);		ravb_modify(ndev, ECMR, ECMR_RE \| ECMR_TE, 0);
	}		}

	static void ravb_rcv_snd_enable(struct net_device *ndev)		static void ravb_rcv_snd_enable(struct net_device *ndev)
	{		{
	/* Enable TX and RX */		/* Enable TX and RX */
	ravb_write(ndev, ravb_read(ndev, ECMR) \| ECMR_RE \| ECMR_TE, ECMR);		ravb_modify(ndev, ECMR, ECMR_RE \| ECMR_TE, ECMR_RE \| ECMR_TE);
	}		}

	/* function for waiting dma process finished */		/* function for waiting dma process finished */
	@@ -812,8 +806,8 @@ static int ravb_poll(struct napi_struct *napi, int budget)

	/* Re-enable RX/TX interrupts */		/* Re-enable RX/TX interrupts */
	spin_lock_irqsave(&priv->lock, flags);		spin_lock_irqsave(&priv->lock, flags);
	ravb_write(ndev, ravb_read(ndev, RIC0) \| mask, RIC0);		ravb_modify(ndev, RIC0, mask, mask);
	ravb_write(ndev, ravb_read(ndev, TIC) \| mask, TIC);		ravb_modify(ndev, TIC, mask, mask);
	mmiowb();		mmiowb();
	spin_unlock_irqrestore(&priv->lock, flags);		spin_unlock_irqrestore(&priv->lock, flags);

	@@ -852,8 +846,7 @@ static void ravb_adjust_link(struct net_device *ndev)
	ravb_set_rate(ndev);		ravb_set_rate(ndev);
	}		}
	if (!priv->link) {		if (!priv->link) {
	ravb_write(ndev, ravb_read(ndev, ECMR) & ~ECMR_TXF,		ravb_modify(ndev, ECMR, ECMR_TXF, 0);
	ECMR);
	new_state = true;		new_state = true;
	priv->link = phydev->link;		priv->link = phydev->link;
	if (priv->no_avb_link)		if (priv->no_avb_link)
	@@ -1393,7 +1386,7 @@ static netdev_tx_t ravb_start_xmit(struct sk_buff skb, struct net_device ndev)
	desc--;		desc--;
	desc->die_dt = DT_FSTART;		desc->die_dt = DT_FSTART;

	ravb_write(ndev, ravb_read(ndev, TCCR) \| (TCCR_TSRQ0 << q), TCCR);		ravb_modify(ndev, TCCR, TCCR_TSRQ0 << q, TCCR_TSRQ0 << q);

	priv->cur_tx[q] += NUM_TX_DESC;		priv->cur_tx[q] += NUM_TX_DESC;
	if (priv->cur_tx[q] - priv->dirty_tx[q] >		if (priv->cur_tx[q] - priv->dirty_tx[q] >
	@@ -1468,15 +1461,10 @@ static void ravb_set_rx_mode(struct net_device *ndev)
	{		{
	struct ravb_private *priv = netdev_priv(ndev);		struct ravb_private *priv = netdev_priv(ndev);
	unsigned long flags;		unsigned long flags;
	u32 ecmr;

	spin_lock_irqsave(&priv->lock, flags);		spin_lock_irqsave(&priv->lock, flags);
	ecmr = ravb_read(ndev, ECMR);		ravb_modify(ndev, ECMR, ECMR_PRM,
	if (ndev->flags & IFF_PROMISC)		ndev->flags & IFF_PROMISC ? ECMR_PRM : 0);
	ecmr \|= ECMR_PRM;
	else
	ecmr &= ~ECMR_PRM;
	ravb_write(ndev, ecmr, ECMR);
	mmiowb();		mmiowb();
	spin_unlock_irqrestore(&priv->lock, flags);		spin_unlock_irqrestore(&priv->lock, flags);
	}		}
	@@ -1804,14 +1792,12 @@ static int ravb_probe(struct platform_device *pdev)

	/* Set AVB config mode */		/* Set AVB config mode */
	if (chip_id == RCAR_GEN2) {		if (chip_id == RCAR_GEN2) {
	ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) \|		ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG);
	CCC_OPC_CONFIG, CCC);
	/* Set CSEL value */		/* Set CSEL value */
	ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_CSEL) \|		ravb_modify(ndev, CCC, CCC_CSEL, CCC_CSEL_HPB);
	CCC_CSEL_HPB, CCC);
	} else {		} else {
	ravb_write(ndev, (ravb_read(ndev, CCC) & ~CCC_OPC) \|		ravb_modify(ndev, CCC, CCC_OPC, CCC_OPC_CONFIG \|
	CCC_OPC_CONFIG \| CCC_GAC \| CCC_CSEL_HPB, CCC);		CCC_GAC \| CCC_CSEL_HPB);
	}		}

	/* Set CSEL value */		/* Set CSEL value */
	@@ -1824,7 +1810,7 @@ static int ravb_probe(struct platform_device *pdev)
	goto out_release;		goto out_release;

	/* Request GTI loading */		/* Request GTI loading */
	ravb_write(ndev, ravb_read(ndev, GCCR) \| GCCR_LTI, GCCR);		ravb_modify(ndev, GCCR, GCCR_LTI, GCCR_LTI);

	/* Allocate descriptor base address table */		/* Allocate descriptor base address table */
	priv->desc_bat_size = sizeof(struct ravb_desc) * DBAT_ENTRY_NUM;		priv->desc_bat_size = sizeof(struct ravb_desc) * DBAT_ENTRY_NUM;

drivers/net/ethernet/renesas/ravb_ptp.c

+6 −19

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	*		*
	* Copyright (C) 2013-2015 Renesas Electronics Corporation		* Copyright (C) 2013-2015 Renesas Electronics Corporation
	* Copyright (C) 2015 Renesas Solutions Corp.		* Copyright (C) 2015 Renesas Solutions Corp.
	* Copyright (C) 2015 Cogent Embedded, Inc. <source@cogentembedded.com>		* Copyright (C) 2015-2016 Cogent Embedded, Inc. <source@cogentembedded.com>
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	@@ -21,7 +21,7 @@ static int ravb_ptp_tcr_request(struct ravb_private *priv, u32 request)
	if (error)		if (error)
	return error;		return error;

	ravb_write(ndev, ravb_read(ndev, GCCR) \| request, GCCR);		ravb_modify(ndev, GCCR, request, request);
	return ravb_wait(ndev, GCCR, GCCR_TCR, GCCR_TCR_NOREQ);		return ravb_wait(ndev, GCCR, GCCR_TCR, GCCR_TCR_NOREQ);
	}		}

	@@ -185,7 +185,6 @@ static int ravb_ptp_extts(struct ptp_clock_info *ptp,
	ptp.info);		ptp.info);
	struct net_device *ndev = priv->ndev;		struct net_device *ndev = priv->ndev;
	unsigned long flags;		unsigned long flags;
	u32 gic;

	if (req->index)		if (req->index)
	return -EINVAL;		return -EINVAL;
	@@ -195,12 +194,7 @@ static int ravb_ptp_extts(struct ptp_clock_info *ptp,
	priv->ptp.extts[req->index] = on;		priv->ptp.extts[req->index] = on;

	spin_lock_irqsave(&priv->lock, flags);		spin_lock_irqsave(&priv->lock, flags);
	gic = ravb_read(ndev, GIC);		ravb_modify(ndev, GIC, GIC_PTCE, on ? GIC_PTCE : 0);
	if (on)
	gic \|= GIC_PTCE;
	else
	gic &= ~GIC_PTCE;
	ravb_write(ndev, gic, GIC);
	mmiowb();		mmiowb();
	spin_unlock_irqrestore(&priv->lock, flags);		spin_unlock_irqrestore(&priv->lock, flags);

	@@ -216,7 +210,6 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp,
	struct ravb_ptp_perout *perout;		struct ravb_ptp_perout *perout;
	unsigned long flags;		unsigned long flags;
	int error = 0;		int error = 0;
	u32 gic;

	if (req->index)		if (req->index)
	return -EINVAL;		return -EINVAL;
	@@ -248,9 +241,7 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp,
	error = ravb_ptp_update_compare(priv, (u32)start_ns);		error = ravb_ptp_update_compare(priv, (u32)start_ns);
	if (!error) {		if (!error) {
	/* Unmask interrupt */		/* Unmask interrupt */
	gic = ravb_read(ndev, GIC);		ravb_modify(ndev, GIC, GIC_PTME, GIC_PTME);
	gic \|= GIC_PTME;
	ravb_write(ndev, gic, GIC);
	}		}
	} else {		} else {
	spin_lock_irqsave(&priv->lock, flags);		spin_lock_irqsave(&priv->lock, flags);
	@@ -259,9 +250,7 @@ static int ravb_ptp_perout(struct ptp_clock_info *ptp,
	perout->period = 0;		perout->period = 0;

	/* Mask interrupt */		/* Mask interrupt */
	gic = ravb_read(ndev, GIC);		ravb_modify(ndev, GIC, GIC_PTME, 0);
	gic &= ~GIC_PTME;
	ravb_write(ndev, gic, GIC);
	}		}
	mmiowb();		mmiowb();
	spin_unlock_irqrestore(&priv->lock, flags);		spin_unlock_irqrestore(&priv->lock, flags);
	@@ -331,7 +320,6 @@ void ravb_ptp_init(struct net_device ndev, struct platform_device pdev)
	{		{
	struct ravb_private *priv = netdev_priv(ndev);		struct ravb_private *priv = netdev_priv(ndev);
	unsigned long flags;		unsigned long flags;
	u32 gccr;

	priv->ptp.info = ravb_ptp_info;		priv->ptp.info = ravb_ptp_info;

	@@ -340,8 +328,7 @@ void ravb_ptp_init(struct net_device ndev, struct platform_device pdev)

	spin_lock_irqsave(&priv->lock, flags);		spin_lock_irqsave(&priv->lock, flags);
	ravb_wait(ndev, GCCR, GCCR_TCR, GCCR_TCR_NOREQ);		ravb_wait(ndev, GCCR, GCCR_TCR, GCCR_TCR_NOREQ);
	gccr = ravb_read(ndev, GCCR) & ~GCCR_TCSS;		ravb_modify(ndev, GCCR, GCCR_TCSS, GCCR_TCSS_ADJGPTP);
	ravb_write(ndev, gccr \| GCCR_TCSS_ADJGPTP, GCCR);
	mmiowb();		mmiowb();
	spin_unlock_irqrestore(&priv->lock, flags);		spin_unlock_irqrestore(&priv->lock, flags);