claude-noether
8b356aa11f
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).
117 lines
4.3 KiB
Diff
117 lines
4.3 KiB
Diff
From 20d349e2b5bffe25c17af2612d179b42e27c7414 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 b595365..371ef4f 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
|
|
|