6.16.2-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 288/570 net: ieee8021q: fix insufficient table-size assertion
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: RubenKelevra <[email protected]>
[ Upstream commit 21deb2d966920f0d4dd098ca6c3a55efbc0b2f23 ]
_Static_assert(ARRAY_SIZE(map) != IEEE8021Q_TT_MAX - 1) rejects only a length of 7 and allows any other mismatch. Replace it with a strict equality test via a helper macro so that every mapping table must have exactly IEEE8021Q_TT_MAX (8) entries.
--- net/core/ieee8021q_helpers.c | 44 +++++++++++------------------------- 1 file changed, 13 insertions(+), 31 deletions(-)
net/core/ieee8021q_helpers.c +13 -31
@@ -7,6 +7,11 @@#include <net/dscp.h> #include <net/ieee8021q.h> +/* verify that table covers all 8 traffic types */ +#define TT_MAP_SIZE_OK (tbl) \ + compiletime_assert(ARRAY_SIZE(tbl) == IEEE8021Q_TT_MAX, \ + #tbl " size mismatch") +/* The following arrays map Traffic Types (TT) to traffic classes (TC) for * different number of queues as shown in the example provided by * IEEE 802.1Q-2022 in Annex I "I.3 Traffic type to traffic class mapping" and
@@ -101,51 +106,28 @@ int ieee8021q_tt_to_tc(enum ieee8021q_traffic_type tt, unsigned int num_queues)switch (num_queues) {case 8 : -compiletime_assert (ARRAY_SIZE (ieee8021q_8queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_8queue_tt_tc_map != max - 1" ); +TT_MAP_SIZE_OK (ieee8021q_8queue_tt_tc_map);return ieee8021q_8queue_tt_tc_map[tt];case 7 : -compiletime_assert (ARRAY_SIZE (ieee8021q_7queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_7queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_7queue_tt_tc_map);return ieee8021q_7queue_tt_tc_map[tt];case 6 : -compiletime_assert (ARRAY_SIZE (ieee8021q_6queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_6queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_6queue_tt_tc_map);return ieee8021q_6queue_tt_tc_map[tt];case 5 : -compiletime_assert (ARRAY_SIZE (ieee8021q_5queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_5queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_5queue_tt_tc_map);return ieee8021q_5queue_tt_tc_map[tt];case 4 : -compiletime_assert (ARRAY_SIZE (ieee8021q_4queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_4queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_4queue_tt_tc_map);return ieee8021q_4queue_tt_tc_map[tt];case 3 : -compiletime_assert (ARRAY_SIZE (ieee8021q_3queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_3queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_3queue_tt_tc_map);return ieee8021q_3queue_tt_tc_map[tt];case 2 : -compiletime_assert (ARRAY_SIZE (ieee8021q_2queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_2queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_2queue_tt_tc_map);return ieee8021q_2queue_tt_tc_map[tt];case 1 : -compiletime_assert (ARRAY_SIZE (ieee8021q_1queue_tt_tc_map) != -IEEE8021Q_TT_MAX -1 , -"ieee8021q_1queue_tt_tc_map != max - 1" ); - +TT_MAP_SIZE_OK (ieee8021q_1queue_tt_tc_map);return ieee8021q_1queue_tt_tc_map[tt]; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 289/570 net: enetc: separate 64-bit counters from enetc_port_counters
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wei Fang <[email protected]>
[ Upstream commit 9fe5f7145ad746e1b8e7522b8a955f642ff1b404 ]
Some counters in enetc_port_counters are 32-bit registers, and some are 64-bit registers. But in the current driver, they are all read through enetc_port_rd(), which can only read a 32-bit value. Therefore, separate 64-bit counters (enetc_pm_counters) from enetc_port_counters and use enetc_port_rd64() to read the 64-bit statistics.
--- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 15 ++++++++++++++- drivers/net/ethernet/freescale/enetc/enetc_hw.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +14 -1
@@ -142,7 +142,7 @@ static const struct {static const struct {int reg; char name[ETH_GSTRING_LEN] __nonstring; -} enetc_port_counters[] = { +} enetc_pm_counters[] = { {ENETC_PM_REOCT (0 ),"MAC rx ethernet octets" }, {ENETC_PM_RALN (0 ),"MAC rx alignment errors" }, {ENETC_PM_RXPF (0 ),"MAC rx valid pause frames" },
@@ -194,6 +194,12 @@ static const struct { { ENETC_PM_TSCOL(0), "MAC tx single collisions" }, { ENETC_PM_TLCOL(0), "MAC tx late collisions" }, { ENETC_PM_TECOL(0), "MAC tx excessive collisions" }, +}; + +static const struct { +int reg; + char name[ETH_GSTRING_LEN] __nonstring; +} enetc_port_counters[] = { {ENETC_UFDMF ,"SI MAC nomatch u-cast discards" }, {ENETC_MFDMF ,"SI MAC nomatch m-cast discards" }, { ENETC_PBFDSIR, "SI MAC nomatch b-cast discards" },
@@ -240,6 +246,7 @@ static int enetc_get_sset_count(struct net_device *ndev, int sset)return len; len +=ARRAY_SIZE (enetc_port_counters); + len +=ARRAY_SIZE (enetc_pm_counters);return len; }
@@ -266,6 +273,9 @@ static void enetc_get_strings(struct net_device *ndev, u32 stringset, u8 *data)for (i =0 ; i <ARRAY_SIZE (enetc_port_counters); i++)ethtool_cpy (&data, enetc_port_counters[i].name); +for (i =0 ; i <ARRAY_SIZE (enetc_pm_counters); i++) +ethtool_cpy (&data, enetc_pm_counters[i].name); +break ; } }
@@ -302,6 +312,9 @@ static void enetc_get_ethtool_stats(struct net_device *ndev,for (i =0 ; i <ARRAY_SIZE (enetc_port_counters); i++) data[o++] =enetc_port_rd (hw, enetc_port_counters[i].reg); + +for (i =0 ; i <ARRAY_SIZE (enetc_pm_counters); i++) + data[o++] =enetc_port_rd64 (hw, enetc_pm_counters[i].reg); } static void enetc_pause_stats(struct enetc_hw *hw, int mac,
drivers/net/ethernet/freescale/enetc/enetc_hw.h +1 -0
@@ -533,6 +533,7 @@ static inline u64 _enetc_rd_reg64_wa(void __iomem *reg)/* port register accessors - PF only */ #define enetc_port_rd (hw, off) enetc_rd_reg((hw)->port + (off))#define enetc_port_wr (hw, off, val) enetc_wr_reg((hw)->port + (off), val) +#define enetc_port_rd64 (hw, off) _enetc_rd_reg64_wa((hw)->port + (off))#define enetc_port_rd_mdio (hw, off) _enetc_rd_mdio_reg_wa((hw)->port + (off))#define enetc_port_wr_mdio (hw, off, val) _enetc_wr_mdio_reg_wa(\ (hw)->port + (off), val)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 290/570 net: fec: allow disable coalescing
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonas Rebmann <[email protected]>
[ Upstream commit b7ad21258f9e9a7f58b19595d5ceed2cde3bed68 ]
In the current implementation, IP coalescing is always enabled and cannot be disabled.
As setting maximum frames to 0 or 1, or setting delay to zero implies immediate delivery of single packets/IRQs, disable coalescing in hardware in these cases.
This also guarantees that coalescing is never enabled with ICFT or ICTT set to zero, a configuration that could lead to unpredictable behaviour according to i.MX8MP reference manual.
--- drivers/net/ethernet/freescale/fec_main.c | 34 +++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +16 -18
@@ -3124,27 +3124,25 @@ static int fec_enet_us_to_itr_clock(struct net_device *ndev, int us)static void fec_enet_itr_coal_set (struct net_device *ndev) {struct fec_enet_private *fep =netdev_priv (ndev); -int rx_itr, tx_itr; +u32 rx_itr =0 , tx_itr =0 ; +int rx_ictt, tx_ictt; -/* Must be greater than zero to avoid unpredictable behavior */ -if (!fep->rx_time_itr || !fep->rx_pkts_itr || - !fep->tx_time_itr || !fep->tx_pkts_itr) -return ; - -/* Select enet system clock as Interrupt Coalescing -* timer Clock Source -*/ - rx_itr =FEC_ITR_CLK_SEL ; - tx_itr =FEC_ITR_CLK_SEL ; + rx_ictt =fec_enet_us_to_itr_clock (ndev, fep->rx_time_itr); + tx_ictt =fec_enet_us_to_itr_clock (ndev, fep->tx_time_itr); -/* set ICFT and ICTT */ - rx_itr |=FEC_ITR_ICFT (fep->rx_pkts_itr); - rx_itr |=FEC_ITR_ICTT (fec_enet_us_to_itr_clock (ndev, fep->rx_time_itr)); - tx_itr |=FEC_ITR_ICFT (fep->tx_pkts_itr); - tx_itr |=FEC_ITR_ICTT (fec_enet_us_to_itr_clock (ndev, fep->tx_time_itr)); +if (rx_ictt >0 && fep->rx_pkts_itr >1 ) { +/* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ + rx_itr =FEC_ITR_EN |FEC_ITR_CLK_SEL ; + rx_itr |=FEC_ITR_ICFT (fep->rx_pkts_itr); + rx_itr |=FEC_ITR_ICTT (rx_ictt); + } - rx_itr |=FEC_ITR_EN ; - tx_itr |=FEC_ITR_EN ; +if (tx_ictt >0 && fep->tx_pkts_itr >1 ) { +/* Enable with enet system clock as Interrupt Coalescing timer Clock Source */ + tx_itr =FEC_ITR_EN |FEC_ITR_CLK_SEL ; + tx_itr |=FEC_ITR_ICFT (fep->tx_pkts_itr); + tx_itr |=FEC_ITR_ICTT (tx_ictt); + }writel (tx_itr, fep->hwp +FEC_TXIC0 );writel (rx_itr, fep->hwp +FEC_RXIC0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 291/570 drm/amdgpu: Use correct severity for BP threshold exceed event
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xiang Liu <[email protected]>
[ Upstream commit 4a33ca3f6ee9a013a423a867426704e9c9d785bd ]
The severity of CPER for BP threshold exceed event should be set as CPER_SEV_FATAL to match the OOB implementation.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c +4 -2
@@ -212,7 +212,7 @@ int amdgpu_cper_entry_fill_bad_page_threshold_section(struct amdgpu_device *adev NONSTD_SEC_OFFSET(hdr->sec_cnt, idx));amdgpu_cper_entry_fill_section_desc (adev, section_desc, true, false, -CPER_SEV_NUM ,RUNTIME ,NONSTD_SEC_LEN , +CPER_SEV_FATAL ,RUNTIME ,NONSTD_SEC_LEN ,NONSTD_SEC_OFFSET (hdr->sec_cnt, idx)); section->hdr.valid_bits.err_info_cnt =1 ;
@@ -326,7 +326,9 @@ int amdgpu_cper_generate_bp_threshold_record(struct amdgpu_device *adev)return -ENOMEM ; } -amdgpu_cper_entry_fill_hdr (adev, bp_threshold,AMDGPU_CPER_TYPE_BP_THRESHOLD ,CPER_SEV_NUM ); +amdgpu_cper_entry_fill_hdr (adev, bp_threshold, +AMDGPU_CPER_TYPE_BP_THRESHOLD , +CPER_SEV_FATAL ); ret =amdgpu_cper_entry_fill_bad_page_threshold_section (adev, bp_threshold,0 );if (ret)return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 292/570 drm/amd/display: Separate set_gsl from set_gsl_source_select
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ilya Bakoulin <[email protected]>
[ Upstream commit 660a467a5e7366cd6642de61f1aaeaf0d253ee68 ]
[Why/How]
Separate the checks for set_gsl and set_gsl_source_select, since source_select may not be implemented/necessary.
--- drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +4 -5
@@ -283,14 +283,13 @@ void dcn20_setup_gsl_group_as_lock( }/* at this point we want to program whether it's to enable or disable */ -if (pipe_ctx->stream_res.tg->funcs->set_gsl !=NULL && - pipe_ctx->stream_res.tg->funcs->set_gsl_source_select !=NULL ) { +if (pipe_ctx->stream_res.tg->funcs->set_gsl !=NULL ) { pipe_ctx->stream_res.tg->funcs->set_gsl ( pipe_ctx->stream_res.tg, &gsl); - - pipe_ctx->stream_res.tg->funcs->set_gsl_source_select ( - pipe_ctx->stream_res.tg, group_idx, enable ?4 :0 ); +if (pipe_ctx->stream_res.tg->funcs->set_gsl_source_select !=NULL ) + pipe_ctx->stream_res.tg->funcs->set_gsl_source_select ( + pipe_ctx->stream_res.tg, group_idx, enable ?4 :0 ); }else BREAK_TO_DEBUGGER (); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 293/570 drm/amd/display: add null check
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peichen Huang <[email protected]>
[ Upstream commit 158b9201c17fc93ed4253c2f03b77fd2671669a1 ]
[WHY]
Prevents null pointer dereferences to enhance function robustness
[HOW]
Adds early null check and return false if invalid.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -2
@@ -6394,11 +6394,13 @@ unsigned int dc_get_det_buffer_size_from_state(const struct dc_state *context)*/ bool dc_get_host_router_index (const struct dc_link *link,unsigned int *host_router_index) { -struct dc *dc = link->ctx->dc; +struct dc *dc; -if (link->ep_type !=DISPLAY_ENDPOINT_USB4_DPIA ) +if (!link || !host_router_index || link->ep_type !=DISPLAY_ENDPOINT_USB4_DPIA )return false; + dc = link->ctx->dc; +if (link->link_index < dc->lowest_dpia_link_index)return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 294/570 wifi: ath10k: shutdown driver when hardware is unreliable
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kang Yang <[email protected]>
[ Upstream commit c256a94d1b1b15109740306f7f2a7c2173e12072 ]
In rare cases, ath10k may lose connection with the PCIe bus due to some unknown reasons, which could further lead to system crashes during resuming due to watchdog timeout:
ath10k_pci 0000:01:00.0: wmi command 20486 timeout, restarting hardware ath10k_pci 0000:01:00.0: already restartingath10k_pci 0000:01:00.0: failed to stop WMI vdev 0: -11 ath10k_pci 0000:01:00.0: failed to stop vdev 0: -11 ieee80211 phy0: PM: **** DPM device timeout ****
Call Trace: panic+0x125/0x315 dpm_watchdog_set+0x54/0x54 dpm_watchdog_handler+0x57/0x57 call_timer_fn+0x31/0x13c
At this point, all WMI commands will timeout and attempt to restart device. So set a threshold for consecutive restart failures. If the threshold is exceeded, consider the hardware is unreliable and all ath10k operations should be skipped to avoid system crash.
fail_cont_count and pending_recovery are atomic variables, and do not involve complex conditional logic. Therefore, even if recovery check and reconfig complete are executed concurrently, the recovery mechanism will not be broken.
Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1
--- drivers/net/wireless/ath/ath10k/core.c | 48 +++++++++++++++++++++++--- drivers/net/wireless/ath/ath10k/core.h | 11 ++++-- drivers/net/wireless/ath/ath10k/mac.c | 7 +++- drivers/net/wireless/ath/ath10k/wmi.c | 6 ++++ 4 files changed, 63 insertions(+), 9 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +43 -5
@@ -2491,12 +2491,50 @@ static int ath10k_init_hw_params(struct ath10k *ar)return 0 ; } +static bool ath10k_core_needs_recovery (struct ath10k *ar) +{ +long time_left; + +/* Sometimes the recovery will fail and then the next all recovery fail, +* so avoid infinite recovery. +*/ +if (atomic_read (&ar->fail_cont_count) >=ATH10K_RECOVERY_MAX_FAIL_COUNT ) { +ath10k_err (ar,"consecutive fail %d times, will shutdown driver!" , +atomic_read (&ar->fail_cont_count)); + ar->state =ATH10K_STATE_WEDGED ; +return false; + } + +ath10k_dbg (ar,ATH10K_DBG_BOOT ,"total recovery count: %d" , ++ar->recovery_count); + +if (atomic_read (&ar->pending_recovery)) { +/* Sometimes it happened another recovery work before the previous one +* completed, then the second recovery work will destroy the previous +* one, thus below is to avoid that. +*/ + time_left =wait_for_completion_timeout (&ar->driver_recovery, +ATH10K_RECOVERY_TIMEOUT_HZ ); +if (time_left) { +ath10k_warn (ar,"previous recovery succeeded, skip this!\n" ); +return false; + } + +/* Record the continuous recovery fail count when recovery failed. */ +atomic_inc (&ar->fail_cont_count); + +/* Avoid having multiple recoveries at the same time. */ +return false; + } + +atomic_inc (&ar->pending_recovery); + +return true; +} +void ath10k_core_start_recovery (struct ath10k *ar) { -if (test_and_set_bit (ATH10K_FLAG_RESTARTING , &ar->dev_flags)) { -ath10k_warn (ar,"already restarting\n" ); +if (!ath10k_core_needs_recovery (ar))return ; - }queue_work (ar->workqueue, &ar->restart_work); }
@@ -2532,6 +2570,8 @@ static void ath10k_core_restart(struct work_struct *work) struct ath10k *ar = container_of(work, struct ath10k, restart_work);int ret; +reinit_completion (&ar->driver_recovery); +set_bit (ATH10K_FLAG_CRASH_FLUSH , &ar->dev_flags);/* Place a barrier to make sure the compiler doesn't reorder
@@ -2596,8 +2636,6 @@ static void ath10k_core_restart(struct work_struct *work)if (ret)ath10k_warn (ar,"failed to send firmware crash dump via devcoredump: %d" , ret); - -complete (&ar->driver_recovery); }static void ath10k_core_set_coverage_class_work (struct work_struct *work)
drivers/net/wireless/ath/ath10k/core.h +8 -3
@@ -4,6 +4,7 @@* Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #ifndef _CORE_H_
@@ -87,6 +88,8 @@ IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER)#define ATH10K_ITER_RESUME_FLAGS (IEEE80211_IFACE_ITER_RESUME_ALL |\ IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER) +#define ATH10K_RECOVERY_TIMEOUT_HZ (5 * HZ) +#define ATH10K_RECOVERY_MAX_FAIL_COUNT 4struct ath10k ;
@@ -865,9 +868,6 @@ enum ath10k_dev_flags {/* Per Station statistics service */ ATH10K_FLAG_PEER_STATS , -/* Indicates that ath10k device is during recovery process and not complete */ -ATH10K_FLAG_RESTARTING , -/* protected by conf_mutex */ ATH10K_FLAG_NAPI_ENABLED, };
@@ -1211,6 +1211,11 @@ struct ath10k {struct work_struct bundle_tx_work;struct work_struct tx_complete_work; +atomic_t pending_recovery; +unsigned int recovery_count; +/* continuous recovery fail count */ +atomic_t fail_cont_count; +/* cycle count is reported twice for each visited channel during scan. * access protected by data_lock */
drivers/net/wireless/ath/ath10k/mac.c +6 -1
@@ -8156,7 +8156,12 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,ath10k_info (ar,"device successfully recovered\n" ); ar->state =ATH10K_STATE_ON ;ieee80211_wake_queues (ar->hw); -clear_bit (ATH10K_FLAG_RESTARTING , &ar->dev_flags); + +/* Clear recovery state. */ +complete (&ar->driver_recovery); +atomic_set (&ar->fail_cont_count,0 ); +atomic_set (&ar->pending_recovery,0 ); +if (ar->hw_params.hw_restart_disconnect) {list_for_each_entry (arvif, &ar->arvifs, list) {if (arvif->is_up && arvif->vdev_type ==WMI_VDEV_TYPE_STA )
drivers/net/wireless/ath/ath10k/wmi.c +6 -0
@@ -4,6 +4,7 @@* Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include <linux/skbuff.h>
@@ -1941,6 +1942,11 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id) } wait_event_timeout(ar->wmi.tx_credits_wq, ({ + if (ar->state == ATH10K_STATE_WEDGED) { + ret = -ESHUTDOWN; + ath10k_dbg(ar, ATH10K_DBG_WMI, + "drop wmi command %d, hardware is wedged\n", cmd_id); + } /* try to send pending beacons first. they take priority */ ath10k_wmi_tx_beacons_nowait(ar);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 295/570 drm/panel: raydium-rm67200: Move initialization from enable() to prepare stage
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Yan <[email protected]>
[ Upstream commit 691674a282bdbf8f8bce4094369a2d1e4b5645e9 ]
The DSI host has different modes in prepare() and enable() functions, prepare() is in LP command mode and enable() is in HS video mode.
Quoted 1 line
From our experience, generally the initialization sequence needs to be
sent in the LP command mode.
Move the setup init function from enable() to prepare() to fix a display shift on rk3568 evb.
Tested on rk3568/rk3576/rk3588 EVB.
--- drivers/gpu/drm/panel/panel-raydium-rm67200.c | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-)
drivers/gpu/drm/panel/panel-raydium-rm67200.c +7 -15
@@ -318,6 +318,7 @@ static void w552793baa_setup(struct mipi_dsi_multi_context *ctx)static int raydium_rm67200_prepare (struct drm_panel *panel) {struct raydium_rm67200 *ctx =to_raydium_rm67200 (panel); +struct mipi_dsi_multi_context mctx = { .dsi = ctx->dsi };int ret; ret =regulator_bulk_enable (ctx->num_supplies, ctx->supplies);
@@ -328,6 +329,12 @@ static int raydium_rm67200_prepare(struct drm_panel *panel)msleep (60 ); + ctx->panel_info->panel_setup (&mctx); +mipi_dsi_dcs_exit_sleep_mode_multi (&mctx); +mipi_dsi_msleep (&mctx,120 ); +mipi_dsi_dcs_set_display_on_multi (&mctx); +mipi_dsi_msleep (&mctx,30 ); +return 0 ; }
@@ -343,20 +350,6 @@ static int raydium_rm67200_unprepare(struct drm_panel *panel)return 0 ; } -static int raydium_rm67200_enable (struct drm_panel *panel) -{ -struct raydium_rm67200 *rm67200 =to_raydium_rm67200 (panel); -struct mipi_dsi_multi_context ctx = { .dsi = rm67200->dsi }; - - rm67200->panel_info->panel_setup (&ctx); -mipi_dsi_dcs_exit_sleep_mode_multi (&ctx); -mipi_dsi_msleep (&ctx,120 ); -mipi_dsi_dcs_set_display_on_multi (&ctx); -mipi_dsi_msleep (&ctx,30 ); - -return ctx.accum_err; -} -static int raydium_rm67200_disable (struct drm_panel *panel) {struct raydium_rm67200 *rm67200 =to_raydium_rm67200 (panel);
@@ -381,7 +374,6 @@ static const struct drm_panel_funcs raydium_rm67200_funcs = { .prepare = raydium_rm67200_prepare, .unprepare = raydium_rm67200_unprepare, .get_modes = raydium_rm67200_get_modes, - .enable = raydium_rm67200_enable, .disable = raydium_rm67200_disable, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 296/570 eth: bnxt: take page size into account for page pool recycling rings
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit f7dbedba63124256feb9d9fcf36e8a2e43858d1e ]
The Rx rings are filled with Rx buffers. Which are supposed to fit packet headers (or MTU if HW-GRO is disabled). The aggregation buffers are filled with "device pages". Adjust the sizes of the page pool recycling ring appropriately, based on ratio of the size of the buffer on given ring vs system page size. Otherwise on a system with 64kB pages we end up with >700MB of memory sitting in every single page pool cache.
Correct the size calculation for the head_pool. Since the buffers there are always small I'm pretty sure I meant to cap the size at 1k, rather than make it the lowest possible size. With 64k pages 1k cache with a 1k ring is 64x larger than we need.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -3
@@ -3809,12 +3809,14 @@ static int bnxt_alloc_rx_page_pool(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, int numa_node) { +const unsigned int agg_size_fac =PAGE_SIZE /BNXT_RX_PAGE_SIZE ; +const unsigned int rx_size_fac =PAGE_SIZE /SZ_4K ;struct page_pool_params pp = {0 };struct page_pool *pool; - pp.pool_size = bp->rx_agg_ring_size; + pp.pool_size = bp->rx_agg_ring_size / agg_size_fac;if (BNXT_RX_PAGE_MODE (bp)) - pp.pool_size += bp->rx_ring_size; + pp.pool_size += bp->rx_ring_size / rx_size_fac; pp.nid = numa_node; pp.netdev = bp->dev; pp.dev = &bp->pdev->dev;
@@ -3831,7 +3833,7 @@ static int bnxt_alloc_rx_page_pool(struct bnxt *bp, rxr->need_head_pool =page_pool_is_unreadable (pool);if (bnxt_separate_head_pool (rxr)) { - pp.pool_size =max (bp->rx_ring_size,1024 ); + pp.pool_size =min (bp->rx_ring_size / rx_size_fac,1024 ); pp.flags =PP_FLAG_DMA_MAP |PP_FLAG_DMA_SYNC_DEV ; pool =page_pool_create (&pp);if (IS_ERR (pool))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 297/570 wifi: ath12k: Add memset and update default rate value in wmi tx completion
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarika Sharma <[email protected]>
[ Upstream commit 9903c0986f782dfc511d7638b6f15fb6e8600cd3 ]
When both AP/STA and monitor interfaces are enabled, ieee80211_tx_status() is invoked from two paths: the TX completion handler for data frames and the WMI TX completion handler for management frames.
In the data path, the skb->cb is properly zeroed using memset, but in the WMI path, this step is missing.
As a result, mac80211 encountered uninitialized (junk) values in skb->cb when generating the radiotap header for monitor mode, leading to invalid radiotap lengths.
Hence, explicitly zero the status field in the skb->cb using memset in WMI TX completion path to ensure consistent and correct behavior during WMI tx completion path.
Additionally, set info->status.rates[0].idx = -1 to indicate that no valid rate information is available, avoiding misinterpretation of garbage values.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/wmi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/ath/ath12k/wmi.c +5 -0
@@ -6140,6 +6140,11 @@ static int wmi_process_mgmt_tx_comp(struct ath12k *ar, u32 desc_id,dma_unmap_single (ar->ab->dev, skb_cb->paddr, msdu->len,DMA_TO_DEVICE ); info =IEEE80211_SKB_CB (msdu); +memset (&info->status,0 ,sizeof (info->status)); + +/* skip tx rate update from ieee80211_status*/ + info->status.rates[0 ].idx =-1 ; +if ((!(info->flags &IEEE80211_TX_CTL_NO_ACK )) && !status) info->flags |=IEEE80211_TX_STAT_ACK ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 298/570 wifi: ath12k: Fix beacon reception for sta associated to Non-TX AP
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rameshkumar Sundaram <[email protected]>
[ Upstream commit ce7c93d196bfd2190dc4a0b86deee04e82042ed1 ]
Currently, when a station is associated with a Non-Transmitting BSS of an MBSSID set, beacons are not frequently received from the firmware. This results in missing events via beacons, such as channel switches, leading to the station not switching to new channel as the AP does, eventually causing a kick out event from the firmware. This issue arises due to missing configuration of Non-Transmitting BSS information in station's vdev up command.
Fix this by filling information such as the Transmitting BSSID, profile index and profile count in vdev up command of station.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 56 ++++++++++++++++++--------- 1 file changed, 37 insertions(+), 19 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +37 -19
@@ -602,6 +602,33 @@ ath12k_mac_get_tx_arvif(struct ath12k_link_vif *arvif,return NULL ; } +static const u8 *ath12k_mac_get_tx_bssid (struct ath12k_link_vif *arvif) +{ +struct ieee80211_bss_conf *link_conf; +struct ath12k_link_vif *tx_arvif; +struct ath12k *ar = arvif->ar; + +lockdep_assert_wiphy (ath12k_ar_to_hw (ar)->wiphy); + + link_conf =ath12k_mac_get_link_bss_conf (arvif); +if (!link_conf) { +ath12k_warn (ar->ab, +"unable to access bss link conf for link %u required to retrieve transmitting link conf\n" , + arvif->link_id); +return NULL ; + } +if (link_conf->vif->type ==NL80211_IFTYPE_STATION ) { +if (link_conf->nontransmitted) +return link_conf->transmitter_bssid; + }else { + tx_arvif =ath12k_mac_get_tx_arvif (arvif, link_conf); +if (tx_arvif) +return tx_arvif->bssid; + } + +return NULL ; +} +struct ieee80211_bss_conf *ath12k_mac_get_link_bss_conf (struct ath12k_link_vif *arvif) {
@@ -1691,8 +1718,6 @@ static void ath12k_control_beaconing(struct ath12k_link_vif *arvif, {struct ath12k_wmi_vdev_up_params params = {};struct ath12k_vif *ahvif = arvif->ahvif; -struct ieee80211_bss_conf *link_conf; -struct ath12k_link_vif *tx_arvif;struct ath12k *ar = arvif->ar;int ret;
@@ -1723,18 +1748,8 @@ static void ath12k_control_beaconing(struct ath12k_link_vif *arvif, params.vdev_id = arvif->vdev_id; params.aid = ahvif->aid; params.bssid = arvif->bssid; - - link_conf =ath12k_mac_get_link_bss_conf (arvif); -if (!link_conf) { -ath12k_warn (ar->ab, -"unable to access bss link conf for link %u required to retrieve transmitting link conf\n" , - arvif->link_id); -return ; - } - - tx_arvif =ath12k_mac_get_tx_arvif (arvif, link_conf); -if (tx_arvif) { - params.tx_bssid = tx_arvif->bssid; + params.tx_bssid =ath12k_mac_get_tx_bssid (arvif); +if (params.tx_bssid) { params.nontx_profile_idx = info->bssid_index; params.nontx_profile_cnt =1 << info->bssid_indicator; }
@@ -3265,6 +3280,11 @@ static void ath12k_bss_assoc(struct ath12k *ar, params.vdev_id = arvif->vdev_id; params.aid = ahvif->aid; params.bssid = arvif->bssid; + params.tx_bssid =ath12k_mac_get_tx_bssid (arvif); +if (params.tx_bssid) { + params.nontx_profile_idx = bss_conf->bssid_index; + params.nontx_profile_cnt =1 << bss_conf->bssid_indicator; + } ret =ath12k_wmi_vdev_up (ar, ¶ms);if (ret) { ath12k_warn(ar->ab, "failed to set vdev %d up: %d\n",
@@ -10010,7 +10030,7 @@ ath12k_mac_update_vif_chan(struct ath12k *ar, int n_vifs) {struct ath12k_wmi_vdev_up_params params = {}; -struct ath12k_link_vif *arvif, *tx_arvif; +struct ath12k_link_vif *arvif;struct ieee80211_bss_conf *link_conf;struct ath12k_base *ab = ar->ab;struct ieee80211_vif *vif;
@@ -10082,10 +10102,8 @@ ath12k_mac_update_vif_chan(struct ath12k *ar, params.vdev_id = arvif->vdev_id; params.aid = ahvif->aid; params.bssid = arvif->bssid; - - tx_arvif =ath12k_mac_get_tx_arvif (arvif, link_conf); -if (tx_arvif) { - params.tx_bssid = tx_arvif->bssid; + params.tx_bssid =ath12k_mac_get_tx_bssid (arvif); +if (params.tx_bssid) { params.nontx_profile_idx = link_conf->bssid_index; params.nontx_profile_cnt =1 << link_conf->bssid_indicator; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 299/570 wifi: ath12k: Fix station association with MBSSID Non-TX BSS
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Chandrakanthan <[email protected]>
[ Upstream commit 70eeacc1a92a444f4b5777ab19e1c378a5edc8dd ]
ath12k station is unable to associate with non-transmitting BSSes in a Multiple BSS set because the user-space does not receive information about the non-transmitting BSSes from mac80211's scan results.
The ath12k driver does not advertise its MBSSID capability to mac80211, resulting in wiphy->support_mbssid not being set. Consequently, the information about non-transmitting BSS is not parsed from received Beacon/Probe response frames and is therefore not included in the scan results.
Fix this by advertising the MBSSID capability of ath12k driver to mac80211.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath12k/mac.c +1 -0
@@ -12522,6 +12522,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah) wiphy->mbssid_max_interfaces = mbssid_max_interfaces; wiphy->ema_max_profile_periodicity =TARGET_EMA_MAX_PROFILE_PERIOD ; +ieee80211_hw_set (hw,SUPPORTS_MULTI_BSSID );if (is_6ghz) { wiphy_ext_feature_set(wiphy,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 300/570 net: phy: realtek: add error handling to rtl8211f_get_wol
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Braunwarth <[email protected]>
[ Upstream commit a9b24b3583ae1da7dbda031f141264f2da260219 ]
We should check if the WOL settings was successfully read from the PHY.
In case this fails we cannot just use the error code and proceed.
--- drivers/net/phy/realtek/realtek_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/net/phy/realtek/realtek_main.c +8 -2
@@ -436,9 +436,15 @@ static irqreturn_t rtl8211f_handle_interrupt(struct phy_device *phydev)static void rtl8211f_get_wol (struct phy_device *dev,struct ethtool_wolinfo *wol) { +int wol_events; + wol->supported =WAKE_MAGIC ; -if (phy_read_paged (dev,RTL8211F_WOL_SETTINGS_PAGE ,RTL8211F_WOL_SETTINGS_EVENTS ) - &RTL8211F_WOL_EVENT_MAGIC ) + + wol_events =phy_read_paged (dev,RTL8211F_WOL_SETTINGS_PAGE ,RTL8211F_WOL_SETTINGS_EVENTS ); +if (wol_events <0 ) +return ; + +if (wol_events &RTL8211F_WOL_EVENT_MAGIC ) wol->wolopts =WAKE_MAGIC ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 301/570 lib: packing: Include necessary headers
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Lynch <[email protected]>
[ Upstream commit 8bd0af3154b2206ce19f8b1410339f7a2a56d0c3 ]
packing.h uses ARRAY_SIZE(), BUILD_BUG_ON_MSG(), min(), max(), and sizeof_field() without including the headers where they are defined, potentially causing build failures.
Fix this in packing.h and sort the result.
--- include/linux/packing.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/packing.h +5 -1
@@ -5,8 +5,12 @@#ifndef _LINUX_PACKING_H#define _LINUX_PACKING_H -#include <linux/types.h> +#include <linux/array_size.h> #include <linux/bitops.h> +#include <linux/build_bug.h> +#include <linux/minmax.h> +#include <linux/stddef.h> +#include <linux/types.h> #define GEN_PACKED_FIELD_STRUCT (__type) \ struct packed_field_ ## __type { \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 302/570 wifi: iwlwifi: dvm: fix potential overflow in rs_fill_link_cmd()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rand Deeb <[email protected]>
[ Upstream commit e3ad987e9dc7d1e12e3f2f1e623f0e174cd0ca78 ]
The 'index' variable in the rs_fill_link_cmd() function can reach LINK_QUAL_MAX_RETRY_NUM during the execution of the inner loop. This variable is used as an index for the lq_cmd->rs_table array, which has a size of LINK_QUAL_MAX_RETRY_NUM, without proper validation.
Modify the condition of the inner loop to ensure that the 'index' variable does not exceed LINK_QUAL_MAX_RETRY_NUM - 1, thereby preventing any potential overflow issues.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/dvm/rs.c +1 -1
@@ -2899,7 +2899,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,/* Repeat initial/next rate. * For legacy IWL_NUMBER_TRY == 1, this loop will not execute. * For HT IWL_HT_NUMBER_TRY == 3, this executes twice. */ -while (repeat_rate >0 && (index <LINK_QUAL_MAX_RETRY_NUM )) { +while (repeat_rate >0 && index < (LINK_QUAL_MAX_RETRY_NUM -1 )) {if (is_legacy (tbl_type.lq_type)) {if (ant_toggle_cnt <NUM_TRY_BEFORE_ANT_TOGGLE ) ant_toggle_cnt++;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 303/570 wifi: iwlwifi: mld: dont exit EMLSR when we shouldnt
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miri Korenblit <[email protected]>
[ Upstream commit 0cdb8ff6ebbac55f38933f4621215784887b400e ]
There is a requirement to exit EMLSR if there wasn't enough throughput in the secondary link.
This is checked in check_tpt_wk, which runs every 5 seconds in a high throughput scenario (when the throughput blocker isn't set)
It can happen that this worker is running immediately after we entered EMLSR, and in that case the secondary link didn't have a chance to have throughput. In that case we will exit EMLSR for no good reason.
Fix this by tracking the time we entered EMLSR, and in the worker make sure that 5 seconds passed from when we entered EMLSR. If not, don't check the secondary link throughput.
--- drivers/net/wireless/intel/iwlwifi/mld/iface.h | 3 +++ drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 1 + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-)
drivers/net/wireless/intel/iwlwifi/mld/iface.h +3 -0
@@ -87,6 +87,8 @@ enum iwl_mld_emlsr_exit {* @last_exit_reason: Reason for the last EMLSR exit * @last_exit_ts: Time of the last EMLSR exit (if @last_exit_reason is non-zero) * @exit_repeat_count: Number of times EMLSR was exited for the same reason +* @last_entry_ts: the time of the last EMLSR entry (if iwl_mld_emlsr_active() +* is true) * @unblock_tpt_wk: Unblock EMLSR because the throughput limit was reached * @check_tpt_wk: a worker to check if IWL_MLD_EMLSR_BLOCKED_TPT should be * added, for example if there is no longer enough traffic.
@@ -105,6 +107,7 @@ struct iwl_mld_emlsr {enum iwl_mld_emlsr_exit last_exit_reason;unsigned long last_exit_ts;u8 exit_repeat_count; +unsigned long last_entry_ts; );struct wiphy_work unblock_tpt_wk;
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +1 -0
@@ -1002,6 +1002,7 @@ int iwl_mld_assign_vif_chanctx(struct ieee80211_hw *hw,/* Indicate to mac80211 that EML is enabled */ vif->driver_flags |=IEEE80211_VIF_EML_ACTIVE ; + mld_vif->emlsr.last_entry_ts = jiffies;if (vif->active_links &BIT (mld_vif->emlsr.selected_links)) mld_vif->emlsr.primary = mld_vif->emlsr.selected_primary;
drivers/net/wireless/intel/iwlwifi/mld/mlo.c +5 -3
@@ -530,10 +530,12 @@ void iwl_mld_emlsr_check_tpt(struct wiphy *wiphy, struct wiphy_work *wk)/* * TPT is unblocked, need to check if the TPT criteria is still met. * -* If EMLSR is active, then we also need to check the secondar link -* requirements. +* If EMLSR is active for at least 5 seconds, then we also +* need to check the secondary link requirements. */ -if (iwl_mld_emlsr_active (vif)) { +if (iwl_mld_emlsr_active (vif) && +time_is_before_jiffies (mld_vif->emlsr.last_entry_ts + +IWL_MLD_TPT_COUNT_WINDOW )) { sec_link_id =iwl_mld_get_other_link (vif,iwl_mld_get_primary_link (vif)); sec_link =iwl_mld_link_dereference_check (mld_vif, sec_link_id);if (WARN_ON_ONCE (!sec_link))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 304/570 wifi: iwlwifi: mld: use the correct struct size for tracing
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Berg <[email protected]>
[ Upstream commit b2c1f9b6e3aac9567c84208b73d716cc5d456404 ]
For the iwlmld driver the RX command is using struct iwl_rx_mpdu_desc and not the much older struct iwl_rx_mpdu_res_start. Adjust the value of rx_mpdu_cmd_hdr_size accordingly so that the trace data is correct.
--- drivers/net/wireless/intel/iwlwifi/mld/mld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/mld.c +1 -1
@@ -357,7 +357,7 @@ iwl_mld_configure_trans(struct iwl_op_mode *op_mode) trans->conf.n_no_reclaim_cmds =ARRAY_SIZE (no_reclaim_cmds); trans->conf.rx_mpdu_cmd =REPLY_RX_MPDU_CMD ; - trans->conf.rx_mpdu_cmd_hdr_size =sizeof (struct iwl_rx_mpdu_res_start ); + trans->conf.rx_mpdu_cmd_hdr_size =sizeof (struct iwl_rx_mpdu_desc ); trans->conf.wide_cmd_header = true;iwl_trans_op_mode_enter (trans, op_mode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 305/570 wifi: iwlwifi: mld: fix last_mlo_scan_time type
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit f26281c1b727b90ec18ae90044d5f429d2250e82 ]
This should be u64, otherwise it rolls over quickly on 32-bit systems.
--- drivers/net/wireless/intel/iwlwifi/mld/scan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mld/scan.h +1 -1
@@ -130,7 +130,7 @@ struct iwl_mld_scan {void *cmd;unsigned long last_6ghz_passive_jiffies;unsigned long last_start_time_jiffies; - unsigned long last_mlo_scan_time; + u64 last_mlo_scan_time; };#endif /* __iwl_mld_scan_h__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 306/570 wifi: iwlwifi: fw: Fix possible memory leak in iwl_fw_dbg_collect
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pagadala Yesu Anjaneyulu <[email protected]>
[ Upstream commit cc8d9cbf269dab363c768bfa9312265bc807fca5 ]
Ensure descriptor is freed on error to avoid memory leak.
--- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +6 -1
@@ -3008,6 +3008,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt,struct iwl_fw_dump_desc *desc;unsigned int delay =0 ;bool monitor_only = false; +int ret;if (trigger) {u16 occurrences =le16_to_cpu (trigger->occurrences) -1 ;
@@ -3038,7 +3039,11 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, desc->trig_desc.type =cpu_to_le32 (trig);memcpy (desc->trig_desc.data, str, len); -return iwl_fw_dbg_collect_desc (fwrt, desc, monitor_only, delay); + ret =iwl_fw_dbg_collect_desc (fwrt, desc, monitor_only, delay); +if (ret) +kfree (desc); + +return ret; }IWL_EXPORT_SYMBOL (iwl_fw_dbg_collect);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 307/570 wifi: iwlwifi: pcie: reinit device properly during TOP reset
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
[ Upstream commit eda36f5195d6c078e20331f1dfcf688bd6567c2b ]
During TOP reset a full _iwl_trans_pcie_start_hw() is needed so the device is properly initialized for operation. Fix that.
--- drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 1 + drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 5 +++++ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/pcie/internal.h +1 -0
@@ -1074,6 +1074,7 @@ void iwl_pcie_rx_allocator_work(struct work_struct *data);/* common trans ops for all generations transports */ void iwl_trans_pcie_op_mode_enter (struct iwl_trans *trans); +int _iwl_trans_pcie_start_hw (struct iwl_trans *trans);int iwl_trans_pcie_start_hw (struct iwl_trans *trans);void iwl_trans_pcie_op_mode_leave (struct iwl_trans *trans);void iwl_trans_pcie_write8 (struct iwl_trans *trans,u32 ofs,u8 val);
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +5 -0
@@ -612,6 +612,11 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,msleep (10 );IWL_INFO (trans,"TOP reset successful, reinit now\n" );/* now load the firmware again properly */ + ret =_iwl_trans_pcie_start_hw (trans); +if (ret) { +IWL_ERR (trans,"failed to start HW after TOP reset\n" ); + goto out; + } trans_pcie->prph_scratch->ctrl_cfg.control.control_flags &= ~cpu_to_le32 (IWL_PRPH_SCRATCH_TOP_RESET ); top_reset_done = true;
drivers/net/wireless/intel/iwlwifi/pcie/trans.c +1 -1
@@ -1845,7 +1845,7 @@ static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)return iwl_trans_pcie_sw_reset (trans, true); } -static int _iwl_trans_pcie_start_hw (struct iwl_trans *trans) +int _iwl_trans_pcie_start_hw (struct iwl_trans *trans) {struct iwl_trans_pcie *trans_pcie =IWL_TRANS_GET_PCIE_TRANS (trans);int err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 308/570 rcutorture: Fix rcutorture_one_extend_check() splat in RT kernels
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zqiang <[email protected]>
[ Upstream commit 8d71351d88e478d3c4e945e3218e97ec677fd807 ]
For built with CONFIG_PREEMPT_RT=y kernels, running rcutorture tests resulted in the following splat:
[ 68.797425] rcutorture_one_extend_check during change: Current 0x1 To add 0x1 To remove 0x0 preempt_count() 0x0 [ 68.797533] WARNING: CPU: 2 PID: 512 at kernel/rcu/rcutorture.c:1993 rcutorture_one_extend_check+0x419/0x560 [rcutorture] [ 68.797601] Call Trace: [ 68.797602] <TASK> [ 68.797619] ? lockdep_softirqs_off+0xa5/0x160 [ 68.797631] rcutorture_one_extend+0x18e/0xcc0 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797646] ? local_clock+0x19/0x40 [ 68.797659] rcu_torture_one_read+0xf0/0x280 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797678] ? __pfx_rcu_torture_one_read+0x10/0x10 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797804] ? __pfx_rcu_torture_timer+0x10/0x10 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797815] rcu-torture: rcu_torture_reader task started [ 68.797824] rcu-torture: Creating rcu_torture_reader task [ 68.797824] rcu_torture_reader+0x238/0x580 [rcutorture 2466dbd2ff34dbaa36049cb323a80c3306ac997c] [ 68.797836] ? kvm_sched_clock_read+0x15/0x30
Disable BH does not change the SOFTIRQ corresponding bits in preempt_count() for RT kernels, this commit therefore use softirq_count() to check the if BH is disabled.
--- kernel/rcu/rcutorture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/rcu/rcutorture.c +6 -3
@@ -464,7 +464,7 @@ rcu_read_delay(struct torture_random_state *rrsp, struct rt_read_seg *rtrsp) !(torture_random(rrsp) % (nrealreaders * 2000 * longdelay_ms))) { started = cur_ops->get_gp_seq (); ts =rcu_trace_clock_local (); -if (preempt_count () & (SOFTIRQ_MASK |HARDIRQ_MASK )) +if ((preempt_count () &HARDIRQ_MASK ) ||softirq_count ()) longdelay_ms =5 ;/* Avoid triggering BH limits. */ mdelay (longdelay_ms); rtrsp->rt_delay_ms = longdelay_ms;
@@ -1930,7 +1930,7 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,return ;WARN_ONCE ((curstate & (RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH )) && - !(preempt_count () &SOFTIRQ_MASK ),ROEC_ARGS ); + !softirq_count (),ROEC_ARGS );WARN_ONCE ((curstate & (RCUTORTURE_RDR_PREEMPT |RCUTORTURE_RDR_SCHED )) && !(preempt_count () &PREEMPT_MASK ),ROEC_ARGS ); WARN_ONCE(cur_ops->readlock_nesting &&
@@ -1944,7 +1944,7 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,WARN_ONCE (cur_ops->extendables && !(curstate & (RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH )) && - (preempt_count () &SOFTIRQ_MASK ),ROEC_ARGS ); +softirq_count (),ROEC_ARGS );/* * non-preemptible RCU in a preemptible kernel uses preempt_disable()
@@ -1965,6 +1965,9 @@ static void rcutorture_one_extend_check(char *s, int curstate, int new, int old,if (!IS_ENABLED (CONFIG_PREEMPT_RCU )) mask |=RCUTORTURE_RDR_PREEMPT |RCUTORTURE_RDR_SCHED ; +if (IS_ENABLED (CONFIG_PREEMPT_RT ) &&softirq_count ()) + mask |=RCUTORTURE_RDR_BH |RCUTORTURE_RDR_RBH ; +WARN_ONCE (cur_ops->readlock_nesting && !(curstate & mask) && cur_ops->readlock_nesting () >0 ,ROEC_ARGS ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 309/570 drm/amdgpu: Add more checks to PSP mailbox
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit 8345a71fc54b28e4d13a759c45ce2664d8540d28 ]
Instead of checking the response flag, use status mask also to check against any unexpected failures like a device drop. Also, log error if waiting on a psp response fails/times out.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 11 +++++++++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 31 +++++++++++++++--------- drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 25 +++++++++++-------- drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 18 ++++++++------ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 25 +++++++++++-------- drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 25 +++++++++++-------- drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 25 +++++++++++-------- 9 files changed, 107 insertions(+), 61 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -0
@@ -596,6 +596,10 @@ int psp_wait_for(struct psp_context *psp, uint32_t reg_index,udelay (1 ); } +dev_err (adev->dev, +"psp reg (0x%x) wait timed out, mask: %x, read: %x exp: %x" , + reg_index, mask, val, reg_val); +return -ETIME ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +11 -0
@@ -51,6 +51,17 @@#define C2PMSG_CMD_SPI_GET_ROM_IMAGE_ADDR_HI 0x10#define C2PMSG_CMD_SPI_GET_FLASH_IMAGE 0x11 +/* Command register bit 31 set to indicate readiness */ +#define MBOX_TOS_READY_FLAG (GFX_FLAG_RESPONSE) +#define MBOX_TOS_READY_MASK (GFX_CMD_RESPONSE_MASK | GFX_CMD_STATUS_MASK) + +/* Values to check for a successful GFX_CMD response wait. Check against +* both status bits and response state - helps to detect a command failure +* or other unexpected cases like a device drop reading all 0xFFs +*/ +#define MBOX_TOS_RESP_FLAG (GFX_FLAG_RESPONSE) +#define MBOX_TOS_RESP_MASK (GFX_CMD_RESPONSE_MASK | GFX_CMD_STATUS_MASK) +extern const struct attribute_group amdgpu_flash_attr_group;enum psp_shared_mem_size {
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +2 -2
@@ -94,7 +94,7 @@ static int psp_v10_0_ring_create(struct psp_context *psp,/* Wait for response flag (bit 31) in C2PMSG_64 */ ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);return ret; }
@@ -115,7 +115,7 @@ static int psp_v10_0_ring_stop(struct psp_context *psp,/* Wait for response flag (bit 31) in C2PMSG_64 */ ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);return ret; }
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +19 -12
@@ -277,11 +277,13 @@ static int psp_v11_0_ring_stop(struct psp_context *psp,/* Wait for response flag (bit 31) */ if (amdgpu_sriov_vf (adev)) - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);else - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);return ret; }
@@ -317,13 +319,15 @@ static int psp_v11_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_101 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Wait for sOS ready for ring creation */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_READY_FLAG ,MBOX_TOS_READY_MASK , false);if (ret) {DRM_ERROR ("Failed to wait for sOS ready for ring creation\n" );return ret;
@@ -347,8 +351,9 @@ static int psp_v11_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_64 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
@@ -381,7 +386,8 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp) offset =SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64); - ret =psp_wait_for (psp, offset,0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for (psp, offset,MBOX_TOS_READY_FLAG , +MBOX_TOS_READY_MASK , false);if (ret) {DRM_INFO ("psp is not working correctly before mode1 reset!\n" );
@@ -395,7 +401,8 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp) offset =SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_33); - ret =psp_wait_for (psp, offset,0x80000000 ,0x80000000 , false); + ret =psp_wait_for (psp, offset,MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , + false);if (ret) {DRM_INFO ("psp mode 1 reset failed!\n" );
drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c +15 -10
@@ -41,8 +41,9 @@ static int psp_v11_0_8_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Write the ring destroy command*/ WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_64,
@@ -50,8 +51,9 @@ static int psp_v11_0_8_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
@@ -87,13 +89,15 @@ static int psp_v11_0_8_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_101 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Wait for sOS ready for ring creation */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_READY_FLAG ,MBOX_TOS_READY_MASK , false);if (ret) {DRM_ERROR ("Failed to wait for trust OS ready for ring creation\n" );return ret;
@@ -117,8 +121,9 @@ static int psp_v11_0_8_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_64 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +11 -7
@@ -163,7 +163,7 @@ static int psp_v12_0_ring_create(struct psp_context *psp,/* Wait for response flag (bit 31) in C2PMSG_64 */ ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);return ret; }
@@ -184,11 +184,13 @@ static int psp_v12_0_ring_stop(struct psp_context *psp,/* Wait for response flag (bit 31) */ if (amdgpu_sriov_vf (adev)) - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);else - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false);return ret; }
@@ -219,7 +221,8 @@ static int psp_v12_0_mode1_reset(struct psp_context *psp) offset =SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_64); - ret =psp_wait_for (psp, offset,0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for (psp, offset,MBOX_TOS_READY_FLAG , +MBOX_TOS_READY_MASK , false);if (ret) {DRM_INFO ("psp is not working correctly before mode1 reset!\n" );
@@ -233,7 +236,8 @@ static int psp_v12_0_mode1_reset(struct psp_context *psp) offset =SOC15_REG_OFFSET (MP0 ,0 , mmMP0_SMN_C2PMSG_33); - ret =psp_wait_for (psp, offset,0x80000000 ,0x80000000 , false); + ret =psp_wait_for (psp, offset,MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , + false);if (ret) {DRM_INFO ("psp mode 1 reset failed!\n" );
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +15 -10
@@ -384,8 +384,9 @@ static int psp_v13_0_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Write the ring destroy command*/ WREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_64,
@@ -393,8 +394,9 @@ static int psp_v13_0_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
@@ -430,13 +432,15 @@ static int psp_v13_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_101 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Wait for sOS ready for ring creation */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_READY_FLAG ,MBOX_TOS_READY_MASK , false);if (ret) {DRM_ERROR ("Failed to wait for trust OS ready for ring creation\n" );return ret;
@@ -460,8 +464,9 @@ static int psp_v13_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_64 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c +15 -10
@@ -204,8 +204,9 @@ static int psp_v13_0_4_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Write the ring destroy command*/ WREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_64,
@@ -213,8 +214,9 @@ static int psp_v13_0_4_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
@@ -250,13 +252,15 @@ static int psp_v13_0_4_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_101 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Wait for sOS ready for ring creation */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_READY_FLAG ,MBOX_TOS_READY_MASK , false);if (ret) {DRM_ERROR ("Failed to wait for trust OS ready for ring creation\n" );return ret;
@@ -280,8 +284,9 @@ static int psp_v13_0_4_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_64 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMP0_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
drivers/gpu/drm/amd/amdgpu/psp_v14_0.c +15 -10
@@ -248,8 +248,9 @@ static int psp_v14_0_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_101), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Write the ring destroy command*/ WREG32_SOC15(MP0, 0, regMPASP_SMN_C2PMSG_64,
@@ -257,8 +258,9 @@ static int psp_v14_0_ring_stop(struct psp_context *psp,/* there might be handshake issue with hardware which needs delay */ mdelay (20 );/* Wait for response flag (bit 31) */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
@@ -294,13 +296,15 @@ static int psp_v14_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_101 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_101), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_101), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }else {/* Wait for sOS ready for ring creation */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), -0x80000000 ,0x80000000 , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), +MBOX_TOS_READY_FLAG ,MBOX_TOS_READY_MASK , false);if (ret) {DRM_ERROR ("Failed to wait for trust OS ready for ring creation\n" );return ret;
@@ -324,8 +328,9 @@ static int psp_v14_0_ring_create(struct psp_context *psp,mdelay (20 );/* Wait for response flag (bit 31) in C2PMSG_64 */ - ret =psp_wait_for (psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), -0x80000000 ,0x8000FFFF , false); + ret =psp_wait_for ( + psp,SOC15_REG_OFFSET (MP0 ,0 , regMPASP_SMN_C2PMSG_64), +MBOX_TOS_RESP_FLAG ,MBOX_TOS_RESP_MASK , false); }return ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 310/570 drm/amd/display: Fix failed to blank crtc!
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Chen <[email protected]>
[ Upstream commit 01f60348d8fb6b3fbcdfc7bdde5d669f95b009a4 ]
[why]
DCN35 is having “DC: failed to blank crtc!” when running HPO test cases. It's caused by not having sufficient udelay time.
[how]
Replace the old wait_for_blank_complete function with fsleep function to sleep just until the next frame should come up. This way it doesn't poll in case the pixel clock or other clock was bugged or until vactive and the vblank are hit again.
--- drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +1 -1
@@ -955,7 +955,7 @@ enum dc_status dcn20_enable_stream_timing(return DC_ERROR_UNEXPECTED ; } - hws->funcs.wait_for_blank_complete (pipe_ctx->stream_res.opp); +fsleep (stream->timing.v_total * (stream->timing.h_total *10000u / stream->timing.pix_clk_100hz)); params.vertical_total_min = stream->adjust.v_total_min; params.vertical_total_max = stream->adjust.v_total_max;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 311/570 drm/amd/display: Initialize mode_select to 0
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Hung <[email protected]>
[ Upstream commit 592ddac93f8c02e13f19175745465f8c4d0f56cd ]
[WHAT]mode_select was supposed to be initialized in mpc_read_gamut_remap but is not set in default case. This can cause indeterminate behaviors.
This is reported as an UNINIT error by Coverity.
--- drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c +1 -1
@@ -561,7 +561,7 @@ void mpc401_get_gamut_remap(struct mpc *mpc, struct mpc_grph_gamut_adjustment *adjust) {uint16_t arr_reg_val[12 ] = {0 }; -uint32_t mode_select; +uint32_t mode_select =MPCC_GAMUT_REMAP_MODE_SELECT_0 ;read_gamut_remap (mpc, mpcc_id, arr_reg_val, adjust->mpcc_gamut_remap_block_id, &mode_select);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 312/570 wifi: mac80211: update radar_required in channel context after channel switch
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ramya Gnanasekar <[email protected]>
[ Upstream commit 140c6a61d83cbd85adba769b5ef8d61acfa5b392 ]
Currently, when a non-DFS channel is brought up and the bandwidth is expanded from 80 MHz to 160 MHz, where the primary 80 MHz is non-DFS and the secondary 80 MHz consists of DFS channels, radar detection fails if radar occurs in the secondary 80 MHz.
When the channel is switched from 80 MHz to 160 MHz, with the primary 80 MHz being non-DFS and the secondary 80 MHz consisting of DFS channels, the radar required flag in the channel switch parameters is set to true. However, when using a reserved channel context, it is not updated in sdata, which disables radar detection in the secondary 80 MHz DFS channels.
Update the radar required flag in sdata to fix this issue when using a reserved channel context.
--- net/mac80211/chan.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/chan.c +1 -0
@@ -1381,6 +1381,7 @@ ieee80211_link_use_reserved_reassign(struct ieee80211_link_data *link) goto out; } + link->radar_required = link->reserved_radar_required;list_move (&link->assigned_chanctx_list, &new_ctx->assigned_links);rcu_assign_pointer (link_conf->chanctx_conf, &new_ctx->conf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 313/570 wifi: rtlwifi: fix possible skb memory leak in `_rtl_pci_rx_interrupt()`.
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 44c0e191004f0e3aa1bdee3be248be14dbe5b020 ]
The function _rtl_pci_init_one_rxdesc() can fail even when the new skb is passed because of a DMA mapping error. If it fails, the skb is not saved in the rx ringbuffer and thus lost.
Compile tested only
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +12 -6
@@ -802,13 +802,19 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) skb = new_skb; no_new:if (rtlpriv->use_new_trx_flow) { -_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)buffer_desc, - rxring_idx, - rtlpci->rx_ring[rxring_idx].idx); +if (!_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)buffer_desc, + rxring_idx, + rtlpci->rx_ring[rxring_idx].idx)) { +if (new_skb) +dev_kfree_skb_any (skb); + } }else { -_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)pdesc, - rxring_idx, - rtlpci->rx_ring[rxring_idx].idx); +if (!_rtl_pci_init_one_rxdesc (hw, skb, (u8 *)pdesc, + rxring_idx, + rtlpci->rx_ring[rxring_idx].idx)) { +if (new_skb) +dev_kfree_skb_any (skb); + }if (rtlpci->rx_ring[rxring_idx].idx == rtlpci->rxringcount -1 ) rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 314/570 wifi: rtw89: coex: Not to set slot duration to zero to avoid firmware issue
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ching-Te Ku <[email protected]>
[ Upstream commit a7feafea4ce80d5fa5284d05d54b4f108d2ab575 ]
If the duration set to zero, Wi-Fi firmware will trigger some unexpected issue when firmware try to enable timer.
--- drivers/net/wireless/realtek/rtw89/coex.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtw89/coex.c +6 -6
@@ -3836,13 +3836,13 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)switch (policy_type) {case BTC_CXP_OFFE_2GBWISOB :/* for normal-case */ -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);break ;case BTC_CXP_OFFE_2GISOB :/* for bt no-link */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_ISO ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_ISO );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);_slot_set_dur (btc,CXST_EBT , dur_2);
@@ -3868,15 +3868,15 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)break ;case BTC_CXP_OFFE_2GBWMIXB :if (a2dp->exist) -_slot_set (btc,CXST_E2G ,0 , cxtbl[2 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[2 ],SLOT_MIX );else -_slot_set (btc,CXST_E2G ,0 , tbl_w1,SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , tbl_w1,SLOT_MIX );_slot_set_le (btc,CXST_EBT , s_def[CXST_EBT ].dur, s_def[CXST_EBT ].cxtbl, s_def[CXST_EBT ].cxtype);break ;case BTC_CXP_OFFE_WL :/* for 4-way */ -_slot_set (btc,CXST_E2G ,0 , cxtbl[1 ],SLOT_MIX ); -_slot_set (btc,CXST_EBT ,0 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_E2G ,5 , cxtbl[1 ],SLOT_MIX ); +_slot_set (btc,CXST_EBT ,5 , cxtbl[1 ],SLOT_MIX );break ;default :break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 315/570 wifi: ath12k: Enable REO queue lookup table feature on QCN9274 hw2.0
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Raj Kumar Bhagat <[email protected]>
[ Upstream commit b79742b84e16e41c4a09f3126436f39f36e75c06 ]
The commit 89ac53e96217 ("wifi: ath12k: Enable REO queue lookup table feature on QCN9274") originally intended to enable the reoq_lut_support hardware parameter flag for both QCN9274 hw1.0 and hw2.0. However, it enabled it only for QCN9274 hw1.0.
Hence, enable REO queue lookup table feature on QCN9274 hw2.0.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/hw.c +1 -1
@@ -1478,7 +1478,7 @@ static const struct ath12k_hw_params ath12k_hw_params[] = { .download_calib = true, .supports_suspend = false, .tcl_ring_retry = true, - .reoq_lut_support = false, + .reoq_lut_support = true, .supports_shadow_regs = false, .num_tcl_banks = 48,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 316/570 wifi: ath12k: Decrement TID on RX peer frag setup error handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Karthikeyan Kathirvel <[email protected]>
[ Upstream commit 7c0884fcd2ddde0544d2e77f297ae461e1f53f58 ]
Currently, TID is not decremented before peer cleanup, during error handling path of ath12k_dp_rx_peer_frag_setup(). This could lead to out-of-bounds access in peer->rx_tid[].
Hence, add a decrement operation for TID, before peer cleanup to ensures proper cleanup and prevents out-of-bounds access issues when the RX peer frag setup fails.
Found during code review. Compile tested only.
--- drivers/net/wireless/ath/ath12k/dp.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath12k/dp.c +1 -0
@@ -84,6 +84,7 @@ int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr) ret =ath12k_dp_rx_peer_frag_setup (ar, addr, vdev_id);if (ret) {ath12k_warn (ab,"failed to setup rx defrag context\n" ); + tid--; goto peer_clean; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 317/570 powerpc: floppy: Add missing checks after DMA map
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit cf183c1730f2634245da35e9b5d53381b787d112 ]
The DMA map functions can fail and should be tested for errors.
--- arch/powerpc/include/asm/floppy.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/floppy.h +4 -1
@@ -144,9 +144,12 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) bus_addr =0 ; } -if (!bus_addr)/* need to map it */ +if (!bus_addr) {/* need to map it */ bus_addr =dma_map_single (&isa_bridge_pcidev->dev, addr, size, dir); +if (dma_mapping_error (&isa_bridge_pcidev->dev, bus_addr)) +return -ENOMEM ; + }/* remember this one as prev */ prev_addr = addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 318/570 netmem: fix skb_frag_address_safe with unreadable skbs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mina Almasry <[email protected]>
[ Upstream commit 4672aec56d2e8edabcb74c3e2320301d106a377e ]
skb_frag_address_safe() needs a check that the skb_frag_page exists check similar to skb_frag_address().
--- include/linux/skbuff.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
include/linux/skbuff.h +7 -1
@@ -3688,7 +3688,13 @@ static inline void *skb_frag_address(const skb_frag_t *frag)*/ static inline void *skb_frag_address_safe (const skb_frag_t *frag) { -void *ptr =page_address (skb_frag_page (frag)); +struct page *page =skb_frag_page (frag); +void *ptr; + +if (!page) +return NULL ; + + ptr =page_address (page);if (unlikely (!ptr))return NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 319/570 arm64: stacktrace: Check kretprobe_find_ret_addr() return value
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
[ Upstream commit beecfd6a88a675e20987e70ec532ba734b230fa4 ]
If kretprobe_find_ret_addr() fails to find the original return address, it returns 0. Check for this case so that a reliable stacktrace won't silently ignore it.
--- arch/arm64/kernel/stacktrace.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kernel/stacktrace.c +2 -0
@@ -152,6 +152,8 @@ kunwind_recover_return_address(struct kunwind_state *state) orig_pc =kretprobe_find_ret_addr (state->task, (void *)state->common.fp, &state->kr_cur); +if (!orig_pc) +return -EINVAL ; state->common.pc = orig_pc; state->flags.kretprobe =1 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 320/570 wifi: iwlegacy: Check rate_idx range after addition
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
[ Upstream commit 0de19d5ae0b2c5b18b88c5c7f0442f707a207409 ]
Limit rate_idx to IL_LAST_OFDM_RATE for 5GHz band for thinkable case the index is incorrect.
--- drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlegacy/4965-mac.c +4 -1
@@ -1575,8 +1575,11 @@ il4965_tx_cmd_build_rate(struct il_priv *il, || rate_idx > RATE_COUNT_LEGACY) rate_idx =rate_lowest_index (&il->bands[info->band], sta);/* For 5 GHZ band, remap mac80211 rate indices into driver indices */ -if (info->band ==NL80211_BAND_5GHZ ) +if (info->band ==NL80211_BAND_5GHZ ) { rate_idx +=IL_FIRST_OFDM_RATE ; +if (rate_idx >IL_LAST_OFDM_RATE ) + rate_idx =IL_LAST_OFDM_RATE ; + }/* Get PLCP rate for tx_cmd->rate_n_flags */ rate_plcp = il_rates[rate_idx].plcp;/* Zero out flags for this packet */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 321/570 dpaa_eth: dont use fixed_phy_change_carrier
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiner Kallweit <[email protected]>
[ Upstream commit d8155c1df5c8b717052567b188455d41fa7a8908 ]
This effectively reverts 6e8b0ff1ba4c ("dpaa_eth: Add change_carrier() for Fixed PHYs"). Usage of fixed_phy_change_carrier() requires that fixed_phy_register() has been called before, directly or indirectly. And that's not the case in this driver.
--- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +0 -2
@@ -28,7 +28,6 @@#include <linux/percpu.h> #include <linux/dma-mapping.h> #include <linux/sort.h> -#include <linux/phy_fixed.h> #include <linux/bpf.h> #include <linux/bpf_trace.h> #include <soc/fsl/bman.h>
@@ -3150,7 +3149,6 @@ static const struct net_device_ops dpaa_ops = { .ndo_stop = dpaa_eth_stop, .ndo_tx_timeout = dpaa_tx_timeout, .ndo_get_stats64 = dpaa_get_stats64, - .ndo_change_carrier = fixed_phy_change_carrier, .ndo_set_mac_address = dpaa_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = dpaa_set_rx_mode,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 322/570 drm/amd/pm: Use pointer type for typecheck()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit b49e3d7ca71aaf1e3412d41522a11a56563799b5 ]
typecheck creates local variables based on the type passed. That could result in stack frame size warnings like below in certain configs:
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu13/smu_v13_0_6_ppt.c:2885:1: error: the frame size of 8304 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
Checking against the pointer type is sufficient for the purpose of getting a diagnostic message during build time.
--- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 41 +++++++++++++------------- 1 file changed, 21 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +21 -20
@@ -40,28 +40,29 @@#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 -#define smu_cmn_init_soft_gpu_metrics (ptr, frev, crev) \ - do { \ - typecheck(struct gpu_metrics_v##frev##_##crev, \ - typeof(*(ptr))); \ - struct metrics_table_header *header = \ - (struct metrics_table_header *)(ptr); \ - memset(header, 0xFF, sizeof(*(ptr))); \ - header->format_revision = frev; \ - header->content_revision = crev; \ - header->structure_size = sizeof(*(ptr)); \ +#define smu_cmn_init_soft_gpu_metrics (ptr, frev, crev) \ + do { \ + typecheck(struct gpu_metrics_v##frev##_##crev *, (ptr)); \ + struct gpu_metrics_v##frev##_##crev *tmp = (ptr); \ + struct metrics_table_header *header = \ + (struct metrics_table_header *)tmp; \ + memset(header, 0xFF, sizeof(*tmp)); \ + header->format_revision = frev; \ + header->content_revision = crev; \ + header->structure_size = sizeof(*tmp); \ } while (0) -#define smu_cmn_init_partition_metrics (ptr, frev, crev) \ - do { \ - typecheck(struct amdgpu_partition_metrics_v##frev##_##crev, \ - typeof(*(ptr))); \ - struct metrics_table_header *header = \ - (struct metrics_table_header *)(ptr); \ - memset(header, 0xFF, sizeof(*(ptr))); \ - header->format_revision = frev; \ - header->content_revision = crev; \ - header->structure_size = sizeof(*(ptr)); \ +#define smu_cmn_init_partition_metrics (ptr, fr, cr) \ + do { \ + typecheck(struct amdgpu_partition_metrics_v##fr##_##cr *, \ + (ptr)); \ + struct amdgpu_partition_metrics_v##fr##_##cr *tmp = (ptr); \ + struct metrics_table_header *header = \ + (struct metrics_table_header *)tmp; \ + memset(header, 0xFF, sizeof(*tmp)); \ + header->format_revision = fr; \ + header->content_revision = cr; \ + header->structure_size = sizeof(*tmp); \ } while (0)extern const int link_speed[];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 323/570 drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to manual
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 2d1ec1e955414e8e8358178011c35afca1a1c0b1 ]
Several other ASICs allow printing OD SCLK levels without setting DPM control to manual. When OD is disabled it will show the range the hardware supports. When OD is enabled it will show what values have been programmed. Adjust VanGogh to work the same.
--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +15 -22
@@ -666,7 +666,6 @@ static int vangogh_print_clk_levels(struct smu_context *smu, {DpmClocks_t *clk_table = smu->smu_table.clocks_table;SmuMetrics_t metrics; -struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);int i, idx, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 ;bool cur_value_match_level = false;
@@ -682,31 +681,25 @@ static int vangogh_print_clk_levels(struct smu_context *smu,switch (clk_type) {case SMU_OD_SCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq);break ;case SMU_OD_CCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq);break ;case SMU_OD_RANGE : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , - smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); - size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , - smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , + smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); + size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , + smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq);break ;case SMU_SOCCLK :/* the level 3 ~ 6 of socclk use the same frequency for vangogh */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 324/570 drm/amd/display: Stop storing failures into adev->dm.cached_state
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit 709a37ab9c63297da2194dc36f604537f9d2d417 ]
If drm_atomic_helper_suspend() has failed for any reason, it's stored in adev->dm.cached_state. This isn't expected because the resume (or complete()) sequence will attempt to use the stored state to resume.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +18 -7
@@ -3060,6 +3060,19 @@ static void hpd_rx_irq_work_suspend(struct amdgpu_display_manager *dm) } } +static int dm_cache_state (struct amdgpu_device *adev) +{ +int r; + + adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); +if (IS_ERR (adev->dm.cached_state)) { + r =PTR_ERR (adev->dm.cached_state); + adev->dm.cached_state =NULL ; + } + +return adev->dm.cached_state ?0 : r; +} +static int dm_prepare_suspend (struct amdgpu_ip_block *ip_block) {struct amdgpu_device *adev = ip_block->adev;
@@ -3068,11 +3081,8 @@ static int dm_prepare_suspend(struct amdgpu_ip_block *ip_block)return 0 ;WARN_ON (adev->dm.cached_state); - adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); -if (IS_ERR (adev->dm.cached_state)) -return PTR_ERR (adev->dm.cached_state); -return 0 ; +return dm_cache_state (adev); }static int dm_suspend (struct amdgpu_ip_block *ip_block)
@@ -3106,9 +3116,10 @@ static int dm_suspend(struct amdgpu_ip_block *ip_block) }if (!adev->dm.cached_state) { - adev->dm.cached_state =drm_atomic_helper_suspend (adev_to_drm (adev)); -if (IS_ERR (adev->dm.cached_state)) -return PTR_ERR (adev->dm.cached_state); +int r =dm_cache_state (adev); + +if (r) +return r; }s3_handle_hdmi_cec (adev_to_drm (adev), true);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 325/570 drm/amdgpu: Suspend IH during mode-2 reset
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lijo Lazar <[email protected]>
[ Upstream commit 3f1e81ecb61923934bd11c3f5c1e10893574e607 ]
On multi-aid SOCs, there could be a continuous stream of interrupts from GC after poison consumption. Suspend IH to disable them before doing mode-2 reset. This avoids conflicts in hardware accesses during interrupt handlers while a reset is ongoing.
--- drivers/gpu/drm/amd/amdgpu/aldebaran.c | 33 ++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/aldebaran.c +29 -4
@@ -71,18 +71,29 @@ aldebaran_get_reset_handler(struct amdgpu_reset_control *reset_ctl,return NULL ; } +static inline uint32_t aldebaran_get_ip_block_mask (struct amdgpu_device *adev) +{ +uint32_t ip_block_mask =BIT (AMD_IP_BLOCK_TYPE_GFX ) | +BIT (AMD_IP_BLOCK_TYPE_SDMA ); + +if (adev->aid_mask) + ip_block_mask |=BIT (AMD_IP_BLOCK_TYPE_IH ); + +return ip_block_mask; +} +static int aldebaran_mode2_suspend_ip (struct amdgpu_device *adev) { +uint32_t ip_block_mask =aldebaran_get_ip_block_mask (adev); +uint32_t ip_block;int r, i;amdgpu_device_set_pg_state (adev,AMD_PG_STATE_UNGATE );amdgpu_device_set_cg_state (adev,AMD_CG_STATE_UNGATE );for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { -if (!(adev->ip_blocks[i].version->type == -AMD_IP_BLOCK_TYPE_GFX || - adev->ip_blocks[i].version->type == -AMD_IP_BLOCK_TYPE_SDMA )) + ip_block =BIT (adev->ip_blocks[i].version->type); +if (!(ip_block_mask & ip_block))continue ; r =amdgpu_ip_block_suspend (&adev->ip_blocks[i]);
@@ -200,8 +211,10 @@ aldebaran_mode2_perform_reset(struct amdgpu_reset_control *reset_ctl,static int aldebaran_mode2_restore_ip (struct amdgpu_device *adev) {struct amdgpu_firmware_info *ucode_list[AMDGPU_UCODE_ID_MAXIMUM ]; +uint32_t ip_block_mask =aldebaran_get_ip_block_mask (adev);struct amdgpu_firmware_info *ucode;struct amdgpu_ip_block *cmn_block; +struct amdgpu_ip_block *ih_block;int ucode_count =0 ;int i, r;
@@ -243,6 +256,18 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev)if (r)return r; +if (ip_block_mask &BIT (AMD_IP_BLOCK_TYPE_IH )) { + ih_block =amdgpu_device_ip_get_ip_block (adev, +AMD_IP_BLOCK_TYPE_IH ); +if (unlikely (!ih_block)) { +dev_err (adev->dev,"Failed to get IH handle\n" ); +return -EINVAL ; + } + r =amdgpu_ip_block_resume (ih_block); +if (r) +return r; + } +/* Reinit GFXHUB */ adev->gfxhub.funcs->init (adev); r = adev->gfxhub.funcs->gart_enable (adev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 326/570 drm/amdgpu: clear pa and mca record counter when resetting eeprom
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: ganglxie <[email protected]>
[ Upstream commit d0cc8d2b7df1848f98f0fea8135ba706814b1d13 ]
clear pa and mca record counter when resetting eeprom, so that ras_num_bad_pages can be calculated correctly
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +2 -0
@@ -476,6 +476,8 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) control->ras_num_recs =0 ; control->ras_num_bad_pages =0 ; + control->ras_num_mca_recs =0 ; + control->ras_num_pa_recs =0 ; control->ras_fri =0 ;amdgpu_dpm_send_hbm_bad_pages_num (adev, control->ras_num_bad_pages);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 327/570 net: vlan: Make is_vlan_dev() a stub when VLAN is not configured
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 2de1ba0887e5d3bf02d7c212f380039b34e10aa3 ]
Add a stub implementation of is_vlan_dev() that returns false when VLAN support is not compiled in (CONFIG_VLAN_8021Q=n).
This allows us to compile-out VLAN-dependent dead code when it is not needed.
This also resolves the following compilation error when:
* CONFIG_VLAN_8021Q=n
* CONFIG_OBJTOOL=y
* CONFIG_OBJTOOL_WERROR=y
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.o: error: objtool: parse_mirred.isra.0+0x370: mlx5e_tc_act_vlan_add_push_action() missing __noreturn in .c/.h or NORETURN() in noreturns.h
The error occurs because objtool cannot determine that unreachable BUG() (which doesn't return) calls in VLAN code paths are actually dead code when VLAN support is disabled.
--- include/linux/if_vlan.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
include/linux/if_vlan.h +10 -5
@@ -79,11 +79,6 @@ static inline struct vlan_ethhdr *skb_vlan_eth_hdr(const struct sk_buff *skb)/* found in socket.c */ extern void vlan_ioctl_set (int (*hook)(struct net *,void __user *)); -static inline bool is_vlan_dev (const struct net_device *dev) -{ -return dev->priv_flags &IFF_802_1Q_VLAN ; -} -#define skb_vlan_tag_present (__skb) (!!(__skb)->vlan_all)#define skb_vlan_tag_get (__skb) ((__skb)->vlan_tci)#define skb_vlan_tag_get_id (__skb) ((__skb)->vlan_tci & VLAN_VID_MASK)
@@ -200,6 +195,11 @@ struct vlan_dev_priv {#endif }; +static inline bool is_vlan_dev (const struct net_device *dev) +{ +return dev->priv_flags &IFF_802_1Q_VLAN ; +} +static inline struct vlan_dev_priv *vlan_dev_priv (const struct net_device *dev) {return netdev_priv (dev);
@@ -237,6 +237,11 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,extern bool vlan_uses_dev (const struct net_device *dev);#else +static inline bool is_vlan_dev (const struct net_device *dev) +{ +return false; +} +static inline struct net_device *__vlan_find_dev_deep_rcu (struct net_device *real_dev,__be16 vlan_proto,u16 vlan_id)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 328/570 net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
[ Upstream commit 60a8b1a5d0824afda869f18dc0ecfe72f8dfda42 ]
When CONFIG_VLAN_8021Q=n, a set of stub helpers are used, three of these helpers use BUG() unconditionally.
This code should not be reached, as callers of these functions should always check for is_vlan_dev() first, but the usage of BUG() is not recommended, replace it with WARN_ON() instead.
--- include/linux/if_vlan.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/linux/if_vlan.h +3 -3
@@ -259,19 +259,19 @@ vlan_for_each(struct net_device *dev,static inline struct net_device *vlan_dev_real_dev (const struct net_device *dev) { -BUG (); +WARN_ON_ONCE (1 );return NULL ; }static inline u16 vlan_dev_vlan_id (const struct net_device *dev) { -BUG (); +WARN_ON_ONCE (1 );return 0 ; }static inline __be16 vlan_dev_vlan_proto (const struct net_device *dev) { -BUG (); +WARN_ON_ONCE (1 );return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 329/570 gve: Return error for unknown admin queue command
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alok Tiwari <[email protected]>
[ Upstream commit b11344f63fdd9e8c5121148a6965b41079071dd2 ]
In gve_adminq_issue_cmd(), return -EINVAL instead of 0 when an unknown admin queue command opcode is encountered.
This prevents the function from silently succeeding on invalid input and prevents undefined behavior by ensuring the function fails gracefully when an unrecognized opcode is provided.
These changes improve error handling.
--- drivers/net/ethernet/google/gve/gve_adminq.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/google/gve/gve_adminq.c +1 -0
@@ -564,6 +564,7 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,break ;default :dev_err (&priv->pdev->dev,"unknown AQ command opcode %d\n" , opcode); +return -EINVAL ; }return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 330/570 net: dsa: b53: ensure BCM5325 PHYs are enabled
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 966a83df36c6f27476ac3501771422e7852098bc ]
According to the datasheet, BCM5325 uses B53_PD_MODE_CTRL_25 register to disable clocking to individual PHYs.
Only ports 1-4 can be enabled or disabled and the datasheet is explicit about not toggling BIT(0) since it disables the PLL power and the switch.
--- drivers/net/dsa/b53/b53_common.c | 13 +++++++++++++ drivers/net/dsa/b53/b53_regs.h | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/dsa/b53/b53_common.c +13 -0
@@ -615,6 +615,19 @@ int b53_setup_port(struct dsa_switch *ds, int port)if (dsa_is_user_port (ds, port))b53_set_eap_mode (dev, port,EAP_MODE_SIMPLIFIED ); +if (is5325 (dev) && +in_range (port,1 ,4 )) { +u8 reg; + +b53_read8 (dev,B53_CTRL_PAGE ,B53_PD_MODE_CTRL_25 , ®); + reg &= ~PD_MODE_POWER_DOWN_PORT (0 ); +if (dsa_is_unused_port (ds, port)) + reg |=PD_MODE_POWER_DOWN_PORT (port); +else + reg &= ~PD_MODE_POWER_DOWN_PORT (port); +b53_write8 (dev,B53_CTRL_PAGE ,B53_PD_MODE_CTRL_25 , reg); + } +return 0 ; }EXPORT_SYMBOL (b53_setup_port);
drivers/net/dsa/b53/b53_regs.h +4 -1
@@ -101,8 +101,11 @@#define PORT_OVERRIDE_SPEED_2000M BIT(6)/* BCM5301X only, requires setting 1000M */ #define PORT_OVERRIDE_EN BIT(7)/* Use the register contents */ -/* Power-down mode control */ +/* Power-down mode control (8 bit) */ #define B53_PD_MODE_CTRL_25 0x0f +#define PD_MODE_PORT_MASK 0x1f +/* Bit 0 also powers down the switch. */ +#define PD_MODE_POWER_DOWN_PORT (i) BIT(i)/* IP Multicast control (8 bit) */ #define B53_IP_MULTICAST_CTRL 0x21
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 331/570 net: dsa: b53: fix b53_imp_vlan_setup for BCM5325
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit c00df1018791185ea398f78af415a2a0aaa0c79c ]
CPU port should be B53_CPU_PORT instead of B53_CPU_PORT_25 for B53_PVLAN_PORT_MASK register.
--- drivers/net/dsa/b53/b53_common.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/dsa/b53/b53_common.c +4 -0
@@ -529,6 +529,10 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)unsigned int i;u16 pvlan; +/* BCM5325 CPU port is at 8 */ +if ((is5325 (dev) ||is5365 (dev)) && cpu_port ==B53_CPU_PORT_25 ) + cpu_port =B53_CPU_PORT ; +/* Enable the IMP port to be in the same VLAN as the other ports * on a per-port basis such that we only have Port i and IMP in * the same VLAN.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 332/570 net: dsa: b53: prevent GMII_PORT_OVERRIDE_CTRL access on BCM5325
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 37883bbc45a8555d6eca88d3a9730504d2dac86c ]
BCM5325 doesn't implement GMII_PORT_OVERRIDE_CTRL register so we should avoid reading or writing it.PORT_OVERRIDE_RX_FLOW and PORT_OVERRIDE_TX_FLOW aren't defined on BCM5325 and we should use PORT_OVERRIDE_LP_FLOW_25 instead.
--- drivers/net/dsa/b53/b53_common.c | 21 +++++++++++++++++---- drivers/net/dsa/b53/b53_regs.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/net/dsa/b53/b53_common.c +17 -4
@@ -1274,6 +1274,8 @@ static void b53_force_link(struct b53_device *dev, int port, int link)if (port == dev->imp_port) { off =B53_PORT_OVERRIDE_CTRL ; val =PORT_OVERRIDE_EN ; + }else if (is5325 (dev)) { +return ; }else { off =B53_GMII_PORT_OVERRIDE_CTRL (port); val =GMII_PO_EN ;
@@ -1298,6 +1300,8 @@ static void b53_force_port_config(struct b53_device *dev, int port,if (port == dev->imp_port) { off =B53_PORT_OVERRIDE_CTRL ; val =PORT_OVERRIDE_EN ; + }else if (is5325 (dev)) { +return ; }else { off =B53_GMII_PORT_OVERRIDE_CTRL (port); val =GMII_PO_EN ;
@@ -1328,10 +1332,19 @@ static void b53_force_port_config(struct b53_device *dev, int port,return ; } -if (rx_pause) - reg |=PORT_OVERRIDE_RX_FLOW ; -if (tx_pause) - reg |=PORT_OVERRIDE_TX_FLOW ; +if (rx_pause) { +if (is5325 (dev)) + reg |=PORT_OVERRIDE_LP_FLOW_25 ; +else + reg |=PORT_OVERRIDE_RX_FLOW ; + } + +if (tx_pause) { +if (is5325 (dev)) + reg |=PORT_OVERRIDE_LP_FLOW_25 ; +else + reg |=PORT_OVERRIDE_TX_FLOW ; + }b53_write8 (dev,B53_CTRL_PAGE , off, reg); }
drivers/net/dsa/b53/b53_regs.h +1 -0
@@ -95,6 +95,7 @@#define PORT_OVERRIDE_SPEED_10M (0 << PORT_OVERRIDE_SPEED_S)#define PORT_OVERRIDE_SPEED_100M (1 << PORT_OVERRIDE_SPEED_S)#define PORT_OVERRIDE_SPEED_1000M (2 << PORT_OVERRIDE_SPEED_S) +#define PORT_OVERRIDE_LP_FLOW_25 BIT(3)/* BCM5325 only */ #define PORT_OVERRIDE_RV_MII_25 BIT(4)/* BCM5325 only */ #define PORT_OVERRIDE_RX_FLOW BIT(4)#define PORT_OVERRIDE_TX_FLOW BIT(5)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 333/570 net: dsa: b53: prevent DIS_LEARNING access on BCM5325
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 800728abd9f83bda4de62a30ce62a8b41c242020 ]
BCM5325 doesn't implement DIS_LEARNING register so we should avoid reading or writing it.
--- drivers/net/dsa/b53/b53_common.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/dsa/b53/b53_common.c +10 -1
@@ -583,6 +583,9 @@ static void b53_port_set_learning(struct b53_device *dev, int port, {u16 reg; +if (is5325 (dev)) +return ; +b53_read16 (dev,B53_CTRL_PAGE ,B53_DIS_LEARNING , ®);if (learning) reg &= ~BIT (port);
@@ -2195,7 +2198,13 @@ int b53_br_flags_pre(struct dsa_switch *ds, int port,struct switchdev_brport_flags flags, struct netlink_ext_ack *extack) { -if (flags.mask & ~(BR_FLOOD |BR_MCAST_FLOOD |BR_LEARNING )) + struct b53_device *dev = ds->priv; +unsigned long mask = (BR_FLOOD |BR_MCAST_FLOOD ); + +if (!is5325 (dev)) + mask |=BR_LEARNING ; + +if (flags.mask & ~mask)return -EINVAL ;return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 334/570 net: dsa: b53: prevent SWITCH_CTRL access on BCM5325
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 22ccaaca43440e90a3b68d2183045b42247dc4be ]
BCM5325 doesn't implement SWITCH_CTRL register so we should avoid reading or writing it.
--- drivers/net/dsa/b53/b53_common.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/dsa/b53/b53_common.c +6 -5
@@ -361,11 +361,12 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_MODE , mgmt); -/* Include IMP port in dumb forwarding mode -*/ -b53_read8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , &mgmt); - mgmt |=B53_MII_DUMB_FWDG_EN ; -b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , mgmt); +if (!is5325 (dev)) { +/* Include IMP port in dumb forwarding mode */ +b53_read8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , &mgmt); + mgmt |=B53_MII_DUMB_FWDG_EN ; +b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , mgmt); + }/* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether * frames should be flooded or not.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 335/570 bpftool: Fix JSON writer resource leak in version command
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuan Chen <[email protected]>
[ Upstream commit 85cd83fed8267cde0dd1cea719808aad95ae4de7 ]
When using bpftool --version -j/-p, the JSON writer object created in do_version() was not properly destroyed after use. This caused a memory leak each time the version command was executed with JSON output.
Fix: 004b45c0e51a (tools: bpftool: provide JSON output for all possible commands)
--- tools/bpf/bpftool/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/bpf/bpftool/main.c +3 -3
@@ -534,9 +534,9 @@ int main(int argc, char **argv)usage ();if (version_requested) -return do_version (argc, argv); - - ret =cmd_select (commands, argc, argv, do_help); + ret =do_version (argc, argv); +else + ret =cmd_select (commands, argc, argv, do_help);if (json_output)jsonw_destroy (&json_wtr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 336/570 ptp: Use ratelimite for freerun error message
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
[ Upstream commit e9a7795e75b78b56997fb0070c18d6e1057b6462 ]
Replace pr_err() with pr_err_ratelimited() in ptp_clock_settime() to prevent log flooding when the physical clock is free running, which happens on some of my hosts. This ensures error messages are rate-limited and improves kernel log readability.
--- drivers/ptp/ptp_clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +1 -1
@@ -96,7 +96,7 @@ static int ptp_clock_settime(struct posix_clock *pc, const struct timespec64 *tp struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);if (ptp_clock_freerun (ptp)) { -pr_err ("ptp: physical clock is free running\n" ); +pr_err_ratelimited ("ptp: physical clock is free running\n" );return -EBUSY ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 337/570 wifi: rtw89: scan abort when assign/unassign_vif
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chih-Kang Chang <[email protected]>
[ Upstream commit 3db8563bac6c34018cbb96b14549a95c368b0304 ]
If scan happen during start_ap, the register which control TX might be turned off during scan. Additionally, if set_channel occurs during scan will backup this register and set to firmware after set_channel done. When scan complete, firmware will also set TX by this register, causing TX to be disabled and beacon can't be TX. Therefore, in assign/unassign_vif call scan abort before set_channel to avoid scan racing with set_channel.
--- drivers/net/wireless/realtek/rtw89/chan.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/realtek/rtw89/chan.c +6 -0
@@ -2816,6 +2816,9 @@ int rtw89_chanctx_ops_assign_vif(struct rtw89_dev *rtwdev, rtwvif_link->chanctx_assigned = true; cfg->ref_count++; +if (rtwdev->scanning) +rtw89_hw_scan_abort (rtwdev, rtwdev->scan_info.scanning_vif); +if (list_empty (&rtwvif->mgnt_entry))list_add_tail (&rtwvif->mgnt_entry, &mgnt->active_list);
@@ -2855,6 +2858,9 @@ void rtw89_chanctx_ops_unassign_vif(struct rtw89_dev *rtwdev, rtwvif_link->chanctx_assigned = false; cfg->ref_count--; +if (rtwdev->scanning) +rtw89_hw_scan_abort (rtwdev, rtwdev->scan_info.scanning_vif); +if (!rtw89_vif_is_active_role (rtwvif))list_del_init (&rtwvif->mgnt_entry);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 338/570 wifi: rtlwifi: fix possible skb memory leak in _rtl_pci_init_one_rxdesc()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Fourier <[email protected]>
[ Upstream commit 76b3e5078d76f0eeadb7aacf9845399f8473da0d ]
When dma_mapping_error() is true, if a new skb has been allocated, then it must be de-allocated.
Compile tested only
--- drivers/net/wireless/realtek/rtlwifi/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtlwifi/pci.c +4 -1
@@ -572,8 +572,11 @@ static int _rtl_pci_init_one_rxdesc(struct ieee80211_hw *hw,dma_map_single (&rtlpci->pdev->dev,skb_tail_pointer (skb), rtlpci->rxbuffersize,DMA_FROM_DEVICE ); bufferaddress = *((dma_addr_t *)skb->cb); -if (dma_mapping_error (&rtlpci->pdev->dev, bufferaddress)) +if (dma_mapping_error (&rtlpci->pdev->dev, bufferaddress)) { +if (!new_skb) +kfree_skb (skb);return 0 ; + } rtlpci->rx_ring[rxring_idx].rx_buf[desc_idx] = skb;if (rtlpriv->use_new_trx_flow) {/* skb->cb may be 64 bit address */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 339/570 ionic: clean dbpage in de-init
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit c9080abea1e69b8b1408ec7dec0acdfdc577a3e2 ]
Since the kern_dbpage gets set up in ionic_lif_init() and that function's error path will clean it if needed, the kern_dbpage on teardown should be cleaned in ionic_lif_deinit(), not in ionic_lif_free(). As it is currently we get a double call to iounmap() on kern_dbpage if the PCI ionic fails setting up the lif. One example of this is when firmware isn't responding to AdminQ requests and ionic's first AdminQ call fails to setup the NotifyQ.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +3 -4
@@ -3526,10 +3526,6 @@ void ionic_lif_free(struct ionic_lif *lif) lif->info =NULL ; lif->info_pa =0 ; -/* unmap doorbell page */ -ionic_bus_unmap_dbpage (lif->ionic, lif->kern_dbpage); - lif->kern_dbpage =NULL ; -mutex_destroy (&lif->config_lock);mutex_destroy (&lif->queue_lock);
@@ -3555,6 +3551,9 @@ void ionic_lif_deinit(struct ionic_lif *lif)ionic_lif_qcq_deinit (lif, lif->notifyqcq);ionic_lif_qcq_deinit (lif, lif->adminqcq); +ionic_bus_unmap_dbpage (lif->ionic, lif->kern_dbpage); + lif->kern_dbpage =NULL ; +ionic_lif_reset (lif); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 340/570 drm/xe: Make dma-fences compliant with the safe access rules
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tvrtko Ursulin <[email protected]>
[ Upstream commit 6bd90e700b4285e6a7541e00f969cab0d696adde ]
Xe can free some of the data pointed to by the dma-fences it exports. Most notably the timeline name can get freed if userspace closes the associated submit queue. At the same time the fence could have been exported to a third party (for example a sync_fence fd) which will then cause an use- after-free on subsequent access.
To make this safe we need to make the driver compliant with the newly documented dma-fence rules. Driver has to ensure a RCU grace period between signalling a fence and freeing any data pointed to by said fence.
For the timeline name we simply make the queue be freed via kfree_rcu and for the shared lock associated with multiple queues we add a RCU grace period before freeing the per GT structure holding the lock.
--- drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 2 ++ drivers/gpu/drm/xe/xe_guc_submit.c | 7 ++++++- drivers/gpu/drm/xe/xe_hw_fence.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_guc_exec_queue_types.h +2 -0
@@ -20,6 +20,8 @@ struct xe_exec_queue;struct xe_guc_exec_queue {/** @q: Backpointer to parent xe_exec_queue */ struct xe_exec_queue *q; +/** @rcu: For safe freeing of exported dma fences */ +struct rcu_head rcu;/** @sched: GPU scheduler for this xe_exec_queue */ struct xe_gpu_scheduler sched;/** @entity: Scheduler entity for this xe_exec_queue */
drivers/gpu/drm/xe/xe_guc_submit.c +6 -1
@@ -1287,7 +1287,11 @@ static void __guc_exec_queue_fini_async(struct work_struct *w)xe_sched_entity_fini (&ge->entity);xe_sched_fini (&ge->sched); -kfree (ge); +/* +* RCU free due sched being exported via DRM scheduler fences +* (timeline name). +*/ +kfree_rcu (ge, rcu);xe_exec_queue_fini (q);xe_pm_runtime_put (guc_to_xe (guc)); }
@@ -1470,6 +1474,7 @@ static int guc_exec_queue_init(struct xe_exec_queue *q) q->guc = ge; ge->q = q; +init_rcu_head (&ge->rcu);init_waitqueue_head (&ge->suspend_wait);for (i =0 ; i <MAX_STATIC_MSG_TYPE ; ++i)
drivers/gpu/drm/xe/xe_hw_fence.c +3 -0
@@ -100,6 +100,9 @@ void xe_hw_fence_irq_finish(struct xe_hw_fence_irq *irq)spin_unlock_irqrestore (&irq->lock, flags);dma_fence_end_signalling (tmp); } + +/* Safe release of the irq->lock used in dma_fence_init. */ +synchronize_rcu (); }void xe_hw_fence_irq_run (struct xe_hw_fence_irq *irq)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 341/570 net: ncsi: Fix buffer overflow in fetching version id
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hari Kalavakunta <[email protected]>
[ Upstream commit 8e16170ae972c7fed132bc928914a2ffb94690fc ]
In NC-SI spec v1.2 section 8.4.44.2, the firmware name doesn't need to be null terminated while its size occupies the full size of the field. Fix the buffer overflow issue by adding one additional byte for null terminator.
--- net/ncsi/internal.h | 2 +- net/ncsi/ncsi-rsp.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
net/ncsi/internal.h +1 -1
@@ -110,7 +110,7 @@ struct ncsi_channel_version {u8 update;/* NCSI version update */ char alpha1;/* NCSI version alpha1 */ char alpha2;/* NCSI version alpha2 */ -u8 fw_name[12 ];/* Firmware name string */ +u8 fw_name[12 +1 ];/* Firmware name string */ u32 fw_version;/* Firmware version */ u16 pci_ids[4 ];/* PCI identification */ u32 mf_id;/* Manufacture ID */
net/ncsi/ncsi-rsp.c +1 -0
@@ -775,6 +775,7 @@ static int ncsi_rsp_handler_gvi(struct ncsi_request *nr) ncv->alpha1 = rsp->alpha1; ncv->alpha2 = rsp->alpha2;memcpy (ncv->fw_name, rsp->fw_name,12 ); + ncv->fw_name[12 ] ='\0' ; ncv->fw_version =ntohl (rsp->fw_version);for (i =0 ; i <ARRAY_SIZE (ncv->pci_ids); i++) ncv->pci_ids[i] =ntohs (rsp->pci_ids[i]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 342/570 drm: renesas: rz-du: mipi_dsi: Add min check for VCLK range
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lad Prabhakar <[email protected]>
[ Upstream commit e37a95d01d5acce211da8446fefbd8684c67f516 ]
The VCLK range for Renesas RZ/G2L SoC is 5.803 MHz to 148.5 MHz. Add a minimum clock check in the mode_valid callback to ensure that the clock value does not fall below the valid range.
--- drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +3 -0
@@ -585,6 +585,9 @@ rzg2l_mipi_dsi_bridge_mode_valid(struct drm_bridge *bridge,if (mode->clock >148500 )return MODE_CLOCK_HIGH ; +if (mode->clock <5803 ) +return MODE_CLOCK_LOW ; +return MODE_OK ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 343/570 drm/ttm: Should to return the evict error
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Emily Deng <[email protected]>
[ Upstream commit 4e16a9a00239db5d819197b9a00f70665951bf50 ]
For the evict fail case, the evict error should be returned.
v2: Consider ENOENT case.
v3: Abort directly when the eviction failed for some reason (except for -ENOENT)
and not wait for the move to finish
--- drivers/gpu/drm/ttm/ttm_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/ttm/ttm_resource.c +3 -0
@@ -557,6 +557,9 @@ int ttm_resource_manager_evict_all(struct ttm_device *bdev,cond_resched (); }while (!ret); +if (ret && ret != -ENOENT ) +return ret; +spin_lock (&man->move_lock); fence =dma_fence_get (man->move);spin_unlock (&man->move_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 344/570 uapi: in6: restore visibility of most IPv6 socket options
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 31557b3487b349464daf42bc4366153743c1e727 ]
A decade ago commit 6d08acd2d32e ("in6: fix conflict with glibc") hid the definitions of IPV6 options, because GCC was complaining about duplicates. The commit did not list the warnings seen, but trying to recreate them now I think they are (building iproute2):
In file included from ./include/uapi/rdma/rdma_user_cm.h:39,
from rdma.h:16,
from res.h:9,
from res-ctx.c:7:
../include/uapi/linux/in6.h:171:9: warning: ‘IPV6_ADD_MEMBERSHIP’ redefined
171 | #define IPV6_ADD_MEMBERSHIP 20
| ^~~~~~~~~~~~~~~~~~~
In file included from /usr/include/netinet/in.h:37,
from rdma.h:13:
/usr/include/bits/in.h:233:10: note: this is the location of the previous definition
233 | # define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
| ^~~~~~~~~~~~~~~~~~~
../include/uapi/linux/in6.h:172:9: warning: ‘IPV6_DROP_MEMBERSHIP’ redefined
172 | #define IPV6_DROP_MEMBERSHIP 21
| ^~~~~~~~~~~~~~~~~~~~
/usr/include/bits/in.h:234:10: note: this is the location of the previous definition
234 | # define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
| ^~~~~~~~~~~~~~~~~~~~Compilers don't complain about redefinition if the defines are identical, but here we have the kernel using the literal value, and glibc using an indirection (defining to a name of another define, with the same numerical value).
Problem is, the commit in question hid all the IPV6 socket options, and glibc has a pretty sparse list. For instance it lacks Flow Label related options. Willem called this out in commit 3fb321fde22d ("selftests/net: ipv6 flowlabel"):
/* uapi/glibc weirdness may leave this undefined */ #ifndef IPV6_FLOWINFO #define IPV6_FLOWINFO 11 #endif
More interestingly some applications (socat) use a #ifdef IPV6_FLOWINFO to gate compilation of thier rudimentary flow label support. (For added confusion socat misspells it as IPV4_FLOWINFO in some places.)
Hide only the two defines we know glibc has a problem with. If we discover more warnings we can hide more but we should avoid covering the entire block of defines for "IPV6 socket options".
--- include/uapi/linux/in6.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/in6.h +2 -2
@@ -152,7 +152,6 @@ struct in6_flowlabel_req {/* * IPV6 socket options */ -#if __UAPI_DEF_IPV6_OPTIONS#define IPV6_ADDRFORM 1#define IPV6_2292PKTINFO 2#define IPV6_2292HOPOPTS 3
@@ -169,8 +168,10 @@ struct in6_flowlabel_req {#define IPV6_MULTICAST_IF 17#define IPV6_MULTICAST_HOPS 18#define IPV6_MULTICAST_LOOP 19 +#if __UAPI_DEF_IPV6_OPTIONS#define IPV6_ADD_MEMBERSHIP 20#define IPV6_DROP_MEMBERSHIP 21 +#endif #define IPV6_ROUTER_ALERT 22#define IPV6_MTU_DISCOVER 23#define IPV6_MTU 24
@@ -203,7 +204,6 @@ struct in6_flowlabel_req {#define IPV6_IPSEC_POLICY 34#define IPV6_XFRM_POLICY 35#define IPV6_HDRINCL 36 -#endif /* * Multicast:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 345/570 wifi: rtw89: 8852c: increase beacon loss to 6 seconds
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuan-Chung Chen <[email protected]>
[ Upstream commit 4bcef86b13316511bb336a26140fc4130c3a65a2 ]
Intermittent beacon loss from a specific AP causes the connection to be lost. Increasing the beacon loss count can make the connection more stable.
--- drivers/net/wireless/realtek/rtw89/fw.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtw89/fw.c +1 -0
@@ -838,6 +838,7 @@ static const struct __fw_feat_cfg fw_feat_tbl[] = {__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,40 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,56 ,10 ,BEACON_FILTER ),__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,80 ,0 ,WOW_REASON_V1 ), +__CFG_FW_FEAT (RTL8852C , ge,0 ,27 ,128 ,0 ,BEACON_LOSS_COUNT_V1 ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,30 ,0 ,CRASH_TRIGGER ),__CFG_FW_FEAT (RTL8922A , ge,0 ,34 ,11 ,0 ,MACID_PAUSE_SLEEP ), __CFG_FW_FEAT(RTL8922A, ge, 0, 34, 35, 0, SCAN_OFFLOAD),
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 346/570 bpf: Make reg_not_null() true for CONST_PTR_TO_MAP
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ihor Solodrai <[email protected]>
[ Upstream commit 5534e58f2e9bd72b253d033ee0af6e68eb8ac96b ]
When reg->type is CONST_PTR_TO_MAP, it can not be null. However the verifier explores the branches under rX == 0 in check_cond_jmp_op() even if reg->type is CONST_PTR_TO_MAP, because it was not checked for in reg_not_null().
Fix this by adding CONST_PTR_TO_MAP to the set of types that are considered non nullable in reg_not_null().
An old "unpriv: cmp map pointer with zero" selftest fails with this change, because now early out correctly triggers in check_cond_jmp_op(), making the verification to pass.
In practice verifier may allow pointer to null comparison in unpriv, since in many cases the relevant branch and comparison op are removed as dead code. So change the expected test result to __success_unpriv.
--- kernel/bpf/verifier.c | 3 ++- tools/testing/selftests/bpf/progs/verifier_unpriv.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
kernel/bpf/verifier.c +2 -1
@@ -405,7 +405,8 @@ static bool reg_not_null(const struct bpf_reg_state *reg) type ==PTR_TO_MAP_KEY || type ==PTR_TO_SOCK_COMMON || (type ==PTR_TO_BTF_ID &&is_trusted_reg (reg)) || - type ==PTR_TO_MEM ; + type ==PTR_TO_MEM || + type ==CONST_PTR_TO_MAP ; }static struct btf_record *reg_btf_record (const struct bpf_reg_state *reg)
tools/testing/selftests/bpf/progs/verifier_unpriv.c +1 -1
@@ -619,7 +619,7 @@ __naked void pass_pointer_to_tail_call(void) SEC("socket") __description("unpriv: cmp map pointer with zero") -__success __failure_unpriv __msg_unpriv("R1 pointer comparison") +__success __success_unpriv __retval(0) __naked void cmp_map_pointer_with_zero(void) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 347/570 selftests/bpf: Fix ringbuf/ringbuf_write test failure with arm64 64KB page size
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit 8c8c5e3c854a2593ec90dacd868f3066b67de1c4 ]
The ringbuf max_entries must be PAGE_ALIGNED. See kernel function ringbuf_map_alloc(). So for arm64 64KB page size, adjust max_entries and other related metrics properly.
--- tools/testing/selftests/bpf/prog_tests/ringbuf.c | 4 ++-- tools/testing/selftests/bpf/progs/test_ringbuf_write.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/prog_tests/ringbuf.c +2 -2
@@ -97,7 +97,7 @@ static void ringbuf_write_subtest(void)if (!ASSERT_OK_PTR (skel,"skel_open" ))return ; - skel->maps.ringbuf.max_entries =0x4000 ; + skel->maps.ringbuf.max_entries =0x40000 ; err =test_ringbuf_write_lskel__load (skel);if (!ASSERT_OK (err,"skel_load" ))
@@ -108,7 +108,7 @@ static void ringbuf_write_subtest(void) mmap_ptr =mmap (NULL , page_size,PROT_READ |PROT_WRITE ,MAP_SHARED , rb_fd,0 );if (!ASSERT_OK_PTR (mmap_ptr,"rw_cons_pos" )) goto cleanup; - *mmap_ptr =0x3000 ; + *mmap_ptr =0x30000 ;ASSERT_OK (munmap (mmap_ptr, page_size),"unmap_rw" ); skel->bss->pid =getpid ();
tools/testing/selftests/bpf/progs/test_ringbuf_write.c +2 -2
@@ -26,11 +26,11 @@ int test_ringbuf_write(void *ctx)if (cur_pid != pid)return 0 ; - sample1 =bpf_ringbuf_reserve (&ringbuf,0x3000 ,0 ); + sample1 =bpf_ringbuf_reserve (&ringbuf,0x30000 ,0 );if (!sample1)return 0 ;/* first one can pass */ - sample2 =bpf_ringbuf_reserve (&ringbuf,0x3000 ,0 ); + sample2 =bpf_ringbuf_reserve (&ringbuf,0x30000 ,0 );if (!sample2) {bpf_ringbuf_discard (sample1,0 );__sync_fetch_and_add (&discarded,1 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 348/570 selftests/bpf: Fix a user_ringbuf failure with arm64 64KB page size
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yonghong Song <[email protected]>
[ Upstream commit bbc7bd658ddc662083639b9e9a280b90225ecd9a ]
The ringbuf max_entries must be PAGE_ALIGNED. See kernel function ringbuf_map_alloc(). So for arm64 64KB page size, adjust max_entries properly.
--- tools/testing/selftests/bpf/prog_tests/user_ringbuf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/prog_tests/user_ringbuf.c +7 -3
@@ -21,8 +21,7 @@#include "../progs/test_user_ringbuf.h" static const long c_sample_size =sizeof (struct sample ) +BPF_RINGBUF_HDR_SZ ; -static const long c_ringbuf_size =1 <<12 ;/* 1 small page */ -static const long c_max_entries = c_ringbuf_size / c_sample_size; +static long c_ringbuf_size, c_max_entries;static void drain_current_samples (void ) {
@@ -424,7 +423,9 @@ static void test_user_ringbuf_loop(void)uint32_t remaining_samples = total_samples;int err; -BUILD_BUG_ON (total_samples <= c_max_entries); +if (!ASSERT_LT (c_max_entries, total_samples,"compare_c_max_entries" )) +return ; + err =load_skel_create_user_ringbuf (&skel, &ringbuf);if (err)return ;
@@ -686,6 +687,9 @@ void test_user_ringbuf(void) {int i; + c_ringbuf_size =getpagesize ();/* 1 page */ + c_max_entries = c_ringbuf_size / c_sample_size; +for (i =0 ; i <ARRAY_SIZE (success_tests); i++) {if (!test__start_subtest (success_tests[i].test_name))continue ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 349/570 drm/amd/display: Update DMCUB loading sequence for DCN3.5
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Kazlauskas <[email protected]>
[ Upstream commit d42b2331e158fa6bcdc89e4c8c470dc5da20be1f ]
[Why]
New sequence from HW for reset and firmware reloading has been provided that aims to stabilize the reload sequence in the case the firmware is hung or has outstanding requests.
[How]
Update the sequence to remove the DMUIF reset and the redundant writes in the release.
--- .../gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c +3 -13
@@ -92,19 +92,15 @@ void dmub_dcn35_reset(struct dmub_srv *dmub)uint32_t in_reset, is_enabled, scratch, i, pwait_mode;REG_GET (DMCUB_CNTL2 ,DMCUB_SOFT_RESET , &in_reset); +REG_GET (DMCUB_CNTL ,DMCUB_ENABLE , &is_enabled); -if (in_reset ==0 ) { +if (in_reset ==0 && is_enabled !=0 ) { cmd.bits.status =1 ; cmd.bits.command_code =DMUB_GPINT__STOP_FW ; cmd.bits.param =0 ; dmub->hw_funcs.set_gpint (dmub, cmd); -/** -* Timeout covers both the ACK and the wait -* for remaining work to finish. -*/ -for (i =0 ; i < timeout; ++i) {if (dmub->hw_funcs.is_gpint_acked (dmub, cmd))break ;
@@ -130,11 +126,9 @@ void dmub_dcn35_reset(struct dmub_srv *dmub)/* Force reset in case we timed out, DMCUB is likely hung. */ } -REG_GET (DMCUB_CNTL ,DMCUB_ENABLE , &is_enabled); -if (is_enabled) {REG_UPDATE (DMCUB_CNTL2 ,DMCUB_SOFT_RESET ,1 ); -REG_UPDATE (MMHUBBUB_SOFT_RESET ,DMUIF_SOFT_RESET ,1 ); +udelay (1 );REG_UPDATE (DMCUB_CNTL ,DMCUB_ENABLE ,0 ); }
@@ -160,11 +154,7 @@ void dmub_dcn35_reset_release(struct dmub_srv *dmub)LONO_SOCCLK_GATE_DISABLE ,1 , LONO_DMCUBCLK_GATE_DISABLE, 1); -REG_UPDATE (MMHUBBUB_SOFT_RESET ,DMUIF_SOFT_RESET ,1 ); -udelay (1 );REG_UPDATE_2 (DMCUB_CNTL ,DMCUB_ENABLE ,1 ,DMCUB_TRACEPORT_EN ,1 ); -REG_UPDATE (DMCUB_CNTL2 ,DMCUB_SOFT_RESET ,1 ); -udelay (1 );REG_UPDATE (MMHUBBUB_SOFT_RESET ,DMUIF_SOFT_RESET ,0 );REG_UPDATE (DMCUB_CNTL2 ,DMCUB_SOFT_RESET ,0 ); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 350/570 drm/amd/display: Avoid trying AUX transactions on disconnected ports
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wayne Lin <[email protected]>
[ Upstream commit deb24e64c8881c462b29e2c69afd9e6669058be5 ]
[Why & How]
Observe that we try to access DPCD 0x600h of disconnected DP ports. In order not to wasting time on retrying these ports, call dpcd_write_rx_power_ctrl() after checking its connection status.
--- drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +2 -1
@@ -140,7 +140,8 @@ void link_blank_dp_stream(struct dc_link *link, bool hw_init) } } -if ((!link->wa_flags.dp_keep_receiver_powered) || hw_init) +if (((!link->wa_flags.dp_keep_receiver_powered) || hw_init) && + (link->type != dc_connection_none))dpcd_write_rx_power_ctrl (link, false); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 351/570 drm/ttm: Respect the shrinker core free target
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tvrtko Ursulin <[email protected]>
[ Upstream commit eac21f8ebeb4f84d703cf41dc3f81d16fa9dc00a ]
Currently the TTM shrinker aborts shrinking as soon as it frees pages from any of the page order pools and by doing so it can fail to respect the freeing target which was configured by the shrinker core.
We use the wording "can fail" because the number of freed pages will depend on the presence of pages in the pools and the order of the pools on the LRU list. For example if there are no free pages in the high order pools the shrinker core may require multiple passes over the TTM shrinker before it will free the default target of 128 pages (assuming there are free pages in the low order pools). This inefficiency can be compounded by the pool LRU where multiple further calls into the TTM shrinker are required to end up looking at the pool with pages.
Improve this by never freeing less than the shrinker core has requested.
At the same time we start reporting the number of scanned pages (freed in this case), which prevents the core shrinker from giving up on the TTM shrinker too soon and moving on.
v2:
* Simplify loop logic. (Christian)
* Improve commit message.
--- drivers/gpu/drm/ttm/ttm_pool.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_pool.c +5 -3
@@ -1132,7 +1132,6 @@ void ttm_pool_fini(struct ttm_pool *pool) }EXPORT_SYMBOL (ttm_pool_fini); -/* As long as pages are available make sure to release at least one */ static unsigned long ttm_pool_shrinker_scan (struct shrinker *shrink,struct shrink_control *sc) {
@@ -1140,9 +1139,12 @@ static unsigned long ttm_pool_shrinker_scan(struct shrinker *shrink,do num_freed +=ttm_pool_shrink (); -while (!num_freed &&atomic_long_read (&allocated_pages)); +while (num_freed < sc->nr_to_scan && +atomic_long_read (&allocated_pages)); -return num_freed; + sc->nr_scanned = num_freed; + +return num_freed ?:SHRINK_STOP ; }/* Return the number of pages available or SHRINK_EMPTY if we have none */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 352/570 rcu: Fix rcu_read_unlock() deadloop due to IRQ work
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joel Fernandes <[email protected]>
[ Upstream commit b41642c87716bbd09797b1e4ea7d904f06c39b7b ]
During rcu_read_unlock_special(), if this happens during irq_exit(), we can lockup if an IPI is issued. This is because the IPI itself triggers the irq_exit() path causing a recursive lock up.
This is precisely what Xiongfeng found when invoking a BPF program on the trace_tick_stop() tracepoint As shown in the trace below. Fix by managing the irq_work state correctly.
irq_exit()
__irq_exit_rcu()
/* in_hardirq() returns false after this */
preempt_count_sub(HARDIRQ_OFFSET)
tick_irq_exit()
tick_nohz_irq_exit()
tick_nohz_stop_sched_tick()
trace_tick_stop() /* a bpf prog is hooked on this trace point */
__bpf_trace_tick_stop()
bpf_trace_run2()
rcu_read_unlock_special()
/* will send a IPI to itself */
irq_work_queue_on(&rdp->defer_qs_iw, rdp->cpu);A simple reproducer can also be obtained by doing the following in tick_irq_exit(). It will hang on boot without the patch:
static inline void tick_irq_exit(void)
{
+ rcu_read_lock();
+ WRITE_ONCE(current->rcu_read_unlock_special.b.need_qs, true);
+ rcu_read_unlock();
+
--- kernel/rcu/tree.h | 13 ++++++++++++- kernel/rcu/tree_plugin.h | 37 ++++++++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 12 deletions(-)
kernel/rcu/tree.h +12 -1
@@ -174,6 +174,17 @@ struct rcu_snap_record {unsigned long jiffies;/* Track jiffies value */ }; +/* +* An IRQ work (deferred_qs_iw) is used by RCU to get the scheduler's attention. +* to report quiescent states at the soonest possible time. +* The request can be in one of the following states: +* - DEFER_QS_IDLE: An IRQ work is yet to be scheduled. +* - DEFER_QS_PENDING: An IRQ work was scheduled but either not yet run, or it +* ran and we still haven't reported a quiescent state. +*/ +#define DEFER_QS_IDLE 0 +#define DEFER_QS_PENDING 1 +/* Per-CPU data for read-copy update. */ struct rcu_data {/* 1) quiescent-state and grace-period handling : */
@@ -192,7 +203,7 @@ struct rcu_data {/* during and after the last grace */ /* period it is aware of. */ struct irq_work defer_qs_iw;/* Obtain later scheduler attention. */ -bool defer_qs_iw_pending;/* Scheduler attention pending? */ +int defer_qs_iw_pending;/* Scheduler attention pending? */ struct work_struct strict_work;/* Schedule readers for strict GPs. */ /* 2) batch handling */
kernel/rcu/tree_plugin.h +26 -11
@@ -486,13 +486,16 @@ rcu_preempt_deferred_qs_irqrestore(struct task_struct *t, unsigned long flags)struct rcu_node *rnp;union rcu_special special; + rdp =this_cpu_ptr (&rcu_data); +if (rdp->defer_qs_iw_pending ==DEFER_QS_PENDING ) + rdp->defer_qs_iw_pending =DEFER_QS_IDLE ; +/* * If RCU core is waiting for this CPU to exit its critical section, * report the fact that it has exited. Because irqs are disabled, * t->rcu_read_unlock_special cannot change. */ special = t->rcu_read_unlock_special; - rdp =this_cpu_ptr (&rcu_data);if (!special.s && !rdp->cpu_no_qs.b.exp) {local_irq_restore (flags);return ;
@@ -629,7 +632,23 @@ static void rcu_preempt_deferred_qs_handler(struct irq_work *iwp) rdp = container_of(iwp, struct rcu_data, defer_qs_iw);local_irq_save (flags); - rdp->defer_qs_iw_pending = false; + +/* +* If the IRQ work handler happens to run in the middle of RCU read-side +* critical section, it could be ineffective in getting the scheduler's +* attention to report a deferred quiescent state (the whole point of the +* IRQ work). For this reason, requeue the IRQ work. +* +* Basically, we want to avoid following situation: +* 1. rcu_read_unlock() queues IRQ work (state -> DEFER_QS_PENDING) +* 2. CPU enters new rcu_read_lock() +* 3. IRQ work runs but cannot report QS due to rcu_preempt_depth() > 0 +* 4. rcu_read_unlock() does not re-queue work (state still PENDING) +* 5. Deferred QS reporting does not happen. +*/ +if (rcu_preempt_depth () >0 ) +WRITE_ONCE (rdp->defer_qs_iw_pending,DEFER_QS_IDLE ); +local_irq_restore (flags); }
@@ -676,17 +695,13 @@ static void rcu_read_unlock_special(struct task_struct *t)set_tsk_need_resched (current);set_preempt_need_resched ();if (IS_ENABLED (CONFIG_IRQ_WORK ) && irqs_were_disabled && - expboost && !rdp->defer_qs_iw_pending &&cpu_online (rdp->cpu)) { + expboost && rdp->defer_qs_iw_pending !=DEFER_QS_PENDING && +cpu_online (rdp->cpu)) {// Get scheduler to re-evaluate and call hooks. // If !IRQ_WORK, FQS scan will eventually IPI. -if (IS_ENABLED (CONFIG_RCU_STRICT_GRACE_PERIOD ) && -IS_ENABLED (CONFIG_PREEMPT_RT )) - rdp->defer_qs_iw =IRQ_WORK_INIT_HARD ( - rcu_preempt_deferred_qs_handler); -else -init_irq_work (&rdp->defer_qs_iw, - rcu_preempt_deferred_qs_handler); - rdp->defer_qs_iw_pending = true; + rdp->defer_qs_iw = +IRQ_WORK_INIT_HARD (rcu_preempt_deferred_qs_handler); + rdp->defer_qs_iw_pending =DEFER_QS_PENDING ;irq_work_queue_on (&rdp->defer_qs_iw, rdp->cpu); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 353/570 net: dsa: b53: fix IP_MULTICAST_CTRL on BCM5325
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Álvaro Fernández Rojas <[email protected]>
[ Upstream commit 044d5ce2788b165798bfd173548e61bf7b6baf4d ]
BCM5325 doesn't implement B53_UC_FWD_EN, B53_MC_FWD_EN or B53_IPMC_FWD_EN.
--- drivers/net/dsa/b53/b53_common.c | 18 +++++++++++------- drivers/net/dsa/b53/b53_regs.h | 1 + 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/net/dsa/b53/b53_common.c +11 -7
@@ -366,14 +366,18 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)b53_read8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , &mgmt); mgmt |=B53_MII_DUMB_FWDG_EN ;b53_write8 (dev,B53_CTRL_PAGE ,B53_SWITCH_CTRL , mgmt); - } -/* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether -* frames should be flooded or not. -*/ -b53_read8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , &mgmt); - mgmt |=B53_UC_FWD_EN |B53_MC_FWD_EN |B53_IPMC_FWD_EN ; -b53_write8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , mgmt); +/* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether +* frames should be flooded or not. +*/ +b53_read8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , &mgmt); + mgmt |=B53_UC_FWD_EN |B53_MC_FWD_EN |B53_IPMC_FWD_EN ; +b53_write8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , mgmt); + }else { +b53_read8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , &mgmt); + mgmt |=B53_IP_MCAST_25 ; +b53_write8 (dev,B53_CTRL_PAGE ,B53_IP_MULTICAST_CTRL , mgmt); + } } static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,
drivers/net/dsa/b53/b53_regs.h +1 -0
@@ -110,6 +110,7 @@/* IP Multicast control (8 bit) */ #define B53_IP_MULTICAST_CTRL 0x21 +#define B53_IP_MCAST_25 BIT(0)#define B53_IPMC_FWD_EN BIT(1)#define B53_UC_FWD_EN BIT(6)#define B53_MC_FWD_EN BIT(7)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 354/570 vsock/virtio: Resize receive buffers so that each SKB fits in a 4K page
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
[ Upstream commit 03a92f036a04fed2b00d69f5f46f1a486e70dc5c ]
When allocating receive buffers for the vsock virtio RX virtqueue, an SKB is allocated with a 4140 data payload (the 44-byte packet header + VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE). Even when factoring in the SKB overhead, the resulting 8KiB allocation thanks to the rounding in kmalloc_reserve() is wasteful (~3700 unusable bytes) and results in a higher-order page allocation on systems with 4KiB pages just for the sake of a few hundred bytes of packet data.
Limit the vsock virtio RX buffers to 4KiB per SKB, resulting in much better memory utilisation and removing the need to allocate higher-order pages entirely.
Message-Id: <[email protected]>
--- include/linux/virtio_vsock.h | 7 ++++++- net/vmw_vsock/virtio_transport.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)
include/linux/virtio_vsock.h +6 -1
@@ -111,7 +111,12 @@ static inline size_t virtio_vsock_skb_len(struct sk_buff *skb)return (size_t )(skb_end_pointer (skb) - skb->head); } -#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE (1024 * 4) +/* Dimension the RX SKB so that the entire thing fits exactly into +* a single 4KiB page. This avoids wasting memory due to alloc_skb() +* rounding up to the next page order and also means that we +* don't leave higher-order pages sitting around in the RX queue. +*/ +#define VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE SKB_WITH_OVERHEAD(1024 * 4)#define VIRTIO_VSOCK_MAX_BUF_SIZE 0xFFFFFFFFUL#define VIRTIO_VSOCK_MAX_PKT_BUF_SIZE (1024 * 64)
net/vmw_vsock/virtio_transport.c +1 -1
@@ -307,7 +307,7 @@ virtio_transport_cancel_pkt(struct vsock_sock *vsk)static void virtio_vsock_rx_fill (struct virtio_vsock *vsock) { -int total_len =VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE +VIRTIO_VSOCK_SKB_HEADROOM ; +int total_len =VIRTIO_VSOCK_DEFAULT_RX_BUF_SIZE ;struct scatterlist pkt, *p;struct virtqueue *vq;struct sk_buff *skb;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 355/570 vhost: fail early when __vhost_add_used() fails
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jason Wang <[email protected]>
[ Upstream commit b4ba1207d45adaafa2982c035898b36af2d3e518 ]
This patch fails vhost_add_used_n() early when __vhost_add_used() fails to make sure used idx is not updated with stale used ring information.
Message-Id: <[email protected]>
--- drivers/vhost/vhost.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/vhost/vhost.c +3 -0
@@ -2983,6 +2983,9 @@ int vhost_add_used_n(struct vhost_virtqueue *vq, struct vring_used_elem *heads, } r =__vhost_add_used_n (vq, heads, count); +if (r <0 ) +return r; +/* Make sure buffer is written before we update index. */ smp_wmb ();if (vhost_put_used_idx (vq)) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 356/570 drm/amd/display: Only finalize atomic_obj if it was initialized
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit b174084b3fe15ad1acc69530e673c1535d2e4f85 ]
[Why]
If amdgpu_dm failed to initalize before amdgpu_dm_initialize_drm_device() completed then freeing atomic_obj will lead to list corruption.
[How]
Check if atomic_obj state is initialized before trying to free.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
@@ -5379,7 +5379,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)static void amdgpu_dm_destroy_drm_device (struct amdgpu_display_manager *dm) { -drm_atomic_private_obj_fini (&dm->atomic_obj); +if (dm->atomic_obj.state) +drm_atomic_private_obj_fini (&dm->atomic_obj); }/******************************************************************************
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 357/570 drm/amd/display: Avoid configuring PSR granularity if PSR-SU not supported
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit a5ce8695d6d1b40d6960d2d298b579042c158f25 ]
[Why]
If PSR-SU is disabled on the link, then configuring su_y granularity in mod_power_calc_psr_configs() can lead to assertions in psr_su_set_dsc_slice_height().
[How]
Check the PSR version in amdgpu_dm_link_setup_psr() to determine whether or not to configure granularity.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +4 -2
@@ -119,8 +119,10 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) psr_config.allow_multi_disp_optimizations = (amdgpu_dc_feature_mask &DC_PSR_ALLOW_MULTI_DISP_OPT ); -if (!psr_su_set_dsc_slice_height (dc, link, stream, &psr_config)) -return false; +if (link->psr_settings.psr_version ==DC_PSR_VERSION_SU_1 ) { +if (!psr_su_set_dsc_slice_height (dc, link, stream, &psr_config)) +return false; + } ret =dc_link_setup_psr (link, stream, &psr_config, &psr_context);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 358/570 drm/amd/display: Disable dsc_power_gate for dcn314 by default
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
[ Upstream commit 02f3ec53177243d32ee8b6f8ba99136d7887ee3a ]
[Why]
"REG_WAIT timeout 1us * 1000 tries - dcn314_dsc_pg_control line" warnings seen after resuming from s2idle.
DCN314 has issues with DSC power gating that cause REG_WAIT timeouts when attempting to power down DSC blocks.
[How]
Disable dsc_power_gate for dcn314 by default.
--- drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c +1 -0
@@ -926,6 +926,7 @@ static const struct dc_debug_options debug_defaults_drv = { .seamless_boot_odm_combine = true, .enable_legacy_fast_update = true, .using_dml2 = false, + .disable_dsc_power_gate = true, };static const struct dc_panel_config panel_config_defaults = {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 359/570 watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaron Plattner <[email protected]>
[ Upstream commit 48defdf6b083f74a44e1f742db284960d3444aec ]
The MediaTek implementation of the sbsa_gwdt watchdog has a race condition where a write to SBSA_GWDT_WRR is ignored if it occurs while the hardware is processing a timeout refresh that asserts WS0.
Detect this based on the hardware implementer and adjust wdd->min_hw_heartbeat_ms to avoid the race by forcing the keepalive ping to be one second later.
--- drivers/watchdog/sbsa_gwdt.c | 50 +++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-)
drivers/watchdog/sbsa_gwdt.c +47 -3
@@ -75,11 +75,17 @@#define SBSA_GWDT_VERSION_MASK 0xF#define SBSA_GWDT_VERSION_SHIFT 16 +#define SBSA_GWDT_IMPL_MASK 0x7FF +#define SBSA_GWDT_IMPL_SHIFT 0 +#define SBSA_GWDT_IMPL_MEDIATEK 0x426 +/** * struct sbsa_gwdt - Internal representation of the SBSA GWDT * @wdd: kernel watchdog_device structure * @clk: store the System Counter clock frequency, in Hz. * @version: store the architecture version +* @need_ws0_race_workaround: +* indicate whether to adjust wdd->timeout to avoid a race with WS0 * @refresh_base: Virtual address of the watchdog refresh frame * @control_base: Virtual address of the watchdog control frame */
@@ -87,6 +93,7 @@ struct sbsa_gwdt {struct watchdog_device wdd;u32 clk;int version; +bool need_ws0_race_workaround;void __iomem *refresh_base;void __iomem *control_base; };
@@ -161,6 +168,31 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd,*/ sbsa_gwdt_reg_write (((u64 )gwdt->clk /2 ) * timeout, gwdt); +/* +* Some watchdog hardware has a race condition where it will ignore +* sbsa_gwdt_keepalive() if it is called at the exact moment that a +* timeout occurs and WS0 is being asserted. Unfortunately, the default +* behavior of the watchdog core is very likely to trigger this race +* when action=0 because it programs WOR to be half of the desired +* timeout, and watchdog_next_keepalive() chooses the exact same time to +* send keepalive pings. +* +* This triggers a race where sbsa_gwdt_keepalive() can be called right +* as WS0 is being asserted, and affected hardware will ignore that +* write and continue to assert WS0. After another (timeout / 2) +* seconds, the same race happens again. If the driver wins then the +* explicit refresh will reset WS0 to false but if the hardware wins, +* then WS1 is asserted and the system resets. +* +* Avoid the problem by scheduling keepalive heartbeats one second later +* than the WOR timeout. +* +* This workaround might not be needed in a future revision of the +* hardware. +*/ +if (gwdt->need_ws0_race_workaround) + wdd->min_hw_heartbeat_ms = timeout *500 +1000 ; +return 0 ; }
@@ -202,12 +234,15 @@ static int sbsa_gwdt_keepalive(struct watchdog_device *wdd)static void sbsa_gwdt_get_version (struct watchdog_device *wdd) {struct sbsa_gwdt *gwdt =watchdog_get_drvdata (wdd); -int ver; +int iidr, ver, impl; - ver =readl (gwdt->control_base +SBSA_GWDT_W_IIDR ); - ver = (ver >>SBSA_GWDT_VERSION_SHIFT ) &SBSA_GWDT_VERSION_MASK ; + iidr =readl (gwdt->control_base +SBSA_GWDT_W_IIDR ); + ver = (iidr >>SBSA_GWDT_VERSION_SHIFT ) &SBSA_GWDT_VERSION_MASK ; + impl = (iidr >>SBSA_GWDT_IMPL_SHIFT ) &SBSA_GWDT_IMPL_MASK ; gwdt->version = ver; + gwdt->need_ws0_race_workaround = + !action && (impl ==SBSA_GWDT_IMPL_MEDIATEK ); }static int sbsa_gwdt_start (struct watchdog_device *wdd)
@@ -299,6 +334,15 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)else wdd->max_hw_heartbeat_ms =GENMASK_ULL (47 ,0 ) / gwdt->clk *1000 ; +if (gwdt->need_ws0_race_workaround) { +/* +* A timeout of 3 seconds means that WOR will be set to 1.5 +* seconds and the heartbeat will be scheduled every 2.5 +* seconds. +*/ + wdd->min_timeout =3 ; + } + status =readl (cf_base +SBSA_GWDT_WCS );if (status &SBSA_GWDT_WCS_WS1 ) {dev_warn (dev,"System reset by WDT.\n" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 360/570 cifs: Fix calling CIFSFindFirst() for root path without msearch
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit b460249b9a1dab7a9f58483e5349d045ad6d585c ]
To query root path (without msearch wildcard) it is needed to send pattern '\' instead of '' (empty string).
This allows to use CIFSFindFirst() to query information about root path which is being used in followup changes.
This change fixes the stat() syscall called on the root path on the mount. It is because stat() syscall uses the cifs_query_path_info() function and it can fallback to the CIFSFindFirst() usage with msearch=false.
--- fs/smb/client/cifssmb.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/smb/client/cifssmb.c +10 -0
@@ -4020,6 +4020,12 @@ CIFSFindFirst(const unsigned int xid, struct cifs_tcon *tcon, pSMB->FileName[name_len] =0 ; pSMB->FileName[name_len+1 ] =0 ; name_len +=2 ; + }else if (!searchName[0 ]) { + pSMB->FileName[0 ] =CIFS_DIR_SEP (cifs_sb); + pSMB->FileName[1 ] =0 ; + pSMB->FileName[2 ] =0 ; + pSMB->FileName[3 ] =0 ; + name_len =4 ; } }else { name_len =copy_path_name (pSMB->FileName, searchName);
@@ -4031,6 +4037,10 @@ CIFSFindFirst(const unsigned int xid, struct cifs_tcon *tcon, pSMB->FileName[name_len] ='*' ; pSMB->FileName[name_len+1 ] =0 ; name_len +=2 ; + }else if (!searchName[0 ]) { + pSMB->FileName[0 ] =CIFS_DIR_SEP (cifs_sb); + pSMB->FileName[1 ] =0 ; + name_len =2 ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 361/570 smb: client: fix session setup against servers that require SPN
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paulo Alcantara <[email protected]>
[ Upstream commit 33cfdd726381828b9907a61c038a9f48b6690a31 ]
Some servers might enforce the SPN to be set in the target info blob (AV pairs) when sending NTLMSSP_AUTH message. In Windows Server, this could be enforced with SmbServerNameHardeningLevel set to 2.
Fix this by always appending SPN (cifs/<hostname>) to the existing list of target infos when setting up NTLMv2 response blob.
--- fs/smb/client/cifsencrypt.c | 79 ++++++++++++++++++++++++++++--------- 1 file changed, 61 insertions(+), 18 deletions(-)
fs/smb/client/cifsencrypt.c +61 -18
@@ -532,17 +532,67 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash, struct shash_return rc; } +/* +* Set up NTLMv2 response blob with SPN (cifs/<hostname>) appended to the +* existing list of AV pairs. +*/ +static int set_auth_key_response (struct cifs_ses *ses) +{ +size_t baselen =CIFS_SESS_KEY_SIZE +sizeof (struct ntlmv2_resp ); +size_t len, spnlen, tilen =0 , num_avs =2 /* SPN + EOL */ ; +struct TCP_Server_Info *server = ses->server; + char *spn __free(kfree) = NULL; +struct ntlmssp2_name *av; +char *rsp =NULL ; +int rc; + + spnlen =strlen (server->hostname); + len =sizeof ("cifs/" ) + spnlen; + spn =kmalloc (len,GFP_KERNEL ); +if (!spn) { + rc = -ENOMEM ; + goto out; + } + + spnlen =scnprintf (spn, len,"cifs/%.*s" , + (int )spnlen, server->hostname); + +av_for_each_entry (ses, av) + tilen +=sizeof (*av) +AV_LEN (av); + + len = baselen + tilen + spnlen *sizeof (__le16) + num_avs *sizeof (*av); + rsp =kmalloc (len,GFP_KERNEL ); +if (!rsp) { + rc = -ENOMEM ; + goto out; + } + +memcpy (rsp + baselen, ses->auth_key.response, tilen); + av = (void *)(rsp + baselen + tilen); + av->type =cpu_to_le16 (NTLMSSP_AV_TARGET_NAME ); + av->length =cpu_to_le16 (spnlen *sizeof (__le16)); +cifs_strtoUTF16 ((__le16 *)av->data, spn, spnlen, ses->local_nls); + av = (void *)((__u8 *)av +sizeof (*av) +AV_LEN (av)); + av->type =cpu_to_le16 (NTLMSSP_AV_EOL ); + av->length =0 ; + + rc =0 ; + ses->auth_key.len = len; +out: + ses->auth_key.response = rsp; +return rc; +} +int setup_ntlmv2_rsp (struct cifs_ses *ses,const struct nls_table *nls_cp) {struct shash_desc *hmacmd5 =NULL ; -int rc; -int baselen; -unsigned int tilen; +unsigned char *tiblob =NULL ;/* target info blob */ struct ntlmv2_resp *ntlmv2;char ntlmv2_hash[16 ]; -unsigned char *tiblob =NULL ;/* target info blob */ __le64 rsp_timestamp; +__u64 cc; +int rc;if (nls_cp ==NULL ) {cifs_dbg (VFS ,"%s called with nls_cp==NULL\n" , __func__);
@@ -588,32 +638,25 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp)* (as Windows 7 does) */ rsp_timestamp =find_timestamp (ses); +get_random_bytes (&cc,sizeof (cc)); - baselen =CIFS_SESS_KEY_SIZE +sizeof (struct ntlmv2_resp ); - tilen = ses->auth_key.len; - tiblob = ses->auth_key.response; +cifs_server_lock (ses->server); - ses->auth_key.response =kmalloc (baselen + tilen,GFP_KERNEL ); -if (!ses->auth_key.response) { - rc = -ENOMEM ; + tiblob = ses->auth_key.response; + rc =set_auth_key_response (ses); +if (rc) { ses->auth_key.len =0 ; - goto setup_ntlmv2_rsp_ret; + goto unlock; } - ses->auth_key.len += baselen; ntlmv2 = (struct ntlmv2_resp *) (ses->auth_key.response +CIFS_SESS_KEY_SIZE ); ntlmv2->blob_signature =cpu_to_le32 (0x00000101 ); ntlmv2->reserved =0 ; ntlmv2->time = rsp_timestamp; - -get_random_bytes (&ntlmv2->client_chal,sizeof (ntlmv2->client_chal)); + ntlmv2->client_chal = cc; ntlmv2->reserved2 =0 ; -memcpy (ses->auth_key.response + baselen, tiblob, tilen); - -cifs_server_lock (ses->server); - rc =cifs_alloc_hash ("hmac(md5)" , &hmacmd5);if (rc) {cifs_dbg (VFS ,"Could not allocate HMAC-MD5, rc=%d\n" , rc);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 362/570 fbdev: fix potential buffer overflow in do_register_framebuffer()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yongzhen Zhang <[email protected]>
[ Upstream commit 523b84dc7ccea9c4d79126d6ed1cf9033cf83b05 ]
The current implementation may lead to buffer overflow when:
1. Unregistration creates NULL gaps in registered_fb[] 2. All array slots become occupied despite num_registered_fb < FB_MAX 3. The registration loop exceeds array bounds
Add boundary check to prevent registered_fb[FB_MAX] access.
--- drivers/video/fbdev/core/fbmem.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/video/fbdev/core/fbmem.c +3 -0
@@ -449,6 +449,9 @@ static int do_register_framebuffer(struct fb_info *fb_info)if (!registered_fb[i])break ; +if (i >=FB_MAX ) +return -ENXIO ; +if (!fb_info->modelist.prev || !fb_info->modelist.next)INIT_LIST_HEAD (&fb_info->modelist);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 363/570 crypto: hisilicon/hpre - fix dma unmap sequence
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhiqi Song <[email protected]>
[ Upstream commit 982fd1a74de63c388c060e4fa6f7fbd088d6d02e ]
Perform DMA unmapping operations before processing data. Otherwise, there may be unsynchronized data accessed by the CPU when the SWIOTLB is enabled.
--- drivers/crypto/hisilicon/hpre/hpre_crypto.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/crypto/hisilicon/hpre/hpre_crypto.c +6 -2
@@ -1491,11 +1491,13 @@ static void hpre_ecdh_cb(struct hpre_ctx *ctx, void *resp)if (overtime_thrhld &&hpre_is_bd_timeout (req, overtime_thrhld))atomic64_inc (&dfx[HPRE_OVER_THRHLD_CNT ].value); +/* Do unmap before data processing */ +hpre_ecdh_hw_data_clr_all (ctx, req, areq->dst, areq->src); + p =sg_virt (areq->dst);memmove (p, p + ctx->key_sz - curve_sz, curve_sz);memmove (p + curve_sz, p + areq->dst_len - curve_sz, curve_sz); -hpre_ecdh_hw_data_clr_all (ctx, req, areq->dst, areq->src);kpp_request_complete (areq, ret);atomic64_inc (&dfx[HPRE_RECV_CNT ].value);
@@ -1808,9 +1810,11 @@ static void hpre_curve25519_cb(struct hpre_ctx *ctx, void *resp)if (overtime_thrhld &&hpre_is_bd_timeout (req, overtime_thrhld))atomic64_inc (&dfx[HPRE_OVER_THRHLD_CNT ].value); +/* Do unmap before data processing */ +hpre_curve25519_hw_data_clr_all (ctx, req, areq->dst, areq->src); +hpre_key_to_big_end (sg_virt (areq->dst),CURVE25519_KEY_SIZE ); -hpre_curve25519_hw_data_clr_all (ctx, req, areq->dst, areq->src);kpp_request_complete (areq, ret);atomic64_inc (&dfx[HPRE_RECV_CNT ].value);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 364/570 ext4: do not BUG when INLINE_DATA_FL lacks system.data xattr
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
[ Upstream commit 099b847ccc6c1ad2f805d13cfbcc83f5b6d4bc42 ]
A syzbot fuzzed image triggered a BUG_ON in ext4_update_inline_data() when an inode had the INLINE_DATA_FL flag set but was missing the system.data extended attribute.
Since this can happen due to a maiciouly fuzzed file system, we shouldn't BUG, but rather, report it as a corrupted file system.
Add similar replacements of BUG_ON with EXT4_ERROR_INODE() ii ext4_create_inline_data() and ext4_inline_data_truncate().
--- fs/ext4/inline.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
fs/ext4/inline.c +16 -3
@@ -303,7 +303,11 @@ static int ext4_create_inline_data(handle_t *handle,if (error) goto out; -BUG_ON (!is.s.not_found); +if (!is.s.not_found) { +EXT4_ERROR_INODE (inode,"unexpected inline data xattr" ); + error = -EFSCORRUPTED ; + goto out; + } error =ext4_xattr_ibody_set (handle, inode, &i, &is);if (error) {
@@ -354,7 +358,11 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode,if (error) goto out; -BUG_ON (is.s.not_found); +if (is.s.not_found) { +EXT4_ERROR_INODE (inode,"missing inline data xattr" ); + error = -EFSCORRUPTED ; + goto out; + } len -=EXT4_MIN_INLINE_DATA_SIZE ; value =kzalloc (len,GFP_NOFS );
@@ -1905,7 +1913,12 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline)if ((err =ext4_xattr_ibody_find (inode, &i, &is)) !=0 ) goto out_error; -BUG_ON (is.s.not_found); +if (is.s.not_found) { +EXT4_ERROR_INODE (inode, +"missing inline data xattr" ); + err = -EFSCORRUPTED ; + goto out_error; + } value_len =le32_to_cpu (is.s.here->e_value_size); value =kmalloc (value_len,GFP_NOFS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 365/570 clk: tegra: periph: Fix error handling and resolve unsigned compare warning
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pei Xiao <[email protected]>
[ Upstream commit 2dc2ca9000eea2eb749f658196204cb84d4306f7 ]
./drivers/clk/tegra/clk-periph.c:59:5-9: WARNING:
Unsigned expression compared with zero: rate < 0
The unsigned long 'rate' variable caused:
- Incorrect handling of negative errors
- Compile warning: "Unsigned expression compared with zero"
Fix by changing to long type and adding req->rate cast.
--- drivers/clk/tegra/clk-periph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/tegra/clk-periph.c +2 -2
@@ -51,7 +51,7 @@ static int clk_periph_determine_rate(struct clk_hw *hw,struct tegra_clk_periph *periph =to_clk_periph (hw);const struct clk_ops *div_ops = periph->div_ops;struct clk_hw *div_hw = &periph->divider.hw; -unsigned long rate; +long rate;__clk_hw_set_clk (div_hw, hw);
@@ -59,7 +59,7 @@ static int clk_periph_determine_rate(struct clk_hw *hw,if (rate <0 )return rate; - req->rate = rate; + req->rate = (unsigned long )rate;return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 366/570 sphinx: kernel_abi: fix performance regression with O=<dir>
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit 2b16b71a05a7f056221751b906c13f8809656b1f ]
The logic there which adds a dependency note to Sphinx cache is not taking into account that the build dir may not be the source dir. This causes a performance regression:
$ time make O=/tmp/foo SPHINXDIRS=admin-guide htmldocs
[OUTDATED]
Added: set()
Changed: {'abi-obsolete', 'abi-removed', 'abi-stable-files', 'abi-obsolete-files', 'abi-stable', 'abi', 'abi-removed-files', 'abi-testing-files', 'abi-testing', 'gpio/index', 'gpio/obsolete'}
Removed: set()
All docs count: 385
Found docs count: 385
real 0m11,324s
user 0m15,783s
sys 0m1,164sTo get the root cause of the problem (ABI files reported as changed), I used this changeset:
# diff --git a/Documentation/conf.py b/Documentation/conf.py
# index e8766e689c1b..ab486623bd8b 100644
# --- a/Documentation/conf.py
# +++ b/Documentation/conf.py
# @@ -571,3 +571,16 @@ def setup(app):
# """Patterns need to be updated at init time on older Sphinx versions"""
#
# app.connect('config-inited', update_patterns)
# + app.connect('env-get-outdated', on_outdated)
# +
# +def on_outdated(app, env, added, changed, removed):
# + """Track cache outdated due to added/changed/removed files"""
# + print("\n[OUTDATED]")
# + print(f"Added: {added}")
# + print(f"Changed: {changed}")
# + print(f"Removed: {removed}")
# + print(f"All docs count: {len(env.all_docs)}")
# + print(f"Found docs count: {len(env.found_docs)}")# +
# + # Just return what we have
# + return added | changed | removed
--- Documentation/sphinx/kernel_abi.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Documentation/sphinx/kernel_abi.py +4 -2
@@ -146,8 +146,10 @@ class KernelCmd(Directive): n += 1 if f != old_f: - # Add the file to Sphinx build dependencies - env.note_dependency(os.path.abspath(f)) + # Add the file to Sphinx build dependencies if the file exists + fname = os.path.join(srctree, f) + if os.path.isfile(fname): + env.note_dependency(fname) old_f = f
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 367/570 mfd: axp20x: Set explicit ID for AXP313 regulator
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen-Yu Tsai <[email protected]>
[ Upstream commit 88828c7e940dd45d139ad4a39d702b23840a37c5 ]
On newer boards featuring the A523 SoC, the AXP323 (related to the AXP313) is paired with the AXP717 and serves as a secondary PMIC providing additional regulator outputs. However the MFD cells are all registered with PLATFORM_DEVID_NONE, which causes the regulator cells to conflict with each other.
Commit e37ec3218870 ("mfd: axp20x: Allow multiple regulators") attempted to fix this by switching to PLATFORM_DEVID_AUTO so that the device names would all be different, however that broke IIO channel mapping, which is also tied to the device names. As a result the change was later reverted.
Instead, here we attempt to make sure the AXP313/AXP323 regulator cell does not conflict by explicitly giving it an ID number. This was previously done for the AXP809+AXP806 pair used with the A80 SoC.
--- drivers/mfd/axp20x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mfd/axp20x.c +2 -1
@@ -1053,7 +1053,8 @@ static const struct mfd_cell axp152_cells[] = { };static struct mfd_cell axp313a_cells[] = { -MFD_CELL_NAME ("axp20x-regulator" ), +/* AXP323 is sometimes paired with AXP717 as sub-PMIC */ +MFD_CELL_BASIC ("axp20x-regulator" ,NULL ,NULL ,0 ,1 ),MFD_CELL_RES ("axp313a-pek" , axp313a_pek_resources), };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/570 phy: rockchip-pcie: Properly disable TEST_WRITE strobe signal
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geraldo Nascimento <[email protected]>
[ Upstream commit 25facbabc3fc33c794ad09d73f73268c0f8cbc7d ]
pcie_conf is used to touch TEST_WRITE strobe signal. This signal should be enabled, a little time waited, and then disabled. Current code clearly was copy-pasted and never disables the strobe signal. Adjust the define. While at it, remove PHY_CFG_RD_MASK which has been unused since 64cdc0360811 ("phy: rockchip-pcie: remove unused phy_rd_cfg function").
--- drivers/phy/rockchip/phy-rockchip-pcie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/phy/rockchip/phy-rockchip-pcie.c +1 -2
@@ -30,9 +30,8 @@#define PHY_CFG_ADDR_SHIFT 1#define PHY_CFG_DATA_MASK 0xf#define PHY_CFG_ADDR_MASK 0x3f -#define PHY_CFG_RD_MASK 0x3ff#define PHY_CFG_WR_ENABLE 1 -#define PHY_CFG_WR_DISABLE 1 +#define PHY_CFG_WR_DISABLE 0#define PHY_CFG_WR_SHIFT 0#define PHY_CFG_WR_MASK 1#define PHY_CFG_PLL_LOCK 0x10
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/570 phy: rockchip-pcie: Enable all four lanes if required
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Valmantas Paliksa <[email protected]>
[ Upstream commit c3fe7071e196e25789ecf90dbc9e8491a98884d7 ]
Current code enables only Lane 0 because pwr_cnt will be incremented on first call to the function. Let's reorder the enablement code to enable all 4 lanes through GRF.
--- drivers/phy/rockchip/phy-rockchip-pcie.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/phy/rockchip/phy-rockchip-pcie.c +6 -6
@@ -159,6 +159,12 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)guard (mutex)(&rk_phy->pcie_mutex); +regmap_write (rk_phy->reg_base, + rk_phy->phy_data->pcie_laneoff, +HIWORD_UPDATE (!PHY_LANE_IDLE_OFF , +PHY_LANE_IDLE_MASK , +PHY_LANE_IDLE_A_SHIFT + inst->index)); +if (rk_phy->pwr_cnt++) {return 0 ; }
@@ -175,12 +181,6 @@ static int rockchip_pcie_phy_power_on(struct phy *phy)PHY_CFG_ADDR_MASK , PHY_CFG_ADDR_SHIFT)); -regmap_write (rk_phy->reg_base, - rk_phy->phy_data->pcie_laneoff, -HIWORD_UPDATE (!PHY_LANE_IDLE_OFF , -PHY_LANE_IDLE_MASK , -PHY_LANE_IDLE_A_SHIFT + inst->index)); -/* * No documented timeout value for phy operation below, * so we make it large enough here. And we use loop-break
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 370/570 scsi: libiscsi: Initialize iscsi_conn->dd_data only if memory is allocated
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Showrya M N <[email protected]>
[ Upstream commit 3ea3a256ed81f95ab0f3281a0e234b01a9cae605 ]
In case of an ib_fast_reg_mr allocation failure during iSER setup, the machine hits a panic because iscsi_conn->dd_data is initialized unconditionally, even when no memory is allocated (dd_size == 0). This leads invalid pointer dereference during connection teardown.
Fix by setting iscsi_conn->dd_data only if memory is actually allocated.
Panic trace:
------------
iser: iser_create_fastreg_desc: Failed to allocate ib_fast_reg_mr err=-12
iser: iser_alloc_rx_descriptors: failed allocating rx descriptors / data buffers
BUG: unable to handle page fault for address: fffffffffffffff8 RIP: 0010:swake_up_locked.part.5+0xa/0x40 Call Trace: complete+0x31/0x40 iscsi_iser_conn_stop+0x88/0xb0 [ib_iser] iscsi_stop_conn+0x66/0xc0 [scsi_transport_iscsi] iscsi_if_stop_conn+0x14a/0x150 [scsi_transport_iscsi] iscsi_if_rx+0x1135/0x1834 [scsi_transport_iscsi] ? netlink_lookup+0x12f/0x1b0 ? netlink_deliver_tap+0x2c/0x200 netlink_unicast+0x1ab/0x280 netlink_sendmsg+0x257/0x4f0 ? _copy_from_user+0x29/0x60 sock_sendmsg+0x5f/0x70
--- drivers/scsi/libiscsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/libiscsi.c +2 -1
@@ -3185,7 +3185,8 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,return NULL ; conn = cls_conn->dd_data; - conn->dd_data = cls_conn->dd_data +sizeof (*conn); +if (dd_size) + conn->dd_data = cls_conn->dd_data +sizeof (*conn); conn->session = session; conn->cls_conn = cls_conn; conn->c_stage =ISCSI_CONN_INITIAL_STAGE ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 371/570 fs/orangefs: use snprintf() instead of sprintf()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amir Mohammad Jahangirzad <[email protected]>
[ Upstream commit cdfa1304657d6f23be8fd2bb0516380a3c89034e ]
sprintf() is discouraged for use with bounded destination buffers as it does not prevent buffer overflows when the formatted output exceeds the destination buffer size. snprintf() is a safer alternative as it limits the number of bytes written and ensures NUL-termination.
Replace sprintf() with snprintf() for copying the debug string into a temporary buffer, using ORANGEFS_MAX_DEBUG_STRING_LEN as the maximum size to ensure safe formatting and prevent memory corruption in edge cases.
EDIT: After this patch sat on linux-next for a few days, Dan Carpenter saw it and suggested that I use scnprintf instead of snprintf. I made the change and retested.
--- fs/orangefs/orangefs-debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/orangefs/orangefs-debugfs.c +1 -1
@@ -396,7 +396,7 @@ static ssize_t orangefs_debug_read(struct file *file, goto out;mutex_lock (&orangefs_debug_lock); - sprintf_ret =sprintf (buf,"%s" , (char *)file->private_data); + sprintf_ret =scnprintf (buf,ORANGEFS_MAX_DEBUG_STRING_LEN ,"%s" , (char *)file->private_data);mutex_unlock (&orangefs_debug_lock); read_ret =simple_read_from_buffer (ubuf, count, ppos, buf, sprintf_ret);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 372/570 watchdog: dw_wdt: Fix default timeout
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sebastian Reichel <[email protected]>
[ Upstream commit ac3dbb91e0167d017f44701dd51c1efe30d0c256 ]
The Synopsys Watchdog driver sets the default timeout to 30 seconds, but on some devices this is not a valid timeout. E.g. on RK3588 the actual timeout being used is 44 seconds instead.
Once the watchdog is started the value is updated accordingly, but it would be better to expose a sensible timeout to userspace without the need to first start the watchdog.
--- drivers/watchdog/dw_wdt.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/watchdog/dw_wdt.c +2 -0
@@ -644,6 +644,8 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) }else { wdd->timeout =DW_WDT_DEFAULT_SECONDS ;watchdog_init_timeout (wdd,0 , dev); +/* Limit timeout value to hardware constraints. */ +dw_wdt_set_timeout (wdd, wdd->timeout); }platform_set_drvdata (pdev, dw_wdt);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 373/570 hwmon: (emc2305) Set initial PWM minimum value during probe based on thermal state
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florin Leotescu <[email protected]>
[ Upstream commit 0429415a084a15466e87d504e8c2a502488184a5 ]
Prevent the PWM value from being set to minimum when thermal zone temperature exceeds any trip point during driver probe. Otherwise, the PWM fan speed will remains at minimum speed and not respond to temperature changes.
--- drivers/hwmon/emc2305.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hwmon/emc2305.c +8 -2
@@ -299,6 +299,12 @@ static int emc2305_set_single_tz(struct device *dev, int idx)dev_err (dev,"Failed to register cooling device %s\n" , emc2305_fan_name[idx]);return PTR_ERR (data->cdev_data[cdev_idx].cdev); } + +if (data->cdev_data[cdev_idx].cur_state >0 ) +/* Update pwm when temperature is above trips */ + pwm =EMC2305_PWM_STATE2DUTY (data->cdev_data[cdev_idx].cur_state, + data->max_state,EMC2305_FAN_MAX ); +/* Set minimal PWM speed. */ if (data->pwm_separate) { ret =emc2305_set_pwm (dev, pwm, cdev_idx);
@@ -312,10 +318,10 @@ static int emc2305_set_single_tz(struct device *dev, int idx) } } data->cdev_data[cdev_idx].cur_state = -EMC2305_PWM_DUTY2STATE (data->pwm_min[cdev_idx], data->max_state, +EMC2305_PWM_DUTY2STATE (pwm, data->max_state,EMC2305_FAN_MAX ); data->cdev_data[cdev_idx].last_hwmon_state = -EMC2305_PWM_DUTY2STATE (data->pwm_min[cdev_idx], data->max_state, +EMC2305_PWM_DUTY2STATE (pwm, data->max_state,EMC2305_FAN_MAX );return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 374/570 clk: qcom: ipq5018: keep XO clock always on
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: George Moussalem <[email protected]>
[ Upstream commit 693a723291d0634eaea24cff2f9d807f3223f204 ]
The XO clock must not be disabled to avoid the kernel trying to disable the it. As such, keep the XO clock always on by flagging it as critical.
--- drivers/clk/qcom/gcc-ipq5018.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-ipq5018.c +1 -1
@@ -1371,7 +1371,7 @@ static struct clk_branch gcc_xo_clk = { &gcc_xo_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, .ops = &clk_branch2_ops, }, },
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 375/570 MIPS: vpe-mt: add missing prototypes for vpe_{alloc,start,stop,free}
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiji Yang <[email protected]>
[ Upstream commit 844615dd0f2d95c018ec66b943e08af22b62aff3 ]
These functions are exported but their prototypes are not defined. This patch adds the missing function prototypes to fix the following compilation warnings:
arch/mips/kernel/vpe-mt.c:180:7: error: no previous prototype for 'vpe_alloc' [-Werror=missing-prototypes]
180 | void *vpe_alloc(void)
| ^~~~~~~~~
arch/mips/kernel/vpe-mt.c:198:5: error: no previous prototype for 'vpe_start' [-Werror=missing-prototypes]
198 | int vpe_start(void *vpe, unsigned long start)
| ^~~~~~~~~
arch/mips/kernel/vpe-mt.c:208:5: error: no previous prototype for 'vpe_stop' [-Werror=missing-prototypes]
208 | int vpe_stop(void *vpe)
| ^~~~~~~~
arch/mips/kernel/vpe-mt.c:229:5: error: no previous prototype for 'vpe_free' [-Werror=missing-prototypes]
229 | int vpe_free(void *vpe)
| ^~~~~~~~--- arch/mips/include/asm/vpe.h | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/mips/include/asm/vpe.h +8 -0
@@ -119,4 +119,12 @@ void cleanup_tc(struct tc *tc);int __init vpe_module_init (void ); void __exit vpe_module_exit(void); + +#ifdef CONFIG_MIPS_VPE_LOADER_MT +void *vpe_alloc (void ); +int vpe_start (void *vpe,unsigned long start); +int vpe_stop (void *vpe); +int vpe_free (void *vpe); +#endif /* CONFIG_MIPS_VPE_LOADER_MT */ +#endif /* _ASM_VPE_H */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 376/570 watchdog: iTCO_wdt: Report error if timeout configuration fails
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ziyan Fu <[email protected]>
[ Upstream commit 40efc43eb7ffb5a4e2f998c13b8cfb555e671b92 ]
The driver probes with the invalid timeout value when 'iTCO_wdt_set_timeout()' fails, as its return value is not checked. In this case, when executing "wdctl", we may get:
Device: /dev/watchdog0 Timeout: 30 seconds Timeleft: 613 seconds
The timeout value is the value of "heartbeat" or "WATCHDOG_TIMEOUT", and the timeleft value is calculated from the register value we actually read (0xffff) by masking with 0x3ff and converting ticks to seconds (* 6 / 10).
Add error handling to return the failure code if 'iTCO_wdt_set_timeout()' fails, ensuring the driver probe fails and prevents invalid operation.
--- drivers/watchdog/iTCO_wdt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/watchdog/iTCO_wdt.c +5 -1
@@ -577,7 +577,11 @@ static int iTCO_wdt_probe(struct platform_device *pdev)/* Check that the heartbeat value is within it's range; if not reset to the default */ if (iTCO_wdt_set_timeout (&p->wddev, heartbeat)) { -iTCO_wdt_set_timeout (&p->wddev,WATCHDOG_TIMEOUT ); + ret =iTCO_wdt_set_timeout (&p->wddev,WATCHDOG_TIMEOUT ); +if (ret !=0 ) { +dev_err (dev,"Failed to set watchdog timeout (%d)\n" ,WATCHDOG_TIMEOUT ); +return ret; + }dev_info (dev,"timeout value out of range, using %d\n" ,WATCHDOG_TIMEOUT ); heartbeat =WATCHDOG_TIMEOUT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 377/570 ext4: limit the maximum folio order
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Yi <[email protected]>
[ Upstream commit b12f423d598fd874df9ecfb2436789d582fda8e6 ]
In environments with a page size of 64KB, the maximum size of a folio can reach up to 128MB. Consequently, during the write-back of folios, the 'rsv_blocks' will be overestimated to 1,577, which can make pressure on the journal space where the journal is small. This can easily exceed the limit of a single transaction. Besides, an excessively large folio is meaningless and will instead increase the overhead of traversing the bhs within the folio. Therefore, limit the maximum order of a folio to 2048 filesystem blocks.
--- fs/ext4/ext4.h | 2 +- fs/ext4/ialloc.c | 3 +-- fs/ext4/inode.c | 22 +++++++++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -3020,7 +3020,7 @@ int ext4_walk_page_buffers(handle_t *handle, struct buffer_head *bh));int do_journal_get_write_access (handle_t *handle,struct inode *inode,struct buffer_head *bh); -bool ext4_should_enable_large_folio (struct inode *inode); +void ext4_set_inode_mapping_order (struct inode *inode);#define FALL_BACK_TO_NONDELALLOC 1#define CONVERT_INLINE_DATA 2
fs/ext4/ialloc.c +1 -2
@@ -1335,8 +1335,7 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap, } } -if (ext4_should_enable_large_folio (inode)) -mapping_set_large_folios (inode->i_mapping); +ext4_set_inode_mapping_order (inode);ext4_update_inode_fsync_trans (handle, inode,1 );
fs/ext4/inode.c +19 -3
@@ -5107,7 +5107,7 @@ static int check_igot_inode(struct inode *inode, ext4_iget_flags flags,return -EFSCORRUPTED ; } -bool ext4_should_enable_large_folio (struct inode *inode) +static bool ext4_should_enable_large_folio (struct inode *inode) {struct super_block *sb = inode->i_sb;
@@ -5124,6 +5124,22 @@ bool ext4_should_enable_large_folio(struct inode *inode)return true; } +/* +* Limit the maximum folio order to 2048 blocks to prevent overestimation +* of reserve handle credits during the folio writeback in environments +* where the PAGE_SIZE exceeds 4KB. +*/ +#define EXT4_MAX_PAGECACHE_ORDER (i) \ + umin(MAX_PAGECACHE_ORDER, (11 + (i)->i_blkbits - PAGE_SHIFT)) +void ext4_set_inode_mapping_order (struct inode *inode) +{ +if (!ext4_should_enable_large_folio (inode)) +return ; + +mapping_set_folio_order_range (inode->i_mapping,0 , +EXT4_MAX_PAGECACHE_ORDER (inode)); +} +struct inode *__ext4_iget (struct super_block *sb,unsigned long ino,ext4_iget_flags flags,const char *function,unsigned int line)
@@ -5441,8 +5457,8 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, ret = -EFSCORRUPTED ; goto bad_inode; } -if (ext4_should_enable_large_folio (inode)) -mapping_set_large_folios (inode->i_mapping); + +ext4_set_inode_mapping_order (inode); ret =check_igot_inode (inode, flags, function, line);/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 378/570 scsi: bfa: Double-free fix
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: jackysliu <[email protected]>
[ Upstream commit add4c4850363d7c1b72e8fce9ccb21fdd2cf5dc9 ]
When the bfad_im_probe() function fails during initialization, the memory pointed to by bfad->im is freed without setting bfad->im to NULL.
Subsequently, during driver uninstallation, when the state machine enters the bfad_sm_stopping state and calls the bfad_im_probe_undo() function, it attempts to free the memory pointed to by bfad->im again, thereby triggering a double-free vulnerability.
Set bfad->im to NULL if probing fails.
--- drivers/scsi/bfa/bfad_im.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/bfa/bfad_im.c +1 -0
@@ -706,6 +706,7 @@ bfad_im_probe(struct bfad_s *bfad)if (bfad_thread_workq (bfad) !=BFA_STATUS_OK ) {kfree (im); + bfad->im =NULL ;return BFA_STATUS_FAILED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 379/570 jfs: truncate good inode pages when hard link is 0
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lizhi Xu <[email protected]>
[ Upstream commit 2d91b3765cd05016335cd5df5e5c6a29708ec058 ]
The fileset value of the inode copy from the disk by the reproducer is AGGR_RESERVED_I. When executing evict, its hard link number is 0, so its inode pages are not truncated. This causes the bugon to be triggered when executing clear_inode() because nrpages is greater than 0.
--- fs/jfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jfs/inode.c +1 -1
@@ -145,9 +145,9 @@ void jfs_evict_inode(struct inode *inode)if (!inode->i_nlink && !is_bad_inode (inode)) {dquot_initialize (inode); +truncate_inode_pages_final (&inode->i_data);if (JFS_IP (inode)->fileset ==FILESYSTEM_I ) {struct inode *ipimap =JFS_SBI (inode->i_sb)->ipimap; -truncate_inode_pages_final (&inode->i_data);if (test_cflag (COMMIT_Freewmap, inode))jfs_free_zero_link (inode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 380/570 jfs: Regular file corruption check
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
[ Upstream commit 2d04df8116426b6c7b9f8b9b371250f666a2a2fb ]
The reproducer builds a corrupted file on disk with a negative i_size value. Add a check when opening this file to avoid subsequent operation failures.
--- fs/jfs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/jfs/file.c +3 -0
@@ -44,6 +44,9 @@ static int jfs_open(struct inode *inode, struct file *file) {int rc; +if (S_ISREG (inode->i_mode) && inode->i_size <0 ) +return -EIO ; +if ((rc =dquot_file_open (inode, file)))return rc;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/570 jfs: upper bound check of tree index in dbAllocAG
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnaud Lecomte <[email protected]>
[ Upstream commit c214006856ff52a8ff17ed8da52d50601d54f9ce ]
When computing the tree index in dbAllocAG, we never check if we are out of bounds realative to the size of the stree.
This could happen in a scenario where the filesystem metadata are corrupted.
--- fs/jfs/jfs_dmap.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/jfs/jfs_dmap.c +6 -0
@@ -1389,6 +1389,12 @@ dbAllocAG(struct bmap * bmp, int agno, s64 nblocks, int l2nb, s64 * results) (1 << (L2LPERCTL - (bmp->db_agheight <<1 ))) / bmp->db_agwidth; ti = bmp->db_agstart + bmp->db_agwidth * (agno & (agperlev -1 )); +if (ti <0 || ti >=le32_to_cpu (dcp->nleafs)) { +jfs_error (bmp->db_ipbmap->i_sb,"Corrupt dmapctl page\n" ); +release_metapage (mp); +return -EIO ; + } +/* dmap control page trees fan-out by 4 and a single allocation * group may be described by 1 or 2 subtrees within the ag level * dmap control page, depending upon the ag size. examine the ag's
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/570 media: hi556: Fix reset GPIO timings
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 99f2211a9d89fe34b3fa847fd7a4475171406cd0 ]
probe() requests the reset GPIO to be set to high when getting it. Immeditately after this hi556_resume() is called and sets the GPIO low.
If the GPIO was low before requesting it this will result in the GPIO only very briefly spiking high and the sensor not being properly reset. The same problem also happens on back to back runtime suspend + resume.
Fix this by adding a sleep of 2 ms in hi556_resume() before setting the GPIO low (if there is a reset GPIO).
The final sleep is kept unconditional, because if there is e.g. no reset GPIO but a controllable clock then the sensor also needs some time after enabling the clock.
--- drivers/media/i2c/hi556.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/i2c/hi556.c +6 -1
@@ -1321,7 +1321,12 @@ static int hi556_resume(struct device *dev)return ret; } -gpiod_set_value_cansleep (hi556->reset_gpio,0 ); +if (hi556->reset_gpio) { +/* Assert reset for at least 2ms on back to back off-on */ +usleep_range (2000 ,2200 ); +gpiod_set_value_cansleep (hi556->reset_gpio,0 ); + } +usleep_range (5000 ,5500 );return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/570 RDMA/bnxt_re: Fix size of uverbs_copy_to() in BNXT_RE_METHOD_GET_TOGGLE_MEM
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh AP <[email protected]>
[ Upstream commit 09d231ab569ca97478445ccc1ad44ab026de39b1 ]
Since both "length" and "offset" are of type u32, there is no functional issue here.
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +1 -1
@@ -4738,7 +4738,7 @@ static int UVERBS_HANDLER(BNXT_RE_METHOD_GET_TOGGLE_MEM)(struct uverbs_attr_bundreturn err; err =uverbs_copy_to (attrs,BNXT_RE_TOGGLE_MEM_MMAP_OFFSET , - &offset,sizeof (length)); + &offset,sizeof (offset));if (err)return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/570 crypto: jitter - fix intermediary handling
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Markus Theil <[email protected]>
[ Upstream commit 735b72568c73875269a6b73ab9543a70f6ac8a9f ]
The intermediary value was included in the wrong hash state. While there, adapt to user-space by setting the timestamp to 0 if stuck and inserting the values nevertheless.
--- crypto/jitterentropy-kcapi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
crypto/jitterentropy-kcapi.c +5 -4
@@ -144,7 +144,7 @@ int jent_hash_time(void *hash_state, __u64 time, u8 *addtl,* Inject the data from the previous loop into the pool. This data is * not considered to contain any entropy, but it stirs the pool a bit. */ - ret =crypto_shash_update (desc, intermediary,sizeof (intermediary)); + ret =crypto_shash_update (hash_state_desc, intermediary,sizeof (intermediary));if (ret) goto err;
@@ -157,11 +157,12 @@ int jent_hash_time(void *hash_state, __u64 time, u8 *addtl,* conditioning operation to have an identical amount of input data * according to section 3.1.5. */ -if (!stuck) { - ret =crypto_shash_update (hash_state_desc, (u8 *)&time, -sizeof (__u64)); +if (stuck) { + time =0 ; } + ret =crypto_shash_update (hash_state_desc, (u8 *)&time,sizeof (__u64)); + err:shash_desc_zero (desc);memzero_explicit (intermediary,sizeof (intermediary));
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/570 MIPS: Dont crash in stack_top() for tasks without ABI or vDSO
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Weißschuh <[email protected]>
[ Upstream commit e9f4a6b3421e936c3ee9d74710243897d74dbaa2 ]
Not all tasks have an ABI associated or vDSO mapped,
for example kthreads never do.
If such a task ever ends up calling stack_top(), it will derefence the NULL ABI pointer and crash.
This can for example happen when using kunit:
mips_stack_top+0x28/0xc0
arch_pick_mmap_layout+0x190/0x220
kunit_vm_mmap_init+0xf8/0x138
__kunit_add_resource+0x40/0xa8
kunit_vm_mmap+0x88/0xd8
usercopy_test_init+0xb8/0x240
kunit_try_run_case+0x5c/0x1a8
kunit_generic_run_threadfn_adapter+0x28/0x50
kthread+0x118/0x240
ret_from_kernel_thread+0x14/0x1cOnly dereference the ABI point if it is set.
The GIC page is also included as it is specific to the vDSO. Also move the randomization adjustment into the same conditional.
--- arch/mips/kernel/process.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arch/mips/kernel/process.c +9 -7
@@ -690,18 +690,20 @@ unsigned long mips_stack_top(void) }/* Space for the VDSO, data page & GIC user page */ - top -=PAGE_ALIGN (current->thread.abi->vdso->size); - top -=PAGE_SIZE ; - top -=mips_gic_present () ?PAGE_SIZE :0 ; +if (current->thread.abi) { + top -=PAGE_ALIGN (current->thread.abi->vdso->size); + top -=PAGE_SIZE ; + top -=mips_gic_present () ?PAGE_SIZE :0 ; + +/* Space to randomize the VDSO base */ +if (current->flags &PF_RANDOMIZE ) + top -=VDSO_RANDOMIZE_SIZE ; + }/* Space for cache colour alignment */ if (cpu_has_dc_aliases) top -= shm_align_mask +1 ; -/* Space to randomize the VDSO base */ -if (current->flags &PF_RANDOMIZE ) - top -=VDSO_RANDOMIZE_SIZE ; -return top; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/570 MIPS: lantiq: falcon: sysctrl: fix request memory check logic
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiji Yang <[email protected]>
[ Upstream commit 9c9a7ff9882fc6ba7d2f4050697e8bb80383e8dc ]
request_mem_region() will return NULL instead of error code when the memory request fails. Therefore, we should check if the return value is non-zero instead of less than zero. In this way, this patch also fixes the build warnings:
arch/mips/lantiq/falcon/sysctrl.c:214:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
214 | res_status.name) < 0) ||
| ^arch/mips/lantiq/falcon/sysctrl.c:216:47: error: ordered comparison of pointer with integer zero [-Werror=extra]
216 | res_ebu.name) < 0) ||
| ^arch/mips/lantiq/falcon/sysctrl.c:219:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
219 | res_sys[0].name) < 0) ||
| ^arch/mips/lantiq/falcon/sysctrl.c:222:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
222 | res_sys[1].name) < 0) ||
| ^arch/mips/lantiq/falcon/sysctrl.c:225:50: error: ordered comparison of pointer with integer zero [-Werror=extra]
225 | res_sys[2].name) < 0))
|
--- arch/mips/lantiq/falcon/sysctrl.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
arch/mips/lantiq/falcon/sysctrl.c +10 -13
@@ -214,19 +214,16 @@ void __init ltq_soc_init(void)of_node_put (np_syseth);of_node_put (np_sysgpe); -if ((request_mem_region (res_status.start,resource_size (&res_status), - res_status.name) <0 ) || - (request_mem_region (res_ebu.start,resource_size (&res_ebu), - res_ebu.name) <0 ) || - (request_mem_region (res_sys[0 ].start, -resource_size (&res_sys[0 ]), - res_sys[0 ].name) <0 ) || - (request_mem_region (res_sys[1 ].start, -resource_size (&res_sys[1 ]), - res_sys[1 ].name) <0 ) || - (request_mem_region (res_sys[2 ].start, -resource_size (&res_sys[2 ]), - res_sys[2 ].name) <0 )) +if ((!request_mem_region (res_status.start,resource_size (&res_status), + res_status.name)) || + (!request_mem_region (res_ebu.start,resource_size (&res_ebu), + res_ebu.name)) || + (!request_mem_region (res_sys[0 ].start,resource_size (&res_sys[0 ]), + res_sys[0 ].name)) || + (!request_mem_region (res_sys[1 ].start,resource_size (&res_sys[1 ]), + res_sys[1 ].name)) || + (!request_mem_region (res_sys[2 ].start,resource_size (&res_sys[2 ]), + res_sys[2 ].name)))pr_err ("Failed to request core resources" ); status_membase = ioremap(res_status.start,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/570 media: iris: Add handling for corrupt and drop frames
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dikshita Agarwal <[email protected]>
[ Upstream commit b791dcfcba3a0c46fb3e2decab31d2340c5dc313 ]
Firmware attach DATACORRUPT/DROP buffer flags for the frames which needs to be dropped, handle it by setting VB2_BUF_STATE_ERROR for these buffers before calling buf_done.
--- drivers/media/platform/qcom/iris/iris_buffer.c | 11 ++++++++--- .../media/platform/qcom/iris/iris_hfi_gen1_defines.h | 2 ++ .../media/platform/qcom/iris/iris_hfi_gen1_response.c | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-)
drivers/media/platform/qcom/iris/iris_buffer.c +8 -3
@@ -593,10 +593,13 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf) vb2 = &vbuf->vb2_buf; -if (buf->flags &V4L2_BUF_FLAG_ERROR ) +if (buf->flags &V4L2_BUF_FLAG_ERROR ) { state =VB2_BUF_STATE_ERROR ; -else - state =VB2_BUF_STATE_DONE ; +vb2_set_plane_payload (vb2,0 ,0 ); + vb2->timestamp =0 ; +v4l2_m2m_buf_done (vbuf, state); +return 0 ; + } vbuf->flags |= buf->flags;
@@ -616,6 +619,8 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf)v4l2_m2m_mark_stopped (m2m_ctx); } } + + state =VB2_BUF_STATE_DONE ; vb2->timestamp = buf->timestamp;v4l2_m2m_buf_done (vbuf, state);
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +2 -0
@@ -117,6 +117,8 @@#define HFI_FRAME_NOTCODED 0x7f002000#define HFI_FRAME_YUV 0x7f004000#define HFI_UNUSED_PICT 0x10000000 +#define HFI_BUFFERFLAG_DATACORRUPT 0x00000008 +#define HFI_BUFFERFLAG_DROP_FRAME 0x20000000struct hfi_pkt_hdr {u32 size;
drivers/media/platform/qcom/iris/iris_hfi_gen1_response.c +6 -0
@@ -481,6 +481,12 @@ static void iris_hfi_gen1_session_ftb_done(struct iris_inst *inst, void *packet) buf->attr |=BUF_ATTR_DEQUEUED ; buf->attr |=BUF_ATTR_BUFFER_DONE ; +if (hfi_flags &HFI_BUFFERFLAG_DATACORRUPT ) + flags |=V4L2_BUF_FLAG_ERROR ; + +if (hfi_flags &HFI_BUFFERFLAG_DROP_FRAME ) + flags |=V4L2_BUF_FLAG_ERROR ; + buf->flags |= flags;iris_vb2_buffer_done (inst, buf);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 388/570 clk: thead: Mark essential bus clocks as CLK_IGNORE_UNUSED
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Michal Wilczynski <[email protected]>
[ Upstream commit 0370395d45ca6dd53bb931978f0e91ac8dd6f1c5 ]
Probing peripherals in the AON and PERI domains, such as the PVT thermal sensor and the PWM controller, can lead to boot hangs or unresponsive devices on the LPi4A board. The root cause is that their parent bus clocks ('CLK_CPU2AON_X2H' and the 'CLK_PERISYS_APB' clocks) are automatically gated by the kernel's power-saving mechanisms when the bus is perceived as idle.
Alternative solutions were investigated, including modeling the parent bus in the Device Tree with 'simple-pm-bus' or refactoring the clock driver's parentage. The 'simple-pm-bus' approach is not viable due to the lack of defined bus address ranges in the hardware manual and its creation of improper dependencies on the 'pm_runtime' API for consumer drivers.
Therefore, applying the'`CLK_IGNORE_UNUSED' flag directly to the essential bus clocks is the most direct and targeted fix. This prevents the kernel from auto-gating these buses and ensures peripherals remain accessible.
This change fixes the boot hang associated with the PVT sensor and resolves the functional issues with the PWM controller.
--- drivers/clk/thead/clk-th1520-ap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/thead/clk-th1520-ap.c +3 -2
@@ -792,11 +792,12 @@ static CCU_GATE(CLK_AON2CPU_A2X, aon2cpu_a2x_clk, "aon2cpu-a2x", axi4_cpusys2_ac 0x134, BIT(8), 0); static CCU_GATE(CLK_X2X_CPUSYS, x2x_cpusys_clk, "x2x-cpusys", axi4_cpusys2_aclk_pd, 0x134, BIT(7), 0); -static CCU_GATE(CLK_CPU2AON_X2H, cpu2aon_x2h_clk, "cpu2aon-x2h", axi_aclk_pd, 0x138, BIT(8), 0); +static CCU_GATE(CLK_CPU2AON_X2H, cpu2aon_x2h_clk, "cpu2aon-x2h", axi_aclk_pd, + 0x138, BIT(8), CLK_IGNORE_UNUSED); static CCU_GATE(CLK_CPU2PERI_X2H, cpu2peri_x2h_clk, "cpu2peri-x2h", axi4_cpusys2_aclk_pd, 0x140, BIT(9), CLK_IGNORE_UNUSED); static CCU_GATE(CLK_PERISYS_APB1_HCLK, perisys_apb1_hclk, "perisys-apb1-hclk", perisys_ahb_hclk_pd, - 0x150, BIT(9), 0); + 0x150, BIT(9), CLK_IGNORE_UNUSED); static CCU_GATE(CLK_PERISYS_APB2_HCLK, perisys_apb2_hclk, "perisys-apb2-hclk", perisys_ahb_hclk_pd, 0x150, BIT(10), CLK_IGNORE_UNUSED); static CCU_GATE(CLK_PERISYS_APB3_HCLK, perisys_apb3_hclk, "perisys-apb3-hclk", perisys_ahb_hclk_pd,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 389/570 media: i2c: vd55g1: Setup sensor external clock before patching
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Mugnier <[email protected]>
[ Upstream commit df2f8fd91bde57d5d5aca6adddf7e988f2e8c60e ]
Proper clock configuration is required to advance through FSM states. Prior than this having a different clock value than default sensor's value was used (12 MHz) could prevent the sensor from booting.
--- drivers/media/i2c/vd55g1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/media/i2c/vd55g1.c +3 -2
@@ -1038,8 +1038,6 @@ static int vd55g1_enable_streams(struct v4l2_subdev *sd,if (ret <0 )return ret; -vd55g1_write (sensor,VD55G1_REG_EXT_CLOCK , sensor->xclk_freq, &ret); -/* Configure output */ vd55g1_write (sensor,VD55G1_REG_MIPI_DATA_RATE , sensor->mipi_rate, &ret);
@@ -1613,6 +1611,9 @@ static int vd55g1_power_on(struct device *dev) goto disable_clock; } +/* Setup clock now to advance through system FSM states */ +vd55g1_write (sensor,VD55G1_REG_EXT_CLOCK , sensor->xclk_freq, &ret); + ret =vd55g1_patch (sensor);if (ret) {dev_err (dev,"Sensor patch failed %d\n" , ret);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 390/570 media: i2c: vd55g1: Fix RATE macros not being expressed in bps
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Mugnier <[email protected]>
[ Upstream commit 5b69a84005b686365e9cacb2ca942271ed74867a ]
As a bit rate is expressed in bps, use MEGA instead of HZ_PER_MHZ.
--- drivers/media/i2c/vd55g1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/i2c/vd55g1.c +2 -2
@@ -129,8 +129,8 @@#define VD55G1_FWPATCH_REVISION_MINOR 9#define VD55G1_XCLK_FREQ_MIN (6 * HZ_PER_MHZ)#define VD55G1_XCLK_FREQ_MAX (27 * HZ_PER_MHZ) -#define VD55G1_MIPI_RATE_MIN (250 * HZ_PER_MHZ) -#define VD55G1_MIPI_RATE_MAX (1200 * HZ_PER_MHZ) +#define VD55G1_MIPI_RATE_MIN (250 * MEGA) +#define VD55G1_MIPI_RATE_MAX (1200 * MEGA)static const u8 patch_array[] = {0x44 ,0x03 ,0x09 ,0x02 ,0xe6 ,0x01 ,0x42 ,0x00 ,0xea ,0x01 ,0x42 ,0x00 ,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 391/570 media: ipu-bridge: Add _HID for OV5670
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Scally <[email protected]>
[ Upstream commit 484f8bec3ddb453321ef0b8621c25de6ce3d0302 ]
The OV5670 is found on Dell 7212 tablets paired with an IPU3 ISP and needs to be connected by the ipu-bridge. Add it to the list of supported devices.
--- drivers/media/pci/intel/ipu-bridge.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/pci/intel/ipu-bridge.c +2 -0
@@ -60,6 +60,8 @@ static const struct ipu_sensor_config ipu_supported_sensors[] = {IPU_SENSOR_CONFIG ("INT33BE" ,1 ,419200000 ),/* Omnivision OV2740 */ IPU_SENSOR_CONFIG ("INT3474" ,1 ,180000000 ), +/* Omnivision OV5670 */ +IPU_SENSOR_CONFIG ("INT3479" ,1 ,422400000 ),/* Omnivision OV8865 */ IPU_SENSOR_CONFIG("INT347A", 1, 360000000),/* Omnivision OV7251 */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 392/570 media: v4l2-common: Reduce warnings about missing V4L2_CID_LINK_FREQ control
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Söderlund <[email protected]>
[ Upstream commit 5a0abb8909b9dcf347fce1d201ac6686ac33fd64 ]
When operating a pipeline with a missing V4L2_CID_LINK_FREQ control this two line warning is printed each time the pipeline is started. Reduce this excessive logging by only warning once for the missing control.
--- drivers/media/v4l2-core/v4l2-common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-common.c +4 -4
@@ -505,10 +505,10 @@ s64 __v4l2_get_link_freq_ctrl(struct v4l2_ctrl_handler *handler, freq =div_u64 (v4l2_ctrl_g_ctrl_int64 (ctrl) * mul, div); -pr_warn ("%s: Link frequency estimated using pixel rate: result might be inaccurate\n" , - __func__); -pr_warn ("%s: Consider implementing support for V4L2_CID_LINK_FREQ in the transmitter driver\n" , - __func__); +pr_warn_once ("%s: Link frequency estimated using pixel rate: result might be inaccurate\n" , + __func__); +pr_warn_once ("%s: Consider implementing support for V4L2_CID_LINK_FREQ in the transmitter driver\n" , + __func__); }return freq >0 ? freq : -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 393/570 leds: leds-lp50xx: Handle reg to get correct multi_index
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Adolfsson <[email protected]>
[ Upstream commit 2e84a5e5374232e6f356ce5c079a5658d7e4af2c ]
mc_subled used for multi_index needs well defined array indexes, to guarantee the desired result, use reg for that.
If devicetree child nodes is processed in random or reverse order you may end up with multi_index "blue green red" instead of the expected "red green blue".
If user space apps uses multi_index to deduce how to control the leds they would most likely be broken without this patch if devicetree processing is reversed (which it appears to be).
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts has reg set but I don't see how it can have worked without this change.
If reg is not set, an error is returned,
If reg is out of range, an error is returned.
reg within led child nodes starts with 0, to map to the iout in each bank.
--- drivers/leds/leds-lp50xx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/leds/leds-lp50xx.c +10 -1
@@ -476,6 +476,7 @@ static int lp50xx_probe_dt(struct lp50xx *priv)return -ENOMEM ;fwnode_for_each_child_node (child, led_node) { +int multi_index; ret =fwnode_property_read_u32 (led_node,"color" , &color_id);if (ret) {
@@ -483,8 +484,16 @@ static int lp50xx_probe_dt(struct lp50xx *priv)dev_err (priv->dev,"Cannot read color\n" );return ret; } + ret =fwnode_property_read_u32 (led_node,"reg" , &multi_index); +if (ret !=0 ) { +dev_err (priv->dev,"reg must be set\n" ); +return -EINVAL ; + }else if (multi_index >=LP50XX_LEDS_PER_MODULE ) { +dev_err (priv->dev,"reg %i out of range\n" , multi_index); +return -EINVAL ; + } - mc_led_info[num_colors].color_index = color_id; + mc_led_info[multi_index].color_index = color_id; num_colors++; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 394/570 dmaengine: stm32-dma: configure next sg only if there are more than 2 sgs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amelie Delaunay <[email protected]>
[ Upstream commit e19bdbaa31082b43dab1d936e20efcebc30aa73d ]
DMA operates in Double Buffer Mode (DBM) when the transfer is cyclic and there are at least two periods.
When DBM is enabled, the DMA toggles between two memory targets (SxM0AR and SxM1AR), indicated by the SxSCR.CT bit (Current Target).
There is no need to update the next memory address if two periods are configured, as SxM0AR and SxM1AR are already properly set up before the transfer begins in the stm32_dma_start_transfer() function. This avoids unnecessary updates to SxM0AR/SxM1AR, thereby preventing potential Transfer Errors. Specifically, when the channel is enabled, SxM0AR and SxM1AR can only be written if SxSCR.CT=1 and SxSCR.CT=0, respectively. Otherwise, a Transfer Error interrupt is triggered, and the stream is automatically disabled.
--- drivers/dma/stm32/stm32-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/stm32/stm32-dma.c +1 -1
@@ -744,7 +744,7 @@ static void stm32_dma_handle_chan_done(struct stm32_dma_chan *chan, u32 scr)/* cyclic while CIRC/DBM disable => post resume reconfiguration needed */ if (!(scr & (STM32_DMA_SCR_CIRC |STM32_DMA_SCR_DBM )))stm32_dma_post_resume_reconfigure (chan); -else if (scr &STM32_DMA_SCR_DBM ) +else if (scr &STM32_DMA_SCR_DBM && chan->desc->num_sgs >2 )stm32_dma_configure_next_sg (chan); }else { chan->busy = false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 395/570 RDMA: hfi1: fix possible divide-by-zero in find_hw_thread_mask()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yury Norov [NVIDIA] <[email protected]>
[ Upstream commit 59f7d2138591ef8f0e4e4ab5f1ab674e8181ad3a ]
The function divides number of online CPUs by num_core_siblings, and later checks the divider by zero. This implies a possibility to get and divide-by-zero runtime error. Fix it by moving the check prior to division. This also helps to save one indentation level.
--- drivers/infiniband/hw/hfi1/affinity.c | 44 +++++++++++++++------------ 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/infiniband/hw/hfi1/affinity.c +24 -20
@@ -964,31 +964,35 @@ static void find_hw_thread_mask(uint hw_thread_no, cpumask_var_t hw_thread_mask, struct hfi1_affinity_node_list *affinity) {int possible, curr_cpu, i; -uint num_cores_per_socket = node_affinity.num_online_cpus / +uint num_cores_per_socket; + +cpumask_copy (hw_thread_mask, &affinity->proc.mask); + +if (affinity->num_core_siblings ==0 ) +return ; + + num_cores_per_socket = node_affinity.num_online_cpus / affinity->num_core_siblings / node_affinity.num_online_nodes; -cpumask_copy (hw_thread_mask, &affinity->proc.mask); -if (affinity->num_core_siblings >0 ) { -/* Removing other siblings not needed for now */ - possible =cpumask_weight (hw_thread_mask); - curr_cpu =cpumask_first (hw_thread_mask); -for (i =0 ; - i < num_cores_per_socket * node_affinity.num_online_nodes; - i++) - curr_cpu =cpumask_next (curr_cpu, hw_thread_mask); - -for (; i < possible; i++) { -cpumask_clear_cpu (curr_cpu, hw_thread_mask); - curr_cpu =cpumask_next (curr_cpu, hw_thread_mask); - } +/* Removing other siblings not needed for now */ + possible =cpumask_weight (hw_thread_mask); + curr_cpu =cpumask_first (hw_thread_mask); +for (i =0 ; + i < num_cores_per_socket * node_affinity.num_online_nodes; + i++) + curr_cpu =cpumask_next (curr_cpu, hw_thread_mask); -/* Identifying correct HW threads within physical cores */ -cpumask_shift_left (hw_thread_mask, hw_thread_mask, - num_cores_per_socket * - node_affinity.num_online_nodes * - hw_thread_no); +for (; i < possible; i++) { +cpumask_clear_cpu (curr_cpu, hw_thread_mask); + curr_cpu =cpumask_next (curr_cpu, hw_thread_mask); } + +/* Identifying correct HW threads within physical cores */ +cpumask_shift_left (hw_thread_mask, hw_thread_mask, + num_cores_per_socket * + node_affinity.num_online_nodes * + hw_thread_no); }int hfi1_get_proc_affinity (int node)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 396/570 RDMA/core: reduce stack using in nldev_stat_get_doit()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit 43163f4c30f94d2103c948a247cdf2cda5068ca7 ]
In the s390 defconfig, gcc-10 and earlier end up inlining three functions into nldev_stat_get_doit(), and each of them uses some 600 bytes of stack.
The result is a function with an overly large stack frame and a warning:
drivers/infiniband/core/nldev.c:2466:1: error: the frame size of 1720 bytes is larger than 1280 bytes [-Werror=frame-larger-than=]
Mark the three functions noinline_for_stack to prevent this, ensuring that only one copy of the nlattr array is on the stack of each function.
--- drivers/infiniband/core/nldev.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
drivers/infiniband/core/nldev.c +12 -10
@@ -1469,10 +1469,11 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = { }; -static int res_get_common_doit (struct sk_buff *skb,struct nlmsghdr *nlh, -struct netlink_ext_ack *extack, -enum rdma_restrack_type res_type, -res_fill_func_t fill_func) +static noinline_for_stack int +res_get_common_doit (struct sk_buff *skb,struct nlmsghdr *nlh, +struct netlink_ext_ack *extack, +enum rdma_restrack_type res_type, +res_fill_func_t fill_func) {const struct nldev_fill_res_entry *fe = &fill_entries[res_type];struct nlattr *tb[RDMA_NLDEV_ATTR_MAX ];
@@ -2263,10 +2264,10 @@ static int nldev_stat_del_doit(struct sk_buff *skb, struct nlmsghdr *nlh,return ret; } -static int stat_get_doit_default_counter (struct sk_buff *skb, -struct nlmsghdr *nlh, -struct netlink_ext_ack *extack, -struct nlattr *tb[]) +static noinline_for_stack int +stat_get_doit_default_counter (struct sk_buff *skb,struct nlmsghdr *nlh, +struct netlink_ext_ack *extack, +struct nlattr *tb[]) {struct rdma_hw_stats *stats;struct nlattr *table_attr;
@@ -2356,8 +2357,9 @@ static int stat_get_doit_default_counter(struct sk_buff *skb,return ret; } -static int stat_get_doit_qp (struct sk_buff *skb,struct nlmsghdr *nlh, -struct netlink_ext_ack *extack,struct nlattr *tb[]) +static noinline_for_stack int +stat_get_doit_qp (struct sk_buff *skb,struct nlmsghdr *nlh, +struct netlink_ext_ack *extack,struct nlattr *tb[]) {static enum rdma_nl_counter_mode mode;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 397/570 scsi: lpfc: Ensure HBA_SETUP flag is used only for SLI4 in dev_loss_tmo_callbk
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 1cced5779e7a3ff7ec025fc47c76a7bd3bb38877 ]
For SLI3, the HBA_SETUP flag is never set so the lpfc_dev_loss_tmo_callbk always early returns. Add a phba->sli_rev check for SLI4 mode so that the SLI3 path can flow through the original dev_loss_tmo worker thread design to lpfc_dev_loss_tmo_handler instead of early return.
--- drivers/scsi/lpfc/lpfc_hbadisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/lpfc/lpfc_hbadisc.c +2 -1
@@ -183,7 +183,8 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)/* Don't schedule a worker thread event if the vport is going down. */ if (test_bit (FC_UNLOADING , &vport->load_flag) || - !test_bit (HBA_SETUP , &phba->hba_flag)) { + (phba->sli_rev ==LPFC_SLI_REV4 && + !test_bit (HBA_SETUP , &phba->hba_flag))) {spin_lock_irqsave (&ndlp->lock, iflags); ndlp->rport =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 398/570 scsi: lpfc: Check for hdwq null ptr when cleaning up lpfc_vport structure
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Tee <[email protected]>
[ Upstream commit 6698796282e828733cde3329c887b4ae9e5545e9 ]
If a call to lpfc_sli4_read_rev() from lpfc_sli4_hba_setup() fails, the resultant cleanup routine lpfc_sli4_vport_delete_fcp_xri_aborted() may occur before sli4_hba.hdwqs are allocated. This may result in a null pointer dereference when attempting to take the abts_io_buf_list_lock for the first hardware queue. Fix by adding a null ptr check on phba->sli4_hba.hdwq and early return because this situation means there must have been an error during port initialization.
--- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/lpfc/lpfc_scsi.c +4 -0
@@ -390,6 +390,10 @@ lpfc_sli4_vport_delete_fcp_xri_aborted(struct lpfc_vport *vport)if (!(vport->cfg_enable_fc4_type &LPFC_ENABLE_FCP ))return ; +/* may be called before queues established if hba_setup fails */ +if (!phba->sli4_hba.hdwq) +return ; +spin_lock_irqsave (&phba->hbalock, iflag);for (idx =0 ; idx < phba->cfg_hdw_queue; idx++) { qp = &phba->sli4_hba.hdwq[idx];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 399/570 crypto: caam - Support iMX8QXP and variants thereof
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Ernberg <[email protected]>
[ Upstream commit ac8aff0035fa58e53b39bd565ad6422a90ccdc87 ]
The iMX8QXP (and variants such as the QX, DX, DXP) all identify as iMX8QXP.
They have the exact same restrictions as the supported iMX8QM introduced at commit 61bb8db6f682 ("crypto: caam - Add support for i.MX8QM")
Loosen the check a little bit with a wildcard to also match the iMX8QXP and its variants.
--- drivers/crypto/caam/ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/caam/ctrl.c +1 -1
@@ -573,7 +573,7 @@ static const struct soc_device_attribute caam_imx_soc_table[] = { { .soc_id = "i.MX7*", .data = &caam_imx7_data }, { .soc_id = "i.MX8M*", .data = &caam_imx7_data }, { .soc_id = "i.MX8ULP", .data = &caam_imx8ulp_data }, - { .soc_id = "i.MX8QM", .data = &caam_imx8ulp_data }, + { .soc_id = "i.MX8Q*", .data = &caam_imx8ulp_data }, { .soc_id = "VF*", .data = &caam_vf610_data }, { .family = "Freescale i.MX" }, {/* sentinel */ }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 400/570 power: supply: qcom_battmgr: Add lithium-polymer entry
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Abel Vesa <[email protected]>
[ Upstream commit 202ac22b8e2e015e6c196fd8113f3d2a62dd1afc ]
On some Dell XPS 13 (9345) variants, the battery used is lithium-polymer based. Currently, this is reported as unknown technology due to the entry missing.
[ 4083.135325] Unknown battery technology 'LIP'
Add another check for lithium-polymer in the technology parsing callback and return that instead of unknown.
--- drivers/power/supply/qcom_battmgr.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/power/supply/qcom_battmgr.c +2 -0
@@ -981,6 +981,8 @@ static unsigned int qcom_battmgr_sc8280xp_parse_technology(const char *chemistry {if (!strncmp (chemistry,"LIO" ,BATTMGR_CHEMISTRY_LEN ))return POWER_SUPPLY_TECHNOLOGY_LION ; +if (!strncmp (chemistry,"LIP" ,BATTMGR_CHEMISTRY_LEN )) +return POWER_SUPPLY_TECHNOLOGY_LIPO ;pr_err ("Unknown battery technology '%s'\n" , chemistry);return POWER_SUPPLY_TECHNOLOGY_UNKNOWN ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 401/570 HID: rate-limit hid_warn to prevent log flooding
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li Chen <[email protected]>
[ Upstream commit 4051ead99888f101be92c7ce90d2de09aac6fd1c ]
Syzkaller can create many uhid devices that trigger repeated warnings like:
"hid-generic xxxx: unknown main item tag 0x0"
These messages can flood the system log, especially if a crash occurs (e.g., with a slow UART console, leading to soft lockups). To mitigate this, convert hid_warn() to use dev_warn_ratelimited().
This helps reduce log noise and improves system stability under fuzzing or faulty device scenarios.
--- drivers/hid/hid-core.c | 4 ++-- include/linux/hid.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/hid/hid-core.c +2 -2
@@ -663,9 +663,9 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)default :if (item->tag >=HID_MAIN_ITEM_TAG_RESERVED_MIN && item->tag <=HID_MAIN_ITEM_TAG_RESERVED_MAX ) -hid_warn (parser->device,"reserved main item tag 0x%x\n" , item->tag); +hid_warn_ratelimited (parser->device,"reserved main item tag 0x%x\n" , item->tag);else -hid_warn (parser->device,"unknown main item tag 0x%x\n" , item->tag); +hid_warn_ratelimited (parser->device,"unknown main item tag 0x%x\n" , item->tag); ret =0 ; }
include/linux/hid.h +2 -0
@@ -1239,6 +1239,8 @@ void hid_quirks_exit(__u16 bus); dev_notice(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_warn (hid, fmt, ...) \ dev_warn(&(hid)->dev, fmt, ##__VA_ARGS__) +#define hid_warn_ratelimited (hid, fmt, ...) \ + dev_warn_ratelimited(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_info (hid, fmt, ...) \ dev_info(&(hid)->dev, fmt, ##__VA_ARGS__)#define hid_dbg (hid, fmt, ...) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 402/570 scsi: mpt3sas: Correctly handle ATA device errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
[ Upstream commit 15592a11d5a5c8411ac8494ec49736b658f6fbff ]
With the ATA error model, an NCQ command failure always triggers an abort (termination) of all NCQ commands queued on the device. In such case, the SAT or the host must handle the failed command according to the command sense data and immediately retry all other NCQ commands that were aborted due to the failed NCQ command.
For SAS HBAs controlled by the mpt3sas driver, NCQ command aborts are not handled by the HBA SAT and sent back to the host, with an ioc log information equal to 0x31080000 (IOC_LOGINFO_PREFIX_PL with the PL code PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR). The function _scsih_io_done() always forces a retry of commands terminated with the status MPI2_IOCSTATUS_SCSI_IOC_TERMINATED using the SCSI result DID_SOFT_ERROR, regardless of the log_info for the command. This correctly forces the retry of collateral NCQ abort commands, but with the retry counter for the command being incremented. If a command to an ATA device is subject to too many retries due to other NCQ commands failing (e.g. read commands trying to access unreadable sectors), the collateral NCQ abort commands may be terminated with an error as they run out of retries. This violates the SAT specification and causes hard-to-debug command errors.
Solve this issue by modifying the handling of the MPI2_IOCSTATUS_SCSI_IOC_TERMINATED status to check if a command is for an ATA device and if the command loginfo indicates an NCQ collateral abort. If that is the case, force the command retry using the SCSI result DID_IMM_RETRY to avoid incrementing the command retry count.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +19 -0
@@ -195,6 +195,14 @@ struct sense_info {#define MPT3SAS_PORT_ENABLE_COMPLETE (0xFFFD)#define MPT3SAS_ABRT_TASK_SET (0xFFFE)#define MPT3SAS_REMOVE_UNRESPONDING_DEVICES (0xFFFF) + +/* +* SAS Log info code for a NCQ collateral abort after an NCQ error: +* IOC_LOGINFO_PREFIX_PL | PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR +* See: drivers/message/fusion/lsi/mpi_log_sas.h +*/ +#define IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR 0x31080000 +/** * struct fw_event_work - firmware event struct * @list: link list framework
@@ -5814,6 +5822,17 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) scmd->result =DID_TRANSPORT_DISRUPTED <<16 ; goto out; } +if (log_info ==IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR ) { +/* +* This is a ATA NCQ command aborted due to another NCQ +* command failure. We must retry this command +* immediately but without incrementing its retry +* counter. +*/ +WARN_ON_ONCE (xfer_cnt !=0 ); + scmd->result =DID_IMM_RETRY <<16 ; +break ; + }if (log_info ==0x31110630 ) {if (scmd->retries >2 ) { scmd->result =DID_NO_CONNECT <<16 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 403/570 scsi: pm80xx: Free allocated tags after failure
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Francisco Gutierrez <[email protected]>
[ Upstream commit 258a0a19621793b811356fc9d1849f950629d669 ]
This change frees resources after an error is detected.
--- drivers/scsi/pm8001/pm80xx_hwi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +10 -2
@@ -4677,8 +4677,12 @@ pm80xx_chip_phy_start_req(struct pm8001_hba_info *pm8001_ha, u8 phy_id) &pm8001_ha->phy[phy_id].dev_sas_addr, SAS_ADDR_SIZE); payload.sas_identify.phy_id = phy_id; -return pm8001_mpi_build_cmd (pm8001_ha,0 , opcode, &payload, + ret =pm8001_mpi_build_cmd (pm8001_ha,0 , opcode, &payload,sizeof (payload),0 ); +if (ret <0 ) +pm8001_tag_free (pm8001_ha, tag); + +return ret; }/**
@@ -4704,8 +4708,12 @@ static int pm80xx_chip_phy_stop_req(struct pm8001_hba_info *pm8001_ha, payload.tag =cpu_to_le32 (tag); payload.phy_id =cpu_to_le32 (phy_id); -return pm8001_mpi_build_cmd (pm8001_ha,0 , opcode, &payload, + ret =pm8001_mpi_build_cmd (pm8001_ha,0 , opcode, &payload,sizeof (payload),0 ); +if (ret <0 ) +pm8001_tag_free (pm8001_ha, tag); + +return ret; }/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/570 scsi: mpi3mr: Correctly handle ATA device errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
[ Upstream commit 04caad5a7ba86e830d04750417a15bad8ac2613c ]
With the ATA error model, an NCQ command failure always triggers an abort (termination) of all NCQ commands queued on the device. In such case, the SAT or the host must handle the failed command according to the command sense data and immediately retry all other NCQ commands that were aborted due to the failed NCQ command.
For SAS HBAs controlled by the mpi3mr driver, NCQ command aborts are not handled by the HBA SAT and sent back to the host, with an ioc log information equal to 0x31080000 (IOC_LOGINFO_PREFIX_PL with the PL code PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR). The function mpi3mr_process_op_reply_desc() always forces a retry of commands terminated with the status MPI3_IOCSTATUS_SCSI_IOC_TERMINATED using the SCSI result DID_SOFT_ERROR, regardless of the ioc_loginfo for the command. This correctly forces the retry of collateral NCQ abort commands, but with the retry counter for the command being incremented. If a command to an ATA device is subject to too many retries due to other NCQ commands failing (e.g. read commands trying to access unreadable sectors), the collateral NCQ abort commands may be terminated with an error as they run out of retries. This violates the SAT specification and causes hard-to-debug command errors.
Solve this issue by modifying the handling of the MPI3_IOCSTATUS_SCSI_IOC_TERMINATED status to check if a command is for an ATA device and if the command ioc_loginfo indicates an NCQ collateral abort. If that is the case, force the command retry using the SCSI result DID_IMM_RETRY to avoid incrementing the command retry count.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +19 -1
@@ -49,6 +49,13 @@ static void mpi3mr_send_event_ack(struct mpi3mr_ioc *mrioc, u8 event,#define MPI3_EVENT_WAIT_FOR_DEVICES_TO_REFRESH (0xFFFE) +/* +* SAS Log info code for a NCQ collateral abort after an NCQ error: +* IOC_LOGINFO_PREFIX_PL | PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR +* See: drivers/message/fusion/lsi/mpi_log_sas.h +*/ +#define IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR 0x31080000 +/** * mpi3mr_host_tag_for_scmd - Get host tag for a scmd * @mrioc: Adapter instance reference
@@ -3430,7 +3437,18 @@ void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc, scmd->result =DID_NO_CONNECT <<16 ;break ;case MPI3_IOCSTATUS_SCSI_IOC_TERMINATED : - scmd->result =DID_SOFT_ERROR <<16 ; +if (ioc_loginfo ==IOC_LOGINFO_SATA_NCQ_FAIL_AFTER_ERR ) { +/* +* This is a ATA NCQ command aborted due to another NCQ +* command failure. We must retry this command +* immediately but without incrementing its retry +* counter. +*/ +WARN_ON_ONCE (xfer_count !=0 ); + scmd->result =DID_IMM_RETRY <<16 ; + }else { + scmd->result =DID_SOFT_ERROR <<16 ; + }break ;case MPI3_IOCSTATUS_SCSI_TASK_TERMINATED :case MPI3_IOCSTATUS_SCSI_EXT_TERMINATED :
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/570 PCI: dw-rockchip: Delay link training after hot reset in EP mode
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wilfred Mallawa <[email protected]>
[ Upstream commit c0b93754547dde16c8370b8fdad5f396e7786647 ]
RK3588 TRM, section "11.6.1.3.3 Hot Reset and Link-Down Reset" states that:
If you want to delay link re-establishment (after reset) so that you can reprogram some registers through DBI, you must set app_ltssm_enable =0 immediately after core_rst_n as shown in above. This can be achieved by enable the app_dly2_en, and end-up the delay by assert app_dly2_done.
I.e. setting app_dly2_en will automatically deassert app_ltssm_enable on a hot reset, and setting app_dly2_done will re-assert app_ltssm_enable, re-enabling link training.
When receiving a hot reset/link-down IRQ when running in EP mode, we will call dw_pcie_ep_linkdown(), which may update registers through DBI. Unless link training is inhibited, these register updates race with the link training.
To avoid the race, set PCIE_LTSSM_APP_DLY2_EN so the controller never automatically trains the link after a link-down or hot reset interrupt. That way any DBI updates done in the dw_pcie_ep_linkdown() path will happen while the link is still down. Then allow link training by setting PCIE_LTSSM_APP_DLY2_DONE
--- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pcie-dw-rockchip.c +12 -3
@@ -58,6 +58,8 @@/* Hot Reset Control Register */ #define PCIE_CLIENT_HOT_RESET_CTRL 0x180 +#define PCIE_LTSSM_APP_DLY2_EN BIT(1) +#define PCIE_LTSSM_APP_DLY2_DONE BIT(3)#define PCIE_LTSSM_ENABLE_ENHANCE BIT(4)/* LTSSM Status Register */
@@ -475,7 +477,7 @@ static irqreturn_t rockchip_pcie_ep_sys_irq_thread(int irq, void *arg)struct rockchip_pcie *rockchip = arg;struct dw_pcie *pci = &rockchip->pci;struct device *dev = pci->dev; -u32 reg; +u32 reg, val; reg =rockchip_pcie_readl_apb (rockchip,PCIE_CLIENT_INTR_STATUS_MISC );rockchip_pcie_writel_apb (rockchip, reg,PCIE_CLIENT_INTR_STATUS_MISC );
@@ -486,6 +488,10 @@ static irqreturn_t rockchip_pcie_ep_sys_irq_thread(int irq, void *arg)if (reg &PCIE_LINK_REQ_RST_NOT_INT ) {dev_dbg (dev,"hot reset or link-down reset\n" );dw_pcie_ep_linkdown (&pci->ep); +/* Stop delaying link training. */ + val =HIWORD_UPDATE_BIT (PCIE_LTSSM_APP_DLY2_DONE ); +rockchip_pcie_writel_apb (rockchip, val, +PCIE_CLIENT_HOT_RESET_CTRL ); }if (reg &PCIE_RDLH_LINK_UP_CHGED ) {
@@ -567,8 +573,11 @@ static int rockchip_pcie_configure_ep(struct platform_device *pdev,return ret; } -/* LTSSM enable control mode */ - val =HIWORD_UPDATE_BIT (PCIE_LTSSM_ENABLE_ENHANCE ); +/* +* LTSSM enable control mode, and automatically delay link training on +* hot reset/link-down reset. +*/ + val =HIWORD_UPDATE_BIT (PCIE_LTSSM_ENABLE_ENHANCE |PCIE_LTSSM_APP_DLY2_EN );rockchip_pcie_writel_apb (rockchip, val,PCIE_CLIENT_HOT_RESET_CTRL ); rockchip_pcie_writel_apb(rockchip, PCIE_CLIENT_EP_MODE,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/570 pinctrl: stm32: Manage irq affinity settings
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cheick Traore <[email protected]>
[ Upstream commit 4c5cc2f65386e22166ce006efe515c667aa075e4 ]
Trying to set the affinity of the interrupts associated to stm32 pinctrl results in a write error.
Fill struct irq_chip::irq_set_affinity to use the default helper function.
--- drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/stm32/pinctrl-stm32.c +1 -0
@@ -411,6 +411,7 @@ static struct irq_chip stm32_gpio_irq_chip = { .irq_set_wake = irq_chip_set_wake_parent, .irq_request_resources = stm32_gpio_irq_request_resources, .irq_release_resources = stm32_gpio_irq_release_resources, + .irq_set_affinity = IS_ENABLED(CONFIG_SMP) ? irq_chip_set_affinity_parent : NULL, }; static int stm32_gpio_domain_translate(struct irq_domain *d,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/570 media: raspberrypi: cfe: Fix min_reqbufs_allocation
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tomi Valkeinen <[email protected]>
[ Upstream commit 57b5a302b5d529db96ddc52fbccec005092ebb3d ]
The driver checks if "vq->max_num_buffers + *nbuffers < 3", but vq->max_num_buffers is (by default) 32, so the check is never true. Nor does the check make sense.
The original code in the BSP kernel was "vq->num_buffers + *nbuffers < 3", but got mangled along the way to upstream. The intention was to make sure that at least 3 buffers are allocated.
Fix this by removing the bad lines and setting q->min_reqbufs_allocation to three.
--- drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/media/platform/raspberrypi/rp1-cfe/cfe.c +1 -3
@@ -1024,9 +1024,6 @@ static int cfe_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,cfe_dbg (cfe,"%s: [%s] type:%u\n" , __func__, node_desc[node->id].name, node->buffer_queue.type); -if (vq->max_num_buffers + *nbuffers <3 ) - *nbuffers =3 - vq->max_num_buffers; -if (*nplanes) {if (sizes[0 ] < size) {cfe_err (cfe,"sizes[0] %i < size %u\n" , sizes[0 ], size);
@@ -1998,6 +1995,7 @@ static int cfe_register_node(struct cfe_device *cfe, int id) q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; q->lock = &node->lock; q->min_queued_buffers =1 ; + q->min_reqbufs_allocation =3 ; q->dev = &cfe->pdev->dev; ret =vb2_queue_init (q);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/570 media: tc358743: Check I2C succeeded during probe
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Stevenson <[email protected]>
[ Upstream commit 303d81635e1d9c949b370215cc94526ed81f2e3d ]
The probe for the TC358743 reads the CHIPID register from the device and compares it to the expected value of 0. If the I2C request fails then that also returns 0, so the driver loads thinking that the device is there.
Generally I2C communications are reliable so there is limited need to check the return value on every transfer, therefore only amend the one read during probe to check for I2C errors.
--- drivers/media/i2c/tc358743.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-)
drivers/media/i2c/tc358743.c +23 -4
@@ -114,7 +114,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd)/* --------------- I2C --------------- */ -static void i2c_rd (struct v4l2_subdev *sd,u16 reg,u8 *values,u32 n) +static int i2c_rd (struct v4l2_subdev *sd,u16 reg,u8 *values,u32 n) {struct tc358743_state *state =to_state (sd);struct i2c_client *client = state->i2c_client;
@@ -140,6 +140,7 @@ static void i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)v4l2_err (sd,"%s: reading register 0x%x from 0x%x failed: %d\n" , __func__, reg, client->addr, err); } +return err !=ARRAY_SIZE (msgs); }static void i2c_wr (struct v4l2_subdev *sd,u16 reg,u8 *values,u32 n)
@@ -196,15 +197,24 @@ static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n) } } -static noinline u32 i2c_rdreg(struct v4l2_subdev *sd, u16 reg, u32 n) +static noinline u32 i2c_rdreg_err(struct v4l2_subdev *sd, u16 reg, u32 n, +int *err) { +int error;__le32 val =0 ; -i2c_rd (sd, reg, (u8 __force *)&val, n); + error =i2c_rd (sd, reg, (u8 __force *)&val, n); +if (err) + *err = error;return le32_to_cpu (val); } +static inline u32 i2c_rdreg (struct v4l2_subdev *sd,u16 reg,u32 n) +{ +return i2c_rdreg_err (sd, reg, n,NULL ); +} + static noinline void i2c_wrreg(struct v4l2_subdev *sd, u16 reg, u32 val, u32 n) {__le32 raw =cpu_to_le32 (val);
@@ -233,6 +243,13 @@ static u16 i2c_rd16(struct v4l2_subdev *sd, u16 reg)return i2c_rdreg (sd, reg,2 ); } +static int i2c_rd16_err (struct v4l2_subdev *sd,u16 reg,u16 *value) +{ +int err; + *value =i2c_rdreg_err (sd, reg,2 , &err); +return err; +} +static void i2c_wr16 (struct v4l2_subdev *sd,u16 reg,u16 val) {i2c_wrreg (sd, reg, val,2 );
@@ -2061,6 +2078,7 @@ static int tc358743_probe(struct i2c_client *client)struct tc358743_platform_data *pdata = client->dev.platform_data;struct v4l2_subdev *sd;u16 irq_mask =MASK_HDMI_MSK |MASK_CSI_MSK ; +u16 chipid;int err;if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_BYTE_DATA ))
@@ -2092,7 +2110,8 @@ static int tc358743_probe(struct i2c_client *client) sd->flags |=V4L2_SUBDEV_FL_HAS_DEVNODE |V4L2_SUBDEV_FL_HAS_EVENTS ;/* i2c access */ -if ((i2c_rd16 (sd,CHIPID ) &MASK_CHIPID ) !=0 ) { +if (i2c_rd16_err (sd,CHIPID , &chipid) || + (chipid &MASK_CHIPID ) !=0 ) {v4l2_info (sd,"not a TC358743 on address 0x%x\n" , client->addr <<1 );return -ENODEV ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/570 media: tc358743: Return an appropriate colorspace from tc358743_set_fmt
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Stevenson <[email protected]>
[ Upstream commit 377cc006a364dfdab2f3f221cfad63a9265200b8 ]
When calling tc358743_set_fmt, the code was calling tc358743_get_fmt to choose a valid format. However that sets the colorspace based on information read back from the chip, not the colour format requested.
The result was that if you called try or set format for UYVY when the current format was RGB3 then you would get told SRGB, and try RGB3 when current was UYVY and you would get told SMPTE170M.
The value programmed in the VI_REP register for the colorspace is always set by this driver, therefore there is no need to read back the value, and never set to REC709.
Return the colorspace based on the format set/tried instead.
--- drivers/media/i2c/tc358743.c | 44 ++++++++++++++---------------------- 1 file changed, 17 insertions(+), 27 deletions(-)
drivers/media/i2c/tc358743.c +17 -27
@@ -1708,12 +1708,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd,return 0 ; } +static u32 tc358743_g_colorspace (u32 code) +{ +switch (code) { +case MEDIA_BUS_FMT_RGB888_1X24 : +return V4L2_COLORSPACE_SRGB ; +case MEDIA_BUS_FMT_UYVY8_1X16 : +return V4L2_COLORSPACE_SMPTE170M ; +default : +return 0 ; + } +} +static int tc358743_get_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_format *format) {struct tc358743_state *state =to_state (sd); -u8 vi_rep =i2c_rd8 (sd,VI_REP );if (format->pad !=0 )return -EINVAL ;
@@ -1723,23 +1734,7 @@ static int tc358743_get_fmt(struct v4l2_subdev *sd, format->format.height = state->timings.bt.height; format->format.field =V4L2_FIELD_NONE ; -switch (vi_rep &MASK_VOUT_COLOR_SEL ) { -case MASK_VOUT_COLOR_RGB_FULL : -case MASK_VOUT_COLOR_RGB_LIMITED : - format->format.colorspace =V4L2_COLORSPACE_SRGB ; -break ; -case MASK_VOUT_COLOR_601_YCBCR_LIMITED : -case MASK_VOUT_COLOR_601_YCBCR_FULL : - format->format.colorspace =V4L2_COLORSPACE_SMPTE170M ; -break ; -case MASK_VOUT_COLOR_709_YCBCR_FULL : -case MASK_VOUT_COLOR_709_YCBCR_LIMITED : - format->format.colorspace =V4L2_COLORSPACE_REC709 ; -break ; -default : - format->format.colorspace =0 ; -break ; - } + format->format.colorspace =tc358743_g_colorspace (format->format.code);return 0 ; }
@@ -1753,19 +1748,14 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd,u32 code = format->format.code;/* is overwritten by get_fmt */ int ret =tc358743_get_fmt (sd, sd_state, format); - format->format.code = code; +if (code ==MEDIA_BUS_FMT_RGB888_1X24 || + code ==MEDIA_BUS_FMT_UYVY8_1X16 ) + format->format.code = code; + format->format.colorspace =tc358743_g_colorspace (format->format.code);if (ret)return ret; -switch (code) { -case MEDIA_BUS_FMT_RGB888_1X24 : -case MEDIA_BUS_FMT_UYVY8_1X16 : -break ; -default : -return -EINVAL ; - } -if (format->which ==V4L2_SUBDEV_FORMAT_TRY )return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/570 media: tc358743: Increase FIFO trigger level to 374
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Stevenson <[email protected]>
[ Upstream commit 86addd25314a1e77dbdcfddfeed0bab2f27da0e2 ]
The existing fixed value of 16 worked for UYVY 720P60 over 2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888 1080P60 needs 6 lanes at 594MHz).
It doesn't allow for lower resolutions to work as the FIFO underflows.
374 is required for 1080P24 or 1080P30 UYVY over 2 lanes @ 972Mbit/s, but >374 means that the FIFO underflows on 1080P50 UYVY over 2 lanes @ 972Mbit/s.
Whilst it would be nice to compute it, the required information isn't published by Toshiba.
--- drivers/media/i2c/tc358743.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/media/i2c/tc358743.c +13 -2
@@ -1979,8 +1979,19 @@ static int tc358743_probe_of(struct tc358743_state *state) state->pdata.refclk_hz =clk_get_rate (refclk); state->pdata.ddc5v_delay =DDC5V_DELAY_100_MS ; state->pdata.enable_hdcp = false; -/* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */ - state->pdata.fifo_level =16 ; +/* +* Ideally the FIFO trigger level should be set based on the input and +* output data rates, but the calculations required are buried in +* Toshiba's register settings spreadsheet. +* A value of 16 works with a 594Mbps data rate for 720p60 (using 2 +* lanes) and 1080p60 (using 4 lanes), but fails when the data rate +* is increased, or a lower pixel clock is used that result in CSI +* reading out faster than the data is arriving. +* +* A value of 374 works with both those modes at 594Mbps, and with most +* modes on 972Mbps. +*/ + state->pdata.fifo_level =374 ;/* * The PLL input clock is obtained by dividing refclk by pll_prd. * It must be between 6 MHz and 40 MHz, lower frequency is better.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/570 media: usb: hdpvr: disable zero-length read messages
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit b5ae5a79825ba8037b0be3ef677a24de8c063abf ]
This driver passes the length of an i2c_msg directly to usb_control_msg(). If the message is now a read and of length 0, it violates the USB protocol and a warning will be printed. Enable the I2C_AQ_NO_ZERO_LEN_READ quirk for this adapter thus forbidding 0-length read messages altogether.
--- drivers/media/usb/hdpvr/hdpvr-i2c.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/usb/hdpvr/hdpvr-i2c.c +6 -0
@@ -165,10 +165,16 @@ static const struct i2c_algorithm hdpvr_algo = { .functionality = hdpvr_functionality, }; +/* prevent invalid 0-length usb_control_msg */ +static const struct i2c_adapter_quirks hdpvr_quirks = { + .flags =I2C_AQ_NO_ZERO_LEN_READ , +}; +static const struct i2c_adapter hdpvr_i2c_adapter_template = { .name ="Hauppauge HD PVR I2C" , .owner =THIS_MODULE , .algo = &hdpvr_algo, + .quirks = &hdpvr_quirks, };static int hdpvr_activate_ir (struct hdpvr_device *dev)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/570 media: dvb-frontends: dib7090p: fix null-ptr-deref in dib7090p_rw_on_apb()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Guo <[email protected]>
[ Upstream commit ce5cac69b2edac3e3246fee03e8f4c2a1075238b ]
In dib7090p_rw_on_apb, msg is controlled by user. When msg[0].buf is null and msg[0].len is zero, former checks on msg[0].buf would be passed. If accessing msg[0].buf[2] without sanity check, null pointer deref would happen. We add check on msg[0].len to prevent crash. Similar issue occurs when access msg[1].buf[0] and msg[1].buf[1].
Similar commit: commit 0ed554fd769a ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()")
--- drivers/media/dvb-frontends/dib7000p.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/dvb-frontends/dib7000p.c +4 -0
@@ -2256,8 +2256,12 @@ static int dib7090p_rw_on_apb(struct i2c_adapter *i2c_adap,u16 word;if (num ==1 ) {/* write */ +if (msg[0 ].len <3 ) +return -EOPNOTSUPP ;dib7000p_write_word (state, apb_address, ((msg[0 ].buf[1 ] <<8 ) | (msg[0 ].buf[2 ]))); }else { +if (msg[1 ].len <2 ) +return -EOPNOTSUPP ; word =dib7000p_read_word (state, apb_address); msg[1 ].buf[0 ] = (word >>8 ) &0xff ; msg[1 ].buf[1 ] = (word) &0xff ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/570 media: dvb-frontends: w7090p: fix null-ptr-deref in w7090p_tuner_write_serpar and w7090p_tuner_read_serpar
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Guo <[email protected]>
[ Upstream commit ed0234c8458b3149f15e496b48a1c9874dd24a1b ]
In w7090p_tuner_write_serpar, msg is controlled by user. When msg[0].buf is null and msg[0].len is zero, former checks on msg[0].buf would be passed. If accessing msg[0].buf[2] without sanity check, null pointer deref would happen. We add check on msg[0].len to prevent crash.
Similar commit: commit 0ed554fd769a ("media: dvb-usb: az6027: fix null-ptr-deref in az6027_i2c_xfer()")
--- drivers/media/dvb-frontends/dib7000p.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/dvb-frontends/dib7000p.c +4 -0
@@ -2193,6 +2193,8 @@ static int w7090p_tuner_write_serpar(struct i2c_adapter *i2c_adap, struct i2c_msstruct dib7000p_state *state =i2c_get_adapdata (i2c_adap);u8 n_overflow =1 ;u16 i =1000 ; +if (msg[0 ].len <3 ) +return -EOPNOTSUPP ;u16 serpar_num = msg[0 ].buf[0 ];while (n_overflow ==1 && i) {
@@ -2212,6 +2214,8 @@ static int w7090p_tuner_read_serpar(struct i2c_adapter *i2c_adap, struct i2c_msgstruct dib7000p_state *state =i2c_get_adapdata (i2c_adap);u8 n_overflow =1 , n_empty =1 ;u16 i =1000 ; +if (msg[0 ].len <1 || msg[1 ].len <2 ) +return -EOPNOTSUPP ;u16 serpar_num = msg[0 ].buf[0 ];u16 read_word;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/570 media: uvcvideo: Add quirk for HP Webcam HD 2300
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 53b0b80e5240fec7c5a420bffb310edc83faf4fd ]
HP Webcam HD 2300 does not seem to flip the FID bit according to spec.
Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 2.00
bDeviceClass 239 Miscellaneous Device
bDeviceSubClass 2 [unknown]
bDeviceProtocol 1 Interface Association
bMaxPacketSize0 64
idVendor 0x03f0 HP, Inc
idProduct 0xe207 HP Webcam HD 2300
bcdDevice 10.20
iManufacturer 3 Hewlett Packard iProduct 1 HP Webcam HD 2300 iSerial 0 bNumConfigurations 1
--- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_driver.c +9 -0
@@ -2514,6 +2514,15 @@ static const struct uvc_device_info uvc_quirk_force_y8 = {* Sort these by vendor/product ID. */ static const struct usb_device_id uvc_ids[] = { +/* HP Webcam HD 2300 */ + { .match_flags =USB_DEVICE_ID_MATCH_DEVICE + |USB_DEVICE_ID_MATCH_INT_INFO , + .idVendor =0x03f0 , + .idProduct =0xe207 , + .bInterfaceClass =USB_CLASS_VIDEO , + .bInterfaceSubClass =1 , + .bInterfaceProtocol =0 , + .driver_info = (kernel_ulong_t)&uvc_quirk_stream_no_fid },/* Quanta ACER HD User Facing */ { .match_flags =USB_DEVICE_ID_MATCH_DEVICE |USB_DEVICE_ID_MATCH_INT_INFO ,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 415/570 media: uvcvideo: Set V4L2_CTRL_FLAG_DISABLED during queryctrl errors
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ricardo Ribalda <[email protected]>
[ Upstream commit 649c033711d7fd6e1d5d69e4cfc3fceca7de2867 ]
To implement VIDIOC_QUERYCTRL, we need to know the minimum, maximum, step and flags of the control. For some of the controls, this involves querying the actual hardware.
Some non-compliant cameras produce errors when we query them. These error can be triggered every time, sometimes, or when other controls do not have the "right value". Right now, we populate that error to userspace. When an error happens, the v4l2 framework does not copy the v4l2_queryctrl struct to userspace. Also, userspace apps are not ready to handle any other error than -EINVAL.
One of the main usecases of VIDIOC_QUERYCTRL is enumerating the controls of a device. This is done using the V4L2_CTRL_FLAG_NEXT_CTRL flag. In that usecase, a non-compliant control will make it almost impossible to enumerate all controls of the device.
A control with an invalid max/min/step/flags is better than non being able to enumerate the rest of the controls.
This patch:
- Retries for an extra attempt to read the control, to avoid spurious errors. More attempts do not seem to produce better results in the tested hardware.
- Makes VIDIOC_QUERYCTRL return 0 for -EIO errors.
- Introduces a warning in dmesg so we can have a trace of what has happened and sets the V4L2_CTRL_FLAG_DISABLED.
- Makes sure we keep returning V4L2_CTRL_FLAG_DISABLED for all the next attempts to query that control (other operations have the same functionality as now).
--- drivers/media/usb/uvc/uvc_ctrl.c | 55 +++++++++++++++++++++++++++----- drivers/media/usb/uvc/uvcvideo.h | 2 ++ 2 files changed, 49 insertions(+), 8 deletions(-)
drivers/media/usb/uvc/uvc_ctrl.c +47 -8
@@ -1483,14 +1483,28 @@ static u32 uvc_get_ctrl_bitmap(struct uvc_control *ctrl,return ~0 ; } +/* +* Maximum retry count to avoid spurious errors with controls. Increasing this +* value does no seem to produce better results in the tested hardware. +*/ +#define MAX_QUERY_RETRIES 2 +static int __uvc_queryctrl_boundaries (struct uvc_video_chain *chain,struct uvc_control *ctrl,struct uvc_control_mapping *mapping,struct v4l2_query_ext_ctrl *v4l2_ctrl) {if (!ctrl->cached) { -int ret =uvc_ctrl_populate_cache (chain, ctrl); -if (ret <0 ) +unsigned int retries; +int ret; + +for (retries =0 ; retries <MAX_QUERY_RETRIES ; retries++) { + ret =uvc_ctrl_populate_cache (chain, ctrl); +if (ret != -EIO ) +break ; + } + +if (ret)return ret; }
@@ -1567,6 +1581,7 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, {struct uvc_control_mapping *master_map =NULL ;struct uvc_control *master_ctrl =NULL ; +int ret;memset (v4l2_ctrl,0 ,sizeof (*v4l2_ctrl)); v4l2_ctrl->id = mapping->id;
@@ -1587,18 +1602,31 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,__uvc_find_control (ctrl->entity, mapping->master_id, &master_map, &master_ctrl,0 ,0 );if (master_ctrl && (master_ctrl->info.flags &UVC_CTRL_FLAG_GET_CUR )) { +unsigned int retries;s32 val;int ret;if (WARN_ON (uvc_ctrl_mapping_is_compound (master_map)))return -EIO ; - ret =__uvc_ctrl_get (chain, master_ctrl, master_map, &val); -if (ret <0 ) -return ret; +for (retries =0 ; retries <MAX_QUERY_RETRIES ; retries++) { + ret =__uvc_ctrl_get (chain, master_ctrl, master_map, + &val); +if (!ret) +break ; +if (ret <0 && ret != -EIO ) +return ret; + } -if (val != mapping->master_manual) - v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; +if (ret == -EIO ) { +dev_warn_ratelimited (&chain->dev->udev->dev, +"UVC non compliance: Error %d querying master control %x (%s)\n" , + ret, master_map->id, +uvc_map_get_name (master_map)); + }else { +if (val != mapping->master_manual) + v4l2_ctrl->flags |=V4L2_CTRL_FLAG_INACTIVE ; + } } v4l2_ctrl->elem_size =uvc_mapping_v4l2_size (mapping);
@@ -1613,7 +1641,18 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,return 0 ; } -return __uvc_queryctrl_boundaries (chain, ctrl, mapping, v4l2_ctrl); + ret =__uvc_queryctrl_boundaries (chain, ctrl, mapping, v4l2_ctrl); +if (ret && !mapping->disabled) { +dev_warn (&chain->dev->udev->dev, +"UVC non compliance: permanently disabling control %x (%s), due to error %d\n" , + mapping->id,uvc_map_get_name (mapping), ret); + mapping->disabled = true; + } + +if (mapping->disabled) + v4l2_ctrl->flags |=V4L2_CTRL_FLAG_DISABLED ; + +return 0 ; } int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
drivers/media/usb/uvc/uvcvideo.h +2 -0
@@ -134,6 +134,8 @@ struct uvc_control_mapping {s32 master_manual;u32 slave_ids[2 ]; +bool disabled; +const struct uvc_control_mapping *(*filter_mapping) (struct uvc_video_chain *chain,struct uvc_control *ctrl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 416/570 media: uvcvideo: Fix bandwidth issue for Alcor camera
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: chenchangcheng <[email protected]>
[ Upstream commit 9764401bf6f8a20eb11c2e78470f20fee91a9ea7 ]
Some broken device return wrong dwMaxPayloadTransferSize fields as follows:
[ 218.632537] uvcvideo: Device requested 2752512 B/frame bandwidth. [ 218.632598] uvcvideo: No fast enough alt setting for requested bandwidth.
When dwMaxPayloadTransferSize is greater than maxpsize, it will prevent the camera from starting. So use the bandwidth of maxpsize.
--- drivers/media/usb/uvc/uvc_video.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/media/usb/uvc/uvc_video.c +9 -0
@@ -262,6 +262,15 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, ctrl->dwMaxPayloadTransferSize = bandwidth; } + +if (stream->intf->num_altsetting >1 && + ctrl->dwMaxPayloadTransferSize > stream->maxpsize) { +dev_warn_ratelimited (&stream->intf->dev, +"UVC non compliance: the max payload transmission size (%u) exceeds the size of the ep max packet (%u). Using the max size.\n" , + ctrl->dwMaxPayloadTransferSize, + stream->maxpsize); + ctrl->dwMaxPayloadTransferSize = stream->maxpsize; + } }static size_t uvc_video_ctrl_size (struct uvc_streaming *stream)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 417/570 crypto: octeontx2 - add timeout for load_fvc completion poll
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bharat Bhushan <[email protected]>
[ Upstream commit 2157e50f65d2030f07ea27ef7ac4cfba772e98ac ]
Adds timeout to exit from possible infinite loop, which polls on CPT instruction(load_fvc) completion.
--- .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +14 -2
@@ -1494,6 +1494,7 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf)dma_addr_t rptr_baddr;struct pci_dev *pdev;u32 len, compl_rlen; +int timeout =10000 ;int ret, etype;void *rptr;
@@ -1554,16 +1555,27 @@ int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf) etype);otx2_cpt_fill_inst (&inst, &iq_cmd, rptr_baddr); lfs->ops->send_cmd (&inst,1 , &cptpf->lfs.lf[0 ]); + timeout =10000 ;while (lfs->ops->cpt_get_compcode (result) == -OTX2_CPT_COMPLETION_CODE_INIT ) +OTX2_CPT_COMPLETION_CODE_INIT ) {cpu_relax (); +udelay (1 ); + timeout--; +if (!timeout) { + ret = -ENODEV ; + cptpf->is_eng_caps_discovered = false; +dev_warn (&pdev->dev,"Timeout on CPT load_fvc completion poll\n" ); + goto error_no_response; + } + } cptpf->eng_caps[etype].u =be64_to_cpup (rptr); } -dma_unmap_single (&pdev->dev, rptr_baddr, len,DMA_BIDIRECTIONAL ); cptpf->is_eng_caps_discovered = true; +error_no_response: +dma_unmap_single (&pdev->dev, rptr_baddr, len,DMA_BIDIRECTIONAL ); free_result:kfree (result); lf_cleanup:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 418/570 crypto: ccp - Add missing bootloader info reg for pspv6
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mario Limonciello <[email protected]>
[ Upstream commit aaeff14688d0254b39731d9bb303c79bfd610f7d ]
The bootloader info reg for pspv6 is the same as pspv4 and pspv5.
--- drivers/crypto/ccp/sp-pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/crypto/ccp/sp-pci.c +1 -0
@@ -453,6 +453,7 @@ static const struct psp_vdata pspv6 = { .cmdresp_reg = 0x10944, /* C2PMSG_17 */ .cmdbuff_addr_lo_reg = 0x10948, /* C2PMSG_18 */ .cmdbuff_addr_hi_reg = 0x1094c, /* C2PMSG_19 */ + .bootloader_info_reg = 0x109ec, /* C2PMSG_59 */ .feature_reg = 0x109fc, /* C2PMSG_63 */ .inten_reg = 0x10510, /* P2CMSG_INTEN */ .intsts_reg = 0x10514, /* P2CMSG_INTSTS */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 419/570 clk: renesas: rzg2l: Postpone updating priv->clks[]
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
[ Upstream commit 2f96afdffad4ef74e3c511207058c41c54a2d014 ]
Since the sibling data is filled after the priv->clks[] array entry is populated, the first clock that is probed and has a sibling will temporarily behave as its own sibling until its actual sibling is populated. To avoid any issues, postpone updating priv->clks[] until after the sibling is populated.
--- drivers/clk/renesas/rzg2l-cpg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/renesas/rzg2l-cpg.c +4 -4
@@ -1389,10 +1389,6 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod, goto fail; } - clk = clock->hw.clk; -dev_dbg (dev,"Module clock %pC at %lu Hz\n" , clk,clk_get_rate (clk)); - priv->clks[id] = clk; -if (mod->is_coupled) {struct mstp_clock *sibling;
@@ -1404,6 +1400,10 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod, } } + clk = clock->hw.clk; +dev_dbg (dev,"Module clock %pC at %lu Hz\n" , clk,clk_get_rate (clk)); + priv->clks[id] = clk; +return ; fail:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 420/570 soundwire: amd: serialize amd manager resume sequence during pm_prepare
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijendar Mukunda <[email protected]>
[ Upstream commit 03837341790039d6f1cbf7a1ae7dfa2cb77ef0a4 ]
During pm_prepare callback, pm_request_resume() delays SoundWire manager D0 entry sequence. Synchronize runtime resume sequence for amd_manager instance prior to invoking child devices resume sequence for both the amd power modes(ClockStop Mode and Power off mode).
Change the power_mode_mask check and use pm_runtime_resume() in amd_pm_prepare() callback.
--- drivers/soundwire/amd_manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/soundwire/amd_manager.c +3 -3
@@ -1178,10 +1178,10 @@ static int __maybe_unused amd_pm_prepare(struct device *dev)* device is not in runtime suspend state, observed that device alerts are missing * without pm_prepare on AMD platforms in clockstop mode0. */ -if (amd_manager->power_mode_mask &AMD_SDW_CLK_STOP_MODE ) { - ret =pm_request_resume (dev); +if (amd_manager->power_mode_mask) { + ret =pm_runtime_resume (dev);if (ret <0 ) { -dev_err (bus->dev,"pm_request_resume failed: %d\n" , ret); +dev_err (bus->dev,"pm_runtime_resume failed: %d\n" , ret);return 0 ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 421/570 soundwire: amd: cancel pending slave status handling workqueue during remove sequence
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vijendar Mukunda <[email protected]>
[ Upstream commit f93b697ed98e3c85d1973ea170d4f4e7a6b2b45d ]
During remove sequence, cancel the pending slave status update workqueue.
--- drivers/soundwire/amd_manager.c | 1 + 1 file changed, 1 insertion(+)
drivers/soundwire/amd_manager.c +1 -0
@@ -1074,6 +1074,7 @@ static void amd_sdw_manager_remove(struct platform_device *pdev)int ret;pm_runtime_disable (&pdev->dev); +cancel_work_sync (&amd_manager->amd_sdw_work);amd_disable_sdw_interrupts (amd_manager);sdw_bus_master_delete (&amd_manager->bus); ret =amd_disable_sdw_manager (amd_manager);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 422/570 soundwire: Move handle_nested_irq outside of sdw_dev_lock
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charles Keepax <[email protected]>
[ Upstream commit ccb7bb13c00bcc3178d270da052635c56148bc16 ]
The sdw_dev_lock protects the SoundWire driver callbacks against the probed flag, which is used to skip the callbacks if the driver gets removed. For more information see commit bd29c00edd0a ("soundwire: revisit driver bind/unbind and callbacks").
However, this lock is a frequent source of mutex inversions. Many audio operations eventually hit the hardware resulting in a SoundWire callback, this means that typically the driver has the locking order ALSA/ASoC locks -> sdw_dev_lock. Conversely, the IRQ comes in directly from the SoundWire hardware, but then will often want to access ALSA/ASoC, such as updating something in DAPM or an ALSA control. This gives the other lock order sdw_dev_lock -> ALSA/ASoC locks.
When the IRQ handling was initially added to SoundWire this was through a callback mechanism. As such it required being covered by the lock because the callbacks are part of the sdw_driver structure and are thus present regardless of if the driver is currently probed.
Since then a newer mechanism using the IRQ framework has been added, which is currently covered by the same lock but this isn't actually required. Handlers for the IRQ framework are registered in probe and should by released during remove, thus the IRQ framework will have already unbound the IRQ before the slave driver is removed. Avoid the aforementioned mutex inversion by moving the handle_nested_irq call outside of the sdw_dev_lock.
--- drivers/soundwire/bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/soundwire/bus.c +3 -3
@@ -1753,15 +1753,15 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)/* Update the Slave driver */ if (slave_notify) { +if (slave->prop.use_domain_irq && slave->irq) +handle_nested_irq (slave->irq); +mutex_lock (&slave->sdw_dev_lock);if (slave->probed) {struct device *dev = &slave->dev;struct sdw_driver *drv =drv_to_sdw_driver (dev->driver); -if (slave->prop.use_domain_irq && slave->irq) -handle_nested_irq (slave->irq); -if (drv->ops && drv->ops->interrupt_callback) { slave_intr.sdca_cascade = sdca_cascade; slave_intr.control_port = clear;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 423/570 md: dm-zoned-target: Initialize return variable r to avoid uninitialized use
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Purva Yeshi <[email protected]>
[ Upstream commit 487767bff572d46f7c37ad846c4078f6d6c9cc55 ]
Fix Smatch-detected error:drivers/md/dm-zoned-target.c:1073 dmz_iterate_devices()
error: uninitialized symbol 'r'.
Smatch detects a possible use of the uninitialized variable 'r' in dmz_iterate_devices() because if dmz->nr_ddevs is zero, the loop is skipped and 'r' is returned without being set, leading to undefined behavior.
Initialize 'r' to 0 before the loop. This ensures that if there are no devices to iterate over, the function still returns a defined value.
--- drivers/md/dm-zoned-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-zoned-target.c +1 -1
@@ -1062,7 +1062,7 @@ static int dmz_iterate_devices(struct dm_target *ti,struct dmz_target *dmz = ti->private;unsigned int zone_nr_sectors =dmz_zone_nr_sectors (dmz->metadata);sector_t capacity; -int i, r; +int i, r =0 ;for (i =0 ; i < dmz->nr_ddevs; i++) { capacity = dmz->dev[i].capacity & ~(zone_nr_sectors -1 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 424/570 module: Prevent silent truncation of module name in delete_module(2)
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Petr Pavlu <[email protected]>
[ Upstream commit a6323bd4e611567913e23df5b58f2d4e4da06789 ]
Passing a module name longer than MODULE_NAME_LEN to the delete_module syscall results in its silent truncation. This really isn't much of a problem in practice, but it could theoretically lead to the removal of an incorrect module. It is more sensible to return ENAMETOOLONG or ENOENT in such a case.
Update the syscall to return ENOENT, as documented in the delete_module(2) man page to mean "No module by that name exists." This is appropriate because a module with a name longer than MODULE_NAME_LEN cannot be loaded in the first place.
--- kernel/module/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/module/main.c +6 -4
@@ -751,14 +751,16 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,struct module *mod;char name[MODULE_NAME_LEN ];char buf[MODULE_FLAGS_BUF_SIZE ]; -int ret, forced =0 ; +int ret, len, forced =0 ;if (!capable (CAP_SYS_MODULE ) || modules_disabled)return -EPERM ; -if (strncpy_from_user (name, name_user,MODULE_NAME_LEN -1 ) <0 ) -return -EFAULT ; - name[MODULE_NAME_LEN -1 ] ='\0' ; + len =strncpy_from_user (name, name_user,MODULE_NAME_LEN ); +if (len ==0 || len ==MODULE_NAME_LEN ) +return -ENOENT ; +if (len <0 ) +return len;audit_log_kern_module (name);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 425/570 i3c: add missing include to internal header
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 3b661ca549b9e5bb11d0bc97ada6110aac3282d2 ]
LKP found a random config which failed to build because IO accessors were not defined:
In file included from drivers/i3c/master.c:21:
drivers/i3c/internals.h: In function 'i3c_writel_fifo':
Quoted 1 line
Quoted 1 line
drivers/i3c/internals.h:35:9: error: implicit declaration of function 'writesl' [-Werror=implicit-function-declaration]
Add the proper header to where the IO accessors are used.
--- drivers/i3c/internals.h | 1 + 1 file changed, 1 insertion(+)
drivers/i3c/internals.h +1 -0
@@ -9,6 +9,7 @@#define I3C_INTERNALS_H #include <linux/i3c/master.h> +#include <linux/io.h> void i3c_bus_normaluse_lock (struct i3c_bus *bus);void i3c_bus_normaluse_unlock (struct i3c_bus *bus);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 426/570 rtc: ds1307: handle oscillator stop flag (OSF) for ds1341
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Meagan Lloyd <[email protected]>
[ Upstream commit 523923cfd5d622b8f4ba893fdaf29fa6adeb8c3e ]
In using CONFIG_RTC_HCTOSYS, rtc_hctosys() will sync the RTC time to the kernel time as long as rtc_read_time() succeeds. In some power loss situations, our supercapacitor-backed DS1342 RTC comes up with either an unpredictable future time or the default 01/01/00 from the datasheet. The oscillator stop flag (OSF) is set in these scenarios due to the power loss and can be used to determine the validity of the RTC data.
This change expands the oscillator stop flag (OSF) handling that has already been implemented for some chips to the ds1341 chip (DS1341 and DS1342 share a datasheet). This handling manages the validity of the RTC data in .read_time and .set_time based on the OSF.
--- drivers/rtc/rtc-ds1307.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/rtc/rtc-ds1307.c +11 -0
@@ -279,6 +279,13 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t)if (tmp &DS1340_BIT_OSF )return -EINVAL ;break ; +case ds_1341: + ret =regmap_read (ds1307->regmap,DS1337_REG_STATUS , &tmp); +if (ret) +return ret; +if (tmp &DS1337_BIT_OSF ) +return -EINVAL ; +break ;case ds_1388: ret =regmap_read (ds1307->regmap,DS1388_REG_FLAG , &tmp);if (ret)
@@ -377,6 +384,10 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)regmap_update_bits (ds1307->regmap,DS1340_REG_FLAG ,DS1340_BIT_OSF ,0 );break ; +case ds_1341: +regmap_update_bits (ds1307->regmap,DS1337_REG_STATUS , +DS1337_BIT_OSF ,0 ); +break ;case ds_1388:regmap_update_bits (ds1307->regmap,DS1388_REG_FLAG ,DS1388_BIT_OSF ,0 );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 427/570 apparmor: shift ouid when mediating hard links in userns
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gabriel Totev <[email protected]>
[ Upstream commit c5bf96d20fd787e4909b755de4705d52f3458836 ]
When using AppArmor profiles inside an unprivileged container, the link operation observes an unshifted ouid. (tested with LXD and Incus)
For example, root inside container and uid 1000000 outside, with owner /root/link l, profile entry for ln:
/root$ touch chain && ln chain link
==> dmesg
apparmor="DENIED" operation="link" class="file" namespace="root//lxd-feet_<var-snap-lxd-common-lxd>" profile="linkit" name="/root/link" pid=1655 comm="ln" requested_mask="l" denied_mask="l" fsuid=1000000 ouid=0 [<== should be 1000000] target="/root/chain"
Fix by mapping inode uid of old_dentry in aa_path_link() rather than using it directly, similarly to how it's mapped in __file_path_perm() later in the file.
--- security/apparmor/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
security/apparmor/file.c +4 -2
@@ -423,9 +423,11 @@ int aa_path_link(const struct cred *subj_cred, {struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry }; +struct inode *inode =d_backing_inode (old_dentry); +vfsuid_t vfsuid =i_uid_into_vfsuid (mnt_idmap (target.mnt), inode);struct path_cond cond = { -d_backing_inode (old_dentry)->i_uid, -d_backing_inode (old_dentry)->i_mode + .uid =vfsuid_into_kuid (vfsuid), + .mode = inode->i_mode, };char *buffer =NULL , *buffer2 =NULL ;struct aa_profile *profile;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 428/570 i3c: dont fail if GETHDRCAP is unsupported
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wolfram Sang <[email protected]>
[ Upstream commit 447270cdb41b1c8c3621bb14b93a6749f942556e ]
'I3C_BCR_HDR_CAP' is still spec v1.0 and has been renamed to 'advanced capabilities' in v1.1 onwards. The ST pressure sensor LPS22DF does not have HDR, but has the 'advanced cap' bit set. The core still wants to get additional information using the CCC 'GETHDRCAP' (or GETCAPS in v1.1 onwards). Not all controllers support this CCC and will notify the upper layers about it. For instantiating the device, we can ignore this unsupported CCC as standard communication will work. Without this patch, the device will not be instantiated at all.
--- drivers/i3c/master.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i3c/master.c +1 -1
@@ -1439,7 +1439,7 @@ static int i3c_master_retrieve_dev_info(struct i3c_dev_desc *dev)if (dev->info.bcr &I3C_BCR_HDR_CAP ) { ret =i3c_master_gethdrcap_locked (master, &dev->info); -if (ret) +if (ret && ret != -ENOTSUPP )return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 429/570 i3c: master: Initialize ret in i3c_i2c_notifier_call()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jorge Marques <[email protected]>
[ Upstream commit 290ce8b2d0745e45a3155268184523a8c75996f1 ]
Set ret to -EINVAL if i3c_i2c_notifier_call() receives an invalid action, resolving uninitialized warning.
--- drivers/i3c/master.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i3c/master.c +2 -0
@@ -2467,6 +2467,8 @@ static int i3c_i2c_notifier_call(struct notifier_block *nb, unsigned long actioncase BUS_NOTIFY_DEL_DEVICE : ret =i3c_master_i2c_detach (adap, client);break ; +default : + ret = -EINVAL ; }i3c_bus_maintenance_unlock (&master->bus);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 430/570 dm-mpath: dont print the "loaded" message if registering fails
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka <[email protected]>
[ Upstream commit 6e11952a6abc4641dc8ae63f01b318b31b44e8db ]
If dm_register_path_selector, don't print the "version X loaded" message.
--- drivers/md/dm-ps-historical-service-time.c | 4 +++- drivers/md/dm-ps-queue-length.c | 4 +++- drivers/md/dm-ps-round-robin.c | 4 +++- drivers/md/dm-ps-service-time.c | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-)
drivers/md/dm-ps-historical-service-time.c +3 -1
@@ -541,8 +541,10 @@ static int __init dm_hst_init(void) {int r =dm_register_path_selector (&hst_ps); -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +return r; + }DMINFO ("version " HST_VERSION " loaded" );
drivers/md/dm-ps-queue-length.c +3 -1
@@ -260,8 +260,10 @@ static int __init dm_ql_init(void) {int r =dm_register_path_selector (&ql_ps); -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +return r; + }DMINFO ("version " QL_VERSION " loaded" );
drivers/md/dm-ps-round-robin.c +3 -1
@@ -220,8 +220,10 @@ static int __init dm_rr_init(void) {int r =dm_register_path_selector (&rr_ps); -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +return r; + }DMINFO ("version " RR_VERSION " loaded" );
drivers/md/dm-ps-service-time.c +3 -1
@@ -341,8 +341,10 @@ static int __init dm_st_init(void) {int r =dm_register_path_selector (&st_ps); -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +return r; + }DMINFO ("version " ST_VERSION " loaded" );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 431/570 dm-table: fix checking for rq stackable devices
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Marzinski <[email protected]>
[ Upstream commit 8ca719b81987be690f197e82fdb030580c0a07f3 ]
Due to the semantics of iterate_devices(), the current code allows a request-based dm table as long as it includes one request-stackable device. It is supposed to only allow tables where there are no non-request-stackable devices.
--- drivers/md/dm-table.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/md/dm-table.c +5 -5
@@ -899,17 +899,17 @@ static bool dm_table_supports_dax(struct dm_table *t,return true; } -static int device_is_rq_stackable (struct dm_target *ti,struct dm_dev *dev, -sector_t start,sector_t len,void *data) +static int device_is_not_rq_stackable (struct dm_target *ti,struct dm_dev *dev, +sector_t start,sector_t len,void *data) {struct block_device *bdev = dev->bdev;struct request_queue *q =bdev_get_queue (bdev);/* request-based cannot stack on partitions! */ if (bdev_is_partition (bdev)) -return false; +return true; -return queue_is_mq (q); +return !queue_is_mq (q); }static int dm_table_determine_type (struct dm_table *t)
@@ -1005,7 +1005,7 @@ static int dm_table_determine_type(struct dm_table *t)/* Non-request-stackable devices can't be used for request-based dm */ if (!ti->type->iterate_devices || - !ti->type->iterate_devices (ti, device_is_rq_stackable,NULL )) { + ti->type->iterate_devices (ti, device_is_not_rq_stackable,NULL )) {DMERR ("table load rejected: including non-request-stackable devices" );return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 432/570 apparmor: use the condition in AA_BUG_FMT even with debug disabled
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mateusz Guzik <[email protected]>
[ Upstream commit 67e370aa7f968f6a4f3573ed61a77b36d1b26475 ]
This follows the established practice and fixes a build failure for me:security/apparmor/file.c: In function ‘__file_sock_perm’:security/apparmor/file.c:544:24: error: unused variable ‘sock’ [-Werror=unused-variable]
544 | struct socket *sock = (struct socket *) file->private_data;
| ^~~~
--- security/apparmor/include/lib.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
security/apparmor/include/lib.h +5 -1
@@ -48,7 +48,11 @@ extern struct aa_dfa *stacksplitdfa; #define AA_BUG_FMT(X, fmt, args...) \ WARN((X), "AppArmor WARN %s: (" #X "): " fmt, __func__, ##args)#else -#define AA_BUG_FMT(X, fmt, args...) no_printk(fmt, ##args) +#define AA_BUG_FMT(X, fmt, args...) \ + do { \ + BUILD_BUG_ON_INVALID(X); \ + no_printk(fmt, ##args); \ + } while (0)#endif #define AA_ERROR(fmt, args...) \
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 433/570 apparmor: fix x_table_lookup when stacking is not the first entry
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Johansen <[email protected]>
[ Upstream commit a9eb185be84e998aa9a99c7760534ccc06216705 ]
x_table_lookup currently does stacking during label_parse() if the target specifies a stack but its only caller ensures that it will never be used with stacking.
Refactor to slightly simplify the code in x_to_label(), this also fixes a long standing problem where x_to_labels check on stacking is only on the first element to the table option list, instead of the element that is found and used.
--- security/apparmor/domain.c | 52 +++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 23 deletions(-)
security/apparmor/domain.c +29 -23
@@ -508,6 +508,7 @@ static const char *next_name(int xtype, const char *name)* @name: returns: name tested to find label (NOT NULL) * * Returns: refcounted label, or NULL on failure (MAYBE NULL) +* @name will always be set with the last name tried */ struct aa_label *x_table_lookup (struct aa_profile *profile,u32 xindex,const char **name)
@@ -517,6 +518,7 @@ struct aa_label *x_table_lookup(struct aa_profile *profile, u32 xindex,struct aa_label *label =NULL ;u32 xtype = xindex &AA_X_TYPE_MASK ;int index = xindex &AA_X_INDEX_MASK ; +const char *next;AA_BUG (!name);
@@ -524,25 +526,27 @@ struct aa_label *x_table_lookup(struct aa_profile *profile, u32 xindex,/* TODO: move lookup parsing to unpack time so this is a straight * index into the resultant label */ -for (*name = rules->file->trans.table[index]; !label && *name; - *name =next_name (xtype, *name)) { +for (next = rules->file->trans.table[index]; next; + next =next_name (xtype, next)) { +const char *lookup = (*next =='&' ) ? next +1 : next; + *name = next;if (xindex &AA_X_CHILD ) { -struct aa_profile *new_profile; -/* release by caller */ - new_profile =aa_find_child (profile, *name); -if (new_profile) - label = &new_profile->label; +/* TODO: switich to parse to get stack of child */ +struct aa_profile *new =aa_find_child (profile, lookup); + +if (new) +/* release by caller */ +return &new->label;continue ; } - label =aa_label_parse (&profile->label, *name,GFP_KERNEL , + label =aa_label_parse (&profile->label, lookup,GFP_KERNEL , true, false); -if (IS_ERR (label)) - label =NULL ; +if (!IS_ERR_OR_NULL (label)) +/* release by caller */ +return label; } -/* released by caller */ - -return label; +return NULL ; }/**
@@ -567,9 +571,9 @@ static struct aa_label *x_to_label(struct aa_profile *profile,struct aa_ruleset *rules =list_first_entry (&profile->rules,typeof (*rules), list);struct aa_label *new =NULL ; +struct aa_label *stack =NULL ;struct aa_ns *ns = profile->ns;u32 xtype = xindex &AA_X_TYPE_MASK ; -const char *stack =NULL ;switch (xtype) {case AA_X_NONE :
@@ -578,13 +582,14 @@ static struct aa_label *x_to_label(struct aa_profile *profile,break ;case AA_X_TABLE :/* TODO: fix when perm mapping done at unload */ - stack = rules->file->trans.table[xindex &AA_X_INDEX_MASK ]; -if (*stack !='&' ) { -/* released by caller */ - new =x_table_lookup (profile, xindex, lookupname); - stack =NULL ; +/* released by caller +* if null for both stack and direct want to try fallback +*/ + new =x_table_lookup (profile, xindex, lookupname); +if (!new || **lookupname !='&' )break ; - } + stack = new; + new =NULL ; fallthrough;/* to X_NAME */ case AA_X_NAME :if (xindex &AA_X_CHILD )
@@ -599,6 +604,7 @@ static struct aa_label *x_to_label(struct aa_profile *profile,break ; } +/* fallback transition check */ if (!new) {if (xindex &AA_X_INHERIT ) {/* (p|c|n)ix - don't change profile but do
@@ -617,12 +623,12 @@ static struct aa_label *x_to_label(struct aa_profile *profile,/* base the stack on post domain transition */ struct aa_label *base = new; - new =aa_label_parse (base, stack,GFP_KERNEL , true, false); -if (IS_ERR (new)) - new =NULL ; + new =aa_label_merge (base, stack,GFP_KERNEL ); +/* null on error */ aa_put_label (base); } +aa_put_label (stack);/* released by caller */ return new; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 434/570 i2c: Force DLL0945 touchpad i2c freq to 100khz
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: fangzhong.zhou <[email protected]>
[ Upstream commit 0b7c9528facdb5a73ad78fea86d2e95a6c48dbc4 ]
This patch fixes an issue where the touchpad cursor movement becomes slow on the Dell Precision 5560. Force the touchpad freq to 100khz as a workaround.
Tested on Dell Precision 5560 with 6.14 to 6.14.6. Cursor movement is now smooth and responsive.
--- drivers/i2c/i2c-core-acpi.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/i2c-core-acpi.c +1 -0
@@ -370,6 +370,7 @@ static const struct acpi_device_id i2c_acpi_force_100khz_device_ids[] = {* the device works without issues on Windows at what is expected to be * a 400KHz frequency. The root cause of the issue is not known. */ + { "DLL0945", 0 }, { "ELAN06FA", 0 }, {} };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 435/570 exfat: add cluster chain loop check for dir
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuezhang Mo <[email protected]>
[ Upstream commit 99f9a97dce39ad413c39b92c90393bbd6778f3fd ]
An infinite loop may occur if the following conditions occur due to file system corruption.
(1) Condition for exfat_count_dir_entries() to loop infinitely.
- The cluster chain includes a loop.
- There is no UNUSED entry in the cluster chain.
(2) Condition for exfat_create_upcase_table() to loop infinitely.
- The cluster chain of the root directory includes a loop.
- There are no UNUSED entry and up-case table entry in the cluster chain of the root directory.
(3) Condition for exfat_load_bitmap() to loop infinitely.
- The cluster chain of the root directory includes a loop.
- There are no UNUSED entry and bitmap entry in the cluster chain of the root directory.
(4) Condition for exfat_find_dir_entry() to loop infinitely.
- The cluster chain includes a loop.
- The unused directory entries were exhausted by some operation.
(5) Condition for exfat_check_dir_empty() to loop infinitely.
- The cluster chain includes a loop.
- The unused directory entries were exhausted by some operation.
- All files and sub-directories under the directory are deleted.
This commit adds checks to break the above infinite loop.
--- fs/exfat/dir.c | 12 ++++++++++++ fs/exfat/fatent.c | 10 ++++++++++ fs/exfat/namei.c | 5 +++++ fs/exfat/super.c | 32 +++++++++++++++++++++----------- 4 files changed, 48 insertions(+), 11 deletions(-)
fs/exfat/dir.c +12 -0
@@ -996,6 +996,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,struct exfat_hint_femp candi_empty;struct exfat_sb_info *sbi =EXFAT_SB (sb);int num_entries =exfat_calc_num_entries (p_uniname); +unsigned int clu_count =0 ;if (num_entries <0 )return num_entries;
@@ -1133,6 +1134,10 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei, }else {if (exfat_get_next_cluster (sb, &clu.dir))return -EIO ; + +/* break if the cluster chain includes a loop */ +if (unlikely (++clu_count >EXFAT_DATA_CLUSTER_COUNT (sbi))) + goto not_found; } }
@@ -1195,6 +1200,7 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)int i, count =0 ;int dentries_per_clu;unsigned int entry_type; +unsigned int clu_count =0 ;struct exfat_chain clu;struct exfat_dentry *ep;struct exfat_sb_info *sbi =EXFAT_SB (sb);
@@ -1227,6 +1233,12 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir) }else {if (exfat_get_next_cluster (sb, &(clu.dir)))return -EIO ; + +if (unlikely (++clu_count > sbi->used_clusters)) { +exfat_fs_error (sb,"FAT or bitmap is corrupted" ); +return -EIO ; + } + } }
fs/exfat/fatent.c +10 -0
@@ -490,5 +490,15 @@ int exfat_count_num_clusters(struct super_block *sb, } *ret_count = count; + +/* +* since exfat_count_used_clusters() is not called, sbi->used_clusters +* cannot be used here. +*/ +if (unlikely (i == sbi->num_clusters && clu !=EXFAT_EOF_CLUSTER )) { +exfat_fs_error (sb,"The cluster chain has a loop" ); +return -EIO ; + } +return 0 ; }
fs/exfat/namei.c +5 -0
@@ -890,6 +890,7 @@ static int exfat_check_dir_empty(struct super_block *sb, {int i, dentries_per_clu;unsigned int type; +unsigned int clu_count =0 ;struct exfat_chain clu;struct exfat_dentry *ep;struct exfat_sb_info *sbi =EXFAT_SB (sb);
@@ -926,6 +927,10 @@ static int exfat_check_dir_empty(struct super_block *sb, }else {if (exfat_get_next_cluster (sb, &(clu.dir)))return -EIO ; + +/* break if the cluster chain includes a loop */ +if (unlikely (++clu_count >EXFAT_DATA_CLUSTER_COUNT (sbi))) +break ; } }
fs/exfat/super.c +21 -11
@@ -341,13 +341,12 @@ static void exfat_hash_init(struct super_block *sb)INIT_HLIST_HEAD (&sbi->inode_hashtable[i]); } -static int exfat_read_root (struct inode *inode) +static int exfat_read_root (struct inode *inode,struct exfat_chain *root_clu) {struct super_block *sb = inode->i_sb;struct exfat_sb_info *sbi =EXFAT_SB (sb);struct exfat_inode_info *ei =EXFAT_I (inode); -struct exfat_chain cdir; -int num_subdirs, num_clu =0 ; +int num_subdirs;exfat_chain_set (&ei->dir, sbi->root_dir,0 ,ALLOC_FAT_CHAIN ); ei->entry =-1 ;
@@ -360,12 +359,9 @@ static int exfat_read_root(struct inode *inode) ei->hint_stat.clu = sbi->root_dir; ei->hint_femp.eidx =EXFAT_HINT_NONE ; -exfat_chain_set (&cdir, sbi->root_dir,0 ,ALLOC_FAT_CHAIN ); -if (exfat_count_num_clusters (sb, &cdir, &num_clu)) -return -EIO ; -i_size_write (inode, num_clu << sbi->cluster_size_bits); +i_size_write (inode,EXFAT_CLU_TO_B (root_clu->size, sbi)); - num_subdirs =exfat_count_dir_entries (sb, &cdir); + num_subdirs =exfat_count_dir_entries (sb, root_clu);if (num_subdirs <0 )return -EIO ;set_nlink (inode, num_subdirs +EXFAT_MIN_SUBDIR );
@@ -578,7 +574,8 @@ static int exfat_verify_boot_region(struct super_block *sb) }/* mount the file system volume */ -static int __exfat_fill_super (struct super_block *sb) +static int __exfat_fill_super (struct super_block *sb, +struct exfat_chain *root_clu) {int ret;struct exfat_sb_info *sbi =EXFAT_SB (sb);
@@ -595,6 +592,18 @@ static int __exfat_fill_super(struct super_block *sb) goto free_bh; } +/* +* Call exfat_count_num_cluster() before searching for up-case and +* bitmap directory entries to avoid infinite loop if they are missing +* and the cluster chain includes a loop. +*/ +exfat_chain_set (root_clu, sbi->root_dir,0 ,ALLOC_FAT_CHAIN ); + ret =exfat_count_num_clusters (sb, root_clu, &root_clu->size); +if (ret) { +exfat_err (sb,"failed to count the number of clusters in root" ); + goto free_bh; + } + ret =exfat_create_upcase_table (sb);if (ret) {exfat_err (sb,"failed to load upcase table" );
@@ -627,6 +636,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc)struct exfat_sb_info *sbi = sb->s_fs_info;struct exfat_mount_options *opts = &sbi->options;struct inode *root_inode; +struct exfat_chain root_clu;int err;if (opts->allow_utime == (unsigned short )-1 )
@@ -645,7 +655,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_time_min =EXFAT_MIN_TIMESTAMP_SECS ; sb->s_time_max =EXFAT_MAX_TIMESTAMP_SECS ; - err =__exfat_fill_super (sb); + err =__exfat_fill_super (sb, &root_clu);if (err) {exfat_err (sb,"failed to recognize exfat type" ); goto check_nls_io;
@@ -680,7 +690,7 @@ static int exfat_fill_super(struct super_block *sb, struct fs_context *fc) root_inode->i_ino =EXFAT_ROOT_INO ;inode_set_iversion (root_inode,1 ); - err =exfat_read_root (root_inode); + err =exfat_read_root (root_inode, &root_clu);if (err) {exfat_err (sb,"failed to initialize root inode" ); goto put_inode;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 436/570 f2fs: check the generic conditions first
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jaegeuk Kim <[email protected]>
[ Upstream commit e23ab8028de0d92df5921a570f5212c0370db3b5 ]
Let's return errors caught by the generic checks. This fixes generic/494 where it expects to see EBUSY by setattr_prepare instead of EINVAL by f2fs for active swapfile.
--- fs/f2fs/file.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
fs/f2fs/file.c +12 -12
@@ -1047,6 +1047,18 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,if (unlikely (f2fs_cp_error (F2FS_I_SB (inode))))return -EIO ; + err =setattr_prepare (idmap, dentry, attr); +if (err) +return err; + + err =fscrypt_prepare_setattr (dentry, attr); +if (err) +return err; + + err =fsverity_prepare_setattr (dentry, attr); +if (err) +return err; +if (unlikely (IS_IMMUTABLE (inode)))return -EPERM ;
@@ -1065,18 +1077,6 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,return -EINVAL ; } - err =setattr_prepare (idmap, dentry, attr); -if (err) -return err; - - err =fscrypt_prepare_setattr (dentry, attr); -if (err) -return err; - - err =fsverity_prepare_setattr (dentry, attr); -if (err) -return err; -if (is_quota_modification (idmap, inode, attr)) { err =f2fs_dquot_initialize (inode);if (err)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 437/570 f2fs: handle nat.blkaddr corruption in f2fs_get_node_info()
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chao Yu <[email protected]>
[ Upstream commit 1773f63d108b1b9b9d053d8c95f8300c556f93b8 ]
F2FS-fs (dm-55): access invalid blkaddr:972878540
Call trace: dump_backtrace+0xec/0x128 show_stack+0x18/0x28 dump_stack_lvl+0x40/0x88 dump_stack+0x18/0x24 __f2fs_is_valid_blkaddr+0x360/0x3b4 f2fs_is_valid_blkaddr+0x10/0x20 f2fs_get_node_info+0x21c/0x60c __write_node_page+0x15c/0x734 f2fs_sync_node_pages+0x4f8/0x700 f2fs_write_checkpoint+0x4a8/0x99c __checkpoint_and_complete_reqs+0x7c/0x20c issue_checkpoint_thread+0x4c/0xd8 kthread+0x11c/0x1b0 ret_from_fork+0x10/0x20
If nat.blkaddr is corrupted, during checkpoint, f2fs_sync_node_pages() will loop to flush node page w/ corrupted nat.blkaddr.
Although, it tags SBI_NEED_FSCK, checkpoint can not persist it due to deadloop.
Let's call f2fs_handle_error(, ERROR_INCONSISTENT_NAT) to record such error into superblock, it expects fsck can detect the error and repair inconsistent nat.blkaddr after device reboot.
Note that, let's add sanity check in f2fs_get_node_info() to detect in-memory nat.blkaddr inconsistency, but only if CONFIG_F2FS_CHECK_FS is enabled.
--- fs/f2fs/node.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
fs/f2fs/node.c +21 -8
@@ -555,8 +555,8 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,struct f2fs_nat_entry ne;struct nat_entry *e;pgoff_t index; -block_t blkaddr;int i; +bool need_cache = true; ni->flag =0 ; ni->nid = nid;
@@ -569,6 +569,10 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid, ni->blk_addr =nat_get_blkaddr (e); ni->version =nat_get_version (e);f2fs_up_read (&nm_i->nat_tree_lock); +if (IS_ENABLED (CONFIG_F2FS_CHECK_FS )) { + need_cache = false; + goto sanity_check; + }return 0 ; }
@@ -594,7 +598,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid,up_read (&curseg->journal_rwsem);if (i >=0 ) {f2fs_up_read (&nm_i->nat_tree_lock); - goto cache; + goto sanity_check; }/* Fill node_info from nat page */
@@ -609,14 +613,23 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid, ne = nat_blk->entries[nid - start_nid];node_info_from_raw_nat (ni, &ne);f2fs_folio_put (folio, true); -cache: - blkaddr =le32_to_cpu (ne.block_addr); -if (__is_valid_data_blkaddr (blkaddr) && - !f2fs_is_valid_blkaddr (sbi, blkaddr,DATA_GENERIC_ENHANCE )) -return -EFAULT ; +sanity_check: +if (__is_valid_data_blkaddr (ni->blk_addr) && + !f2fs_is_valid_blkaddr (sbi, ni->blk_addr, +DATA_GENERIC_ENHANCE )) { +set_sbi_flag (sbi,SBI_NEED_FSCK ); +f2fs_err_ratelimited (sbi, +"f2fs_get_node_info of %pS: inconsistent nat entry, " +"ino:%u, nid:%u, blkaddr:%u, ver:%u, flag:%u" , +__builtin_return_address (0 ), + ni->ino, ni->nid, ni->blk_addr, ni->version, ni->flag); +f2fs_handle_error (sbi,ERROR_INCONSISTENT_NAT ); +return -EFSCORRUPTED ; + }/* cache nat entry */ -cache_nat_entry (sbi, nid, &ne); +if (need_cache) +cache_nat_entry (sbi, nid, &ne);return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 438/570 printk: nbcon: Allow reacquire during panic
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Ogness <[email protected]>
[ Upstream commit 571c1ea91a73db56bd94054fabecd0f070dc90db ]
If a console printer is interrupted during panic, it will never be able to reacquire ownership in order to perform and cleanup. That in itself is not a problem, since the non-panic CPU will simply quiesce in an endless loop within nbcon_reacquire_nobuf().
However, in this state, platforms that do not support a true NMI to interrupt the quiesced CPU will not be able to shutdown that CPU from within panic(). This then causes problems for such as being unable to load and run a kdump kernel.
Fix this by allowing non-panic CPUs to reacquire ownership using a direct acquire. Then the non-panic CPUs can successfullyl exit the nbcon_reacquire_nobuf() loop and the console driver can perform any necessary cleanup. But more importantly, the CPU is no longer quiesced and is free to process any interrupts necessary for panic() to shutdown the CPU.
All other forms of acquire are still not allowed for non-panic CPUs since it is safer to have them avoid gaining console ownership that is not strictly necessary.
--- kernel/printk/nbcon.c | 63 ++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 22 deletions(-)
kernel/printk/nbcon.c +41 -22
@@ -214,8 +214,9 @@ static void nbcon_seq_try_update(struct nbcon_context *ctxt, u64 new_seq)/** * nbcon_context_try_acquire_direct - Try to acquire directly -* @ctxt: The context of the caller -* @cur: The current console state +* @ctxt: The context of the caller +* @cur: The current console state +* @is_reacquire: This acquire is a reacquire * * Acquire the console when it is released. Also acquire the console when * the current owner has a lower priority and the console is in a safe state.
@@ -225,17 +226,17 @@ static void nbcon_seq_try_update(struct nbcon_context *ctxt, u64 new_seq)* * Errors: * -* -EPERM: A panic is in progress and this is not the panic CPU. -* Or the current owner or waiter has the same or higher -* priority. No acquire method can be successful in -* this case. +* -EPERM: A panic is in progress and this is neither the panic +* CPU nor is this a reacquire. Or the current owner or +* waiter has the same or higher priority. No acquire +* method can be successful in these cases. * * -EBUSY: The current owner has a lower priority but the console * in an unsafe state. The caller should try using * the handover acquire method. */ static int nbcon_context_try_acquire_direct (struct nbcon_context *ctxt, -struct nbcon_state *cur) +struct nbcon_state *cur,bool is_reacquire) {unsigned int cpu =smp_processor_id ();struct console *con = ctxt->console;
@@ -243,14 +244,20 @@ static int nbcon_context_try_acquire_direct(struct nbcon_context *ctxt, do { /* - * Panic does not imply that the console is owned. However, it - * is critical that non-panic CPUs during panic are unable to - * acquire ownership in order to satisfy the assumptions of - * nbcon_waiter_matches(). In particular, the assumption that - * lower priorities are ignored during panic. + * Panic does not imply that the console is owned. However, + * since all non-panic CPUs are stopped during panic(), it + * is safer to have them avoid gaining console ownership. + * + * If this acquire is a reacquire (and an unsafe takeover + * has not previously occurred) then it is allowed to attempt + * a direct acquire in panic. This gives console drivers an + * opportunity to perform any necessary cleanup if they were + * interrupted by the panic CPU while printing. */ - if (other_cpu_in_panic()) + if (other_cpu_in_panic() && + (!is_reacquire || cur->unsafe_takeover)) { return -EPERM; + } if (ctxt->prio <= cur->prio || ctxt->prio <= cur->req_prio) return -EPERM;
@@ -301,8 +308,9 @@ static bool nbcon_waiter_matches(struct nbcon_state *cur, int expected_prio)* Event #1 implies this context is EMERGENCY. * Event #2 implies the new context is PANIC. * Event #3 occurs when panic() has flushed the console. -* Events #4 and #5 are not possible due to the other_cpu_in_panic() -* check in nbcon_context_try_acquire_direct(). +* Event #4 occurs when a non-panic CPU reacquires. +* Event #5 is not possible due to the other_cpu_in_panic() check +* in nbcon_context_try_acquire_handover(). */ return (cur->req_prio == expected_prio);
@@ -431,6 +439,16 @@ static int nbcon_context_try_acquire_handover(struct nbcon_context *ctxt,WARN_ON_ONCE (ctxt->prio <= cur->prio || ctxt->prio <= cur->req_prio);WARN_ON_ONCE (!cur->unsafe); +/* +* Panic does not imply that the console is owned. However, it +* is critical that non-panic CPUs during panic are unable to +* wait for a handover in order to satisfy the assumptions of +* nbcon_waiter_matches(). In particular, the assumption that +* lower priorities are ignored during panic. +*/ +if (other_cpu_in_panic ()) +return -EPERM ; +/* Handover is not possible on the same CPU. */ if (cur->cpu == cpu)return -EBUSY ;
@@ -558,7 +576,8 @@ static struct printk_buffers panic_nbcon_pbufs;/** * nbcon_context_try_acquire - Try to acquire nbcon console -* @ctxt: The context of the caller +* @ctxt: The context of the caller +* @is_reacquire: This acquire is a reacquire * * Context: Under @ctxt->con->device_lock() or local_irq_save(). * Return: True if the console was acquired. False otherwise.
@@ -568,7 +587,7 @@ static struct printk_buffers panic_nbcon_pbufs;* in an unsafe state. Otherwise, on success the caller may assume * the console is not in an unsafe state. */ -static bool nbcon_context_try_acquire (struct nbcon_context *ctxt) +static bool nbcon_context_try_acquire (struct nbcon_context *ctxt,bool is_reacquire) {unsigned int cpu =smp_processor_id ();struct console *con = ctxt->console;
@@ -577,7 +596,7 @@ static bool nbcon_context_try_acquire(struct nbcon_context *ctxt)nbcon_state_read (con, &cur); try_again: - err =nbcon_context_try_acquire_direct (ctxt, &cur); + err =nbcon_context_try_acquire_direct (ctxt, &cur, is_reacquire);if (err != -EBUSY ) goto out;
@@ -913,7 +932,7 @@ void nbcon_reacquire_nobuf(struct nbcon_write_context *wctxt) {struct nbcon_context *ctxt = &ACCESS_PRIVATE (wctxt, ctxt); -while (!nbcon_context_try_acquire (ctxt)) +while (!nbcon_context_try_acquire (ctxt, true))cpu_relax ();nbcon_write_context_set_buf (wctxt,NULL ,0 );
@@ -1101,7 +1120,7 @@ static bool nbcon_emit_one(struct nbcon_write_context *wctxt, bool use_atomic)cant_migrate (); } -if (!nbcon_context_try_acquire (ctxt)) +if (!nbcon_context_try_acquire (ctxt, false)) goto out;/*
@@ -1486,7 +1505,7 @@ static int __nbcon_atomic_flush_pending_con(struct console *con, u64 stop_seq, ctxt->prio =nbcon_get_default_prio (); ctxt->allow_unsafe_takeover = allow_unsafe_takeover; -if (!nbcon_context_try_acquire (ctxt)) +if (!nbcon_context_try_acquire (ctxt, false))return -EPERM ;while (nbcon_seq_read (con) < stop_seq) {
@@ -1762,7 +1781,7 @@ bool nbcon_device_try_acquire(struct console *con) ctxt->console = con; ctxt->prio =NBCON_PRIO_NORMAL ; -if (!nbcon_context_try_acquire (ctxt)) +if (!nbcon_context_try_acquire (ctxt, false))return false;if (!nbcon_context_enter_unsafe (ctxt))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 439/570 kconfig: lxdialog: replace strcpy() with strncpy() in inputbox.c
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suchit Karunakaran <[email protected]>
[ Upstream commit 5ac726653a1029a2eccba93bbe59e01fc9725828 ]
strcpy() performs no bounds checking and can lead to buffer overflows if the input string exceeds the destination buffer size. This patch replaces it with strncpy(), and null terminates the input string.
--- scripts/kconfig/lxdialog/inputbox.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
scripts/kconfig/lxdialog/inputbox.c +4 -2
@@ -39,8 +39,10 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int widthif (!init) instr[0 ] ='\0' ; -else -strcpy (instr, init); +else { +strncpy (instr, init,sizeof (dialog_input_result) -1 ); + instr[sizeof (dialog_input_result) -1 ] ='\0' ; + } do_resize:if (getmaxy (stdscr) <= (height -INPUTBOX_HEIGHT_MIN ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 440/570 vfio/type1: conditional rescheduling while pinning
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Keith Busch <[email protected]>
[ Upstream commit b1779e4f209c7ff7e32f3c79d69bca4e3a3a68b6 ]
A large DMA mapping request can loop through dma address pinning for many pages. In cases where THP can not be used, the repeated vmf_insert_pfn can be costly, so let the task reschedule as need to prevent CPU stalls. Failure to do so has potential harmful side effects, like increased memory pressure as unrelated rcu tasks are unable to make their reclaim callbacks and result in OOM conditions.
rcu: INFO: rcu_sched self-detected stall on CPU rcu: 36-....: (20999 ticks this GP) idle=b01c/1/0x4000000000000000 softirq=35839/35839 fqs=3538 rcu: hardirqs softirqs csw/system rcu: number: 0 107 0 rcu: cputime: 50 0 10446 ==> 10556(ms) rcu: (t=21075 jiffies g=377761 q=204059 ncpus=384) ... <TASK> ? asm_sysvec_apic_timer_interrupt+0x16/0x20 ? walk_system_ram_range+0x63/0x120 ? walk_system_ram_range+0x46/0x120 ? pgprot_writethrough+0x20/0x20 lookup_memtype+0x67/0xf0 track_pfn_insert+0x20/0x40 vmf_insert_pfn_prot+0x88/0x140 vfio_pci_mmap_huge_fault+0xf9/0x1b0 [vfio_pci_core] __do_fault+0x28/0x1b0 handle_mm_fault+0xef1/0x2560 fixup_user_fault+0xf5/0x270 vaddr_get_pfns+0x169/0x2f0 [vfio_iommu_type1] vfio_pin_pages_remote+0x162/0x8e0 [vfio_iommu_type1] vfio_iommu_type1_ioctl+0x1121/0x1810 [vfio_iommu_type1] ? futex_wake+0x1c1/0x260 x64_sys_call+0x234/0x17a0 do_syscall_64+0x63/0x130 ? exc_page_fault+0x63/0x130 entry_SYSCALL_64_after_hwframe+0x4b/0x53
--- drivers/vfio/vfio_iommu_type1.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/vfio/vfio_iommu_type1.c +7 -0
@@ -647,6 +647,13 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,while (npage) {if (!batch->size) { +/* +* Large mappings may take a while to repeatedly refill +* the batch, so conditionally relinquish the CPU when +* needed to avoid stalls. +*/ +cond_resched (); +/* Empty batch, so refill it. */ ret =vaddr_get_pfns (mm, vaddr, npage, dma->prot, &pfn, batch);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 441/570 kconfig: nconf: Ensure null termination where strncpy is used
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shankari Anand <[email protected]>
[ Upstream commit f468992936894c9ce3b1659cf38c230d33b77a16 ]
strncpy() does not guarantee null-termination if the source string is longer than the destination buffer.
Ensure the buffer is explicitly null-terminated to prevent potential string overflows or undefined behavior.
--- scripts/kconfig/nconf.c | 2 ++ scripts/kconfig/nconf.gui.c | 1 + 2 files changed, 3 insertions(+)
scripts/kconfig/nconf.c +2 -0
@@ -593,6 +593,8 @@ static void item_add_str(const char *fmt, ...) tmp_str, sizeof(k_menu_items[index].str)); + k_menu_items[index].str[sizeof (k_menu_items[index].str) -1 ] ='\0' ; +free_item (curses_menu_items[index]); curses_menu_items[index] = new_item( k_menu_items[index].str,
scripts/kconfig/nconf.gui.c +1 -0
@@ -359,6 +359,7 @@ int dialog_inputbox(WINDOW *main_window, x = (columns-win_cols)/2 ;strncpy (result, init, *result_len); + result[*result_len -1 ] ='\0' ;/* create the windows */ win =newwin (win_lines, win_cols, y, x);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 442/570 scsi: Fix sas_user_scan() to handle wildcard and multi-channel scans
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
[ Upstream commit 37c4e72b0651e7697eb338cd1fb09feef472cc1a ]
sas_user_scan() did not fully process wildcard channel scans (SCAN_WILD_CARD) when a transport-specific user_scan() callback was present. Only channel 0 would be scanned via user_scan(), while the remaining channels were skipped, potentially missing devices.
user_scan() invokes updated sas_user_scan() for channel 0, and if successful, iteratively scans remaining channels (1 to shost->max_channel) via scsi_scan_host_selected(). This ensures complete wildcard scanning without affecting transport-specific scanning behavior.
--- drivers/scsi/scsi_scan.c | 2 +- drivers/scsi/scsi_transport_sas.c | 60 ++++++++++++++++++++++++------- 2 files changed, 49 insertions(+), 13 deletions(-)
drivers/scsi/scsi_scan.c +1 -1
@@ -1899,7 +1899,7 @@ int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,return 0 ; } - +EXPORT_SYMBOL (scsi_scan_host_selected);static void scsi_sysfs_add_devices (struct Scsi_Host *shost) {struct scsi_device *sdev;
drivers/scsi/scsi_transport_sas.c +48 -12
86 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 443/570 scsi: target: core: Generate correct identifiers for PR OUT transport IDs
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 6e0f6aa44b68335df404a2df955055f416b5f2aa ]
Fix target_parse_pr_out_transport_id() to return a string representing the transport ID in a human-readable format (e.g., naa.xxxxxxxx...) for various SCSI protocol types (SAS, FCP, SRP, SBP).
Previously, the function returned a pointer to the raw binary buffer, which was incorrectly compared against human-readable strings, causing comparisons to fail. Now, the function writes a properly formatted string into a buffer provided by the caller. The output format depends on the transport protocol:
* SAS: 64-bit identifier, "naa." prefix.
* FCP: 64-bit identifier, colon separated values.
* SBP: 64-bit identifier, no prefix.
* SRP: 128-bit identifier, "0x" prefix.
* iSCSI: IQN string.
--- drivers/target/target_core_fabric_lib.c | 63 +++++++++++++++++++------ drivers/target/target_core_internal.h | 4 +- drivers/target/target_core_pr.c | 18 +++---- 3 files changed, 60 insertions(+), 25 deletions(-)
drivers/target/target_core_fabric_lib.c +48 -15
@@ -257,11 +257,41 @@ static int iscsi_get_pr_transport_id_len(return len; } -static char *iscsi_parse_pr_out_transport_id ( +static void sas_parse_pr_out_transport_id (char *buf,char *i_str) +{ +char hex[17 ] = {}; + +bin2hex (hex, buf +4 ,8 ); +snprintf (i_str,TRANSPORT_IQN_LEN ,"naa.%s" , hex); +} + +static void srp_parse_pr_out_transport_id (char *buf,char *i_str) +{ +char hex[33 ] = {}; + +bin2hex (hex, buf +8 ,16 ); +snprintf (i_str,TRANSPORT_IQN_LEN ,"0x%s" , hex); +} + +static void fcp_parse_pr_out_transport_id (char *buf,char *i_str) +{ +snprintf (i_str,TRANSPORT_IQN_LEN ,"%8phC" , buf +8 ); +} + +static void sbp_parse_pr_out_transport_id (char *buf,char *i_str) +{ +char hex[17 ] = {}; + +bin2hex (hex, buf +8 ,8 ); +snprintf (i_str,TRANSPORT_IQN_LEN ,"%s" , hex); +} + +static bool iscsi_parse_pr_out_transport_id (struct se_portal_group *se_tpg,char *buf,u32 *out_tid_len, -char **port_nexus_ptr) +char **port_nexus_ptr, +char *i_str) {char *p;int i;
@@ -282,7 +312,7 @@ static char *iscsi_parse_pr_out_transport_id(if ((format_code !=0x00 ) && (format_code !=0x40 )) {pr_err ("Illegal format code: 0x%02x for iSCSI" " Initiator Transport ID\n" , format_code); -return NULL ; +return false; }/* * If the caller wants the TransportID Length, we set that value for the
@@ -306,7 +336,7 @@ static char *iscsi_parse_pr_out_transport_id(pr_err ("Unable to locate \",i,0x\" separator" " for Initiator port identifier: %s\n" , &buf[4 ]); -return NULL ; +return false; } *p ='\0' ;/* Terminate iSCSI Name */ p +=5 ;/* Skip over ",i,0x" separator */
@@ -339,7 +369,8 @@ static char *iscsi_parse_pr_out_transport_id( }else *port_nexus_ptr =NULL ; -return &buf[4 ]; +strscpy (i_str, &buf[4 ],TRANSPORT_IQN_LEN ); +return true; } int target_get_pr_transport_id_len(struct se_node_acl *nacl,
@@ -387,33 +418,35 @@ int target_get_pr_transport_id(struct se_node_acl *nacl, } } -const char *target_parse_pr_out_transport_id (struct se_portal_group *tpg, -char *buf,u32 *out_tid_len,char **port_nexus_ptr) +bool target_parse_pr_out_transport_id (struct se_portal_group *tpg, +char *buf,u32 *out_tid_len,char **port_nexus_ptr,char *i_str) { -u32 offset; -switch (tpg->proto_id) {case SCSI_PROTOCOL_SAS :/* * Assume the FORMAT CODE 00b from spc4r17, 7.5.4.7 TransportID * for initiator ports using SCSI over SAS Serial SCSI Protocol. */ - offset =4 ; +sas_parse_pr_out_transport_id (buf, i_str);break ; -case SCSI_PROTOCOL_SBP :case SCSI_PROTOCOL_SRP : +srp_parse_pr_out_transport_id (buf, i_str); +break ;case SCSI_PROTOCOL_FCP : - offset =8 ; +fcp_parse_pr_out_transport_id (buf, i_str); +break ; +case SCSI_PROTOCOL_SBP : +sbp_parse_pr_out_transport_id (buf, i_str);break ;case SCSI_PROTOCOL_ISCSI :return iscsi_parse_pr_out_transport_id (tpg, buf, out_tid_len, - port_nexus_ptr); + port_nexus_ptr, i_str);default :pr_err ("Unknown proto_id: 0x%02x\n" , tpg->proto_id); -return NULL ; +return false; } *port_nexus_ptr =NULL ; *out_tid_len =24 ; -return buf + offset; +return true; }
drivers/target/target_core_internal.h +2 -2
@@ -103,8 +103,8 @@ int target_get_pr_transport_id_len(struct se_node_acl *nacl,int target_get_pr_transport_id (struct se_node_acl *nacl,struct t10_pr_registration *pr_reg,int *format_code,unsigned char *buf); -const char *target_parse_pr_out_transport_id (struct se_portal_group *tpg, -char *buf,u32 *out_tid_len,char **port_nexus_ptr); +bool target_parse_pr_out_transport_id (struct se_portal_group *tpg, +char *buf,u32 *out_tid_len,char **port_nexus_ptr,char *i_str);/* target_core_hba.c */ struct se_hba *core_alloc_hba (const char *,u32 ,u32 );
drivers/target/target_core_pr.c +10 -8
@@ -1478,11 +1478,12 @@ core_scsi3_decode_spec_i_port(LIST_HEAD (tid_dest_list);struct pr_transport_id_holder *tidh_new, *tidh, *tidh_tmp;unsigned char *buf, *ptr, proto_ident; -const unsigned char *i_str =NULL ; +unsigned char i_str[TRANSPORT_IQN_LEN ];char *iport_ptr =NULL , i_buf[PR_REG_ISID_ID_LEN ];sense_reason_t ret;u32 tpdl, tid_len =0 ;u32 dest_rtpi =0 ; +bool tid_found;/* * Allocate a struct pr_transport_id_holder and setup the
@@ -1571,9 +1572,9 @@ core_scsi3_decode_spec_i_port( dest_rtpi = tmp_lun->lun_tpg->tpg_rtpi; iport_ptr =NULL ; - i_str =target_parse_pr_out_transport_id (tmp_tpg, - ptr, &tid_len, &iport_ptr); -if (!i_str) + tid_found =target_parse_pr_out_transport_id (tmp_tpg, + ptr, &tid_len, &iport_ptr, i_str); +if (!tid_found)continue ;/* * Determine if this SCSI device server requires that
@@ -3153,13 +3154,14 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key,struct t10_pr_registration *pr_reg, *pr_res_holder, *dest_pr_reg;struct t10_reservation *pr_tmpl = &dev->t10_pr;unsigned char *buf; -const unsigned char *initiator_str; +unsigned char initiator_str[TRANSPORT_IQN_LEN ];char *iport_ptr =NULL , i_buf[PR_REG_ISID_ID_LEN ] = { };u32 tid_len, tmp_tid_len;int new_reg =0 , type, scope, matching_iname;sense_reason_t ret;unsigned short rtpi;unsigned char proto_ident; +bool tid_found;if (!se_sess || !se_lun) {pr_err ("SPC-3 PR: se_sess || struct se_lun is NULL!\n" );
@@ -3278,9 +3280,9 @@ core_scsi3_emulate_pro_register_and_move(struct se_cmd *cmd, u64 res_key, ret =TCM_INVALID_PARAMETER_LIST ; goto out; } - initiator_str =target_parse_pr_out_transport_id (dest_se_tpg, - &buf[24 ], &tmp_tid_len, &iport_ptr); -if (!initiator_str) { + tid_found =target_parse_pr_out_transport_id (dest_se_tpg, + &buf[24 ], &tmp_tid_len, &iport_ptr, initiator_str); +if (!tid_found) {pr_err ("SPC-3 PR REGISTER_AND_MOVE: Unable to locate" " initiator_str from Transport ID\n" ); ret =TCM_INVALID_PARAMETER_LIST ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 444/570 scsi: aacraid: Stop using PCI_IRQ_AFFINITY
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Garry <[email protected]>
[ Upstream commit dafeaf2c03e71255438ffe5a341d94d180e6c88e ]
When PCI_IRQ_AFFINITY is set for calling pci_alloc_irq_vectors(), it means interrupts are spread around the available CPUs. It also means that the interrupts become managed, which means that an interrupt is shutdown when all the CPUs in the interrupt affinity mask go offline.
Using managed interrupts in this way means that we should ensure that completions should not occur on HW queues where the associated interrupt is shutdown. This is typically achieved by ensuring only CPUs which are online can generate IO completion traffic to the HW queue which they are mapped to (so that they can also serve completion interrupts for that HW queue).
The problem in the driver is that a CPU can generate completions to a HW queue whose interrupt may be shutdown, as the CPUs in the HW queue interrupt affinity mask may be offline. This can cause IOs to never complete and hang the system. The driver maintains its own CPU <-> HW queue mapping for submissions, see aac_fib_vector_assign(), but this does not reflect the CPU <-> HW queue interrupt affinity mapping.
Commit 9dc704dcc09e ("scsi: aacraid: Reply queue mapping to CPUs based on IRQ affinity") tried to remedy this issue may mapping CPUs properly to HW queue interrupts. However this was later reverted in commit c5becf57dd56 ("Revert "scsi: aacraid: Reply queue mapping to CPUs based on IRQ affinity") - it seems that there were other reports of hangs. I guess that this was due to some implementation issue in the original commit or maybe a HW issue.
Fix the very original hang by just not using managed interrupts by not setting PCI_IRQ_AFFINITY. In this way, all CPUs will be in each HW queue affinity mask, so should not create completion problems if any CPUs go offline.
--- drivers/scsi/aacraid/comminit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aacraid/comminit.c +1 -2
@@ -481,8 +481,7 @@ void aac_define_int_mode(struct aac_dev *dev) pci_find_capability(dev->pdev, PCI_CAP_ID_MSIX)) { min_msix =2 ; i =pci_alloc_irq_vectors (dev->pdev, - min_msix, msi_count, -PCI_IRQ_MSIX |PCI_IRQ_AFFINITY ); + min_msix, msi_count,PCI_IRQ_MSIX );if (i >0 ) { dev->msi_enabled =1 ; msi_count = i;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 445/570 vfio/mlx5: fix possible overflow in tracking max message size
In reply to Greg Kroah-Hartman6.16-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Sadovnikov <[email protected]>
[ Upstream commit b3060198483bac43ec113c62ae3837076f61f5de ]
MLX cap pg_track_log_max_msg_size consists of 5 bits, value of which is used as power of 2 for max_msg_size. This can lead to multiplication overflow between max_msg_size (u32) and integer constant, and afterwards incorrect value is being written to rq_size.
Fix this issue by extending integer constant to u64 type.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/vfio/pci/mlx5/cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vfio/pci/mlx5/cmd.c +2 -2
@@ -1523,8 +1523,8 @@ int mlx5vf_start_page_tracker(struct vfio_device *vdev, log_max_msg_size =MLX5_CAP_ADV_VIRTUALIZATION (mdev, pg_track_log_max_msg_size); max_msg_size = (1ULL << log_max_msg_size);/* The RQ must hold at least 4 WQEs/messages for successful QP creation */ -if (rq_size <4 * max_msg_size) - rq_size =4 * max_msg_size; +if (rq_size <4ULL * max_msg_size) + rq_size =4ULL * max_msg_size;memset (tracker,0 ,sizeof (*tracker)); tracker->uar =mlx5_get_uars_page (mdev);
Signature · 1 line
2.39.5