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.
84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
From 445c619da88d69adf68e8cae08ad1b53f76fe57d Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Fri, 8 May 2026 00:22:14 +0200
|
|
Subject: [PATCH 28/29] =?UTF-8?q?bes2600:=20Patch=20E=20=E2=80=94=20skip?=
|
|
=?UTF-8?q?=20ps=5Fstate=5Flock=20when=20PSM-known-disabled?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Per the Opus structural critique (PR #8 §2.4) and Sonnet review item 5.
|
|
The per-RX-frame early-data path takes ps_state_lock to double-check
|
|
whether a link entry transitioned to BES2600_LINK_SOFT (AP-side
|
|
power-save state machine, soft-link transition).
|
|
|
|
When c7 has latched pm_unsupported = true (firmware does not honor
|
|
PSM, see feedback_bes2600_firmware_no_psm memory), the AP power-save
|
|
state machine is dead and link entries never transition to LINK_SOFT.
|
|
The per-frame spin_lock_bh + double-check is wasted work.
|
|
|
|
This patch gates the lock acquisition on !pm_unsupported. When the
|
|
latch is on (the steady state on the production-shipped bes2600
|
|
firmware), early_data RX frames bypass the spin_lock_bh and go
|
|
directly to ieee80211_rx_irqsafe.
|
|
|
|
If a future firmware drop fixes PSM, c7 self-clears pm_unsupported on
|
|
the first real PM_INDICATION and the locked path resumes.
|
|
|
|
Scope is narrower than Sonnet originally framed: only the per-RX-frame
|
|
hot path (txrx.c:1945-1951 in cleanups+G+D) is touched. Other
|
|
ps_state_lock sites in txrx.c (lines 657, 1256, 1420, 1528) are TX
|
|
submission / multicast-start / link-id paths, not per-frame RX, and
|
|
not on the Bug #5 hot path. Leave those alone.
|
|
|
|
Build verified: srcversion B5922B4933590F33207EE97 on ohm sandbox.
|
|
---
|
|
bes2600/txrx.c | 30 ++++++++++++++++++++++++------
|
|
1 file changed, 24 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/txrx.c b/drivers/staging/bes2600/txrx.c
|
|
index 536b198..cb718ad 100644
|
|
--- a/drivers/staging/bes2600/txrx.c
|
|
+++ b/drivers/staging/bes2600/txrx.c
|
|
@@ -1965,13 +1965,31 @@ void bes2600_rx_cb(struct bes2600_vif *priv,
|
|
if (unlikely(bes2600_itp_rxed(hw_priv, skb)))
|
|
consume_skb(skb);
|
|
else if (unlikely(early_data)) {
|
|
- spin_lock_bh(&priv->ps_state_lock);
|
|
- /* Double-check status with lock held */
|
|
- if (entry->status == BES2600_LINK_SOFT)
|
|
- skb_queue_tail(&entry->rx_queue, skb);
|
|
- else
|
|
+ /*
|
|
+ * Patch E: when c7 has latched pm_unsupported (firmware
|
|
+ * doesn't honour PSM, see feedback_bes2600_firmware_no_psm),
|
|
+ * AP-side power-save state machine is dead and link entries
|
|
+ * never transition to BES2600_LINK_SOFT. The double-check
|
|
+ * branch under ps_state_lock is unreachable in that case,
|
|
+ * so skip the per-frame lock acquisition entirely and
|
|
+ * deliver to mac80211 directly.
|
|
+ *
|
|
+ * On firmware that does honour PSM (the latch self-clears
|
|
+ * if a real PM_INDICATION ever arrives — see c7), this
|
|
+ * predicate flips back to false and the original locked
|
|
+ * path is taken.
|
|
+ */
|
|
+ if (hw_priv->bes_power.pm_unsupported) {
|
|
ieee80211_rx_irqsafe(priv->hw, skb);
|
|
- spin_unlock_bh(&priv->ps_state_lock);
|
|
+ } else {
|
|
+ spin_lock_bh(&priv->ps_state_lock);
|
|
+ /* Double-check status with lock held */
|
|
+ if (entry->status == BES2600_LINK_SOFT)
|
|
+ skb_queue_tail(&entry->rx_queue, skb);
|
|
+ else
|
|
+ ieee80211_rx_irqsafe(priv->hw, skb);
|
|
+ spin_unlock_bh(&priv->ps_state_lock);
|
|
+ }
|
|
} else {
|
|
ieee80211_rx_irqsafe(priv->hw, skb);
|
|
}
|
|
--
|
|
2.54.0
|
|
|