From: Sasha Levin Date: Thu, 19 Sep 2024 19:36:30 +0000 (-0400) Subject: Fixes for 5.4 X-Git-Tag: v6.1.112~41 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c554a1406f2ce8c4d5357fc474af50857cead46;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch b/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch new file mode 100644 index 00000000000..ed25ce28775 --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch @@ -0,0 +1,126 @@ +From 590bf1f1ab6a19498f13177c60ed804b8a753caa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 10:54:19 +0800 +Subject: ALSA: hda/realtek - Fixed ALC256 headphone no sound + +From: Kailang Yang + +[ Upstream commit 9b82ff1362f50914c8292902e07be98a9f59d33d ] + +Dell platform, plug headphone or headset, it had a chance to get no +sound from headphone. +Replace depop procedure will solve this issue. + +Signed-off-by: Kailang Yang +Link: https://lore.kernel.org/bb8e2de30d294dc287944efa0667685a@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 50 ++++++++++++++++++++++++++--------- + 1 file changed, 37 insertions(+), 13 deletions(-) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index dddf3f55cb13b..33e4db337efd8 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4622,6 +4622,30 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, + } + } + ++static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay) ++{ ++ if (delay <= 0) ++ delay = 75; ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); ++ msleep(delay); ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); ++ msleep(delay); ++} ++ ++static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay) ++{ ++ if (delay <= 0) ++ delay = 75; ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); ++ msleep(delay); ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); ++ msleep(delay); ++} ++ + static const struct coef_fw alc225_pre_hsmode[] = { + UPDATE_COEF(0x4a, 1<<8, 0), + UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), +@@ -4717,6 +4741,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) + case 0x10ec0236: + case 0x10ec0256: + case 0x19e58326: ++ alc_hp_mute_disable(codec, 75); + alc_process_coef_fw(codec, coef0256); + break; + case 0x10ec0234: +@@ -4988,6 +5013,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) + alc_write_coef_idx(codec, 0x45, 0xc089); + msleep(50); + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5085,6 +5111,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) + case 0x10ec0256: + case 0x19e58326: + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5200,6 +5227,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) + case 0x10ec0256: + case 0x19e58326: + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5300,25 +5328,21 @@ static void alc_determine_headset_type(struct hda_codec *codec) + alc_write_coef_idx(codec, 0x06, 0x6104); + alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3); + +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); +- + alc_process_coef_fw(codec, coef0255); + msleep(300); + val = alc_read_coef_idx(codec, 0x46); + is_ctia = (val & 0x0070) == 0x0070; +- ++ if (!is_ctia) { ++ alc_write_coef_idx(codec, 0x45, 0xe089); ++ msleep(100); ++ val = alc_read_coef_idx(codec, 0x46); ++ if ((val & 0x0070) == 0x0070) ++ is_ctia = false; ++ else ++ is_ctia = true; ++ } + alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3); + alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0); +- +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + break; + case 0x10ec0234: + case 0x10ec0274: +-- +2.43.0 + diff --git a/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch-25519 b/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch-25519 new file mode 100644 index 00000000000..ed25ce28775 --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch-25519 @@ -0,0 +1,126 @@ +From 590bf1f1ab6a19498f13177c60ed804b8a753caa Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 10:54:19 +0800 +Subject: ALSA: hda/realtek - Fixed ALC256 headphone no sound + +From: Kailang Yang + +[ Upstream commit 9b82ff1362f50914c8292902e07be98a9f59d33d ] + +Dell platform, plug headphone or headset, it had a chance to get no +sound from headphone. +Replace depop procedure will solve this issue. + +Signed-off-by: Kailang Yang +Link: https://lore.kernel.org/bb8e2de30d294dc287944efa0667685a@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 50 ++++++++++++++++++++++++++--------- + 1 file changed, 37 insertions(+), 13 deletions(-) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index dddf3f55cb13b..33e4db337efd8 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4622,6 +4622,30 @@ static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, + } + } + ++static void alc_hp_mute_disable(struct hda_codec *codec, unsigned int delay) ++{ ++ if (delay <= 0) ++ delay = 75; ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); ++ msleep(delay); ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); ++ msleep(delay); ++} ++ ++static void alc_hp_enable_unmute(struct hda_codec *codec, unsigned int delay) ++{ ++ if (delay <= 0) ++ delay = 75; ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); ++ msleep(delay); ++ snd_hda_codec_write(codec, 0x21, 0, ++ AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); ++ msleep(delay); ++} ++ + static const struct coef_fw alc225_pre_hsmode[] = { + UPDATE_COEF(0x4a, 1<<8, 0), + UPDATE_COEFEX(0x57, 0x05, 1<<14, 0), +@@ -4717,6 +4741,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) + case 0x10ec0236: + case 0x10ec0256: + case 0x19e58326: ++ alc_hp_mute_disable(codec, 75); + alc_process_coef_fw(codec, coef0256); + break; + case 0x10ec0234: +@@ -4988,6 +5013,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) + alc_write_coef_idx(codec, 0x45, 0xc089); + msleep(50); + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5085,6 +5111,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) + case 0x10ec0256: + case 0x19e58326: + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5200,6 +5227,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) + case 0x10ec0256: + case 0x19e58326: + alc_process_coef_fw(codec, coef0256); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0234: + case 0x10ec0274: +@@ -5300,25 +5328,21 @@ static void alc_determine_headset_type(struct hda_codec *codec) + alc_write_coef_idx(codec, 0x06, 0x6104); + alc_write_coefex_idx(codec, 0x57, 0x3, 0x09a3); + +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); +- + alc_process_coef_fw(codec, coef0255); + msleep(300); + val = alc_read_coef_idx(codec, 0x46); + is_ctia = (val & 0x0070) == 0x0070; +- ++ if (!is_ctia) { ++ alc_write_coef_idx(codec, 0x45, 0xe089); ++ msleep(100); ++ val = alc_read_coef_idx(codec, 0x46); ++ if ((val & 0x0070) == 0x0070) ++ is_ctia = false; ++ else ++ is_ctia = true; ++ } + alc_write_coefex_idx(codec, 0x57, 0x3, 0x0da3); + alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0); +- +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + break; + case 0x10ec0234: + case 0x10ec0274: +-- +2.43.0 + diff --git a/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch b/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch new file mode 100644 index 00000000000..c3705ec327b --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch @@ -0,0 +1,100 @@ +From 5702ccf88c68c0e21f8108685128fbda635e2f36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 16:46:56 +0800 +Subject: ALSA: hda/realtek - FIxed ALC285 headphone no sound + +From: Kailang Yang + +[ Upstream commit 1fa7b099d60ad64f559bd3b8e3f0d94b2e015514 ] + +Dell platform with ALC215 ALC285 ALC289 ALC225 ALC295 ALC299, plug +headphone or headset. +It had a chance to get no sound from headphone. +Replace depop procedure will solve this issue. + +Signed-off-by: Kailang Yang +Link: https://lore.kernel.org/d0de1b03fd174520945dde216d765223@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 33e4db337efd8..fbd8b4206bad8 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4776,6 +4776,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) + case 0x10ec0295: + case 0x10ec0289: + case 0x10ec0299: ++ alc_hp_mute_disable(codec, 75); + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_process_coef_fw(codec, coef0225); + break; +@@ -5001,6 +5002,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) + case 0x10ec0299: + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_process_coef_fw(codec, coef0225); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0255: + alc_process_coef_fw(codec, coef0255); +@@ -5160,6 +5162,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) + alc_process_coef_fw(codec, coef0225_2); + else + alc_process_coef_fw(codec, coef0225_1); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0867: + alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0); +@@ -5265,6 +5268,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) + case 0x10ec0289: + case 0x10ec0299: + alc_process_coef_fw(codec, coef0225); ++ alc_hp_enable_unmute(codec, 75); + break; + } + codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n"); +@@ -5419,12 +5423,6 @@ static void alc_determine_headset_type(struct hda_codec *codec) + case 0x10ec0295: + case 0x10ec0289: + case 0x10ec0299: +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); +- + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000); + val = alc_read_coef_idx(codec, 0x45); +@@ -5441,15 +5439,19 @@ static void alc_determine_headset_type(struct hda_codec *codec) + val = alc_read_coef_idx(codec, 0x46); + is_ctia = (val & 0x00f0) == 0x00f0; + } ++ if (!is_ctia) { ++ alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x38<<10); ++ alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8); ++ msleep(100); ++ val = alc_read_coef_idx(codec, 0x46); ++ if ((val & 0x00f0) == 0x00f0) ++ is_ctia = false; ++ else ++ is_ctia = true; ++ } + alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6); + alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4); + alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000); +- +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + break; + case 0x10ec0867: + is_ctia = true; +-- +2.43.0 + diff --git a/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch-15833 b/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch-15833 new file mode 100644 index 00000000000..c3705ec327b --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch-15833 @@ -0,0 +1,100 @@ +From 5702ccf88c68c0e21f8108685128fbda635e2f36 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 16:46:56 +0800 +Subject: ALSA: hda/realtek - FIxed ALC285 headphone no sound + +From: Kailang Yang + +[ Upstream commit 1fa7b099d60ad64f559bd3b8e3f0d94b2e015514 ] + +Dell platform with ALC215 ALC285 ALC289 ALC225 ALC295 ALC299, plug +headphone or headset. +It had a chance to get no sound from headphone. +Replace depop procedure will solve this issue. + +Signed-off-by: Kailang Yang +Link: https://lore.kernel.org/d0de1b03fd174520945dde216d765223@realtek.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 33e4db337efd8..fbd8b4206bad8 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4776,6 +4776,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) + case 0x10ec0295: + case 0x10ec0289: + case 0x10ec0299: ++ alc_hp_mute_disable(codec, 75); + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_process_coef_fw(codec, coef0225); + break; +@@ -5001,6 +5002,7 @@ static void alc_headset_mode_default(struct hda_codec *codec) + case 0x10ec0299: + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_process_coef_fw(codec, coef0225); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0255: + alc_process_coef_fw(codec, coef0255); +@@ -5160,6 +5162,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) + alc_process_coef_fw(codec, coef0225_2); + else + alc_process_coef_fw(codec, coef0225_1); ++ alc_hp_enable_unmute(codec, 75); + break; + case 0x10ec0867: + alc_update_coefex_idx(codec, 0x57, 0x5, 1<<14, 0); +@@ -5265,6 +5268,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) + case 0x10ec0289: + case 0x10ec0299: + alc_process_coef_fw(codec, coef0225); ++ alc_hp_enable_unmute(codec, 75); + break; + } + codec_dbg(codec, "Headset jack set to Nokia-style headset mode.\n"); +@@ -5419,12 +5423,6 @@ static void alc_determine_headset_type(struct hda_codec *codec) + case 0x10ec0295: + case 0x10ec0289: + case 0x10ec0299: +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); +- + alc_process_coef_fw(codec, alc225_pre_hsmode); + alc_update_coef_idx(codec, 0x67, 0xf000, 0x1000); + val = alc_read_coef_idx(codec, 0x45); +@@ -5441,15 +5439,19 @@ static void alc_determine_headset_type(struct hda_codec *codec) + val = alc_read_coef_idx(codec, 0x46); + is_ctia = (val & 0x00f0) == 0x00f0; + } ++ if (!is_ctia) { ++ alc_update_coef_idx(codec, 0x45, 0x3f<<10, 0x38<<10); ++ alc_update_coef_idx(codec, 0x49, 3<<8, 1<<8); ++ msleep(100); ++ val = alc_read_coef_idx(codec, 0x46); ++ if ((val & 0x00f0) == 0x00f0) ++ is_ctia = false; ++ else ++ is_ctia = true; ++ } + alc_update_coef_idx(codec, 0x4a, 7<<6, 7<<6); + alc_update_coef_idx(codec, 0x4a, 3<<4, 3<<4); + alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000); +- +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); +- msleep(80); +- snd_hda_codec_write(codec, 0x21, 0, +- AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + break; + case 0x10ec0867: + is_ctia = true; +-- +2.43.0 + diff --git a/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch b/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch new file mode 100644 index 00000000000..39f739eb69a --- /dev/null +++ b/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch @@ -0,0 +1,35 @@ +From c613a8b610a77fcbaebb414a4772f61d1ce7a2d4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Aug 2024 14:19:54 +0800 +Subject: ASoC: allow module autoloading for table db1200_pids + +From: Hongbo Li + +[ Upstream commit 0e9fdab1e8df490354562187cdbb8dec643eae2c ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly +autoloaded based on the alias from platform_device_id table. + +Signed-off-by: Hongbo Li +Link: https://patch.msgid.link/20240821061955.2273782-2-lihongbo22@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/au1x/db1200.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c +index d6b692fff29a2..cdde5ba2ec351 100644 +--- a/sound/soc/au1x/db1200.c ++++ b/sound/soc/au1x/db1200.c +@@ -44,6 +44,7 @@ static const struct platform_device_id db1200_pids[] = { + }, + {}, + }; ++MODULE_DEVICE_TABLE(platform, db1200_pids); + + /*------------------------- AC97 PART ---------------------------*/ + +-- +2.43.0 + diff --git a/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch-25150 b/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch-25150 new file mode 100644 index 00000000000..39f739eb69a --- /dev/null +++ b/queue-5.4/asoc-allow-module-autoloading-for-table-db1200_pids.patch-25150 @@ -0,0 +1,35 @@ +From c613a8b610a77fcbaebb414a4772f61d1ce7a2d4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 21 Aug 2024 14:19:54 +0800 +Subject: ASoC: allow module autoloading for table db1200_pids + +From: Hongbo Li + +[ Upstream commit 0e9fdab1e8df490354562187cdbb8dec643eae2c ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly +autoloaded based on the alias from platform_device_id table. + +Signed-off-by: Hongbo Li +Link: https://patch.msgid.link/20240821061955.2273782-2-lihongbo22@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/au1x/db1200.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c +index d6b692fff29a2..cdde5ba2ec351 100644 +--- a/sound/soc/au1x/db1200.c ++++ b/sound/soc/au1x/db1200.c +@@ -44,6 +44,7 @@ static const struct platform_device_id db1200_pids[] = { + }, + {}, + }; ++MODULE_DEVICE_TABLE(platform, db1200_pids); + + /*------------------------- AC97 PART ---------------------------*/ + +-- +2.43.0 + diff --git a/queue-5.4/asoc-tda7419-fix-module-autoloading.patch b/queue-5.4/asoc-tda7419-fix-module-autoloading.patch new file mode 100644 index 00000000000..642f9fa4df8 --- /dev/null +++ b/queue-5.4/asoc-tda7419-fix-module-autoloading.patch @@ -0,0 +1,35 @@ +From e5e23ee17e039d3a657731b0ca99f0ca8fa3f13f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Aug 2024 08:49:23 +0000 +Subject: ASoC: tda7419: fix module autoloading + +From: Liao Chen + +[ Upstream commit 934b44589da9aa300201a00fe139c5c54f421563 ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly autoloaded +based on the alias from of_device_id table. + +Signed-off-by: Liao Chen +Link: https://patch.msgid.link/20240826084924.368387-4-liaochen4@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tda7419.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/codecs/tda7419.c b/sound/soc/codecs/tda7419.c +index 2bf4f5e8af275..9d8753b28e36e 100644 +--- a/sound/soc/codecs/tda7419.c ++++ b/sound/soc/codecs/tda7419.c +@@ -629,6 +629,7 @@ static const struct of_device_id tda7419_of_match[] = { + { .compatible = "st,tda7419" }, + { }, + }; ++MODULE_DEVICE_TABLE(of, tda7419_of_match); + + static struct i2c_driver tda7419_driver = { + .driver = { +-- +2.43.0 + diff --git a/queue-5.4/asoc-tda7419-fix-module-autoloading.patch-16548 b/queue-5.4/asoc-tda7419-fix-module-autoloading.patch-16548 new file mode 100644 index 00000000000..642f9fa4df8 --- /dev/null +++ b/queue-5.4/asoc-tda7419-fix-module-autoloading.patch-16548 @@ -0,0 +1,35 @@ +From e5e23ee17e039d3a657731b0ca99f0ca8fa3f13f Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Aug 2024 08:49:23 +0000 +Subject: ASoC: tda7419: fix module autoloading + +From: Liao Chen + +[ Upstream commit 934b44589da9aa300201a00fe139c5c54f421563 ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly autoloaded +based on the alias from of_device_id table. + +Signed-off-by: Liao Chen +Link: https://patch.msgid.link/20240826084924.368387-4-liaochen4@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/codecs/tda7419.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sound/soc/codecs/tda7419.c b/sound/soc/codecs/tda7419.c +index 2bf4f5e8af275..9d8753b28e36e 100644 +--- a/sound/soc/codecs/tda7419.c ++++ b/sound/soc/codecs/tda7419.c +@@ -629,6 +629,7 @@ static const struct of_device_id tda7419_of_match[] = { + { .compatible = "st,tda7419" }, + { }, + }; ++MODULE_DEVICE_TABLE(of, tda7419_of_match); + + static struct i2c_driver tda7419_driver = { + .driver = { +-- +2.43.0 + diff --git a/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch b/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch new file mode 100644 index 00000000000..6660d5b704c --- /dev/null +++ b/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch @@ -0,0 +1,79 @@ +From 6090d550b61d0095a9f1386dcb1eaff650220ac7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Aug 2024 10:45:17 +0800 +Subject: drm: komeda: Fix an issue related to normalized zpos + +From: hongchi.peng + +[ Upstream commit 258905cb9a6414be5c9ca4aa20ef855f8dc894d4 ] + +We use komeda_crtc_normalize_zpos to normalize zpos of affected planes +to their blending zorder in CU. If there's only one slave plane in +affected planes and its layer_split property is enabled, order++ for +its split layer, so that when calculating the normalized_zpos +of master planes, the split layer of the slave plane is included, but +the max_slave_zorder does not include the split layer and keep zero +because there's only one slave plane in affacted planes, although we +actually use two slave layers in this commit. + +In most cases, this bug does not result in a commit failure, but assume +the following situation: + slave_layer 0: zpos = 0, layer split enabled, normalized_zpos = + 0;(use slave_layer 2 as its split layer) + master_layer 0: zpos = 2, layer_split enabled, normalized_zpos = + 2;(use master_layer 2 as its split layer) + master_layer 1: zpos = 4, normalized_zpos = 4; + master_layer 3: zpos = 5, normalized_zpos = 5; + kcrtc_st->max_slave_zorder = 0; +When we use master_layer 3 as a input of CU in function +komeda_compiz_set_input and check it with function +komeda_component_check_input, the parameter idx is equal to +normailzed_zpos minus max_slave_zorder, the value of idx is 5 +and is euqal to CU's max_active_inputs, so that +komeda_component_check_input returns a -EINVAL value. + +To fix the bug described above, when calculating the max_slave_zorder +with the layer_split enabled, count the split layer in this calculation +directly. + +Signed-off-by: hongchi.peng +Acked-by: Liviu Dudau +Signed-off-by: Liviu Dudau +Link: https://patchwork.freedesktop.org/patch/msgid/20240826024517.3739-1-hongchi.peng@siengine.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +index ae274902ff924..4e9c3184a906c 100644 +--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c ++++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +@@ -148,6 +148,7 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, + struct drm_plane *plane; + struct list_head zorder_list; + int order = 0, err; ++ u32 slave_zpos = 0; + + DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n", + crtc->base.id, crtc->name); +@@ -187,10 +188,13 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, + plane_st->zpos, plane_st->normalized_zpos); + + /* calculate max slave zorder */ +- if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) ++ if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) { ++ slave_zpos = plane_st->normalized_zpos; ++ if (to_kplane_st(plane_st)->layer_split) ++ slave_zpos++; + kcrtc_st->max_slave_zorder = +- max(plane_st->normalized_zpos, +- kcrtc_st->max_slave_zorder); ++ max(slave_zpos, kcrtc_st->max_slave_zorder); ++ } + } + + crtc_st->zpos_changed = true; +-- +2.43.0 + diff --git a/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch-26721 b/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch-26721 new file mode 100644 index 00000000000..6660d5b704c --- /dev/null +++ b/queue-5.4/drm-komeda-fix-an-issue-related-to-normalized-zpos.patch-26721 @@ -0,0 +1,79 @@ +From 6090d550b61d0095a9f1386dcb1eaff650220ac7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 26 Aug 2024 10:45:17 +0800 +Subject: drm: komeda: Fix an issue related to normalized zpos + +From: hongchi.peng + +[ Upstream commit 258905cb9a6414be5c9ca4aa20ef855f8dc894d4 ] + +We use komeda_crtc_normalize_zpos to normalize zpos of affected planes +to their blending zorder in CU. If there's only one slave plane in +affected planes and its layer_split property is enabled, order++ for +its split layer, so that when calculating the normalized_zpos +of master planes, the split layer of the slave plane is included, but +the max_slave_zorder does not include the split layer and keep zero +because there's only one slave plane in affacted planes, although we +actually use two slave layers in this commit. + +In most cases, this bug does not result in a commit failure, but assume +the following situation: + slave_layer 0: zpos = 0, layer split enabled, normalized_zpos = + 0;(use slave_layer 2 as its split layer) + master_layer 0: zpos = 2, layer_split enabled, normalized_zpos = + 2;(use master_layer 2 as its split layer) + master_layer 1: zpos = 4, normalized_zpos = 4; + master_layer 3: zpos = 5, normalized_zpos = 5; + kcrtc_st->max_slave_zorder = 0; +When we use master_layer 3 as a input of CU in function +komeda_compiz_set_input and check it with function +komeda_component_check_input, the parameter idx is equal to +normailzed_zpos minus max_slave_zorder, the value of idx is 5 +and is euqal to CU's max_active_inputs, so that +komeda_component_check_input returns a -EINVAL value. + +To fix the bug described above, when calculating the max_slave_zorder +with the layer_split enabled, count the split layer in this calculation +directly. + +Signed-off-by: hongchi.peng +Acked-by: Liviu Dudau +Signed-off-by: Liviu Dudau +Link: https://patchwork.freedesktop.org/patch/msgid/20240826024517.3739-1-hongchi.peng@siengine.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +index ae274902ff924..4e9c3184a906c 100644 +--- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c ++++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +@@ -148,6 +148,7 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, + struct drm_plane *plane; + struct list_head zorder_list; + int order = 0, err; ++ u32 slave_zpos = 0; + + DRM_DEBUG_ATOMIC("[CRTC:%d:%s] calculating normalized zpos values\n", + crtc->base.id, crtc->name); +@@ -187,10 +188,13 @@ static int komeda_crtc_normalize_zpos(struct drm_crtc *crtc, + plane_st->zpos, plane_st->normalized_zpos); + + /* calculate max slave zorder */ +- if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) ++ if (has_bit(drm_plane_index(plane), kcrtc->slave_planes)) { ++ slave_zpos = plane_st->normalized_zpos; ++ if (to_kplane_st(plane_st)->layer_split) ++ slave_zpos++; + kcrtc_st->max_slave_zorder = +- max(plane_st->normalized_zpos, +- kcrtc_st->max_slave_zorder); ++ max(slave_zpos, kcrtc_st->max_slave_zorder); ++ } + } + + crtc_st->zpos_changed = true; +-- +2.43.0 + diff --git a/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch b/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch new file mode 100644 index 00000000000..db3b790c48e --- /dev/null +++ b/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch @@ -0,0 +1,51 @@ +From 618a46b95f5b2aee43b5a9bb4764c9f56776d9dd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jul 2024 08:33:27 +0300 +Subject: microblaze: don't treat zero reserved memory regions as error + +From: Mike Rapoport + +[ Upstream commit 0075df288dd8a7abfe03b3766176c393063591dd ] + +Before commit 721f4a6526da ("mm/memblock: remove empty dummy entry") the +check for non-zero of memblock.reserved.cnt in mmu_init() would always +be true either because memblock.reserved.cnt is initialized to 1 or +because there were memory reservations earlier. + +The removal of dummy empty entry in memblock caused this check to fail +because now memblock.reserved.cnt is initialized to 0. + +Remove the check for non-zero of memblock.reserved.cnt because it's +perfectly fine to have an empty memblock.reserved array that early in +boot. + +Reported-by: Guenter Roeck +Signed-off-by: Mike Rapoport +Reviewed-by: Wei Yang +Tested-by: Guenter Roeck +Link: https://lore.kernel.org/r/20240729053327.4091459-1-rppt@kernel.org +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + arch/microblaze/mm/init.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index a015a951c8b78..0a190c55577e6 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -276,11 +276,6 @@ asmlinkage void __init mmu_init(void) + { + unsigned int kstart, ksize; + +- if (!memblock.reserved.cnt) { +- pr_emerg("Error memory count\n"); +- machine_restart(NULL); +- } +- + if ((u32) memblock.memory.regions[0].size < 0x400000) { + pr_emerg("Memory must be greater than 4MB\n"); + machine_restart(NULL); +-- +2.43.0 + diff --git a/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch-23935 b/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch-23935 new file mode 100644 index 00000000000..db3b790c48e --- /dev/null +++ b/queue-5.4/microblaze-don-t-treat-zero-reserved-memory-regions-.patch-23935 @@ -0,0 +1,51 @@ +From 618a46b95f5b2aee43b5a9bb4764c9f56776d9dd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 29 Jul 2024 08:33:27 +0300 +Subject: microblaze: don't treat zero reserved memory regions as error + +From: Mike Rapoport + +[ Upstream commit 0075df288dd8a7abfe03b3766176c393063591dd ] + +Before commit 721f4a6526da ("mm/memblock: remove empty dummy entry") the +check for non-zero of memblock.reserved.cnt in mmu_init() would always +be true either because memblock.reserved.cnt is initialized to 1 or +because there were memory reservations earlier. + +The removal of dummy empty entry in memblock caused this check to fail +because now memblock.reserved.cnt is initialized to 0. + +Remove the check for non-zero of memblock.reserved.cnt because it's +perfectly fine to have an empty memblock.reserved array that early in +boot. + +Reported-by: Guenter Roeck +Signed-off-by: Mike Rapoport +Reviewed-by: Wei Yang +Tested-by: Guenter Roeck +Link: https://lore.kernel.org/r/20240729053327.4091459-1-rppt@kernel.org +Signed-off-by: Guenter Roeck +Signed-off-by: Sasha Levin +--- + arch/microblaze/mm/init.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index a015a951c8b78..0a190c55577e6 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -276,11 +276,6 @@ asmlinkage void __init mmu_init(void) + { + unsigned int kstart, ksize; + +- if (!memblock.reserved.cnt) { +- pr_emerg("Error memory count\n"); +- machine_restart(NULL); +- } +- + if ((u32) memblock.memory.regions[0].size < 0x400000) { + pr_emerg("Memory must be greater than 4MB\n"); + machine_restart(NULL); +-- +2.43.0 + diff --git a/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch b/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch new file mode 100644 index 00000000000..83dad92f1cc --- /dev/null +++ b/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch @@ -0,0 +1,109 @@ +From 3335f4bf7ebddceb248f603feb03409e7e549635 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 15:30:06 +0800 +Subject: net: ftgmac100: Ensure tx descriptor updates are visible + +From: Jacky Chou + +[ Upstream commit 4186c8d9e6af57bab0687b299df10ebd47534a0a ] + +The driver must ensure TX descriptor updates are visible +before updating TX pointer and TX clear pointer. + +This resolves TX hangs observed on AST2600 when running +iperf3. + +Signed-off-by: Jacky Chou +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/faraday/ftgmac100.c | 26 ++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c +index 98e94d914597a..1de25a5a3f13a 100644 +--- a/drivers/net/ethernet/faraday/ftgmac100.c ++++ b/drivers/net/ethernet/faraday/ftgmac100.c +@@ -567,7 +567,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) + (*processed)++; + return true; + +- drop: ++drop: + /* Clean rxdes0 (which resets own bit) */ + rxdes->rxdes0 = cpu_to_le32(status & priv->rxdes0_edorr_mask); + priv->rx_pointer = ftgmac100_next_rx_pointer(priv, pointer); +@@ -651,6 +651,11 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv) + ftgmac100_free_tx_packet(priv, pointer, skb, txdes, ctl_stat); + txdes->txdes0 = cpu_to_le32(ctl_stat & priv->txdes0_edotr_mask); + ++ /* Ensure the descriptor config is visible before setting the tx ++ * pointer. ++ */ ++ smp_wmb(); ++ + priv->tx_clean_pointer = ftgmac100_next_tx_pointer(priv, pointer); + + return true; +@@ -804,6 +809,11 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + dma_wmb(); + first->txdes0 = cpu_to_le32(f_ctl_stat); + ++ /* Ensure the descriptor config is visible before setting the tx ++ * pointer. ++ */ ++ smp_wmb(); ++ + /* Update next TX pointer */ + priv->tx_pointer = pointer; + +@@ -824,7 +834,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + + return NETDEV_TX_OK; + +- dma_err: ++dma_err: + if (net_ratelimit()) + netdev_err(netdev, "map tx fragment failed\n"); + +@@ -846,7 +856,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + * last fragment, so we know ftgmac100_free_tx_packet() + * hasn't freed the skb yet. + */ +- drop: ++drop: + /* Drop the packet */ + dev_kfree_skb_any(skb); + netdev->stats.tx_dropped++; +@@ -1418,7 +1428,7 @@ static void ftgmac100_reset_task(struct work_struct *work) + ftgmac100_init_all(priv, true); + + netdev_dbg(netdev, "Reset done !\n"); +- bail: ++bail: + if (priv->mii_bus) + mutex_unlock(&priv->mii_bus->mdio_lock); + if (netdev->phydev) +@@ -1489,15 +1499,15 @@ static int ftgmac100_open(struct net_device *netdev) + + return 0; + +- err_ncsi: ++err_ncsi: + napi_disable(&priv->napi); + netif_stop_queue(netdev); +- err_alloc: ++err_alloc: + ftgmac100_free_buffers(priv); + free_irq(netdev->irq, netdev); +- err_irq: ++err_irq: + netif_napi_del(&priv->napi); +- err_hw: ++err_hw: + iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); + ftgmac100_free_rings(priv); + return err; +-- +2.43.0 + diff --git a/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch-30566 b/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch-30566 new file mode 100644 index 00000000000..83dad92f1cc --- /dev/null +++ b/queue-5.4/net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch-30566 @@ -0,0 +1,109 @@ +From 3335f4bf7ebddceb248f603feb03409e7e549635 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Aug 2024 15:30:06 +0800 +Subject: net: ftgmac100: Ensure tx descriptor updates are visible + +From: Jacky Chou + +[ Upstream commit 4186c8d9e6af57bab0687b299df10ebd47534a0a ] + +The driver must ensure TX descriptor updates are visible +before updating TX pointer and TX clear pointer. + +This resolves TX hangs observed on AST2600 when running +iperf3. + +Signed-off-by: Jacky Chou +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +--- + drivers/net/ethernet/faraday/ftgmac100.c | 26 ++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c +index 98e94d914597a..1de25a5a3f13a 100644 +--- a/drivers/net/ethernet/faraday/ftgmac100.c ++++ b/drivers/net/ethernet/faraday/ftgmac100.c +@@ -567,7 +567,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) + (*processed)++; + return true; + +- drop: ++drop: + /* Clean rxdes0 (which resets own bit) */ + rxdes->rxdes0 = cpu_to_le32(status & priv->rxdes0_edorr_mask); + priv->rx_pointer = ftgmac100_next_rx_pointer(priv, pointer); +@@ -651,6 +651,11 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv) + ftgmac100_free_tx_packet(priv, pointer, skb, txdes, ctl_stat); + txdes->txdes0 = cpu_to_le32(ctl_stat & priv->txdes0_edotr_mask); + ++ /* Ensure the descriptor config is visible before setting the tx ++ * pointer. ++ */ ++ smp_wmb(); ++ + priv->tx_clean_pointer = ftgmac100_next_tx_pointer(priv, pointer); + + return true; +@@ -804,6 +809,11 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + dma_wmb(); + first->txdes0 = cpu_to_le32(f_ctl_stat); + ++ /* Ensure the descriptor config is visible before setting the tx ++ * pointer. ++ */ ++ smp_wmb(); ++ + /* Update next TX pointer */ + priv->tx_pointer = pointer; + +@@ -824,7 +834,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + + return NETDEV_TX_OK; + +- dma_err: ++dma_err: + if (net_ratelimit()) + netdev_err(netdev, "map tx fragment failed\n"); + +@@ -846,7 +856,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, + * last fragment, so we know ftgmac100_free_tx_packet() + * hasn't freed the skb yet. + */ +- drop: ++drop: + /* Drop the packet */ + dev_kfree_skb_any(skb); + netdev->stats.tx_dropped++; +@@ -1418,7 +1428,7 @@ static void ftgmac100_reset_task(struct work_struct *work) + ftgmac100_init_all(priv, true); + + netdev_dbg(netdev, "Reset done !\n"); +- bail: ++bail: + if (priv->mii_bus) + mutex_unlock(&priv->mii_bus->mdio_lock); + if (netdev->phydev) +@@ -1489,15 +1499,15 @@ static int ftgmac100_open(struct net_device *netdev) + + return 0; + +- err_ncsi: ++err_ncsi: + napi_disable(&priv->napi); + netif_stop_queue(netdev); +- err_alloc: ++err_alloc: + ftgmac100_free_buffers(priv); + free_irq(netdev->irq, netdev); +- err_irq: ++err_irq: + netif_napi_del(&priv->napi); +- err_hw: ++err_hw: + iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); + ftgmac100_free_rings(priv); + return err; +-- +2.43.0 + diff --git a/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch b/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch new file mode 100644 index 00000000000..d44af3f81b1 --- /dev/null +++ b/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch @@ -0,0 +1,85 @@ +From e9d47f2d26f29cd8dc4c357c7d2233e009094383 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 May 2024 10:40:23 +0800 +Subject: ocfs2: add bounds checking to ocfs2_xattr_find_entry() + +From: Ferry Meng + +[ Upstream commit 9e3041fecdc8f78a5900c3aa51d3d756e73264d6 ] + +Add a paranoia check to make sure it doesn't stray beyond valid memory +region containing ocfs2 xattr entries when scanning for a match. It will +prevent out-of-bound access in case of crafted images. + +Link: https://lkml.kernel.org/r/20240520024024.1976129-1-joseph.qi@linux.alibaba.com +Signed-off-by: Ferry Meng +Signed-off-by: Joseph Qi +Reported-by: lei lu +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Signed-off-by: Andrew Morton +Stable-dep-of: af77c4fc1871 ("ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry()") +Signed-off-by: Sasha Levin +--- + fs/ocfs2/xattr.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c +index 9ccd19d8f7b18..16bf7bb8f0db0 100644 +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -1068,7 +1068,7 @@ ssize_t ocfs2_listxattr(struct dentry *dentry, + return i_ret + b_ret; + } + +-static int ocfs2_xattr_find_entry(int name_index, ++static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + const char *name, + struct ocfs2_xattr_search *xs) + { +@@ -1082,6 +1082,10 @@ static int ocfs2_xattr_find_entry(int name_index, + name_len = strlen(name); + entry = xs->here; + for (i = 0; i < le16_to_cpu(xs->header->xh_count); i++) { ++ if ((void *)entry >= xs->end) { ++ ocfs2_error(inode->i_sb, "corrupted xattr entries"); ++ return -EFSCORRUPTED; ++ } + cmp = name_index - ocfs2_xattr_get_type(entry); + if (!cmp) + cmp = name_len - entry->xe_name_len; +@@ -1172,7 +1176,7 @@ static int ocfs2_xattr_ibody_get(struct inode *inode, + xs->base = (void *)xs->header; + xs->here = xs->header->xh_entries; + +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + if (ret) + return ret; + size = le64_to_cpu(xs->here->xe_value_size); +@@ -2704,7 +2708,7 @@ static int ocfs2_xattr_ibody_find(struct inode *inode, + + /* Find the named attribute. */ + if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) { +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + if (ret && ret != -ENODATA) + return ret; + xs->not_found = ret; +@@ -2839,7 +2843,7 @@ static int ocfs2_xattr_block_find(struct inode *inode, + xs->end = (void *)(blk_bh->b_data) + blk_bh->b_size; + xs->here = xs->header->xh_entries; + +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + } else + ret = ocfs2_xattr_index_block_find(inode, blk_bh, + name_index, +-- +2.43.0 + diff --git a/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch-4823 b/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch-4823 new file mode 100644 index 00000000000..d44af3f81b1 --- /dev/null +++ b/queue-5.4/ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch-4823 @@ -0,0 +1,85 @@ +From e9d47f2d26f29cd8dc4c357c7d2233e009094383 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 May 2024 10:40:23 +0800 +Subject: ocfs2: add bounds checking to ocfs2_xattr_find_entry() + +From: Ferry Meng + +[ Upstream commit 9e3041fecdc8f78a5900c3aa51d3d756e73264d6 ] + +Add a paranoia check to make sure it doesn't stray beyond valid memory +region containing ocfs2 xattr entries when scanning for a match. It will +prevent out-of-bound access in case of crafted images. + +Link: https://lkml.kernel.org/r/20240520024024.1976129-1-joseph.qi@linux.alibaba.com +Signed-off-by: Ferry Meng +Signed-off-by: Joseph Qi +Reported-by: lei lu +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Gang He +Cc: Jun Piao +Signed-off-by: Andrew Morton +Stable-dep-of: af77c4fc1871 ("ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry()") +Signed-off-by: Sasha Levin +--- + fs/ocfs2/xattr.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c +index 9ccd19d8f7b18..16bf7bb8f0db0 100644 +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -1068,7 +1068,7 @@ ssize_t ocfs2_listxattr(struct dentry *dentry, + return i_ret + b_ret; + } + +-static int ocfs2_xattr_find_entry(int name_index, ++static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + const char *name, + struct ocfs2_xattr_search *xs) + { +@@ -1082,6 +1082,10 @@ static int ocfs2_xattr_find_entry(int name_index, + name_len = strlen(name); + entry = xs->here; + for (i = 0; i < le16_to_cpu(xs->header->xh_count); i++) { ++ if ((void *)entry >= xs->end) { ++ ocfs2_error(inode->i_sb, "corrupted xattr entries"); ++ return -EFSCORRUPTED; ++ } + cmp = name_index - ocfs2_xattr_get_type(entry); + if (!cmp) + cmp = name_len - entry->xe_name_len; +@@ -1172,7 +1176,7 @@ static int ocfs2_xattr_ibody_get(struct inode *inode, + xs->base = (void *)xs->header; + xs->here = xs->header->xh_entries; + +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + if (ret) + return ret; + size = le64_to_cpu(xs->here->xe_value_size); +@@ -2704,7 +2708,7 @@ static int ocfs2_xattr_ibody_find(struct inode *inode, + + /* Find the named attribute. */ + if (oi->ip_dyn_features & OCFS2_INLINE_XATTR_FL) { +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + if (ret && ret != -ENODATA) + return ret; + xs->not_found = ret; +@@ -2839,7 +2843,7 @@ static int ocfs2_xattr_block_find(struct inode *inode, + xs->end = (void *)(blk_bh->b_data) + blk_bh->b_size; + xs->here = xs->header->xh_entries; + +- ret = ocfs2_xattr_find_entry(name_index, name, xs); ++ ret = ocfs2_xattr_find_entry(inode, name_index, name, xs); + } else + ret = ocfs2_xattr_index_block_find(inode, blk_bh, + name_index, +-- +2.43.0 + diff --git a/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch b/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch new file mode 100644 index 00000000000..654c57ee9b4 --- /dev/null +++ b/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch @@ -0,0 +1,67 @@ +From 2b81dbdc627879fc11a163997bd126802a027906 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 May 2024 10:40:24 +0800 +Subject: ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() + +From: Ferry Meng + +[ Upstream commit af77c4fc1871847b528d58b7fdafb4aa1f6a9262 ] + +xattr in ocfs2 maybe 'non-indexed', which saved with additional space +requested. It's better to check if the memory is out of bound before +memcmp, although this possibility mainly comes from crafted poisonous +images. + +Link: https://lkml.kernel.org/r/20240520024024.1976129-2-joseph.qi@linux.alibaba.com +Signed-off-by: Ferry Meng +Signed-off-by: Joseph Qi +Reported-by: lei lu +Reviewed-by: Joseph Qi +Cc: Changwei Ge +Cc: Gang He +Cc: Joel Becker +Cc: Jun Piao +Cc: Junxiao Bi +Cc: Mark Fasheh +Signed-off-by: Andrew Morton +Signed-off-by: Sasha Levin +--- + fs/ocfs2/xattr.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c +index 16bf7bb8f0db0..495fb5b7a0876 100644 +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -1074,7 +1074,7 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + { + struct ocfs2_xattr_entry *entry; + size_t name_len; +- int i, cmp = 1; ++ int i, name_offset, cmp = 1; + + if (name == NULL) + return -EINVAL; +@@ -1089,10 +1089,15 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + cmp = name_index - ocfs2_xattr_get_type(entry); + if (!cmp) + cmp = name_len - entry->xe_name_len; +- if (!cmp) +- cmp = memcmp(name, (xs->base + +- le16_to_cpu(entry->xe_name_offset)), +- name_len); ++ if (!cmp) { ++ name_offset = le16_to_cpu(entry->xe_name_offset); ++ if ((xs->base + name_offset + name_len) > xs->end) { ++ ocfs2_error(inode->i_sb, ++ "corrupted xattr entries"); ++ return -EFSCORRUPTED; ++ } ++ cmp = memcmp(name, (xs->base + name_offset), name_len); ++ } + if (cmp == 0) + break; + entry += 1; +-- +2.43.0 + diff --git a/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch-23173 b/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch-23173 new file mode 100644 index 00000000000..654c57ee9b4 --- /dev/null +++ b/queue-5.4/ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch-23173 @@ -0,0 +1,67 @@ +From 2b81dbdc627879fc11a163997bd126802a027906 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 20 May 2024 10:40:24 +0800 +Subject: ocfs2: strict bound check before memcmp in ocfs2_xattr_find_entry() + +From: Ferry Meng + +[ Upstream commit af77c4fc1871847b528d58b7fdafb4aa1f6a9262 ] + +xattr in ocfs2 maybe 'non-indexed', which saved with additional space +requested. It's better to check if the memory is out of bound before +memcmp, although this possibility mainly comes from crafted poisonous +images. + +Link: https://lkml.kernel.org/r/20240520024024.1976129-2-joseph.qi@linux.alibaba.com +Signed-off-by: Ferry Meng +Signed-off-by: Joseph Qi +Reported-by: lei lu +Reviewed-by: Joseph Qi +Cc: Changwei Ge +Cc: Gang He +Cc: Joel Becker +Cc: Jun Piao +Cc: Junxiao Bi +Cc: Mark Fasheh +Signed-off-by: Andrew Morton +Signed-off-by: Sasha Levin +--- + fs/ocfs2/xattr.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c +index 16bf7bb8f0db0..495fb5b7a0876 100644 +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -1074,7 +1074,7 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + { + struct ocfs2_xattr_entry *entry; + size_t name_len; +- int i, cmp = 1; ++ int i, name_offset, cmp = 1; + + if (name == NULL) + return -EINVAL; +@@ -1089,10 +1089,15 @@ static int ocfs2_xattr_find_entry(struct inode *inode, int name_index, + cmp = name_index - ocfs2_xattr_get_type(entry); + if (!cmp) + cmp = name_len - entry->xe_name_len; +- if (!cmp) +- cmp = memcmp(name, (xs->base + +- le16_to_cpu(entry->xe_name_offset)), +- name_len); ++ if (!cmp) { ++ name_offset = le16_to_cpu(entry->xe_name_offset); ++ if ((xs->base + name_offset + name_len) > xs->end) { ++ ocfs2_error(inode->i_sb, ++ "corrupted xattr entries"); ++ return -EFSCORRUPTED; ++ } ++ cmp = memcmp(name, (xs->base + name_offset), name_len); ++ } + if (cmp == 0) + break; + entry += 1; +-- +2.43.0 + diff --git a/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch b/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch new file mode 100644 index 00000000000..17d90d9fa3e --- /dev/null +++ b/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch @@ -0,0 +1,51 @@ +From 38542c131ef00d13dd898f477d173cf23a68cfdd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 31 Jul 2024 01:16:26 +0200 +Subject: pinctrl: at91: make it work with current gpiolib + +From: Thomas Blocher + +[ Upstream commit 752f387faaae0ae2e84d3f496922524785e77d60 ] + +pinctrl-at91 currently does not support the gpio-groups devicetree +property and has no pin-range. +Because of this at91 gpios stopped working since patch +commit 2ab73c6d8323fa1e ("gpio: Support GPIO controllers without pin-ranges") +This was discussed in the patches +commit fc328a7d1fcce263 ("gpio: Revert regression in sysfs-gpio (gpiolib.c)") +commit 56e337f2cf132632 ("Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)"") + +As a workaround manually set pin-range via gpiochip_add_pin_range() until +a) pinctrl-at91 is reworked to support devicetree gpio-groups +b) another solution as mentioned in +commit 56e337f2cf132632 ("Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)"") +is found + +Signed-off-by: Thomas Blocher +Link: https://lore.kernel.org/5b992862-355d-f0de-cd3d-ff99e67a4ff1@ek-dev.de +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-at91.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c +index 39a55fd85b192..4e6e151db11f2 100644 +--- a/drivers/pinctrl/pinctrl-at91.c ++++ b/drivers/pinctrl/pinctrl-at91.c +@@ -1398,8 +1398,11 @@ static int at91_pinctrl_probe(struct platform_device *pdev) + + /* We will handle a range of GPIO pins */ + for (i = 0; i < gpio_banks; i++) +- if (gpio_chips[i]) ++ if (gpio_chips[i]) { + pinctrl_add_gpio_range(info->pctl, &gpio_chips[i]->range); ++ gpiochip_add_pin_range(&gpio_chips[i]->chip, dev_name(info->pctl->dev), 0, ++ gpio_chips[i]->range.pin_base, gpio_chips[i]->range.npins); ++ } + + dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n"); + +-- +2.43.0 + diff --git a/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch-2943 b/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch-2943 new file mode 100644 index 00000000000..17d90d9fa3e --- /dev/null +++ b/queue-5.4/pinctrl-at91-make-it-work-with-current-gpiolib.patch-2943 @@ -0,0 +1,51 @@ +From 38542c131ef00d13dd898f477d173cf23a68cfdd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 31 Jul 2024 01:16:26 +0200 +Subject: pinctrl: at91: make it work with current gpiolib + +From: Thomas Blocher + +[ Upstream commit 752f387faaae0ae2e84d3f496922524785e77d60 ] + +pinctrl-at91 currently does not support the gpio-groups devicetree +property and has no pin-range. +Because of this at91 gpios stopped working since patch +commit 2ab73c6d8323fa1e ("gpio: Support GPIO controllers without pin-ranges") +This was discussed in the patches +commit fc328a7d1fcce263 ("gpio: Revert regression in sysfs-gpio (gpiolib.c)") +commit 56e337f2cf132632 ("Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)"") + +As a workaround manually set pin-range via gpiochip_add_pin_range() until +a) pinctrl-at91 is reworked to support devicetree gpio-groups +b) another solution as mentioned in +commit 56e337f2cf132632 ("Revert "gpio: Revert regression in sysfs-gpio (gpiolib.c)"") +is found + +Signed-off-by: Thomas Blocher +Link: https://lore.kernel.org/5b992862-355d-f0de-cd3d-ff99e67a4ff1@ek-dev.de +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + drivers/pinctrl/pinctrl-at91.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c +index 39a55fd85b192..4e6e151db11f2 100644 +--- a/drivers/pinctrl/pinctrl-at91.c ++++ b/drivers/pinctrl/pinctrl-at91.c +@@ -1398,8 +1398,11 @@ static int at91_pinctrl_probe(struct platform_device *pdev) + + /* We will handle a range of GPIO pins */ + for (i = 0; i < gpio_banks; i++) +- if (gpio_chips[i]) ++ if (gpio_chips[i]) { + pinctrl_add_gpio_range(info->pctl, &gpio_chips[i]->range); ++ gpiochip_add_pin_range(&gpio_chips[i]->chip, dev_name(info->pctl->dev), 0, ++ gpio_chips[i]->range.pin_base, gpio_chips[i]->range.npins); ++ } + + dev_info(&pdev->dev, "initialized AT91 pinctrl driver\n"); + +-- +2.43.0 + diff --git a/queue-5.4/series b/queue-5.4/series index c574edd8c6e..2614c3b7510 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -10,3 +10,31 @@ net-dpaa-pad-packets-to-eth_zlen.patch spi-nxp-fspi-fix-the-kasan-report-out-of-bounds-bug.patch soundwire-stream-revert-soundwire-stream-fix-programming-slave-ports-for-non-continous-port-maps.patch selftests-breakpoints-fix-a-typo-of-function-name.patch +asoc-allow-module-autoloading-for-table-db1200_pids.patch +alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch +alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch +pinctrl-at91-make-it-work-with-current-gpiolib.patch +microblaze-don-t-treat-zero-reserved-memory-regions-.patch +net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch +wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch +wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch +asoc-tda7419-fix-module-autoloading.patch +drm-komeda-fix-an-issue-related-to-normalized-zpos.patch +spi-bcm63xx-enable-module-autoloading.patch +x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch +ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch +ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch +asoc-allow-module-autoloading-for-table-db1200_pids.patch-25150 +alsa-hda-realtek-fixed-alc256-headphone-no-sound.patch-25519 +alsa-hda-realtek-fixed-alc285-headphone-no-sound.patch-15833 +pinctrl-at91-make-it-work-with-current-gpiolib.patch-2943 +microblaze-don-t-treat-zero-reserved-memory-regions-.patch-23935 +net-ftgmac100-ensure-tx-descriptor-updates-are-visib.patch-30566 +wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch-5572 +wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch-13759 +asoc-tda7419-fix-module-autoloading.patch-16548 +drm-komeda-fix-an-issue-related-to-normalized-zpos.patch-26721 +spi-bcm63xx-enable-module-autoloading.patch-32373 +x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch-2903 +ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch-4823 +ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch-23173 diff --git a/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch b/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch new file mode 100644 index 00000000000..9e4dc67f139 --- /dev/null +++ b/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch @@ -0,0 +1,35 @@ +From 8891037b366b064217111bbd65cdc2199d554b68 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 31 Aug 2024 09:42:31 +0000 +Subject: spi: bcm63xx: Enable module autoloading + +From: Liao Chen + +[ Upstream commit 709df70a20e990d262c473ad9899314039e8ec82 ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly autoloaded based +on the alias from of_device_id table. + +Signed-off-by: Liao Chen +Link: https://patch.msgid.link/20240831094231.795024-1-liaochen4@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-bcm63xx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c +index ff27596168732..104e3e6e056d7 100644 +--- a/drivers/spi/spi-bcm63xx.c ++++ b/drivers/spi/spi-bcm63xx.c +@@ -481,6 +481,7 @@ static const struct of_device_id bcm63xx_spi_of_match[] = { + { .compatible = "brcm,bcm6358-spi", .data = &bcm6358_spi_reg_offsets }, + { }, + }; ++MODULE_DEVICE_TABLE(of, bcm63xx_spi_of_match); + + static int bcm63xx_spi_probe(struct platform_device *pdev) + { +-- +2.43.0 + diff --git a/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch-32373 b/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch-32373 new file mode 100644 index 00000000000..9e4dc67f139 --- /dev/null +++ b/queue-5.4/spi-bcm63xx-enable-module-autoloading.patch-32373 @@ -0,0 +1,35 @@ +From 8891037b366b064217111bbd65cdc2199d554b68 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 31 Aug 2024 09:42:31 +0000 +Subject: spi: bcm63xx: Enable module autoloading + +From: Liao Chen + +[ Upstream commit 709df70a20e990d262c473ad9899314039e8ec82 ] + +Add MODULE_DEVICE_TABLE(), so modules could be properly autoloaded based +on the alias from of_device_id table. + +Signed-off-by: Liao Chen +Link: https://patch.msgid.link/20240831094231.795024-1-liaochen4@huawei.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/spi/spi-bcm63xx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c +index ff27596168732..104e3e6e056d7 100644 +--- a/drivers/spi/spi-bcm63xx.c ++++ b/drivers/spi/spi-bcm63xx.c +@@ -481,6 +481,7 @@ static const struct of_device_id bcm63xx_spi_of_match[] = { + { .compatible = "brcm,bcm6358-spi", .data = &bcm6358_spi_reg_offsets }, + { }, + }; ++MODULE_DEVICE_TABLE(of, bcm63xx_spi_of_match); + + static int bcm63xx_spi_probe(struct platform_device *pdev) + { +-- +2.43.0 + diff --git a/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch b/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch new file mode 100644 index 00000000000..bd892a55622 --- /dev/null +++ b/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch @@ -0,0 +1,60 @@ +From f5d6bc56c54f32fa91cc7da3a9d71bc430920751 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Aug 2024 19:17:04 +0300 +Subject: wifi: iwlwifi: mvm: don't wait for tx queues if firmware is dead + +From: Emmanuel Grumbach + +[ Upstream commit 3a84454f5204718ca5b4ad2c1f0bf2031e2403d1 ] + +There is a WARNING in iwl_trans_wait_tx_queues_empty() (that was +recently converted from just a message), that can be hit if we +wait for TX queues to become empty after firmware died. Clearly, +we can't expect anything from the firmware after it's declared dead. + +Don't call iwl_trans_wait_tx_queues_empty() in this case. While it could +be a good idea to stop the flow earlier, the flush functions do some +maintenance work that is not related to the firmware, so keep that part +of the code running even when the firmware is not running. + +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20240825191257.a7cbd794cee9.I44a739fbd4ffcc46b83844dd1c7b2eb0c7b270f6@changeid +[edit commit message] +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +index 3c523774ef0e6..c8c884bb5090e 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +@@ -4666,6 +4666,10 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) + int i; + + if (!iwl_mvm_has_new_tx_api(mvm)) { ++ /* we can't ask the firmware anything if it is dead */ ++ if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, ++ &mvm->status)) ++ return; + if (drop) { + mutex_lock(&mvm->mutex); + iwl_mvm_flush_tx_path(mvm, +@@ -4747,8 +4751,11 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, + + /* this can take a while, and we may need/want other operations + * to succeed while doing this, so do it without the mutex held ++ * If the firmware is dead, this can't work... + */ +- if (!drop && !iwl_mvm_has_new_tx_api(mvm)) ++ if (!drop && !iwl_mvm_has_new_tx_api(mvm) && ++ !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, ++ &mvm->status)) + iwl_trans_wait_tx_queues_empty(mvm->trans, msk); + } + +-- +2.43.0 + diff --git a/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch-13759 b/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch-13759 new file mode 100644 index 00000000000..bd892a55622 --- /dev/null +++ b/queue-5.4/wifi-iwlwifi-mvm-don-t-wait-for-tx-queues-if-firmwar.patch-13759 @@ -0,0 +1,60 @@ +From f5d6bc56c54f32fa91cc7da3a9d71bc430920751 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Aug 2024 19:17:04 +0300 +Subject: wifi: iwlwifi: mvm: don't wait for tx queues if firmware is dead + +From: Emmanuel Grumbach + +[ Upstream commit 3a84454f5204718ca5b4ad2c1f0bf2031e2403d1 ] + +There is a WARNING in iwl_trans_wait_tx_queues_empty() (that was +recently converted from just a message), that can be hit if we +wait for TX queues to become empty after firmware died. Clearly, +we can't expect anything from the firmware after it's declared dead. + +Don't call iwl_trans_wait_tx_queues_empty() in this case. While it could +be a good idea to stop the flow earlier, the flush functions do some +maintenance work that is not related to the firmware, so keep that part +of the code running even when the firmware is not running. + +Signed-off-by: Emmanuel Grumbach +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20240825191257.a7cbd794cee9.I44a739fbd4ffcc46b83844dd1c7b2eb0c7b270f6@changeid +[edit commit message] +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +index 3c523774ef0e6..c8c884bb5090e 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +@@ -4666,6 +4666,10 @@ static void iwl_mvm_flush_no_vif(struct iwl_mvm *mvm, u32 queues, bool drop) + int i; + + if (!iwl_mvm_has_new_tx_api(mvm)) { ++ /* we can't ask the firmware anything if it is dead */ ++ if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, ++ &mvm->status)) ++ return; + if (drop) { + mutex_lock(&mvm->mutex); + iwl_mvm_flush_tx_path(mvm, +@@ -4747,8 +4751,11 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, + + /* this can take a while, and we may need/want other operations + * to succeed while doing this, so do it without the mutex held ++ * If the firmware is dead, this can't work... + */ +- if (!drop && !iwl_mvm_has_new_tx_api(mvm)) ++ if (!drop && !iwl_mvm_has_new_tx_api(mvm) && ++ !test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, ++ &mvm->status)) + iwl_trans_wait_tx_queues_empty(mvm->trans, msk); + } + +-- +2.43.0 + diff --git a/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch b/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch new file mode 100644 index 00000000000..27f5477dca5 --- /dev/null +++ b/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch @@ -0,0 +1,58 @@ +From f256fb8ddfdfbadcda14fcdb445b8886c289fabe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Aug 2024 19:17:06 +0300 +Subject: wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() + +From: Daniel Gabay + +[ Upstream commit 916a5d9c5354c426220a0a6533a5e8ea1287d6ea ] + +Driver creates also the WFA TPC element, consider that in the +calculation. + +Signed-off-by: Daniel Gabay +Reviewed-by: Ilan Peer +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20240825191257.e710ce446b7f.I2715c6742e9c3d160e2ba41bc4b35de370d2ce34@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +index 3bce3b59a12b1..55292e9b15c15 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +@@ -93,6 +93,8 @@ + /* adaptive dwell default APs number in social channels (1, 6, 11) */ + #define IWL_SCAN_ADWELL_DEFAULT_N_APS_SOCIAL 10 + ++#define WFA_TPC_IE_LEN 9 ++ + struct iwl_mvm_scan_timing_params { + u32 suspend_time; + u32 max_out_time; +@@ -378,8 +380,8 @@ static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm) + + max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE; + +- /* we create the 802.11 header and SSID element */ +- max_probe_len -= 24 + 2; ++ /* we create the 802.11 header SSID element and WFA TPC element */ ++ max_probe_len -= 24 + 2 + WFA_TPC_IE_LEN; + + /* DS parameter set element is added on 2.4GHZ band if required */ + if (iwl_mvm_rrm_scan_needed(mvm)) +@@ -776,8 +778,6 @@ static u8 *iwl_mvm_copy_and_insert_ds_elem(struct iwl_mvm *mvm, const u8 *ies, + return newpos; + } + +-#define WFA_TPC_IE_LEN 9 +- + static void iwl_mvm_add_tpc_report_ie(u8 *pos) + { + pos[0] = WLAN_EID_VENDOR_SPECIFIC; +-- +2.43.0 + diff --git a/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch-5572 b/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch-5572 new file mode 100644 index 00000000000..27f5477dca5 --- /dev/null +++ b/queue-5.4/wifi-iwlwifi-mvm-fix-iwl_mvm_max_scan_ie_fw_cmd_room.patch-5572 @@ -0,0 +1,58 @@ +From f256fb8ddfdfbadcda14fcdb445b8886c289fabe Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 25 Aug 2024 19:17:06 +0300 +Subject: wifi: iwlwifi: mvm: fix iwl_mvm_max_scan_ie_fw_cmd_room() + +From: Daniel Gabay + +[ Upstream commit 916a5d9c5354c426220a0a6533a5e8ea1287d6ea ] + +Driver creates also the WFA TPC element, consider that in the +calculation. + +Signed-off-by: Daniel Gabay +Reviewed-by: Ilan Peer +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20240825191257.e710ce446b7f.I2715c6742e9c3d160e2ba41bc4b35de370d2ce34@changeid +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +index 3bce3b59a12b1..55292e9b15c15 100644 +--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c ++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +@@ -93,6 +93,8 @@ + /* adaptive dwell default APs number in social channels (1, 6, 11) */ + #define IWL_SCAN_ADWELL_DEFAULT_N_APS_SOCIAL 10 + ++#define WFA_TPC_IE_LEN 9 ++ + struct iwl_mvm_scan_timing_params { + u32 suspend_time; + u32 max_out_time; +@@ -378,8 +380,8 @@ static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm) + + max_probe_len = SCAN_OFFLOAD_PROBE_REQ_SIZE; + +- /* we create the 802.11 header and SSID element */ +- max_probe_len -= 24 + 2; ++ /* we create the 802.11 header SSID element and WFA TPC element */ ++ max_probe_len -= 24 + 2 + WFA_TPC_IE_LEN; + + /* DS parameter set element is added on 2.4GHZ band if required */ + if (iwl_mvm_rrm_scan_needed(mvm)) +@@ -776,8 +778,6 @@ static u8 *iwl_mvm_copy_and_insert_ds_elem(struct iwl_mvm *mvm, const u8 *ies, + return newpos; + } + +-#define WFA_TPC_IE_LEN 9 +- + static void iwl_mvm_add_tpc_report_ie(u8 *pos) + { + pos[0] = WLAN_EID_VENDOR_SPECIFIC; +-- +2.43.0 + diff --git a/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch b/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch new file mode 100644 index 00000000000..f82dec68b58 --- /dev/null +++ b/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch @@ -0,0 +1,49 @@ +From f2b34572f8d80d0ce9ca6d1d3f00d87a860043b4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Jun 2024 19:55:59 -0700 +Subject: x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides + frequency + +From: Michael Kelley + +[ Upstream commit 8fcc514809de41153b43ccbe1a0cdf7f72b78e7e ] + +A Linux guest on Hyper-V gets the TSC frequency from a synthetic MSR, if +available. In this case, set X86_FEATURE_TSC_KNOWN_FREQ so that Linux +doesn't unnecessarily do refined TSC calibration when setting up the TSC +clocksource. + +With this change, a message such as this is no longer output during boot +when the TSC is used as the clocksource: + +[ 1.115141] tsc: Refined TSC clocksource calibration: 2918.408 MHz + +Furthermore, the guest and host will have exactly the same view of the +TSC frequency, which is important for features such as the TSC deadline +timer that are emulated by the Hyper-V host. + +Signed-off-by: Michael Kelley +Reviewed-by: Roman Kisel +Link: https://lore.kernel.org/r/20240606025559.1631-1-mhklinux@outlook.com +Signed-off-by: Wei Liu +Message-ID: <20240606025559.1631-1-mhklinux@outlook.com> +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/mshyperv.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c +index 51d95c4b692c3..cebbcc6c36ae5 100644 +--- a/arch/x86/kernel/cpu/mshyperv.c ++++ b/arch/x86/kernel/cpu/mshyperv.c +@@ -256,6 +256,7 @@ static void __init ms_hyperv_init_platform(void) + ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) { + x86_platform.calibrate_tsc = hv_get_tsc_khz; + x86_platform.calibrate_cpu = hv_get_tsc_khz; ++ setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); + } + + if (ms_hyperv.hints & HV_X64_ENLIGHTENED_VMCS_RECOMMENDED) { +-- +2.43.0 + diff --git a/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch-2903 b/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch-2903 new file mode 100644 index 00000000000..f82dec68b58 --- /dev/null +++ b/queue-5.4/x86-hyperv-set-x86_feature_tsc_known_freq-when-hyper.patch-2903 @@ -0,0 +1,49 @@ +From f2b34572f8d80d0ce9ca6d1d3f00d87a860043b4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 5 Jun 2024 19:55:59 -0700 +Subject: x86/hyperv: Set X86_FEATURE_TSC_KNOWN_FREQ when Hyper-V provides + frequency + +From: Michael Kelley + +[ Upstream commit 8fcc514809de41153b43ccbe1a0cdf7f72b78e7e ] + +A Linux guest on Hyper-V gets the TSC frequency from a synthetic MSR, if +available. In this case, set X86_FEATURE_TSC_KNOWN_FREQ so that Linux +doesn't unnecessarily do refined TSC calibration when setting up the TSC +clocksource. + +With this change, a message such as this is no longer output during boot +when the TSC is used as the clocksource: + +[ 1.115141] tsc: Refined TSC clocksource calibration: 2918.408 MHz + +Furthermore, the guest and host will have exactly the same view of the +TSC frequency, which is important for features such as the TSC deadline +timer that are emulated by the Hyper-V host. + +Signed-off-by: Michael Kelley +Reviewed-by: Roman Kisel +Link: https://lore.kernel.org/r/20240606025559.1631-1-mhklinux@outlook.com +Signed-off-by: Wei Liu +Message-ID: <20240606025559.1631-1-mhklinux@outlook.com> +Signed-off-by: Sasha Levin +--- + arch/x86/kernel/cpu/mshyperv.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c +index 51d95c4b692c3..cebbcc6c36ae5 100644 +--- a/arch/x86/kernel/cpu/mshyperv.c ++++ b/arch/x86/kernel/cpu/mshyperv.c +@@ -256,6 +256,7 @@ static void __init ms_hyperv_init_platform(void) + ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) { + x86_platform.calibrate_tsc = hv_get_tsc_khz; + x86_platform.calibrate_cpu = hv_get_tsc_khz; ++ setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); + } + + if (ms_hyperv.hints & HV_X64_ENLIGHTENED_VMCS_RECOMMENDED) { +-- +2.43.0 +