claude-noether
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.
patches/driver/bes2600/
BES2600 WiFi driver patches (drivers/staging/bes2600/*, mainline-bound).
Mirrored from marfrit/besser/patches/ on 2026-05-16.
Scope tag: driver:bes2600 (see fleet/ohm.yaml for the consumer).
Consumer: ohm (PineTab2, RK3566 + BES2600 SDIO).
Series taxonomy
30 series (15 base + 15 -danctnix siblings). The -danctnix
variants exist because vanilla series don't apply on the DanctNIX
kernel base (slightly different in-tree state for drivers/staging/bes2600/*).
Keep both as separate series until BES2600 lands upstream, then
collapse — issue #2 acceptance criterion.
Each series directory contains numbered .patch files plus
optionally a 0000-cover-letter.patch for multi-patch series.
Promotion eligibility (per series)
Marked here for the kernel-agent CLI (ka-promote) to pick up.
Markus to update as series mature. Default UNSET means "ask before
including in a build".
| Series | promote_eligible | Notes |
|---|---|---|
debian-copyright-fsf-address |
unset | Debian packaging metadata; not kernel-side |
drop-dpd-file-paths |
unset | |
drop-dpd-file-paths-danctnix |
unset | DanctNIX sibling |
drop-orphan-file-io |
unset | |
drop-orphan-file-io-danctnix |
unset | DanctNIX sibling |
enable-testmode |
unset | |
factory-drop-kernel-write |
unset | |
factory-drop-kernel-write-danctnix |
unset | DanctNIX sibling |
factory-series |
unset | |
factory-thread-dev |
unset | |
lmac-recover-via-mmc-hw-reset |
unset | |
lmac-recover-via-mmc-hw-reset-danctnix |
unset | DanctNIX sibling |
pm-detect-firmware-unsupported |
unset | |
pm-detect-firmware-unsupported-danctnix |
unset | DanctNIX sibling |
pm-gate-on-handshake |
unset | |
pm-state-resync |
unset | |
pm-state-resync-danctnix |
unset | DanctNIX sibling |
pm-timeout-silence |
unset | |
pm-timeout-silence-danctnix |
unset | DanctNIX sibling |
pm-wake-consume-state |
unset | |
pm-wake-consume-state-danctnix |
unset | DanctNIX sibling |
remove-chardev-user-interface |
unset | Cross-ref bes_chardev merge regression (besser #17) |
scan-defer-backoff-tune |
unset | |
scan-defer-backoff-tune-danctnix |
unset | DanctNIX sibling |
scan-defer-on-reject |
unset | |
scan-defer-on-reject-danctnix |
unset | DanctNIX sibling |
staging-prep-series |
unset | 7-patch cover-letter series; upstream-staging-prep work |
staging-prep-series-danctnix |
unset | DanctNIX sibling |
tx-sdio-dma-oob |
unset | |
tx-sdio-dma-oob-danctnix |
unset | DanctNIX sibling |
DKMS-to-in-tree transition path
bes2600-dkms (Mobian fork, in marfrit/bes2600-dkms) is the
out-of-tree shim that ohm currently uses for the BES2600 wifi+BT.
Once these driver/bes2600/ series land in mainline (or at least in
DanctNIX's PineTab2 kernel base):
- ohm's manifest drops the
bes2600-dkmspackage dependency kernel-agentbuilds the in-tree variant via the series listed heremarfrit/bes2600-dkmsrepo gets archived (kept as history)- PineTab2 buyers from then on get bes2600 directly out of the kernel
Track the dropdown in fleet/ohm.yaml (replaces_dkms: bes2600-dkms
once the cumulative series is enough to replace it).
Cumulative-patch generation order
The current single-patch cumulative (0001-bes2600-besser-cumulative-series.patch
in the existing PKGBUILD) is generated in this order on boltzmann:
A, B, C v3, F, G, D, E, C2, c5.x, c6.x, c7, H
This is NOT alphabetical — C2 follows E rather than coming after
C v3. ka-promote MUST honor an explicit series-ordering field
when concatenating, not sort by series name. Field name TBD; suggest
adding apply_order: to fleet/ohm.yaml (issue #5 will surface this
when the cumulative gets regenerated).
References
- Issue:
git.reauktion.de/marfrit/kernel-agent/issues/2 - Source repo:
git.reauktion.de/marfrit/besser/patches/ - Consumer: ohm (
fleet/ohm.yaml) - Related:
bes2600-dkms,linux-pinetab2-danctnix-besserPKGBUILD