forked from marfrit/kernel-agent
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.
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From 894c502cd541079a8a26d61cd4289af9001b3046 Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Thu, 23 Apr 2026 20:35:17 +0200
|
|
Subject: [PATCH 11/29] bes2600: demote 'wait pm ind timeout' from bes_err to
|
|
bes_devel
|
|
|
|
bes2600_pwr_enter_lp_mode() logs 'wait pm ind timeout' at bes_err
|
|
level every time wait_for_completion_timeout() on the firmware's
|
|
PM-change indication returns 0. The preceding patch ('bes2600:
|
|
gate device LP-mode entry on successful per-VIF firmware
|
|
handshake') already handles this case correctly: the per-VIF
|
|
timeouts counter is incremented, the function returns
|
|
-ETIMEDOUT, and the device-side LP transition is skipped -- the
|
|
cascade into sdio_tx_work splats and [RX] Receive failure
|
|
messages is prevented.
|
|
|
|
The timeout itself is benign steady-state noise on the PineTab2
|
|
(BES2600WM). Firmware occasionally misses the 5 s PM-change
|
|
deadline when mac80211 flips power-save rapidly during
|
|
association or roaming; observed rate on a quiet, associated
|
|
ohm is roughly 3-10 events per 10 min of uptime, with no
|
|
user-visible effect. Keeping it at bes_err() level (== KERN_ERR,
|
|
priority 3) floods dmesg with what is already a handled
|
|
condition and makes real SDIO / PM errors harder to spot.
|
|
|
|
Demote to bes_devel() (== KERN_DEBUG gated on the driver's debug
|
|
flag). The gate in the caller is unchanged, so the downstream
|
|
suppression behaviour introduced by the earlier patch remains.
|
|
Real pathologies -- bes_err("set operation mode fail") on the
|
|
same path, and the timeouts != 0 / -ETIMEDOUT return consumed
|
|
by callers -- still surface at bes_err() / return-value level.
|
|
|
|
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
|
---
|
|
bes2600/bes_pwr.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/bes_pwr.c b/drivers/staging/bes2600/bes_pwr.c
|
|
index f62ae22..474b6f1 100644
|
|
--- a/drivers/staging/bes2600/bes_pwr.c
|
|
+++ b/drivers/staging/bes2600/bes_pwr.c
|
|
@@ -538,7 +538,7 @@ static int bes2600_pwr_enter_lp_mode(struct bes2600_common *hw_priv)
|
|
atomic_set(&hw_priv->bes_power.pm_set_in_process, 0);
|
|
reinit_completion(&hw_priv->bes_power.pm_enter_cmpl);
|
|
if (!status) {
|
|
- bes_err("%s, wait pm ind timeout\n", __func__);
|
|
+ bes_devel("%s, wait pm ind timeout\n", __func__);
|
|
timeouts++;
|
|
}
|
|
} else {
|
|
--
|
|
2.54.0
|
|
|