6.7-stable patches

added patches:
	alsa-usb-audio-sort-quirk-table-entries.patch
	net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch

diff --git a/queue-6.7/alsa-usb-audio-sort-quirk-table-entries.patch b/queue-6.7/alsa-usb-audio-sort-quirk-table-entries.patch
new file mode 100644 (file)
index 0000000..c1eeedc
--- /dev/null
+++ b/queue-6.7/alsa-usb-audio-sort-quirk-table-entries.patch
@@ -0,0 +1,101 @@
+From 668abe6dc7b61941fa5c724c06797efb0b87f070 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 24 Jan 2024 16:53:07 +0100
+Subject: ALSA: usb-audio: Sort quirk table entries
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 668abe6dc7b61941fa5c724c06797efb0b87f070 upstream.
+
+The quirk table entries should be put in the USB ID order, but some
+entries have been put in random places.  Re-sort them.
+
+Fixes: bf990c102319 ("ALSA: usb-audio: add quirk to fix Hamedal C20 disconnect issue")
+Fixes: fd28941cff1c ("ALSA: usb-audio: Add new quirk FIXED_RATE for JBL Quantum810 Wireless")
+Fixes: dfd5fe19db7d ("ALSA: usb-audio: Add FIXED_RATE quirk for JBL Quantum610 Wireless")
+Fixes: 4a63e68a2951 ("ALSA: usb-audio: Fix microphone sound on Nexigo webcam.")
+Fixes: 7822baa844a8 ("ALSA: usb-audio: add quirk for RODE NT-USB+")
+Fixes: 4fb7c24f69c4 ("ALSA: usb-audio: Add quirk for Fiero SC-01")
+Fixes: 2307a0e1ca0b ("ALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0)")
+Link: https://lore.kernel.org/r/20240124155307.16996-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/usb/quirks.c |   36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -2037,6 +2037,8 @@ static const struct usb_audio_quirk_flag
+                  QUIRK_FLAG_GET_SAMPLE_RATE),
+       DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */
+                  QUIRK_FLAG_SKIP_CLOCK_SELECTOR | QUIRK_FLAG_CTL_MSG_DELAY_5M),
++      DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
++                 QUIRK_FLAG_IFACE_SKIP_CLOSE),
+       DEVICE_FLG(0x054c, 0x0b8c, /* Sony WALKMAN NW-A45 DAC */
+                  QUIRK_FLAG_SET_IFACE_FIRST),
+       DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */
+@@ -2083,8 +2085,14 @@ static const struct usb_audio_quirk_flag
+                  QUIRK_FLAG_CTL_MSG_DELAY_1M),
+       DEVICE_FLG(0x0b0e, 0x0349, /* Jabra 550a */
+                  QUIRK_FLAG_CTL_MSG_DELAY_1M),
++      DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
++                 QUIRK_FLAG_FIXED_RATE),
++      DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
++                 QUIRK_FLAG_FIXED_RATE),
+       DEVICE_FLG(0x0fd9, 0x0008, /* Hauppauge HVR-950Q */
+                  QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
++      DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
++                 QUIRK_FLAG_GET_SAMPLE_RATE),
+       DEVICE_FLG(0x1395, 0x740a, /* Sennheiser DECT */
+                  QUIRK_FLAG_GET_SAMPLE_RATE),
+       DEVICE_FLG(0x1397, 0x0507, /* Behringer UMC202HD */
+@@ -2117,6 +2125,10 @@ static const struct usb_audio_quirk_flag
+                  QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
+       DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
+                  QUIRK_FLAG_GET_SAMPLE_RATE),
++      DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
++                 QUIRK_FLAG_GET_SAMPLE_RATE),
++      DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
++                 QUIRK_FLAG_GET_SAMPLE_RATE),
+       DEVICE_FLG(0x2040, 0x7200, /* Hauppauge HVR-950Q */
+                  QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
+       DEVICE_FLG(0x2040, 0x7201, /* Hauppauge HVR-950Q-MXL */
+@@ -2159,6 +2171,12 @@ static const struct usb_audio_quirk_flag
+                  QUIRK_FLAG_IGNORE_CTL_ERROR),
+       DEVICE_FLG(0x2912, 0x30c8, /* Audioengine D1 */
+                  QUIRK_FLAG_GET_SAMPLE_RATE),
++      DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
++                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
++      DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
++                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
++      DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
++                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+       DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
+                  QUIRK_FLAG_IGNORE_CTL_ERROR),
+       DEVICE_FLG(0x413c, 0xa506, /* Dell AE515 sound bar */
+@@ -2167,24 +2185,6 @@ static const struct usb_audio_quirk_flag
+                  QUIRK_FLAG_ALIGN_TRANSFER),
+       DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
+                  QUIRK_FLAG_ALIGN_TRANSFER),
+-      DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
+-                 QUIRK_FLAG_GET_SAMPLE_RATE),
+-      DEVICE_FLG(0x2b53, 0x0023, /* Fiero SC-01 (firmware v1.0.0 @ 48 kHz) */
+-                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+-      DEVICE_FLG(0x2b53, 0x0024, /* Fiero SC-01 (firmware v1.0.0 @ 96 kHz) */
+-                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+-      DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
+-                 QUIRK_FLAG_GENERIC_IMPLICIT_FB),
+-      DEVICE_FLG(0x0525, 0xa4ad, /* Hamedal C20 usb camero */
+-                 QUIRK_FLAG_IFACE_SKIP_CLOSE),
+-      DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
+-                 QUIRK_FLAG_FIXED_RATE),
+-      DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
+-                 QUIRK_FLAG_FIXED_RATE),
+-      DEVICE_FLG(0x1bcf, 0x2283, /* NexiGo N930AF FHD Webcam */
+-                 QUIRK_FLAG_GET_SAMPLE_RATE),
+-      DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
+-                 QUIRK_FLAG_GET_SAMPLE_RATE),
+ 
+       /* Vendor matches */
+       VENDOR_FLG(0x045e, /* MS Lifecam */

diff --git a/queue-6.7/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch b/queue-6.7/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch
new file mode 100644 (file)
index 0000000..a5d1978
--- /dev/null
+++ b/queue-6.7/net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch
@@ -0,0 +1,50 @@
+From 1ce2654d87e2fb91fea83b288bd9b2641045e42a Mon Sep 17 00:00:00 2001
+From: Furong Xu <0x1207@gmail.com>
+Date: Sat, 3 Feb 2024 13:31:33 +0800
+Subject: net: stmmac: xgmac: fix a typo of register name in DPP safety handling
+
+From: Furong Xu <0x1207@gmail.com>
+
+commit 1ce2654d87e2fb91fea83b288bd9b2641045e42a upstream.
+
+DDPP is copied from Synopsys Data book:
+
+DDPP: Disable Data path Parity Protection.
+    When it is 0x0, Data path Parity Protection is enabled.
+    When it is 0x1, Data path Parity Protection is disabled.
+
+The macro name should be XGMAC_DPP_DISABLE.
+
+Fixes: 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
+Signed-off-by: Furong Xu <0x1207@gmail.com>
+Reviewed-by: Serge Semin <fancer.lancer@gmail.com>
+Link: https://lore.kernel.org/r/20240203053133.1129236-1-0x1207@gmail.com
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h      |    2 +-
+ drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
++++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+@@ -320,7 +320,7 @@
+ #define XGMAC_TXCEIE                  BIT(0)
+ #define XGMAC_MTL_ECC_INT_STATUS      0x000010cc
+ #define XGMAC_MTL_DPP_CONTROL         0x000010e0
+-#define XGMAC_DDPP_DISABLE            BIT(0)
++#define XGMAC_DPP_DISABLE             BIT(0)
+ #define XGMAC_MTL_TXQ_OPMODE(x)               (0x00001100 + (0x80 * (x)))
+ #define XGMAC_TQS                     GENMASK(25, 16)
+ #define XGMAC_TQS_SHIFT                       16
+--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
++++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+@@ -929,7 +929,7 @@ dwxgmac3_safety_feat_config(void __iomem
+       /* 5. Enable Data Path Parity Protection */
+       value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL);
+       /* already enabled by default, explicit enable it again */
+-      value &= ~XGMAC_DDPP_DISABLE;
++      value &= ~XGMAC_DPP_DISABLE;
+       writel(value, ioaddr + XGMAC_MTL_DPP_CONTROL);
+ 
+       return 0;

diff --git a/queue-6.7/series b/queue-6.7/series
index 3f09ad3db9414e92c39480f0e029bb832bed4b72..a2e157ead58b61671028b5b386bb24d3f5f81fce 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -123,3 +123,5 @@ io_uring-poll-add-requeue-return-code-from-poll-multishot-handling.patch
 io_uring-net-limit-inline-multishot-retries.patch
 net-fix-from-address-in-memcpy_to_iter_csum.patch
 net-stmmac-xgmac-use-define-for-string-constants.patch
+alsa-usb-audio-sort-quirk-table-entries.patch
+net-stmmac-xgmac-fix-a-typo-of-register-name-in-dpp-safety-handling.patch