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.
117 lines
4.3 KiB
Diff
117 lines
4.3 KiB
Diff
From 40a0a1a0c72ae5b4ee538f6e8a5d0def522606af Mon Sep 17 00:00:00 2001
|
|
From: Markus Fritsche <fritsche.markus@gmail.com>
|
|
Date: Wed, 22 Apr 2026 13:18:38 +0200
|
|
Subject: [PATCH 03/29] bes2600: thread struct device * through factory
|
|
request_firmware() call
|
|
|
|
Follow-up to \"bes2600: use request_firmware() for factory.txt read\".
|
|
That patch switched the factory calibration read path from filp_open()
|
|
+ kernel_read() to request_firmware(), but passed dev=NULL to
|
|
request_firmware() because factory_section_read_file() did not have a
|
|
struct device * in scope. The resulting logs carry the
|
|
'(NULL device *):' prefix and do not propagate a udev association.
|
|
|
|
Add a module-local static struct device * used as the firmware-class
|
|
load context, plus a small exported setter:
|
|
|
|
static struct device *bes2600_factory_dev;
|
|
void bes2600_factory_set_dev(struct device *dev);
|
|
|
|
Wire bes2600_factory_set_dev(&func->dev) from bes2600_sdio_probe(),
|
|
right after bes2600_platform_data_init() so the platform layer has
|
|
already had a chance to use the same struct device for its own
|
|
initialization.
|
|
|
|
factory_section_read_file() now passes bes2600_factory_dev (instead
|
|
of NULL) to request_firmware(). When the factory read happens before
|
|
probe (not currently the case on PineTab2) the pointer is still NULL
|
|
and request_firmware() accepts that; no regression.
|
|
|
|
No API changes to bes2600_get_factory_cali_data() callers. The
|
|
char *path parameter remains (it is the firmware-class name fed
|
|
straight to request_firmware()).
|
|
|
|
Tested-on: PineTab2 (BES2600WM + RK3566) running linux-pinetab2
|
|
6.19.10-danctnix1-1. Driver probes, factory data is read, and any
|
|
post-c5 factory diagnostics now carry the SDIO device identity
|
|
instead of '(NULL device *)'.
|
|
|
|
Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
|
|
---
|
|
bes2600/bes2600_factory.c | 14 +++++++++++++-
|
|
bes2600/bes2600_factory.h | 3 +++
|
|
bes2600/bes2600_sdio.c | 4 ++++
|
|
3 files changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/bes2600/bes2600_factory.c b/drivers/staging/bes2600/bes2600_factory.c
|
|
index 8d60b7c..1cda447 100644
|
|
--- a/drivers/staging/bes2600/bes2600_factory.c
|
|
+++ b/drivers/staging/bes2600/bes2600_factory.c
|
|
@@ -31,6 +31,18 @@
|
|
|
|
static DEFINE_MUTEX(factory_lock);
|
|
|
|
+/*
|
|
+ * struct device * for request_firmware() context. Set once at SDIO
|
|
+ * probe via bes2600_factory_set_dev(). NULL is tolerated (falls back
|
|
+ * to the udev-less firmware-class path) but loses per-device logging.
|
|
+ */
|
|
+static struct device *bes2600_factory_dev;
|
|
+
|
|
+void bes2600_factory_set_dev(struct device *dev)
|
|
+{
|
|
+ bes2600_factory_dev = dev;
|
|
+}
|
|
+
|
|
/*
|
|
* It is only used for temporary storage.
|
|
* Every time get the factory, it will read from the
|
|
@@ -148,7 +160,7 @@ static int factory_section_read_file(char *path, void *buffer)
|
|
|
|
bes_devel("requesting firmware-class %s\n", path);
|
|
|
|
- ret = request_firmware(&fw, path, NULL);
|
|
+ ret = request_firmware(&fw, path, bes2600_factory_dev);
|
|
if (ret) {
|
|
bes_devel("BES2600: request_firmware(%s) failed: %d\n", path, ret);
|
|
return -1;
|
|
diff --git a/drivers/staging/bes2600/bes2600_factory.h b/drivers/staging/bes2600/bes2600_factory.h
|
|
index 3835b0d..7dbe9f8 100644
|
|
--- a/drivers/staging/bes2600/bes2600_factory.h
|
|
+++ b/drivers/staging/bes2600/bes2600_factory.h
|
|
@@ -199,6 +199,9 @@ enum factory_cali_status {
|
|
/* just calibrate 11n, other protocols are automatically mapped */
|
|
#define WIFI_RF_11N_MODE 0x15
|
|
|
|
+/* set the struct device * used for request_firmware() context */
|
|
+void bes2600_factory_set_dev(struct device *dev);
|
|
+
|
|
/* read wifi & bt factory cali value*/
|
|
u8* bes2600_get_factory_cali_data(u8 *file_buffer, u32 *data_len, char *path);
|
|
void factory_little_endian_cvrt(u8 *data);
|
|
diff --git a/drivers/staging/bes2600/bes2600_sdio.c b/drivers/staging/bes2600/bes2600_sdio.c
|
|
index 13d4ff1..f172d53 100644
|
|
--- a/drivers/staging/bes2600/bes2600_sdio.c
|
|
+++ b/drivers/staging/bes2600/bes2600_sdio.c
|
|
@@ -30,6 +30,7 @@
|
|
#include "bes2600.h"
|
|
#include "sbus.h"
|
|
#include "bes2600_plat.h"
|
|
+#include "bes2600_factory.h"
|
|
#include "hwio.h"
|
|
#include "bes_chardev.h"
|
|
#include "bes_log.h"
|
|
@@ -1834,6 +1835,9 @@ static int bes2600_sdio_probe(struct sdio_func *func,
|
|
if (ret)
|
|
goto err;
|
|
|
|
+ /* wire struct device into factory.c for request_firmware() context */
|
|
+ bes2600_factory_set_dev(dev);
|
|
+
|
|
self->pdata = bes2600_get_platform_data();
|
|
self->func = func;
|
|
self->dev = &func->dev;
|
|
--
|
|
2.54.0
|
|
|