[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130611111230.000062d2@unknown>
Date: Tue, 11 Jun 2013 11:12:30 -0700
From: Jesse Brandeburg <jesse.brandeburg@...el.com>
To: Russell King - ARM Linux <linux@....linux.org.uk>
Cc: Alex Duyck <alexander.h.duyck@...el.com>,
Bruce Allan <bruce.w.allan@...el.com>,
Carolyn Wyborny <carolyn.wyborny@...el.com>,
"Don Skidmore" <donald.c.skidmore@...el.com>,
<e1000-devel@...ts.sourceforge.net>,
Greg Rose <gregory.v.rose@...el.com>,
Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
John Ronciak <john.ronciak@...el.com>,
<netdev@...r.kernel.org>,
"Peter P Waskiewicz Jr" <peter.p.waskiewicz.jr@...el.com>,
Rasesh Mody <rmody@...cade.com>,
Tushar Dave <tushar.n.dave@...el.com>
Subject: Re: [RFC 0/7] Fixing dma mask setting in various network drivers
On Tue, 11 Jun 2013 00:08:49 +0100
Russell King - ARM Linux <linux@....linux.org.uk> wrote:
> While looking at the way coherent DMA masks are handled (and the
> fact many drivers write directly to the mask) I stumbled across
> this set of oddities in various network drivers, which looks like
> it's been cut'n'pasted.
>
> I haven't yet tested these patches in any way, which is one reason
> I'm sending them out as an RFC. The other reason is to find out
> if other people agree that these are indeed fixes.
>
> drivers/net/ethernet/brocade/bna/bnad.c | 7 +++----
> drivers/net/ethernet/intel/e1000e/netdev.c | 11 +++++------
> drivers/net/ethernet/intel/igb/igb_main.c | 11 +++++------
> drivers/net/ethernet/intel/igbvf/netdev.c | 11 +++++------
> drivers/net/ethernet/intel/ixgb/ixgb_main.c | 9 ++++-----
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +++++------
> drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 11 +++++------
> 7 files changed, 32 insertions(+), 39 deletions(-)
Thanks Russell,
The intel driver changes seem valid (we are testing them now).
According to DMA-API-HOWTO, the coherent mask will always succeed if
the regular mask succeeded, so the code can be further simplified as
well to basically match the example in DMA-API-HOWTO.
This is my proposed change to the intel drivers. Comments?
+ if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
+ pci_using_dac = true;
+ /* coherent mask for the same size will always succeed if
+ * dma_set_mask does
+ */
+ dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+ } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
+ pci_using_dac = false;
+ dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+ } else {
+ dev_err(&pdev->dev, "%s: DMA configuration failed: %d\n",
+ __func__, err);
+ err = -EIO;
+ goto err_dma;
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists