4.4-stable patches

added patches:
	cs5536-add-support-for-ide-controller-variant.patch

diff --git a/queue-4.4/cs5536-add-support-for-ide-controller-variant.patch b/queue-4.4/cs5536-add-support-for-ide-controller-variant.patch
new file mode 100644 (file)
index 0000000..b583238
--- /dev/null
+++ b/queue-4.4/cs5536-add-support-for-ide-controller-variant.patch
@@ -0,0 +1,55 @@
+From 591b6bb605785c12a21e8b07a08a277065b655a5 Mon Sep 17 00:00:00 2001
+From: Andrey Korolyov <andrey@xdel.ru>
+Date: Thu, 10 Aug 2017 13:21:14 +0300
+Subject: cs5536: add support for IDE controller variant
+
+From: Andrey Korolyov <andrey@xdel.ru>
+
+commit 591b6bb605785c12a21e8b07a08a277065b655a5 upstream.
+
+Several legacy devices such as Geode-based Cisco ASA appliances
+and DB800 development board do possess CS5536 IDE controller
+with different PCI id than existing one. Using pata_generic is
+not always feasible as at least DB800 requires MSR quirk from
+pata_cs5536 to be used with vendor firmware.
+
+Signed-off-by: Andrey Korolyov <andrey@xdel.ru>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/pata_amd.c    |    1 +
+ drivers/ata/pata_cs5536.c |    1 +
+ include/linux/pci_ids.h   |    1 +
+ 3 files changed, 3 insertions(+)
+
+--- a/drivers/ata/pata_amd.c
++++ b/drivers/ata/pata_amd.c
+@@ -616,6 +616,7 @@ static const struct pci_device_id amd[]
+       { PCI_VDEVICE(NVIDIA,   PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE), 8 },
+       { PCI_VDEVICE(NVIDIA,   PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE), 8 },
+       { PCI_VDEVICE(AMD,      PCI_DEVICE_ID_AMD_CS5536_IDE),          9 },
++      { PCI_VDEVICE(AMD,      PCI_DEVICE_ID_AMD_CS5536_DEV_IDE),      9 },
+ 
+       { },
+ };
+--- a/drivers/ata/pata_cs5536.c
++++ b/drivers/ata/pata_cs5536.c
+@@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_de
+ 
+ static const struct pci_device_id cs5536[] = {
+       { PCI_VDEVICE(AMD,      PCI_DEVICE_ID_AMD_CS5536_IDE), },
++      { PCI_VDEVICE(AMD,      PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), },
+       { },
+ };
+ 
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -573,6 +573,7 @@
+ #define PCI_DEVICE_ID_AMD_CS5536_EHC    0x2095
+ #define PCI_DEVICE_ID_AMD_CS5536_UDC    0x2096
+ #define PCI_DEVICE_ID_AMD_CS5536_UOC    0x2097
++#define PCI_DEVICE_ID_AMD_CS5536_DEV_IDE    0x2092
+ #define PCI_DEVICE_ID_AMD_CS5536_IDE    0x209A
+ #define PCI_DEVICE_ID_AMD_LX_VIDEO  0x2081
+ #define PCI_DEVICE_ID_AMD_LX_AES    0x2082

diff --git a/queue-4.4/series b/queue-4.4/series
index e1d142e8687088b28d773e4877a4f05c536894f4..145a2b17a362bd2ff1787f89afd2485a9814fd19 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -15,3 +15,4 @@ dlm-avoid-double-free-on-error-path-in-dlm_device_-register-unregister.patch
 mwifiex-correct-channel-stat-buffer-overflows.patch
 drm-nouveau-pci-msi-disable-msi-on-big-endian-platforms-by-default.patch
 workqueue-fix-flag-collision.patch
+cs5536-add-support-for-ide-controller-variant.patch