From: Greg Kroah-Hartman Date: Mon, 29 Jun 2015 22:55:10 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.10.83~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6126dd17921b2eaad63efcf899774e7f91db60a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch --- diff --git a/queue-3.10/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch b/queue-3.10/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch new file mode 100644 index 00000000000..4fd9da1365e --- /dev/null +++ b/queue-3.10/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch @@ -0,0 +1,60 @@ +From a6dfa128ce5c414ab46b1d690f7a1b8decb8526d Mon Sep 17 00:00:00 2001 +From: Konrad Rzeszutek Wilk +Date: Fri, 17 Apr 2015 15:04:48 -0400 +Subject: config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected + +From: Konrad Rzeszutek Wilk + +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 +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 +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -154,7 +154,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 diff --git a/queue-3.10/series b/queue-3.10/series index ccf01f7ffec..2d037b0873f 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -1,2 +1,3 @@ fput-turn-list_head-delayed_fput_list-into-llist_head.patch get-rid-of-s_files-and-files_lock.patch +config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch diff --git a/queue-3.14/series b/queue-3.14/series index ca0b6eb5799..3adc440544b 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -1 +1,3 @@ arm64-dma-mapping-always-clear-allocated-buffers.patch +kprobes-x86-return-correct-length-in-__copy_instruction.patch +config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch diff --git a/queue-4.0/series b/queue-4.0/series index e69de29bb2d..b73c67bb889 100644 --- a/queue-4.0/series +++ b/queue-4.0/series @@ -0,0 +1 @@ +config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch diff --git a/queue-4.1/series b/queue-4.1/series new file mode 100644 index 00000000000..e69de29bb2d