claude-noether
fd0f5a8b71
Replace the single squashed 0001-bes2600-besser-cumulative-series.patch with 20 individual per-commit patches matching the bes2600/besser-danctnix-v3 branch in marfrit/bes2600-dkms. Also remove the duplicate 0003-arm64 entry that was a bug in pkgrel=3. Patch list: 0001 c5.1 defer scan and soften WARN on firmware reject 0002 c5.1.1 widen scan-defer backoff to 30s and decay reject_count 0003 c5.2 recover wedged firmware via mmc_hw_reset on link break 0004 c6.1 gate PM indication completion on pending request 0005 c6.2 short-circuit wake handshake when chip confirmed ACTIVE 0006 c7 self-detect when firmware does not honor PSM and skip 0007 c5.2.1 handle multi-function SDIO cards in mmc_hw_reset 0008 Patch A pre-empt AP-deauth-6 with reassoc on decrypt-fail storm 0009 Patch B bus_reset on connection-loss storm 0010 Patch F3 atomicize atomic_add() calls 0011 Patch F2 fix missing destroy_workqueue() on error in init_common 0012 Patch F1 fix concurrency UAF in bes2600_hw_scan / sched_scan 0013 Patch C v3 drop sdio_rx_work relay, IRQ→bh-direct 0014 Patch G restore SPDX identifiers + ST-Ericsson attribution 0015 Patch D atomicize ba_lock counters, drop the spinlock 0016 Patch E skip ps_state_lock when PSM-known-disabled 0017 Patch C2 replace ieee80211_rx_irqsafe with ieee80211_rx_ni 0018 Patch H bh.c hygiene cleanup (drop fossil blocks, dead stubs) 0019 besser#18 pending_record_lock SOFTIRQ-safe fix 0020 danctnix-flavor: export bus_reset helpers for bes2600_btuart Build pending (pkgrel=4 makepkg in progress on boltzmann). Signed-off-by: Claude (noether) <claude@reauktion.de>
93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
From d9268b433abc035c6e3f63a26191df5855b09b61 Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Thu, 7 May 2026 21:19:49 +0200
|
|
Subject: [PATCH 10/20] bes2600: replace a set of atomic_add()
|
|
|
|
Backport of cw1200 mainline commit 07f995ca1951 ("cw1200: replace a set
|
|
of atomic_add()", 2020-11-10). atomic_inc() reads more naturally than
|
|
atomic_add(1, &x). Mechanical change, no functional impact.
|
|
|
|
7 sites: 6 in bh.c (bh_term, bh_rx x2, bh_tx x3) and 1 in itp.c
|
|
(awaiting_confirm). Two of the bh_rx and three of the bh_tx sites are
|
|
inside the cw1200-ancestor #if 0 block; replaced anyway to keep the
|
|
file consistent with cw1200 mainline source style.
|
|
|
|
Cherry-picked from upstream Linux:
|
|
07f995ca1951 cw1200: replace a set of atomic_add()
|
|
Author: Yejune Deng <yejune.deng@gmail.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Link: https://lore.kernel.org/r/1604991491-27908-1-git-send-email-yejune.deng@gmail.com
|
|
---
|
|
bes2600/bh.c | 12 ++++++------
|
|
bes2600/itp.c | 2 +-
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/bh.c b/drivers/staging/bes2600/bh.c
|
|
index 175ab5e..fab3bf0 100644
|
|
--- a/drivers/staging/bes2600/bh.c
|
|
+++ b/drivers/staging/bes2600/bh.c
|
|
@@ -102,7 +102,7 @@ void bes2600_unregister_bh(struct bes2600_common *hw_priv)
|
|
coex_deinit_mode(hw_priv);
|
|
#endif
|
|
|
|
- atomic_add(1, &hw_priv->bh_term);
|
|
+ atomic_inc(&hw_priv->bh_term);
|
|
wake_up(&hw_priv->bh_wq);
|
|
|
|
flush_workqueue(hw_priv->bh_workqueue);
|
|
@@ -591,7 +591,7 @@ static int bes2600_bh(void *arg)
|
|
bes_devel("[BH] Device resume.\n");
|
|
atomic_set(&hw_priv->bh_suspend, BES2600_BH_RESUMED);
|
|
wake_up(&hw_priv->bh_evt_wq);
|
|
- atomic_add(1, &hw_priv->bh_rx);
|
|
+ atomic_inc(&hw_priv->bh_rx);
|
|
continue;
|
|
}
|
|
|
|
@@ -759,9 +759,9 @@ tx:
|
|
|
|
#if 0 /* count is not implemented */
|
|
if (ret > 1)
|
|
- atomic_add(1, &hw_priv->bh_tx);
|
|
+ atomic_inc(&hw_priv->bh_tx);
|
|
#else
|
|
- atomic_add(1, &hw_priv->bh_tx);
|
|
+ atomic_inc(&hw_priv->bh_tx);
|
|
#endif
|
|
|
|
#if defined(CONFIG_BES2600_NON_POWER_OF_TWO_BLOCKSIZES)
|
|
@@ -1135,7 +1135,7 @@ static int bes2600_bh_tx_helper(struct bes2600_common *hw_priv,
|
|
tx_len += 4;
|
|
#endif
|
|
|
|
- atomic_add(1, &hw_priv->bh_tx);
|
|
+ atomic_inc(&hw_priv->bh_tx);
|
|
|
|
tx_len = hw_priv->sbus_ops->align_size(
|
|
hw_priv->sbus_priv, tx_len);
|
|
@@ -1442,7 +1442,7 @@ static int bes2600_bh(void *arg)
|
|
bes_devel("[BH] Device resume.\n");
|
|
atomic_set(&hw_priv->bh_suspend, BES2600_BH_RESUMED);
|
|
wake_up(&hw_priv->bh_evt_wq);
|
|
- atomic_add(1, &hw_priv->bh_rx);
|
|
+ atomic_inc(&hw_priv->bh_rx);
|
|
goto done;
|
|
}
|
|
|
|
diff --git a/drivers/staging/bes2600/itp.c b/drivers/staging/bes2600/itp.c
|
|
index e5c2958..c50b29c 100644
|
|
--- a/drivers/staging/bes2600/itp.c
|
|
+++ b/drivers/staging/bes2600/itp.c
|
|
@@ -570,7 +570,7 @@ int bes2600_itp_get_tx(struct bes2600_common *priv, u8 **data,
|
|
*burst = 2;
|
|
atomic_set(&priv->bh_tx, 1);
|
|
ktime_get_ts(&itp->last_sent);
|
|
- atomic_add(1, &itp->awaiting_confirm);
|
|
+ atomic_inc(&itp->awaiting_confirm);
|
|
spin_unlock_bh(&itp->tx_lock);
|
|
return 1;
|
|
|
|
--
|
|
2.54.0
|
|
|