claude-noether
8b356aa11f
Replaces the 13 broken DKMS-path -danctnix mirrors from PR #17 + adds 9 new series-dirs for the c-stack patches that were never split (Patches A/B/C-v3/F/D/E/C2/G/H) + retires the cumulative-c5x-danctnix single-file interim from fleet/ohm.yaml. Mechanism: cd marfrit/bes2600-dkms-mobian git format-patch fe73571..cleanups --no-merges -o /tmp/cleanups/ git format-patch cleanups..bes2600/bh-c-fossil-cleanup --no-merges -o /tmp/h/ for each commit: route to series-dir, sed-rewrite a/bes2600/foo.c -> a/drivers/staging/bes2600/foo.c The 29 cleanups commits + 1 Patch H commit map to 25 series-dirs (a few series-dirs get multiple commits: lmac-recover gets c5.2 + c5.2.1 as 0001+0002; cw1200-fix-backports gets F3+F2+F1 as 0001-0003; factory-series gets request_firmware + STANDARD_FACTORY_EFUSE_FLAG as 0001+0002). fleet/ohm.yaml apply order matches cleanups commit chronology, which is what produced the working c5x interim. cumulative.patch from ka-promote ohm now has 32 resolved patches (29 cleanups + 1 Patch H + scan-filter-5ghz + xor-neon SCS + besser#18-fix), 276 079 bytes, b2sum 7418db5ddf8fe938b130bc9d0e9f7dc9060f3a13703cd50757835ac43140a13... Apply order in cleanups + bh-c-fossil-cleanup: 1 factory-series (c1 + factory-no-efuse-flag) 3 factory-thread-dev 4 pm-gate-on-handshake 5 remove-chardev-user-interface 6 enable-testmode 7 tx-sdio-dma-oob-danctnix (was 'staging-prep-series') 8 factory-drop-kernel-write-danctnix 9 drop-dpd-file-paths-danctnix 10 drop-orphan-file-io-danctnix 11 pm-timeout-silence-danctnix 12 scan-defer-on-reject-danctnix (c5.1) 13 scan-defer-backoff-tune-danctnix (c5.1.1) 14 lmac-recover-via-mmc-hw-reset-danctnix (c5.2 + c5.2.1) 16 pm-state-resync-danctnix (c6.1) 17 pm-wake-consume-state-danctnix (c6.2) 18 pm-detect-firmware-unsupported-danctnix (c7) 19 decrypt-storm-fast-recover-danctnix (Patch A) 20 connection-loss-fast-recover-danctnix (Patch B) 21 cw1200-fix-backports-danctnix (Patches F3 + F2 + F1) 24 sdio-rx-no-relay-danctnix (Patch C v3) 25 license-spdx-restore-attribution-danctnix (Patch G) 26 ba-lock-atomic-danctnix (Patch D) 27 ps-state-lock-skip-pm-disabled-danctnix (Patch E) 28 rx-list-batch-delivery-danctnix (Patch C2) 29 bh-c-fossil-cleanup-danctnix (Patch H) 30 scan-filter-5ghz-danctnix (besser#1) 31 arch/arm64/xor-neon-... (GCC 15 SCS) 32 queue-pending-record-lock-bh-danctnix (besser#18) Verification: pkgrel=6 build from this manifest in progress; if srcversion == 26B0003FE9F2B05DCE838C4 (pkgrel=5's), source-tree is byte-equivalent to the c5x interim + scan-filter + besser#18 stack that's currently running on ohm. Refs: #17 (the broken mirror), #28 (the interim PR that landed cumulative-c5x), #31 (ka-promote trailer normalisation followup).
84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
From 4be43770fd03391df66f9043280d55764e477221 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 84c34bc..bf17777 100644
|
|
--- a/drivers/staging/bes2600/txrx.c
|
|
+++ b/drivers/staging/bes2600/txrx.c
|
|
@@ -1942,13 +1942,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
|
|
|