6.1-stable patches

added patches:
	input-xpad-add-vid-for-turtle-beach-controllers.patch
	mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch

diff --git a/queue-6.1/input-xpad-add-vid-for-turtle-beach-controllers.patch b/queue-6.1/input-xpad-add-vid-for-turtle-beach-controllers.patch
new file mode 100644 (file)
index 0000000..4b77e59
--- /dev/null
+++ b/queue-6.1/input-xpad-add-vid-for-turtle-beach-controllers.patch
@@ -0,0 +1,29 @@
+From 1999a6b12a3b5c8953fc9ec74863ebc75a1b851d Mon Sep 17 00:00:00 2001
+From: Vicki Pfau <vi@endrift.com>
+Date: Thu, 23 Mar 2023 18:32:43 -0700
+Subject: Input: xpad - add VID for Turtle Beach controllers
+
+From: Vicki Pfau <vi@endrift.com>
+
+commit 1999a6b12a3b5c8953fc9ec74863ebc75a1b851d upstream.
+
+This adds support for the Turtle Beach REACT-R and Recon Xbox controllers
+
+Signed-off-by: Vicki Pfau <vi@endrift.com>
+Link: https://lore.kernel.org/r/20230225012147.276489-4-vi@endrift.com
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/joystick/xpad.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/input/joystick/xpad.c
++++ b/drivers/input/joystick/xpad.c
+@@ -474,6 +474,7 @@ static const struct usb_device_id xpad_t
+       XPAD_XBOX360_VENDOR(0x0f0d),            /* Hori Controllers */
+       XPAD_XBOXONE_VENDOR(0x0f0d),            /* Hori Controllers */
+       XPAD_XBOX360_VENDOR(0x1038),            /* SteelSeries Controllers */
++      XPAD_XBOXONE_VENDOR(0x10f5),            /* Turtle Beach Controllers */
+       XPAD_XBOX360_VENDOR(0x11c9),            /* Nacon GC100XF */
+       XPAD_XBOX360_VENDOR(0x11ff),            /* PXN V900 */
+       XPAD_XBOX360_VENDOR(0x1209),            /* Ardwiino Controllers */

diff --git a/queue-6.1/mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch b/queue-6.1/mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch
new file mode 100644 (file)
index 0000000..eacaecb
--- /dev/null
+++ b/queue-6.1/mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch
@@ -0,0 +1,51 @@
+From 85dd3af64965c1c0eb7373b340a1b1f7773586b0 Mon Sep 17 00:00:00 2001
+From: Victor Shih <victor.shih@genesyslogic.com.tw>
+Date: Tue, 7 Nov 2023 17:57:41 +0800
+Subject: mmc: sdhci-pci-gli: GL9755: Mask the replay timer timeout of AER
+
+From: Victor Shih <victor.shih@genesyslogic.com.tw>
+
+commit 85dd3af64965c1c0eb7373b340a1b1f7773586b0 upstream.
+
+Due to a flaw in the hardware design, the GL9755 replay timer frequently
+times out when ASPM is enabled. As a result, the warning messages will
+often appear in the system log when the system accesses the GL9755
+PCI config. Therefore, the replay timer timeout must be masked.
+
+Fixes: 36ed2fd32b2c ("mmc: sdhci-pci-gli: A workaround to allow GL9755 to enter ASPM L1.2")
+Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Acked-by: Kai-Heng Feng <kai.heng.geng@canonical.com>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20231107095741.8832-3-victorshihgli@gmail.com
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mmc/host/sdhci-pci-gli.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/drivers/mmc/host/sdhci-pci-gli.c
++++ b/drivers/mmc/host/sdhci-pci-gli.c
+@@ -154,6 +154,9 @@
+ #define PCI_GLI_9755_PM_CTRL     0xFC
+ #define   PCI_GLI_9755_PM_STATE    GENMASK(1, 0)
+ 
++#define PCI_GLI_9755_CORRERR_MASK                             0x214
++#define   PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT        BIT(12)
++
+ #define GLI_MAX_TUNING_LOOP 40
+ 
+ /* Genesys Logic chipset */
+@@ -711,6 +714,11 @@ static void gl9755_hw_setting(struct sdh
+       value &= ~PCI_GLI_9755_PM_STATE;
+       pci_write_config_dword(pdev, PCI_GLI_9755_PM_CTRL, value);
+ 
++      /* mask the replay timer timeout of AER */
++      pci_read_config_dword(pdev, PCI_GLI_9755_CORRERR_MASK, &value);
++      value |= PCI_GLI_9755_CORRERR_MASK_REPLAY_TIMER_TIMEOUT;
++      pci_write_config_dword(pdev, PCI_GLI_9755_CORRERR_MASK, value);
++
+       gl9755_wt_off(pdev);
+ }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index ea423e6a07fb79335ff4574332b46effc3566c31..da3bf967e7343c03be3ce535c26b59f34fbae9c4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -368,3 +368,5 @@ drm-amd-display-enable-fast-plane-updates-on-dcn3.2-and-above.patch
 drm-amd-display-change-the-dmcub-mailbox-memory-location-from-fb-to-inbox.patch
 powerpc-powernv-fix-fortify-source-warnings-in-opal-prd.c.patch
 tracing-have-trace_event_file-have-ref-counters.patch
+input-xpad-add-vid-for-turtle-beach-controllers.patch
+mmc-sdhci-pci-gli-gl9755-mask-the-replay-timer-timeout-of-aer.patch