From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752971AbbDRMkR (ORCPT ); Sat, 18 Apr 2015 08:40:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42253 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054AbbDRMkK (ORCPT ); Sat, 18 Apr 2015 08:40:10 -0400 Date: Sat, 18 Apr 2015 05:39:36 -0700 From: tip-bot for Konrad Rzeszutek Wilk Message-ID: Cc: mchan@broadcom.com, tglx@linutronix.de, Ian.Jackson@eu.citrix.com, hpa@zytor.com, torvalds@linux-foundation.org, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, bp@alien8.de, prashant@broadcom.com, mingo@kernel.org, davem@davemloft.net Reply-To: mchan@broadcom.com, Ian.Jackson@eu.citrix.com, tglx@linutronix.de, hpa@zytor.com, konrad.wilk@oracle.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@alien8.de, prashant@broadcom.com, mingo@kernel.org, davem@davemloft.net In-Reply-To: <20150417190448.GA9462@l.oracle.com> References: <20150417190448.GA9462@l.oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected Git-Commit-ID: a6dfa128ce5c414ab46b1d690f7a1b8decb8526d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a6dfa128ce5c414ab46b1d690f7a1b8decb8526d Gitweb: http://git.kernel.org/tip/a6dfa128ce5c414ab46b1d690f7a1b8decb8526d Author: Konrad Rzeszutek Wilk AuthorDate: Fri, 17 Apr 2015 15:04:48 -0400 Committer: Ingo Molnar CommitDate: Sat, 18 Apr 2015 14:36:49 +0200 config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected 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 Signed-off-by: Konrad Rzeszutek Wilk Acked-by: David S. Miller Acked-by: Prashant Sreedharan Cc: Borislav Petkov Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Michael Chan Cc: Thomas Gleixner Cc: boris.ostrovsky@oracle.com Cc: cascardo@linux.vnet.ibm.com Cc: david.vrabel@citrix.com Cc: sanjeevb@broadcom.com Cc: siva.kallam@broadcom.com Cc: vyasevich@gmail.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index faff693..eb79036 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -177,7 +177,7 @@ config SBUS config NEED_DMA_MAP_STATE def_bool y - depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG + depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB config NEED_SG_DMA_LENGTH def_bool y