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).
144 lines
6.0 KiB
Diff
144 lines
6.0 KiB
Diff
From 9012b74eea8d540c8637d7645093204d1e94e99a Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Wed, 22 Apr 2026 13:04:27 +0200
|
|
Subject: [PATCH 06/29] bes2600: enable CONFIG_BES2600_TESTMODE by default +
|
|
fix bit-rotted testmode plumbing
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The driver implements a mac80211 testmode_cmd operation that dispatches
|
|
to a set of vendor commands (GET_TX_POWER_LEVEL, GET_TX_POWER_RANGE,
|
|
SET_SNAP_FRAME, TSM_STATS, GET_ROAM_DELAY, GET_STREAM, etc) plus the
|
|
BES2600 RF-test path (bes2600_vendor_rf_cmd → firmware
|
|
patch_wifi_testMode). The testmode handlers and the .testmode_cmd
|
|
binding in struct ieee80211_ops are conditionally compiled under
|
|
CONFIG_BES2600_TESTMODE, which previously defaulted to n.
|
|
|
|
Flip the Makefile default from n to y so wifi_testmode_cmd.o is
|
|
included in the build and the .testmode_cmd op is populated. On the
|
|
PineTab2 target kernel (linux-pinetab2 6.19.10-danctnix1, built with
|
|
CONFIG_NL80211_TESTMODE=y) this exposes the BES2600 RF-test surface
|
|
through the standard nl80211 testmode interface ('iw phy0 ...').
|
|
|
|
This also makes visible two classes of bit-rot that had accumulated
|
|
while nobody was building with CONFIG_BES2600_TESTMODE=y:
|
|
|
|
1. sta.c contains ~41 calls to bes2600_info() / bes2600_err() /
|
|
bes2600_warn() / bes2600_dbg() / bes2600_err_with_cond() - a
|
|
legacy log-macro family carrying a BES2600_DBG_* subsystem-id
|
|
first argument. Neither the macros nor any of the BES2600_DBG_*
|
|
constants are defined anywhere in the tree. The same call pattern
|
|
appears under #if defined(BES2600_DETECTION_LOGIC) in hwio.c and
|
|
under CONFIG_BES2600_ITP in itp.c, both normally disabled.
|
|
|
|
Add minimal shim macros to bes_log.h that rewire the calls onto
|
|
the existing bes_info() / bes_err() / bes_warn() / bes_devel()
|
|
family (ignoring the subsystem id). Define BES2600_DBG_SBUS,
|
|
BES2600_DBG_DOWNLOAD, BES2600_DBG_ITP and BES2600_DBG_TEST_MODE
|
|
as 0 constants for documentation / grep.
|
|
|
|
2. bes2600_start_stop_tsm(), bes2600_get_tsm_params(), and
|
|
bes2600_get_roam_delay() are declared in sta.c with external
|
|
linkage but have no prototype in any header. All callers live in
|
|
sta.c (inside bes2600_testmode_cmd). With CONFIG_BES2600_TESTMODE
|
|
off the compiler never sees them; with it on gcc
|
|
-Werror=missing-prototypes breaks the build.
|
|
|
|
Mark the three functions static. (Keeping them file-local also
|
|
matches their actual usage.)
|
|
|
|
Both changes are strictly scoped to make CONFIG_BES2600_TESTMODE=y
|
|
buildable; no behavioural change when the flag is off.
|
|
|
|
Tested-on: PineTab2 (BES2600WM + RK3566) running linux-pinetab2
|
|
6.19.10-danctnix1-1 with CONFIG_NL80211_TESTMODE=y. Module builds
|
|
cleanly, nl80211 testmode interface reachable via 'iw phy0 ...' from
|
|
userspace.
|
|
|
|
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
|
---
|
|
bes2600/Makefile | 2 +-
|
|
bes2600/bes_log.h | 23 +++++++++++++++++++++++
|
|
bes2600/sta.c | 6 +++---
|
|
3 files changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/Makefile b/drivers/staging/bes2600/Makefile
|
|
index 2dcba09..2c1a850 100644
|
|
--- a/drivers/staging/bes2600/Makefile
|
|
+++ b/drivers/staging/bes2600/Makefile
|
|
@@ -2,7 +2,7 @@ KERN_DIR = /lib/modules/$(KERNELRELEASE)/build
|
|
# feature option
|
|
BES2600 ?= m
|
|
|
|
-CONFIG_BES2600_TESTMODE ?= n
|
|
+CONFIG_BES2600_TESTMODE ?= y
|
|
|
|
CONFIG_BES2600_ENABLE_DEVEL_LOGS ?= n
|
|
|
|
diff --git a/drivers/staging/bes2600/bes_log.h b/drivers/staging/bes2600/bes_log.h
|
|
index 605cea8..65cf703 100644
|
|
--- a/drivers/staging/bes2600/bes_log.h
|
|
+++ b/drivers/staging/bes2600/bes_log.h
|
|
@@ -8,3 +8,26 @@ extern struct device *global_dev;
|
|
#define bes_info(fmt, ...) dev_info(global_dev, fmt, ##__VA_ARGS__)
|
|
#define bes_warn(fmt, ...) dev_warn(global_dev, fmt, ##__VA_ARGS__)
|
|
#define bes_err(fmt, ...) dev_err(global_dev, fmt, ##__VA_ARGS__)
|
|
+
|
|
+/*
|
|
+ * Legacy debug-subsystem-tagged log macros. The per-subsystem filtering
|
|
+ * was never implemented in-tree; these shims let code paths gated by
|
|
+ * CONFIG_BES2600_TESTMODE / CONFIG_BES2600_ITP / BES2600_DETECTION_LOGIC
|
|
+ * build when their conditions are enabled. The first argument is
|
|
+ * currently unused; pick one of the BES2600_DBG_* constants below for
|
|
+ * documentation.
|
|
+ */
|
|
+#define BES2600_DBG_SBUS 0
|
|
+#define BES2600_DBG_DOWNLOAD 0
|
|
+#define BES2600_DBG_ITP 0
|
|
+#define BES2600_DBG_TEST_MODE 0
|
|
+
|
|
+#define bes2600_info(_dbg, fmt, ...) bes_info(fmt, ##__VA_ARGS__)
|
|
+#define bes2600_err(_dbg, fmt, ...) bes_err(fmt, ##__VA_ARGS__)
|
|
+#define bes2600_warn(_dbg, fmt, ...) bes_warn(fmt, ##__VA_ARGS__)
|
|
+#define bes2600_dbg(_dbg, fmt, ...) bes_devel(fmt, ##__VA_ARGS__)
|
|
+#define bes2600_err_with_cond(_cond, _dbg, fmt, ...) \
|
|
+ do { \
|
|
+ if (_cond) \
|
|
+ bes_err(fmt, ##__VA_ARGS__); \
|
|
+ } while (0)
|
|
diff --git a/drivers/staging/bes2600/sta.c b/drivers/staging/bes2600/sta.c
|
|
index aa69eb8..5f1a456 100644
|
|
--- a/drivers/staging/bes2600/sta.c
|
|
+++ b/drivers/staging/bes2600/sta.c
|
|
@@ -3633,7 +3633,7 @@ static int bes2600_set_power_save(struct ieee80211_hw *hw,
|
|
*
|
|
* Returns: 0 on success or non zero value on failure
|
|
*/
|
|
-int bes2600_start_stop_tsm(struct ieee80211_hw *hw, void *data)
|
|
+static int bes2600_start_stop_tsm(struct ieee80211_hw *hw, void *data)
|
|
{
|
|
struct bes_msg_start_stop_tsm *start_stop_tsm =
|
|
(struct bes_msg_start_stop_tsm *) data;
|
|
@@ -3663,7 +3663,7 @@ int bes2600_start_stop_tsm(struct ieee80211_hw *hw, void *data)
|
|
*
|
|
* Returns: TSM parameters collected
|
|
*/
|
|
-int bes2600_get_tsm_params(struct ieee80211_hw *hw)
|
|
+static int bes2600_get_tsm_params(struct ieee80211_hw *hw)
|
|
{
|
|
struct bes2600_common *hw_priv = hw->priv;
|
|
struct bes_tsm_stats tsm_stats;
|
|
@@ -3703,7 +3703,7 @@ int bes2600_get_tsm_params(struct ieee80211_hw *hw)
|
|
*
|
|
* Returns: Returns the last measured roam delay
|
|
*/
|
|
-int bes2600_get_roam_delay(struct ieee80211_hw *hw)
|
|
+static int bes2600_get_roam_delay(struct ieee80211_hw *hw)
|
|
{
|
|
struct bes2600_common *hw_priv = hw->priv;
|
|
u16 roam_delay = hw_priv->tsm_info.roam_delay / 1000;
|
|
--
|
|
2.54.0
|
|
|