| Message ID | 1351766464-27354-4-git-send-email-robherring2@gmail.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Rob Herring <robherring2@gmail.com> Date: Thu, 1 Nov 2012 05:41:01 -0500 > From: Rob Herring <rob.herring@calxeda.com> > > 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 relaxed variants instead. > > Signed-off-by: Rob Herring <rob.herring@calxeda.com> > --- > drivers/net/ethernet/calxeda/Kconfig | 2 +- > drivers/net/ethernet/calxeda/xgmac.c | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig > index aba435c..6a4ddf6 100644 > --- a/drivers/net/ethernet/calxeda/Kconfig > +++ b/drivers/net/ethernet/calxeda/Kconfig > @@ -1,6 +1,6 @@ > config NET_CALXEDA_XGMAC > tristate "Calxeda 1G/10G XGMAC Ethernet driver" > - depends on HAS_IOMEM > + depends on HAS_IOMEM && ARM > select CRC32 > help > This is the driver for the XGMAC Ethernet IP block found on Calxeda This is a regression. Now I can't built test this driver on x86 or sparc. I'm not applying this series. You can argue until the cows come home about why you absolutley have to add this restriction, but I simply don't care, this issue is too important to me. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/01/2012 10:21 AM, David Miller wrote: > From: Rob Herring <robherring2@gmail.com> > Date: Thu, 1 Nov 2012 05:41:01 -0500 > >> From: Rob Herring <rob.herring@calxeda.com> >> >> 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 relaxed variants instead. >> >> Signed-off-by: Rob Herring <rob.herring@calxeda.com> >> --- >> drivers/net/ethernet/calxeda/Kconfig | 2 +- >> drivers/net/ethernet/calxeda/xgmac.c | 12 ++++++------ >> 2 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig >> index aba435c..6a4ddf6 100644 >> --- a/drivers/net/ethernet/calxeda/Kconfig >> +++ b/drivers/net/ethernet/calxeda/Kconfig >> @@ -1,6 +1,6 @@ >> config NET_CALXEDA_XGMAC >> tristate "Calxeda 1G/10G XGMAC Ethernet driver" >> - depends on HAS_IOMEM >> + depends on HAS_IOMEM && ARM >> select CRC32 >> help >> This is the driver for the XGMAC Ethernet IP block found on Calxeda > > This is a regression. Now I can't built test this driver on x86 > or sparc. > > I'm not applying this series. You can argue until the cows come home > about why you absolutley have to add this restriction, but I simply > don't care, this issue is too important to me. I did first try fixing this in the ARM L2 code, but that was rejected as well. It is a 20-30% performance difference. It would be nice if we had unified accessors on all platforms. Are you okay with adding "!(BLACKFIN || HEXAGON || M68K || MICROBLAZE || OPENRISC || S390 || SCORE || UNICORE32)"? Or would you be okay with using __raw_readl/__raw_writel? Rob -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Rob Herring <rob.herring@calxeda.com> Date: Thu, 01 Nov 2012 10:57:03 -0500 > Or would you be okay with using __raw_readl/__raw_writel? Those should be provided by all HAS_IOMEM platforms, so yes. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/calxeda/Kconfig b/drivers/net/ethernet/calxeda/Kconfig index aba435c..6a4ddf6 100644 --- a/drivers/net/ethernet/calxeda/Kconfig +++ b/drivers/net/ethernet/calxeda/Kconfig @@ -1,6 +1,6 @@ config NET_CALXEDA_XGMAC tristate "Calxeda 1G/10G XGMAC Ethernet driver" - depends on HAS_IOMEM + depends on HAS_IOMEM && ARM select CRC32 help This is the driver for the XGMAC Ethernet IP block found on Calxeda diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 728fcef..117839e 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -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); + writel_relaxed(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 = readl_relaxed(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 = readl_relaxed(priv->base + XGMAC_DMA_STATUS); + intr_status &= readl_relaxed(priv->base + XGMAC_DMA_INTR_ENA); + writel_relaxed(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); + writel_relaxed(DMA_INTR_ABNORMAL, priv->base + XGMAC_DMA_INTR_ENA); napi_schedule(&priv->napi); }