4.9-stable patches

added patches:
	alsa-oxfw-allow-pcm-capture-for-stanton-scs.1m.patch
	libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch

diff --git a/queue-4.9/alsa-oxfw-allow-pcm-capture-for-stanton-scs.1m.patch b/queue-4.9/alsa-oxfw-allow-pcm-capture-for-stanton-scs.1m.patch
new file mode 100644 (file)
index 0000000..a7dfaef
--- /dev/null
+++ b/queue-4.9/alsa-oxfw-allow-pcm-capture-for-stanton-scs.1m.patch
@@ -0,0 +1,38 @@
+From d8fa87c368f5b4096c4746894fdcc195da285df1 Mon Sep 17 00:00:00 2001
+From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Date: Sun, 9 Jun 2019 19:29:12 +0900
+Subject: ALSA: oxfw: allow PCM capture for Stanton SCS.1m
+
+From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+
+commit d8fa87c368f5b4096c4746894fdcc195da285df1 upstream.
+
+Stanton SCS.1m can transfer isochronous packet with Multi Bit Linear
+Audio data channels, therefore it allows software to capture PCM
+substream. However, ALSA oxfw driver doesn't.
+
+This commit changes the driver to add one PCM substream for capture
+direction.
+
+Fixes: de5126cc3c0b ("ALSA: oxfw: add stream format quirk for SCS.1 models")
+Cc: <stable@vger.kernel.org> # v4.5+
+Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/firewire/oxfw/oxfw.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/sound/firewire/oxfw/oxfw.c
++++ b/sound/firewire/oxfw/oxfw.c
+@@ -175,9 +175,6 @@ static int detect_quirks(struct snd_oxfw
+               oxfw->midi_input_ports = 0;
+               oxfw->midi_output_ports = 0;
+ 
+-              /* Output stream exists but no data channels are useful. */
+-              oxfw->has_output = false;
+-
+               return snd_oxfw_scs1x_add(oxfw);
+       }
+ 

diff --git a/queue-4.9/libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch b/queue-4.9/libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch
new file mode 100644 (file)
index 0000000..ca371c4
--- /dev/null
+++ b/queue-4.9/libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch
@@ -0,0 +1,42 @@
+From 31f6264e225fb92cf6f4b63031424f20797c297d Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Tue, 11 Jun 2019 16:32:59 +0200
+Subject: libata: Extend quirks for the ST1000LM024 drives with NOLPM quirk
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 31f6264e225fb92cf6f4b63031424f20797c297d upstream.
+
+We've received a bugreport that using LPM with ST1000LM024 drives leads
+to system lockups. So it seems that these models are buggy in more then
+1 way. Add NOLPM quirk to the existing quirks entry for BROKEN_FPDMA_AA.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1571330
+Cc: stable@vger.kernel.org
+Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/libata-core.c |    9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4355,9 +4355,12 @@ static const struct ata_blacklist_entry
+       { "ST3320[68]13AS",     "SD1[5-9]",     ATA_HORKAGE_NONCQ |
+                                               ATA_HORKAGE_FIRMWARE_WARN },
+ 
+-      /* drives which fail FPDMA_AA activation (some may freeze afterwards) */
+-      { "ST1000LM024 HN-M101MBB", "2AR10001", ATA_HORKAGE_BROKEN_FPDMA_AA },
+-      { "ST1000LM024 HN-M101MBB", "2BA30001", ATA_HORKAGE_BROKEN_FPDMA_AA },
++      /* drives which fail FPDMA_AA activation (some may freeze afterwards)
++         the ST disks also have LPM issues */
++      { "ST1000LM024 HN-M101MBB", "2AR10001", ATA_HORKAGE_BROKEN_FPDMA_AA |
++                                              ATA_HORKAGE_NOLPM, },
++      { "ST1000LM024 HN-M101MBB", "2BA30001", ATA_HORKAGE_BROKEN_FPDMA_AA |
++                                              ATA_HORKAGE_NOLPM, },
+       { "VB0250EAVER",        "HPG7",         ATA_HORKAGE_BROKEN_FPDMA_AA },
+ 
+       /* Blacklist entries taken from Silicon Image 3124/3132

diff --git a/queue-4.9/series b/queue-4.9/series
index 6dab917660eab4c8d4b9fe8c0d3362575d30f669..f37a1ef2b136771453bd18abd00847ba0ffc49e9 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -54,3 +54,5 @@ pwm-fix-deadlock-warning-when-removing-pwm-device.patch
 arm-exynos-fix-undefined-instruction-during-exynos54.patch
 revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch
 alsa-seq-cover-unsubscribe_port-in-list_mutex.patch
+alsa-oxfw-allow-pcm-capture-for-stanton-scs.1m.patch
+libata-extend-quirks-for-the-st1000lm024-drives-with-nolpm-quirk.patch