From d3f51a821f8e0626e4c08cc996e7e077631951fa Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 23 Nov 2024 05:44:08 -0500 Subject: [PATCH] Fixes for 5.4 Signed-off-by: Sasha Levin --- ...-add-subwoofer-quirk-for-infinix-zer.patch | 67 ++++++++++++++++ ..._rt5640-add-dmi-quirk-for-vexia-edu-.patch | 53 +++++++++++++ ...-potential-division-by-zero-in-stm32.patch | 40 ++++++++++ ...ntial-division-by-zero-in-stm32.patch-8785 | 39 ++++++++++ ...-to-mfc_cache_list-without-lock-held.patch | 76 +++++++++++++++++++ ...ix-user-power-when-emulating-chanctx.patch | 37 +++++++++ .../net-usb-qmi_wwan-add-quectel-rg650v.patch | 65 ++++++++++++++++ ...place-seq_printf-with-seq_put_decima.patch | 39 ++++++++++ ...808-add-apply_bit-for-buck3-on-rk809.patch | 43 +++++++++++ ...og-test-fix-system-accidentally-rese.patch | 58 ++++++++++++++ queue-5.4/series | 12 +++ ...-check-devm_kasprintf-returned-value.patch | 45 +++++++++++ ...ompile-testing-without-config_amd_nb.patch | 53 +++++++++++++ 13 files changed, 627 insertions(+) create mode 100644 queue-5.4/alsa-hda-realtek-add-subwoofer-quirk-for-infinix-zer.patch create mode 100644 queue-5.4/asoc-intel-bytcr_rt5640-add-dmi-quirk-for-vexia-edu-.patch create mode 100644 queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch create mode 100644 queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch-8785 create mode 100644 queue-5.4/ipmr-fix-access-to-mfc_cache_list-without-lock-held.patch create mode 100644 queue-5.4/mac80211-fix-user-power-when-emulating-chanctx.patch create mode 100644 queue-5.4/net-usb-qmi_wwan-add-quectel-rg650v.patch create mode 100644 queue-5.4/proc-softirqs-replace-seq_printf-with-seq_put_decima.patch create mode 100644 queue-5.4/regulator-rk808-add-apply_bit-for-buck3-on-rk809.patch create mode 100644 queue-5.4/selftests-watchdog-test-fix-system-accidentally-rese.patch create mode 100644 queue-5.4/soc-qcom-add-check-devm_kasprintf-returned-value.patch create mode 100644 queue-5.4/x86-amd_nb-fix-compile-testing-without-config_amd_nb.patch diff --git a/queue-5.4/alsa-hda-realtek-add-subwoofer-quirk-for-infinix-zer.patch b/queue-5.4/alsa-hda-realtek-add-subwoofer-quirk-for-infinix-zer.patch new file mode 100644 index 00000000000..edc5436d225 --- /dev/null +++ b/queue-5.4/alsa-hda-realtek-add-subwoofer-quirk-for-infinix-zer.patch @@ -0,0 +1,67 @@ +From c36d58512f9faf6e34083a20e063e622f2a01b6c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Oct 2024 15:55:16 +0000 +Subject: ALSA: hda/realtek: Add subwoofer quirk for Infinix ZERO BOOK 13 + +From: Piyush Raj Chouhan + +[ Upstream commit ef5fbdf732a158ec27eeba69d8be851351f29f73 ] + +Infinix ZERO BOOK 13 has a 2+2 speaker system which isn't probed correctly. +This patch adds a quirk with the proper pin connections. +Also The mic in this laptop suffers too high gain resulting in mostly +fan noise being recorded, +This patch Also limit mic boost. + +HW Probe for device; https://linux-hardware.org/?probe=a2e892c47b + +Test: All 4 speaker works, Mic has low noise. + +Signed-off-by: Piyush Raj Chouhan +Link: https://patch.msgid.link/20241028155516.15552-1-piyuschouhan1598@gmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/patch_realtek.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c +index 3ddbb6b953c1f..8122370106492 100644 +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -6428,6 +6428,7 @@ enum { + ALC290_FIXUP_SUBWOOFER_HSJACK, + ALC269_FIXUP_THINKPAD_ACPI, + ALC269_FIXUP_DMIC_THINKPAD_ACPI, ++ ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13, + ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO, + ALC255_FIXUP_ACER_MIC_NO_PRESENCE, + ALC255_FIXUP_ASUS_MIC_NO_PRESENCE, +@@ -6677,6 +6678,16 @@ static const struct hda_fixup alc269_fixups[] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc269_fixup_pincfg_U7x7_headset_mic, + }, ++ [ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13] = { ++ .type = HDA_FIXUP_PINS, ++ .v.pins = (const struct hda_pintbl[]) { ++ { 0x14, 0x90170151 }, /* use as internal speaker (LFE) */ ++ { 0x1b, 0x90170152 }, /* use as internal speaker (back) */ ++ { } ++ }, ++ .chained = true, ++ .chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST ++ }, + [ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { +@@ -8533,6 +8544,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { + SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC), + SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC), + SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), ++ SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13), + SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO), + SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME), + SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC), +-- +2.43.0 + diff --git a/queue-5.4/asoc-intel-bytcr_rt5640-add-dmi-quirk-for-vexia-edu-.patch b/queue-5.4/asoc-intel-bytcr_rt5640-add-dmi-quirk-for-vexia-edu-.patch new file mode 100644 index 00000000000..0cd101327e6 --- /dev/null +++ b/queue-5.4/asoc-intel-bytcr_rt5640-add-dmi-quirk-for-vexia-edu-.patch @@ -0,0 +1,53 @@ +From 12c28974829ef61f29e3761e4ca73af347968237 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2024 23:16:15 +0200 +Subject: ASoC: Intel: bytcr_rt5640: Add DMI quirk for Vexia Edu Atla 10 tablet + +From: Hans de Goede + +[ Upstream commit 0107f28f135231da22a9ad5756bb16bd5cada4d5 ] + +The Vexia Edu Atla 10 tablet mostly uses the BYTCR tablet defaults, +but as happens on more models it is using IN1 instead of IN3 for +its internal mic and JD_SRC_JD2_IN4N instead of JD_SRC_JD1_IN4P +for jack-detection. + +Add a DMI quirk for this to fix the internal-mic and jack-detection. + +Signed-off-by: Hans de Goede +Link: https://patch.msgid.link/20241024211615.79518-2-hdegoede@redhat.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/intel/boards/bytcr_rt5640.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c +index 057ecfe2c8b5c..53a15be38b56f 100644 +--- a/sound/soc/intel/boards/bytcr_rt5640.c ++++ b/sound/soc/intel/boards/bytcr_rt5640.c +@@ -909,6 +909,21 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { + BYT_RT5640_SSP0_AIF2 | + BYT_RT5640_MCLK_EN), + }, ++ { /* Vexia Edu Atla 10 tablet */ ++ .matches = { ++ DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), ++ DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"), ++ /* Above strings are too generic, also match on BIOS date */ ++ DMI_MATCH(DMI_BIOS_DATE, "08/25/2014"), ++ }, ++ .driver_data = (void *)(BYT_RT5640_IN1_MAP | ++ BYT_RT5640_JD_SRC_JD2_IN4N | ++ BYT_RT5640_OVCD_TH_2000UA | ++ BYT_RT5640_OVCD_SF_0P75 | ++ BYT_RT5640_DIFF_MIC | ++ BYT_RT5640_SSP0_AIF2 | ++ BYT_RT5640_MCLK_EN), ++ }, + { /* Voyo Winpad A15 */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), +-- +2.43.0 + diff --git a/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch b/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch new file mode 100644 index 00000000000..21927ac12d8 --- /dev/null +++ b/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch @@ -0,0 +1,40 @@ +From 74162b643283ec5a22d84018dd1de9fab0808951 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Nov 2024 09:46:54 +0800 +Subject: ASoC: stm: Prevent potential division by zero in + stm32_sai_mclk_round_rate() + +From: Luo Yifan + +[ Upstream commit 63c1c87993e0e5bb11bced3d8224446a2bc62338 ] + +This patch checks if div is less than or equal to zero (div <= 0). If +div is zero or negative, the function returns -EINVAL, ensuring the +division operation (*prate / div) is safe to perform. + +Signed-off-by: Luo Yifan +Link: https://patch.msgid.link/20241106014654.206860-1-luoyifan@cmss.chinamobile.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/stm/stm32_sai_sub.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c +index 7e965848796c3..b7dc9d3192597 100644 +--- a/sound/soc/stm/stm32_sai_sub.c ++++ b/sound/soc/stm/stm32_sai_sub.c +@@ -379,8 +379,8 @@ static long stm32_sai_mclk_round_rate(struct clk_hw *hw, unsigned long rate, + int div; + + div = stm32_sai_get_clk_div(sai, *prate, rate); +- if (div < 0) +- return div; ++ if (div <= 0) ++ return -EINVAL; + + mclk->freq = *prate / div; + +-- +2.43.0 + diff --git a/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch-8785 b/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch-8785 new file mode 100644 index 00000000000..17a586b314f --- /dev/null +++ b/queue-5.4/asoc-stm-prevent-potential-division-by-zero-in-stm32.patch-8785 @@ -0,0 +1,39 @@ +From ea9a8c1754326ed14e301d039a6242a603f3cb0c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 7 Nov 2024 09:59:36 +0800 +Subject: ASoC: stm: Prevent potential division by zero in + stm32_sai_get_clk_div() + +From: Luo Yifan + +[ Upstream commit 23569c8b314925bdb70dd1a7b63cfe6100868315 ] + +This patch checks if div is less than or equal to zero (div <= 0). If +div is zero or negative, the function returns -EINVAL, ensuring the +division operation is safe to perform. + +Signed-off-by: Luo Yifan +Reviewed-by: Olivier Moysan +Link: https://patch.msgid.link/20241107015936.211902-1-luoyifan@cmss.chinamobile.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + sound/soc/stm/stm32_sai_sub.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c +index b7dc9d3192597..e8cd58c0838ee 100644 +--- a/sound/soc/stm/stm32_sai_sub.c ++++ b/sound/soc/stm/stm32_sai_sub.c +@@ -318,7 +318,7 @@ static int stm32_sai_get_clk_div(struct stm32_sai_sub_data *sai, + int div; + + div = DIV_ROUND_CLOSEST(input_rate, output_rate); +- if (div > SAI_XCR1_MCKDIV_MAX(version)) { ++ if (div > SAI_XCR1_MCKDIV_MAX(version) || div <= 0) { + dev_err(&sai->pdev->dev, "Divider %d out of range\n", div); + return -EINVAL; + } +-- +2.43.0 + diff --git a/queue-5.4/ipmr-fix-access-to-mfc_cache_list-without-lock-held.patch b/queue-5.4/ipmr-fix-access-to-mfc_cache_list-without-lock-held.patch new file mode 100644 index 00000000000..aad218a7ea1 --- /dev/null +++ b/queue-5.4/ipmr-fix-access-to-mfc_cache_list-without-lock-held.patch @@ -0,0 +1,76 @@ +From 9038891eb46c722c1ca939ec76976b879fb75204 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 8 Nov 2024 06:08:36 -0800 +Subject: ipmr: Fix access to mfc_cache_list without lock held + +From: Breno Leitao + +[ Upstream commit e28acc9c1ccfcb24c08e020828f69d0a915b06ae ] + +Accessing `mr_table->mfc_cache_list` is protected by an RCU lock. In the +following code flow, the RCU read lock is not held, causing the +following error when `RCU_PROVE` is not held. The same problem might +show up in the IPv6 code path. + + 6.12.0-rc5-kbuilder-01145-gbac17284bdcb #33 Tainted: G E N + ----------------------------- + net/ipv4/ipmr_base.c:313 RCU-list traversed in non-reader section!! + + rcu_scheduler_active = 2, debug_locks = 1 + 2 locks held by RetransmitAggre/3519: + #0: ffff88816188c6c0 (nlk_cb_mutex-ROUTE){+.+.}-{3:3}, at: __netlink_dump_start+0x8a/0x290 + #1: ffffffff83fcf7a8 (rtnl_mutex){+.+.}-{3:3}, at: rtnl_dumpit+0x6b/0x90 + + stack backtrace: + lockdep_rcu_suspicious + mr_table_dump + ipmr_rtm_dumproute + rtnl_dump_all + rtnl_dumpit + netlink_dump + __netlink_dump_start + rtnetlink_rcv_msg + netlink_rcv_skb + netlink_unicast + netlink_sendmsg + +This is not a problem per see, since the RTNL lock is held here, so, it +is safe to iterate in the list without the RCU read lock, as suggested +by Eric. + +To alleviate the concern, modify the code to use +list_for_each_entry_rcu() with the RTNL-held argument. + +The annotation will raise an error only if RTNL or RCU read lock are +missing during iteration, signaling a legitimate problem, otherwise it +will avoid this false positive. + +This will solve the IPv6 case as well, since ip6mr_rtm_dumproute() calls +this function as well. + +Signed-off-by: Breno Leitao +Reviewed-by: David Ahern +Link: https://patch.msgid.link/20241108-ipmr_rcu-v2-1-c718998e209b@debian.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + net/ipv4/ipmr_base.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c +index ea48bd15a575b..4a1a90a135406 100644 +--- a/net/ipv4/ipmr_base.c ++++ b/net/ipv4/ipmr_base.c +@@ -301,7 +301,8 @@ int mr_table_dump(struct mr_table *mrt, struct sk_buff *skb, + if (filter->filter_set) + flags |= NLM_F_DUMP_FILTERED; + +- list_for_each_entry_rcu(mfc, &mrt->mfc_cache_list, list) { ++ list_for_each_entry_rcu(mfc, &mrt->mfc_cache_list, list, ++ lockdep_rtnl_is_held()) { + if (e < s_e) + goto next_entry; + if (filter->dev && +-- +2.43.0 + diff --git a/queue-5.4/mac80211-fix-user-power-when-emulating-chanctx.patch b/queue-5.4/mac80211-fix-user-power-when-emulating-chanctx.patch new file mode 100644 index 00000000000..8a5af1e16d2 --- /dev/null +++ b/queue-5.4/mac80211-fix-user-power-when-emulating-chanctx.patch @@ -0,0 +1,37 @@ +From 75f28d3f560c536a2a0f38bd339df44a376ab436 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 10 Oct 2024 13:39:54 -0700 +Subject: mac80211: fix user-power when emulating chanctx + +From: Ben Greear + +[ Upstream commit 9b15c6cf8d2e82c8427cd06f535d8de93b5b995c ] + +ieee80211_calc_hw_conf_chan was ignoring the configured +user_txpower. If it is set, use it to potentially decrease +txpower as requested. + +Signed-off-by: Ben Greear +Link: https://patch.msgid.link/20241010203954.1219686-1-greearb@candelatech.com +Signed-off-by: Johannes Berg +Signed-off-by: Sasha Levin +--- + net/mac80211/main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/mac80211/main.c b/net/mac80211/main.c +index fa2ac02063cf4..266250e9f0330 100644 +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -139,6 +139,8 @@ static u32 ieee80211_hw_conf_chan(struct ieee80211_local *local) + } + + power = ieee80211_chandef_max_power(&chandef); ++ if (local->user_power_level != IEEE80211_UNSET_POWER_LEVEL) ++ power = min(local->user_power_level, power); + + rcu_read_lock(); + list_for_each_entry_rcu(sdata, &local->interfaces, list) { +-- +2.43.0 + diff --git a/queue-5.4/net-usb-qmi_wwan-add-quectel-rg650v.patch b/queue-5.4/net-usb-qmi_wwan-add-quectel-rg650v.patch new file mode 100644 index 00000000000..c8fff68a311 --- /dev/null +++ b/queue-5.4/net-usb-qmi_wwan-add-quectel-rg650v.patch @@ -0,0 +1,65 @@ +From c3b389dbf2396d359514b7f458e5299902e90fbb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2024 17:11:13 +0200 +Subject: net: usb: qmi_wwan: add Quectel RG650V +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Benoît Monin + +[ Upstream commit 6b3f18a76be6bbd237c7594cf0bf2912b68084fe ] + +Add support for Quectel RG650V which is based on Qualcomm SDX65 chip. +The composition is DIAG / NMEA / AT / AT / QMI. + +T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 +P: Vendor=2c7c ProdID=0122 Rev=05.15 +S: Manufacturer=Quectel +S: Product=RG650V-EU +S: SerialNumber=xxxxxxx +C: #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=83(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=9ms +I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=85(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=9ms +I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +E: Ad=05(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=9ms + +Signed-off-by: Benoît Monin +Reviewed-by: Simon Horman +Link: https://patch.msgid.link/20241024151113.53203-1-benoit.monin@gmx.fr +Signed-off-by: Jakub Kicinski +Signed-off-by: Sasha Levin +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c +index db52090bb27be..af787088f1aea 100644 +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1042,6 +1042,7 @@ static const struct usb_device_id products[] = { + USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), + .driver_info = (unsigned long)&qmi_wwan_info, + }, ++ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0122)}, /* Quectel RG650V */ + {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */ + {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */ + {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */ +-- +2.43.0 + diff --git a/queue-5.4/proc-softirqs-replace-seq_printf-with-seq_put_decima.patch b/queue-5.4/proc-softirqs-replace-seq_printf-with-seq_put_decima.patch new file mode 100644 index 00000000000..2f93bac70bf --- /dev/null +++ b/queue-5.4/proc-softirqs-replace-seq_printf-with-seq_put_decima.patch @@ -0,0 +1,39 @@ +From 7764ff90f28103258e83ab5cfb01dea78bb4a3d1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 6 Nov 2024 10:12:28 +0800 +Subject: proc/softirqs: replace seq_printf with seq_put_decimal_ull_width + +From: David Wang <00107082@163.com> + +[ Upstream commit 84b9749a3a704dcc824a88aa8267247c801d51e4 ] + +seq_printf is costy, on a system with n CPUs, reading /proc/softirqs +would yield 10*n decimal values, and the extra cost parsing format string +grows linearly with number of cpus. Replace seq_printf with +seq_put_decimal_ull_width have significant performance improvement. +On an 8CPUs system, reading /proc/softirqs show ~40% performance +gain with this patch. + +Signed-off-by: David Wang <00107082@163.com> +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + fs/proc/softirqs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/proc/softirqs.c b/fs/proc/softirqs.c +index 12901dcf57e2b..d8f4e7d54d002 100644 +--- a/fs/proc/softirqs.c ++++ b/fs/proc/softirqs.c +@@ -19,7 +19,7 @@ static int show_softirqs(struct seq_file *p, void *v) + for (i = 0; i < NR_SOFTIRQS; i++) { + seq_printf(p, "%12s:", softirq_to_name[i]); + for_each_possible_cpu(j) +- seq_printf(p, " %10u", kstat_softirqs_cpu(i, j)); ++ seq_put_decimal_ull_width(p, " ", kstat_softirqs_cpu(i, j), 10); + seq_putc(p, '\n'); + } + return 0; +-- +2.43.0 + diff --git a/queue-5.4/regulator-rk808-add-apply_bit-for-buck3-on-rk809.patch b/queue-5.4/regulator-rk808-add-apply_bit-for-buck3-on-rk809.patch new file mode 100644 index 00000000000..00a81d30cca --- /dev/null +++ b/queue-5.4/regulator-rk808-add-apply_bit-for-buck3-on-rk809.patch @@ -0,0 +1,43 @@ +From 4044cb3094ee72ffef774bde198a89ba1fb071fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 17 Oct 2024 21:37:28 +0300 +Subject: regulator: rk808: Add apply_bit for BUCK3 on RK809 + +From: Mikhail Rudenko + +[ Upstream commit 5e53e4a66bc7430dd2d11c18a86410e3a38d2940 ] + +Currently, RK809's BUCK3 regulator is modelled in the driver as a +configurable regulator with 0.5-2.4V voltage range. But the voltage +setting is not actually applied, because when bit 6 of +PMIC_POWER_CONFIG register is set to 0 (default), BUCK3 output voltage +is determined by the external feedback resistor. Fix this, by setting +bit 6 when voltage selection is set. Existing users which do not +specify voltage constraints in their device trees will not be affected +by this change, since no voltage setting is applied in those cases, +and bit 6 is not enabled. + +Signed-off-by: Mikhail Rudenko +Link: https://patch.msgid.link/20241017-rk809-dcdc3-v1-1-e3c3de92f39c@gmail.com +Signed-off-by: Mark Brown +Signed-off-by: Sasha Levin +--- + drivers/regulator/rk808-regulator.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c +index 97c846c19c2f6..da34af37f191f 100644 +--- a/drivers/regulator/rk808-regulator.c ++++ b/drivers/regulator/rk808-regulator.c +@@ -959,6 +959,8 @@ static const struct regulator_desc rk809_reg[] = { + .n_linear_ranges = ARRAY_SIZE(rk817_buck1_voltage_ranges), + .vsel_reg = RK817_BUCK3_ON_VSEL_REG, + .vsel_mask = RK817_BUCK_VSEL_MASK, ++ .apply_reg = RK817_POWER_CONFIG, ++ .apply_bit = RK817_BUCK3_FB_RES_INTER, + .enable_reg = RK817_POWER_EN_REG(0), + .enable_mask = ENABLE_MASK(RK817_ID_DCDC3), + .enable_val = ENABLE_MASK(RK817_ID_DCDC3), +-- +2.43.0 + diff --git a/queue-5.4/selftests-watchdog-test-fix-system-accidentally-rese.patch b/queue-5.4/selftests-watchdog-test-fix-system-accidentally-rese.patch new file mode 100644 index 00000000000..d5b6ad7df8b --- /dev/null +++ b/queue-5.4/selftests-watchdog-test-fix-system-accidentally-rese.patch @@ -0,0 +1,58 @@ +From 0d3cbf637074803943047ac97f0d986526fead1a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Oct 2024 11:13:24 +0800 +Subject: selftests/watchdog-test: Fix system accidentally reset after + watchdog-test + +From: Li Zhijian + +[ Upstream commit dc1308bee1ed03b4d698d77c8bd670d399dcd04d ] + +When running watchdog-test with 'make run_tests', the watchdog-test will +be terminated by a timeout signal(SIGTERM) due to the test timemout. + +And then, a system reboot would happen due to watchdog not stop. see +the dmesg as below: +``` +[ 1367.185172] watchdog: watchdog0: watchdog did not stop! +``` + +Fix it by registering more signals(including SIGTERM) in watchdog-test, +where its signal handler will stop the watchdog. + +After that + # timeout 1 ./watchdog-test + Watchdog Ticking Away! + . + Stopping watchdog ticks... + +Link: https://lore.kernel.org/all/20241029031324.482800-1-lizhijian@fujitsu.com/ +Signed-off-by: Li Zhijian +Reviewed-by: Shuah Khan +Signed-off-by: Shuah Khan +Signed-off-by: Sasha Levin +--- + tools/testing/selftests/watchdog/watchdog-test.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c +index f45e510500c0d..09773695d219f 100644 +--- a/tools/testing/selftests/watchdog/watchdog-test.c ++++ b/tools/testing/selftests/watchdog/watchdog-test.c +@@ -242,7 +242,13 @@ int main(int argc, char *argv[]) + + printf("Watchdog Ticking Away!\n"); + ++ /* ++ * Register the signals ++ */ + signal(SIGINT, term); ++ signal(SIGTERM, term); ++ signal(SIGKILL, term); ++ signal(SIGQUIT, term); + + while (1) { + keep_alive(); +-- +2.43.0 + diff --git a/queue-5.4/series b/queue-5.4/series index 21768a3d761..edd9fc33209 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -10,3 +10,15 @@ revert-mmc-dw_mmc-fix-idmac-operation-with-pages-bigger-than-4k.patch media-dvbdev-fix-the-logic-when-dvb_dynamic_minors-is-not-set.patch kbuild-use-uname-for-linux_compile_host-detection.patch mm-revert-mm-shmem-fix-data-race-in-shmem_getattr.patch +asoc-intel-bytcr_rt5640-add-dmi-quirk-for-vexia-edu-.patch +mac80211-fix-user-power-when-emulating-chanctx.patch +selftests-watchdog-test-fix-system-accidentally-rese.patch +alsa-hda-realtek-add-subwoofer-quirk-for-infinix-zer.patch +x86-amd_nb-fix-compile-testing-without-config_amd_nb.patch +net-usb-qmi_wwan-add-quectel-rg650v.patch +soc-qcom-add-check-devm_kasprintf-returned-value.patch +regulator-rk808-add-apply_bit-for-buck3-on-rk809.patch +asoc-stm-prevent-potential-division-by-zero-in-stm32.patch +asoc-stm-prevent-potential-division-by-zero-in-stm32.patch-8785 +proc-softirqs-replace-seq_printf-with-seq_put_decima.patch +ipmr-fix-access-to-mfc_cache_list-without-lock-held.patch diff --git a/queue-5.4/soc-qcom-add-check-devm_kasprintf-returned-value.patch b/queue-5.4/soc-qcom-add-check-devm_kasprintf-returned-value.patch new file mode 100644 index 00000000000..4821c625575 --- /dev/null +++ b/queue-5.4/soc-qcom-add-check-devm_kasprintf-returned-value.patch @@ -0,0 +1,45 @@ +From 1d9ee6fed42bb9ba1f2f70a0c62c0722c933fdf2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 29 Sep 2024 15:23:49 +0800 +Subject: soc: qcom: Add check devm_kasprintf() returned value + +From: Charles Han + +[ Upstream commit e694d2b5c58ba2d1e995d068707c8d966e7f5f2a ] + +devm_kasprintf() can return a NULL pointer on failure but this +returned value in qcom_socinfo_probe() is not checked. + +Signed-off-by: Charles Han +Link: https://lore.kernel.org/r/20240929072349.202520-1-hanchunchao@inspur.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Sasha Levin +--- + drivers/soc/qcom/socinfo.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c +index 3303bcaf67154..8a9f781ba83f7 100644 +--- a/drivers/soc/qcom/socinfo.c ++++ b/drivers/soc/qcom/socinfo.c +@@ -433,10 +433,16 @@ static int qcom_socinfo_probe(struct platform_device *pdev) + qs->attr.revision = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%u.%u", + SOCINFO_MAJOR(le32_to_cpu(info->ver)), + SOCINFO_MINOR(le32_to_cpu(info->ver))); +- if (offsetof(struct socinfo, serial_num) <= item_size) ++ if (!qs->attr.soc_id || qs->attr.revision) ++ return -ENOMEM; ++ ++ if (offsetof(struct socinfo, serial_num) <= item_size) { + qs->attr.serial_number = devm_kasprintf(&pdev->dev, GFP_KERNEL, + "%u", + le32_to_cpu(info->serial_num)); ++ if (!qs->attr.serial_number) ++ return -ENOMEM; ++ } + + qs->soc_dev = soc_device_register(&qs->attr); + if (IS_ERR(qs->soc_dev)) +-- +2.43.0 + diff --git a/queue-5.4/x86-amd_nb-fix-compile-testing-without-config_amd_nb.patch b/queue-5.4/x86-amd_nb-fix-compile-testing-without-config_amd_nb.patch new file mode 100644 index 00000000000..7e40bb0ee51 --- /dev/null +++ b/queue-5.4/x86-amd_nb-fix-compile-testing-without-config_amd_nb.patch @@ -0,0 +1,53 @@ +From 15b84193c9f59bac87faa54f12feca476b8456fc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Oct 2024 09:23:20 +0000 +Subject: x86/amd_nb: Fix compile-testing without CONFIG_AMD_NB +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Arnd Bergmann + +[ Upstream commit fce9642c765a18abd1db0339a7d832c29b68456a ] + +node_to_amd_nb() is defined to NULL in non-AMD configs: + + drivers/platform/x86/amd/hsmp/plat.c: In function 'init_platform_device': + drivers/platform/x86/amd/hsmp/plat.c:165:68: error: dereferencing 'void *' pointer [-Werror] + 165 | sock->root = node_to_amd_nb(i)->root; + | ^~ + drivers/platform/x86/amd/hsmp/plat.c:165:68: error: request for member 'root' in something not a structure or union + +Users of the interface who also allow COMPILE_TEST will cause the above build +error so provide an inline stub to fix that. + + [ bp: Massage commit message. ] + +Signed-off-by: Arnd Bergmann +Signed-off-by: Borislav Petkov (AMD) +Reviewed-by: Ilpo Järvinen +Link: https://lore.kernel.org/r/20241029092329.3857004-1-arnd@kernel.org +Signed-off-by: Sasha Levin +--- + arch/x86/include/asm/amd_nb.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h +index 1ae4e5791afaf..a4f98a2fb5353 100644 +--- a/arch/x86/include/asm/amd_nb.h ++++ b/arch/x86/include/asm/amd_nb.h +@@ -118,7 +118,10 @@ static inline bool amd_gart_present(void) + + #define amd_nb_num(x) 0 + #define amd_nb_has_feature(x) false +-#define node_to_amd_nb(x) NULL ++static inline struct amd_northbridge *node_to_amd_nb(int node) ++{ ++ return NULL; ++} + #define amd_gart_present(x) false + + #endif +-- +2.43.0 + -- 2.47.3