patches/driver/bes2600/*-danctnix: reconstruct from cleanups (closes #29)
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).
This commit is contained in:
+15
-15
@@ -1,8 +1,8 @@
|
||||
From 9ea8a8e810ee5eb220de700a5c0a6d1153b15130 Mon Sep 17 00:00:00 2001
|
||||
From 0dde479994a84f9e968b327d5409c3a926acb69c Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Mon, 27 Apr 2026 06:32:41 +0200
|
||||
Subject: [PATCH] bes2600: recover wedged firmware via mmc_hw_reset on link
|
||||
break
|
||||
Date: Sun, 26 Apr 2026 22:31:58 +0200
|
||||
Subject: [PATCH 15/29] bes2600: recover wedged firmware via mmc_hw_reset on
|
||||
link break
|
||||
|
||||
When the LMAC active monitor detects 'link break between lmac and host'
|
||||
(the hw_buf_used==pending watchdog in bes2600_bh_lmac_active_monitor),
|
||||
@@ -78,14 +78,14 @@ v2.0 boards) are both already configured as MMC pwrseq resets.
|
||||
|
||||
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
---
|
||||
drivers/staging/bes2600/bes2600_sdio.c | 29 +++++++++++++
|
||||
drivers/staging/bes2600/bes_chardev.c | 59 +++++++++++++++++++++++++-
|
||||
drivers/staging/bes2600/bes_chardev.h | 1 +
|
||||
drivers/staging/bes2600/sbus.h | 8 ++++
|
||||
bes2600/bes2600_sdio.c | 29 +++++++++++++++++++++
|
||||
bes2600/bes_chardev.c | 59 ++++++++++++++++++++++++++++++++++++++++--
|
||||
bes2600/bes_chardev.h | 1 +
|
||||
bes2600/sbus.h | 8 ++++++
|
||||
4 files changed, 95 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
index b9d836fab7af..f7f86d765bba 100644
|
||||
index 3e04e8c..e5840c8 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
||||
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -139,10 +139,10 @@ index b9d836fab7af..f7f86d765bba 100644
|
||||
|
||||
static void bes2600_sdio_en_lp_cb(struct bes2600_common *hw_priv)
|
||||
diff --git a/drivers/staging/bes2600/bes_chardev.c b/drivers/staging/bes2600/bes_chardev.c
|
||||
index 455108a2dd66..b776aab5e062 100644
|
||||
index a02d6d9..d1375bc 100644
|
||||
--- a/drivers/staging/bes2600/bes_chardev.c
|
||||
+++ b/drivers/staging/bes2600/bes_chardev.c
|
||||
@@ -626,6 +626,48 @@ int bes2600_chrdev_do_system_close(const struct sbus_ops *sbus_ops, struct sbus_
|
||||
@@ -442,6 +442,48 @@ int bes2600_chrdev_do_system_close(const struct sbus_ops *sbus_ops, struct sbus_
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@ index 455108a2dd66..b776aab5e062 100644
|
||||
bool bes2600_chrdev_is_wifi_opened(void)
|
||||
{
|
||||
bool wifi_opened = false;
|
||||
@@ -726,8 +768,21 @@ static void bes2600_chrdev_wifi_force_close_work(struct work_struct *work)
|
||||
@@ -540,8 +582,21 @@ static void bes2600_chrdev_wifi_force_close_work(struct work_struct *work)
|
||||
/* unregister wifi */
|
||||
bes2600_switch_wifi(0);
|
||||
|
||||
@@ -216,7 +216,7 @@ index 455108a2dd66..b776aab5e062 100644
|
||||
bes2600_cdev.sbus_priv);
|
||||
}
|
||||
diff --git a/drivers/staging/bes2600/bes_chardev.h b/drivers/staging/bes2600/bes_chardev.h
|
||||
index c627bb7c3d65..ca8419eead8f 100644
|
||||
index 15602ba..3f0c59b 100644
|
||||
--- a/drivers/staging/bes2600/bes_chardev.h
|
||||
+++ b/drivers/staging/bes2600/bes_chardev.h
|
||||
@@ -60,6 +60,7 @@ struct sbus_priv *bes2600_chrdev_get_sbus_priv_data(void);
|
||||
@@ -228,7 +228,7 @@ index c627bb7c3d65..ca8419eead8f 100644
|
||||
void bes2600_chrdev_wifi_force_close(struct bes2600_common *hw_priv, bool halt_dev);
|
||||
void bes2600_chrdev_usb_remove(struct bes2600_common *hw_priv);
|
||||
diff --git a/drivers/staging/bes2600/sbus.h b/drivers/staging/bes2600/sbus.h
|
||||
index 1f2c0cda73de..cb9089004041 100644
|
||||
index 1f2c0cd..cb90890 100644
|
||||
--- a/drivers/staging/bes2600/sbus.h
|
||||
+++ b/drivers/staging/bes2600/sbus.h
|
||||
@@ -75,6 +75,14 @@ struct sbus_ops {
|
||||
@@ -247,5 +247,5 @@ index 1f2c0cda73de..cb9089004041 100644
|
||||
|
||||
void bes2600_irq_handler(struct bes2600_common *priv);
|
||||
--
|
||||
2.53.0
|
||||
2.54.0
|
||||
|
||||
+83
@@ -0,0 +1,83 @@
|
||||
From 80e5e68c223b676698288fde62e527b96e1ac8e2 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
Date: Tue, 28 Apr 2026 21:37:37 +0200
|
||||
Subject: [PATCH 19/29] bes2600: handle multi-function SDIO cards in
|
||||
mmc_hw_reset bus_reset
|
||||
|
||||
c5.2 (recover-wedged-firmware-via-mmc-hw-reset) wraps mmc_hw_reset()
|
||||
and treats any non-zero return as a recovery failure. On
|
||||
single-function SDIO cards mmc_hw_reset returns 0 after doing the
|
||||
remove + rescan inline. On multi-function cards (BES2600 has WLAN
|
||||
func 1 + BT companion func 2) the kernel's mmc_sdio_hw_reset() does
|
||||
NOT do the rescan: it tears the card down and returns 1 to signal
|
||||
"caller must trigger rescan".
|
||||
|
||||
Field observation on PineTab2 (linux-pinetab2 6.19.10-danctnix1):
|
||||
when a real LMAC wedge fired bes2600_chrdev_wifi_force_close ->
|
||||
bes2600_chrdev_do_bus_reset, mmc_hw_reset returned 1, c5.2's wrapper
|
||||
treated that as "bus_reset failed: 1", logged the error, and gave
|
||||
up. The card was already removed (mmc2: card 0001 removed) but
|
||||
nothing scheduled a rescan; wifi (and the BT companion which shares
|
||||
the same SDIO host) stayed silent until the user rebooted four
|
||||
minutes later.
|
||||
|
||||
Fix:
|
||||
|
||||
- Capture the mmc_host pointer before calling mmc_hw_reset (the
|
||||
card pointer is invalid after the remove).
|
||||
- On positive return (multi-function path), log informationally
|
||||
and call mmc_detect_change(host, 0) to schedule a rescan.
|
||||
Return 0 so callers see the recovery as successful.
|
||||
- Negative return is still treated as failure as before.
|
||||
|
||||
The mmc_detect_change side effect is asynchronous; the chrdev's
|
||||
wait_event_timeout(probe_done_wq, !sbus_priv) still observes the
|
||||
remove half synchronously, and the rescan + re-probe runs out of
|
||||
the host detect work afterwards.
|
||||
|
||||
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
---
|
||||
bes2600/bes2600_sdio.c | 24 +++++++++++++++++++++++-
|
||||
1 file changed, 23 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
index c9cb073..b998381 100644
|
||||
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
||||
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
||||
@@ -1810,10 +1810,32 @@ static void bes2600_sdio_halt_device(struct sbus_priv *self)
|
||||
*/
|
||||
static int bes2600_sdio_bus_reset(struct sbus_priv *self)
|
||||
{
|
||||
+ struct mmc_host *host;
|
||||
+ int ret;
|
||||
+
|
||||
if (!self || !self->func || !self->func->card)
|
||||
return -EINVAL;
|
||||
|
||||
- return mmc_hw_reset(self->func->card);
|
||||
+ host = self->func->card->host;
|
||||
+ ret = mmc_hw_reset(self->func->card);
|
||||
+
|
||||
+ /*
|
||||
+ * On multi-function SDIO cards (BES2600 has WLAN func 1 + BT
|
||||
+ * companion func 2), mmc_sdio_hw_reset() removes the card and
|
||||
+ * returns 1 to signal "remove happened, caller must trigger
|
||||
+ * rescan". The kernel does NOT auto-rescan in this case;
|
||||
+ * single-function cards take the rescan path inline and return 0.
|
||||
+ * Treat any non-negative return as success and force a rescan if
|
||||
+ * mmc_hw_reset signalled the multi-function path - otherwise the
|
||||
+ * card stays removed indefinitely after a wedge recovery,
|
||||
+ * leaving wifi (and the BT companion) silent until reboot.
|
||||
+ */
|
||||
+ if (ret > 0) {
|
||||
+ bes_info("multi-func mmc_hw_reset removed card; scheduling rescan\n");
|
||||
+ mmc_detect_change(host, 0);
|
||||
+ ret = 0;
|
||||
+ }
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
static bool bes2600_sdio_wakeup_source(struct sbus_priv *self)
|
||||
--
|
||||
2.54.0
|
||||
|
||||
Reference in New Issue
Block a user