3.2.70-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> commit a6dfa128ce5c414ab46b1d690f7a1b8decb8526d upstream. A huge amount of NIC drivers use the DMA API, however if compiled under 32-bit an very important part of the DMA API can be ommitted leading to the drivers not working at all (especially if used with 'swiotlb=force iommu=soft'). As Prashant Sreedharan explains it: "the driver [tg3] uses DEFINE_DMA_UNMAP_ADDR(), dma_unmap_addr_set() to keep a copy of the dma "mapping" and dma_unmap_addr() to get the "mapping" value. On most of the platforms this is a no-op, but ... with "iommu=soft and swiotlb=force" this house keeping is required, ... otherwise we pass 0 while calling pci_unmap_/pci_dma_sync_ instead of the DMA address." As such enable this even when using 32-bit kernels. Reported-by: Ian Jackson <ian.jack...@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Acked-by: David S. Miller <da...@davemloft.net> Acked-by: Prashant Sreedharan <prash...@broadcom.com> Cc: Borislav Petkov <b...@alien8.de> Cc: H. Peter Anvin <h...@zytor.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Michael Chan <mc...@broadcom.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: boris.ostrov...@oracle.com Cc: casca...@linux.vnet.ibm.com Cc: david.vra...@citrix.com Cc: sanje...@broadcom.com Cc: siva.kal...@broadcom.com Cc: vyasev...@gmail.com Cc: xen-de...@lists.xensource.com Link: http://lkml.kernel.org/r/20150417190448.ga9...@l.oracle.com Signed-off-by: Ingo Molnar <mi...@kernel.org> [bwh: Backported to 3.2: also change the def_bool (cond) to def_bool y + depends] Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -133,7 +133,8 @@ config SBUS bool config NEED_DMA_MAP_STATE - def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG) + def_bool y + depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB config NEED_SG_DMA_LENGTH def_bool y -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
