From 977704da4ac521fae6603e0aacb9a3a3c49fde08 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Wed, 22 Apr 2026 13:14:33 +0200 Subject: [PATCH] patches: add c4 (enable CONFIG_BES2600_TESTMODE + fix bit-rot) Fifth and (for now) final patch in the BESser staging-prep series. enable-testmode/ 0001-bes2600-enable-CONFIG_BES2600_TESTMODE-by-default-fi.patch Flips the CONFIG_BES2600_TESTMODE Makefile default from n to y, which exposes the mac80211 testmode_cmd surface (-> firmware patch_wifi_testMode) through the standard nl80211 testmode interface. This is the replacement path for the /dev/bes2600 signal/no-signal switching that the preceding c3 patch removed. Enabling the flag exposes accumulated bit-rot in the testmode code: ~41 calls to bes2600_info/err/warn/dbg/err_with_cond which have no corresponding #define anywhere in-tree, plus 3 functions (bes2600_start_stop_tsm, bes2600_get_tsm_params, bes2600_get_roam_delay) with external linkage but no prototypes. Both classes of error are fixed in the same commit: - Add shim macros to bes_log.h rewiring bes2600_info() etc to the existing bes_info() / bes_err() / bes_warn() / bes_devel() family, ignoring the legacy BES2600_DBG_* subsystem-id first argument. - Define BES2600_DBG_SBUS / _DOWNLOAD / _ITP / _TEST_MODE as 0 constants for documentation and grep-ability. - Mark the 3 TSM / roam-delay helpers static (they are only called from bes2600_testmode_cmd in the same file). Verified on PineTab2 (BES2600WM + RK3566) running linux-pinetab2 6.19.10-danctnix1-1 + CONFIG_NL80211_TESTMODE=y: - Module builds cleanly - 'iw phy0' lists 'testmode' under Supported commands - wifi stays associated post-reboot; bug #2 (PM handshake timeout) and bug #3 (SDIO TX splat) counts remain 0 across the c1+c5+c2+c3+c4 stack Signed-off-by: Markus Fritsche --- ...ONFIG_BES2600_TESTMODE-by-default-fi.patch | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 patches/enable-testmode/0001-bes2600-enable-CONFIG_BES2600_TESTMODE-by-default-fi.patch diff --git a/patches/enable-testmode/0001-bes2600-enable-CONFIG_BES2600_TESTMODE-by-default-fi.patch b/patches/enable-testmode/0001-bes2600-enable-CONFIG_BES2600_TESTMODE-by-default-fi.patch new file mode 100644 index 000000000..276d17650 --- /dev/null +++ b/patches/enable-testmode/0001-bes2600-enable-CONFIG_BES2600_TESTMODE-by-default-fi.patch @@ -0,0 +1,143 @@ +From 9398d3028bc9d2f4ccbf8e830f8e9799bf065ce4 Mon Sep 17 00:00:00 2001 +From: Markus Fritsche +Date: Wed, 22 Apr 2026 13:04:27 +0200 +Subject: [PATCH] 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 +--- + bes2600/Makefile | 2 +- + bes2600/bes_log.h | 23 +++++++++++++++++++++++ + bes2600/sta.c | 6 +++--- + 3 files changed, 27 insertions(+), 4 deletions(-) + +diff --git a/bes2600/Makefile b/bes2600/Makefile +index 300912b..39150e0 100644 +--- a/bes2600/Makefile ++++ b/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/bes2600/bes_log.h b/bes2600/bes_log.h +index 605cea8..65cf703 100644 +--- a/bes2600/bes_log.h ++++ b/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/bes2600/sta.c b/bes2600/sta.c +index aa69eb8..5f1a456 100644 +--- a/bes2600/sta.c ++++ b/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.53.0 +