forked from marfrit/kernel-agent
claude-noether
b04c8cd501
PR #33's per-series mirrors were generated against the bes2600-dkms cleanups branch (rooted at fe73571) without rebasing onto the v7.0-danctnix1 kernel baseline. Result: per-commit diffs carried stale baseline context (e.g. from_timer rather than the new timer_container_of API), so the cumulative no longer applied cleanly to ohm's actual base. pkgrel=6 build #1 failed with 'Hunk #3 FAILED' in Patch D's sta.c. Fix: in marfrit/bes2600-dkms, create danctnix-sync branch (fe73571 + drop-in replace bes2600/ with v7.0-danctnix1's drivers/staging/bes2600/), rebase cleanups onto it as cleanups-rebased-on-danctnix, manually resolve the resulting conflicts keeping each commit's intent + the new baseline context, rebase Patch H accordingly. Format-patch and re-route to the same series-dir names as PR #33. Conflict resolution notes: - 'remove userspace /dev/bes2600 character device interface' commit: the chardev wrapper was removed but two utility funcs that danctnix's bes2600_btuart.c depends on (bes2600_chrdev_is_bus_error, bes2600_chrdev_switch_subsys_glb) were re-added with EXPORT_SYMBOL_GPL. bes2600_switch_bt re-added as static (file-local, called only from bes2600_chrdev_switch_subsys_glb). - Patch D (atomicize ba_lock): re-resolved bes2600_ba_timer's timer_container_of() vs from_timer() to keep the new API. - SCS Makefile @@ hunk counts corrected from -9,6 +9,10 to -9,6 +9,11 (the original was actually wrong; build-via-fuzz was masking it). Cumulative b2sum: ka-promote ohm now emits eb179c03f35a4dbaec2e40036f0033ef04985bb6b14ab22419d68e5caaa5874f... (279 554 bytes, 32 patches resolved). pkgrel=6 built from this manifest + installed on ohm 2026-05-19 ~23:39. Functional verification: bes2600 + bes2600_btuart both load, Pattern A 0 over fresh boot, wlan0 associates to newton. srcversion 1A919EED0E6DC2478559B17 differs from pkgrel=5's BEB625FA... — the reconstruction is functionally equivalent (5 GHz working, no firmware/driver race conditions) but NOT byte-equivalent (the chardev utility re-add chose different formatting than the original danctnix code). Byte-equivalence is not a goal; per-series traceability and working hardware are. Closes (proper this time): #29. Refs: #28, #30, #33 (the half-working attempt), #31, #32.
93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
From 737f28e29c4b8253939e24b1d6b97d5605bb7ac4 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 22/29] 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
|
|
|