[kernel] r22665 - in dists/jessie/linux/debian: . patches patches/bugfix/all

Fri May 22 22:01:48 UTC 2015

Author: benh
Date: Fri May 22 22:01:48 2015
New Revision: 22665

Log:
[x86] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected (Closes: #786551)

Added:
   dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
   dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
   dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
Modified:
   dists/jessie/linux/debian/changelog
   dists/jessie/linux/debian/patches/series

Modified: dists/jessie/linux/debian/changelog
==============================================================================

--- dists/jessie/linux/debian/changelog	Fri May 22 21:46:17 2015	(r22664)
+++ dists/jessie/linux/debian/changelog	Fri May 22 22:01:48 2015	(r22665)
@@ -161,6 +161,8 @@
   * ext4: fix data corruption caused by unwritten and delayed extents
     (Closes: #785672)
   * ext4: move check under lock scope to close a race.
+  * [x86] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
+    (Closes: #786551)
 
   [ Ian Campbell ]
   * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364)

Added: dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch	Fri May 22 22:01:48 2015	(r22665)
@@ -0,0 +1,54 @@
+From: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+Date: Fri, 17 Apr 2015 15:04:48 -0400
+Subject: config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
+Origin: https://git.kernel.org/linus/a6dfa128ce5c414ab46b1d690f7a1b8decb8526d
+Bug-Debian: https://bugs.debian.org/786551
+
+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.Jackson at eu.citrix.com>
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+Acked-by: David S. Miller <davem at davemloft.net>
+Acked-by: Prashant Sreedharan <prashant at broadcom.com>
+Cc: Borislav Petkov <bp at alien8.de>
+Cc: H. Peter Anvin <hpa at zytor.com>
+Cc: Linus Torvalds <torvalds at linux-foundation.org>
+Cc: Michael Chan <mchan at broadcom.com>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: boris.ostrovsky at oracle.com
+Cc: cascardo at linux.vnet.ibm.com
+Cc: david.vrabel at citrix.com
+Cc: sanjeevb at broadcom.com
+Cc: siva.kallam at broadcom.com
+Cc: vyasevich at gmail.com
+Cc: xen-devel at lists.xensource.com
+Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com
+Signed-off-by: Ingo Molnar <mingo at kernel.org>
+---
+ arch/x86/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -164,7 +164,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

Added: dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch	Fri May 22 22:01:48 2015	(r22665)
@@ -0,0 +1,27 @@
+From: "Martin K. Petersen" <martin.petersen at oracle.com>
+Date: Fri, 27 Mar 2015 15:17:21 -0400
+Subject: libata: Blacklist queued TRIM on Samsung SSD 850 Pro
+Origin: https://git.kernel.org/linus/6fc4d97a4987c5d247655a157a9377996626221a
+
+Blacklist queued TRIM on this drive for now.
+
+Reported-by: Stefan Keller <linux-list at zahlenfresser.de>
+Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
+CC: stable at vger.kernel.org
+Signed-off-by: Tejun Heo <tj at kernel.org>
+[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flag]
+Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/libata-core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4229,6 +4229,7 @@ static const struct ata_blacklist_entry
+ 	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
+ 	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
+ 	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
++	{ "Samsung SSD 850 PRO*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
+ 
+ 	/*
+ 	 * Some WD SATA-I drives spin up and down erratically when the link

Added: dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/jessie/linux/debian/patches/bugfix/all/libata-update-crucial-micron-blacklist.patch	Fri May 22 22:01:48 2015	(r22665)
@@ -0,0 +1,37 @@
+From: "Martin K. Petersen" <martin.petersen at oracle.com>
+Date: Fri, 27 Mar 2015 15:17:20 -0400
+Subject: libata: Update Crucial/Micron blacklist
+Origin: https://git.kernel.org/linus/ff7f53fb82a7801a778e5902bdbbc5e195ab0de0
+
+Micron has released an updated firmware (MU02) for M510/M550/MX100
+drives to fix the issues with queued TRIM. Queued TRIM remains broken on
+M500 but is working fine on later drives such as M600 and MX200.
+
+Tweak our blacklist to reflect the above.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=71371
+Signed-off-by: Martin K. Petersen <martin.petersen at oracle.com>
+Cc: stable at vger.kernel.org
+Signed-off-by: Tejun Heo <tj at kernel.org>
+[bwh: Backported to 3.16: adjust context and drop ZERO_AFTER_TRIM flags]
+Signed-off-by; Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/ata/libata-core.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4225,9 +4225,10 @@ static const struct ata_blacklist_entry
+ 
+ 	/* devices that don't properly handle queued TRIM commands */
+ 	{ "Micron_M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
+-	{ "Crucial_CT???M500SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
+-	{ "Micron_M550*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
+-	{ "Crucial_CT*M550SSD*",	NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
++	{ "Crucial_CT*M500*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM, },
++	{ "Micron_M5[15]0*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
++	{ "Crucial_CT*M550*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
++	{ "Crucial_CT*MX100*",		"MU01",	ATA_HORKAGE_NO_NCQ_TRIM, },
+ 
+ 	/*
+ 	 * Some WD SATA-I drives spin up and down erratically when the link

Modified: dists/jessie/linux/debian/patches/series
==============================================================================
--- dists/jessie/linux/debian/patches/series	Fri May 22 21:46:17 2015	(r22664)
+++ dists/jessie/linux/debian/patches/series	Fri May 22 22:01:48 2015	(r22665)
@@ -595,3 +595,6 @@
 features/x86/thinkpad_acpi-support-new-BIOS-version-string-patter.patch
 bugfix/all/ext4-fix-data-corruption-caused-by-unwritten-and-del.patch
 bugfix/all/ext4-move-check-under-lock-scope-to-close-a-race.patch
+bugfix/all/libata-update-crucial-micron-blacklist.patch
+bugfix/all/libata-blacklist-queued-trim-on-samsung-ssd-850-pro.patch
+bugfix/all/config-enable-need_dma_map_state-by-default-when-swi.patch

