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

Commit 0ec6d343 authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

net: calxedaxgmac: use raw i/o accessors in rx and tx paths 



The standard readl/writel accessors involve a spinlock and cache sync
operation on ARM platforms with an outer cache. Only DMA triggering
accesses need this, so use the raw variants instead in the critical paths.

The relaxed variants would be more appropriate, but don't exist on all
arches.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b821bd8e

drivers/net/ethernet/calxeda/xgmac.c

+6 −6
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static int xgmac_poll(struct napi_struct *napi, int budget) 


	if (work_done < budget) {

		napi_complete(napi);

		writel(DMA_INTR_DEFAULT_MASK, priv->base + XGMAC_DMA_INTR_ENA);

		__raw_writel(DMA_INTR_DEFAULT_MASK, priv->base + XGMAC_DMA_INTR_ENA);

	}

	return work_done;

}
@@ -1348,7 +1348,7 @@ static irqreturn_t xgmac_pmt_interrupt(int irq, void *dev_id) 
	struct xgmac_priv *priv = netdev_priv(dev);

	void __iomem *ioaddr = priv->base;



	intr_status = readl(ioaddr + XGMAC_INT_STAT);

	intr_status = __raw_readl(ioaddr + XGMAC_INT_STAT);

	if (intr_status & XGMAC_INT_STAT_PMT) {

		netdev_dbg(priv->dev, "received Magic frame\n");

		/* clear the PMT bits 5 and 6 by reading the PMT */
@@ -1366,9 +1366,9 @@ static irqreturn_t xgmac_interrupt(int irq, void *dev_id) 
	struct xgmac_extra_stats *x = &priv->xstats;



	/* read the status register (CSR5) */

	intr_status = readl(priv->base + XGMAC_DMA_STATUS);

	intr_status &= readl(priv->base + XGMAC_DMA_INTR_ENA);

	writel(intr_status, priv->base + XGMAC_DMA_STATUS);

	intr_status = __raw_readl(priv->base + XGMAC_DMA_STATUS);

	intr_status &= __raw_readl(priv->base + XGMAC_DMA_INTR_ENA);

	__raw_writel(intr_status, priv->base + XGMAC_DMA_STATUS);



	/* It displays the DMA process states (CSR5 register) */

	/* ABNORMAL interrupts */
@@ -1404,7 +1404,7 @@ static irqreturn_t xgmac_interrupt(int irq, void *dev_id) 


	/* TX/RX NORMAL interrupts */

	if (intr_status & (DMA_STATUS_RI | DMA_STATUS_TU)) {

		writel(DMA_INTR_ABNORMAL, priv->base + XGMAC_DMA_INTR_ENA);

		__raw_writel(DMA_INTR_ABNORMAL, priv->base + XGMAC_DMA_INTR_ENA);

		napi_schedule(&priv->napi);

	}