test0r
b76c9904f8
The BES2600 factory calibration file (bes2600_factory.txt) was being read via filp_open() + kernel_read() from a hard-coded absolute path baked in at compile time via the FACTORY_PATH Makefile macro (default: /lib/firmware/bes2600_factory.txt). This had several problems: 1. Path mismatch - linux-firmware-style packaging (and danctnix 0.2-5 device-pine64-pinetab2) ships the file at /lib/firmware/bes2600/bes2600_factory.txt, not /lib/firmware/. The driver logged '(NULL device *): read and check /lib/firmware/bes2600_factory.txt error' on every boot on PineTab2 running linux-pinetab2 6.19.10-danctnix1-1. 2. Direct filesystem access via filp_open() / kernel_read() from a driver is an anti-pattern that upstream rejects: drivers should use request_firmware() to get binary data from userspace-managed firmware directories. request_firmware() natively searches the firmware_class path list (typically /lib/firmware + derivatives), associates the load with a uevent, and respects the firmware-loading infrastructure. 3. The (NULL device *) prefix in error messages indicated the absence of proper device-context logging. While this patch does not yet thread struct device through, the upstream path uses request_firmware() which works with dev=NULL and is the building block for a follow-up patch that adds per-chip device context. Repoint the FACTORY_PATH default to the firmware-class name (bes2600/bes2600_factory.txt) - request_firmware() prepends /lib/firmware/ from the configured search paths. The macro remains overridable at build time for non-standard deployments. Rewrite factory_section_read_file() to: * Call request_firmware(&fw, path, NULL). * Size-check fw->size against FACTORY_MAX_SIZE. * memcpy the data into the caller's buffer. * Always call release_firmware() on exit. The file write path (factory_section_write_file + kernel_write) is left unchanged in this patch; it is the subject of a follow-up patch that removes kernel_write and moves any remaining userspace-visible factory configuration to a standard kernel-userspace boundary (debugfs or nl80211 testmode). No caller signature changes. No Makefile flag drops. Bisectable. Tested-on: PineTab2 (BES2600WM + RK3566) running linux-pinetab2 6.19.10-danctnix1-1, deployed via /lib/modules/<ver>/extra/. Verified post-reboot: original 'read and check /lib/firmware/bes2600_factory.txt error' is gone; request_firmware reads the file successfully (a separate factory_parse() bug, previously masked by the read failure, is now exposed and tracked separately). Signed-off-by: Markus Fritsche <fritsche.markus@gmail.com>
231 lines
7.5 KiB
Makefile
231 lines
7.5 KiB
Makefile
KERN_DIR = /lib/modules/$(KERNELRELEASE)/build
|
|
# feature option
|
|
BES2600 ?= m
|
|
|
|
CONFIG_BES2600_TESTMODE ?= n
|
|
|
|
CONFIG_BES2600_ENABLE_DEVEL_LOGS ?= n
|
|
|
|
CONFIG_BES2600_WAPI_SUPPORT ?= n
|
|
CONFIG_BES2600_STA_DEBUG ?= y
|
|
CONFIG_BES2600_STATIC_SDD ?= y
|
|
P2P_MULTIVIF ?= y
|
|
AP_AGGREGATE_FW_FIX ?= y
|
|
CONFIG_BES2600_BT ?= n
|
|
WIFI_BT_COEXIST_EPTA_ENABLE ?= y
|
|
WIFI_BT_COEXIST_EPTA_FDD ?= n
|
|
CONFIG_BES2600_WOWLAN ?= y
|
|
CONFIG_BES2600_LISTEN_INTERVAL ?= 3
|
|
BSS_LOSS_CHECK ?= y
|
|
|
|
CONFIG_BES2600_DEBUGFS ?= y
|
|
CONFIG_BES2600_ITP ?= n
|
|
|
|
CONFIG_BES2600_NON_POWER_OF_TWO_BLOCKSIZES ?= n
|
|
CONFIG_BES2600_CALIB_FROM_LINUX ?= y
|
|
|
|
CONFIG_BES2600_WIFI_BOOT_ON ?= y
|
|
CONFIG_BES2600_BT_BOOT_ON ?= n
|
|
|
|
BES2600_GPIO_WAKEUP_AP ?= n
|
|
BES2600_WRITE_DPD_TO_FILE ?= n
|
|
BES2600_TX_MORE_RETRY ?= n
|
|
|
|
# bes evb
|
|
BES2600_INDEPENDENT_EVB ?= n
|
|
# wifi module for allwinner made by bes
|
|
BES2600_INTEGRATED_MODULE_V1 ?= n
|
|
# xiaomi R329 wifi module
|
|
BES2600_INTEGRATED_MODULE_V2 ?= n
|
|
# sicun QM215 wifi module
|
|
BES2600_INTEGRATED_MODULE_V3 ?= n
|
|
|
|
# 0: use dynamic_ps_timeout value
|
|
# other: override dynamic_ps_timeout value
|
|
BES2600_FASTPS_IDLE_TIME ?= 8
|
|
|
|
#1.rock api(fixed macaddr)
|
|
#2.read from file(macaddr of customers)
|
|
#3.read from file(macaddr template)
|
|
#4.random macaddr
|
|
GET_MAC_ADDR_METHOD ?= 4
|
|
|
|
ifeq ($(CONFIG_BES2600_DEBUGFS),y)
|
|
BES2600_DUMP_FW_DPD_LOG ?= n
|
|
endif
|
|
|
|
ifeq ($(CONFIG_BES2600_TESTMODE),y)
|
|
CONFIG_BES2600_KEEP_ALIVE ?= n
|
|
ifeq ($(CONFIG_BES2600_KEEP_ALIVE),y)
|
|
ccflags-y += -DVENDOR_XM_KEEPALIVE
|
|
endif
|
|
endif
|
|
|
|
BES2600_DRV_VERSION := bes2600_0.3.5_2024.0116
|
|
|
|
ifeq ($(CONFIG_BES2600_CALIB_FROM_LINUX),y)
|
|
FACTORY_CRC_CHECK ?= n
|
|
STANDARD_FACTORY_EFUSE_FLAG ?= y
|
|
FACTORY_PATH ?= bes2600/bes2600_factory.txt
|
|
endif
|
|
|
|
# basic function
|
|
define boolen_flag
|
|
$(strip $(if $(findstring $($(1)),$(2)),-D$(1)))
|
|
endef
|
|
|
|
define string_flag
|
|
$(strip $(if $($(1)),-D$(1)=\"$($(1))\"))
|
|
endef
|
|
|
|
define value_flag
|
|
$(strip $(if $($(1)),-D$(1)=$($(1))))
|
|
endef
|
|
|
|
ccflags-y += -Werror
|
|
|
|
SDIO_HOST_ADMA_SUPPORT ?= y
|
|
ccflags-y += -DCONFIG_BES2600_WLAN_BES
|
|
ccflags-y += -DBES_SDIO_RXTX_TOGGLE
|
|
ccflags-y += -DBES_SDIO_TX_MULTIPLE_ENABLE
|
|
ccflags-y += -DBES_SDIO_RX_MULTIPLE_ENABLE
|
|
ccflags-y += -DBES_UNIFIED_PM
|
|
ccflags-y += -DBES_SDIO_OPTIMIZED_LEN
|
|
ccflags-y += -DBES2600_HOST_TIMESTAMP_DEBUG
|
|
|
|
ifeq ($(BES2600_WRITE_DPD_TO_FILE),y)
|
|
BES2600_DPD_PATH ?= /data/cfg/bes2600_dpd.bin
|
|
BES2600_DEFAULT_DPD_PATH ?= /lib/firmware/bes2600_dpd.bin
|
|
BES2600_DPD_GOLDEN_PATH ?= /data/cfg/bes2600_dpd_golden.bin
|
|
endif
|
|
|
|
ifeq ($(BES2600_DUMP_FW_DPD_LOG),y)
|
|
BES2600_DPD_LOG_PATH ?= /data/applog/bes2600_dpd_log.log
|
|
endif
|
|
|
|
# compilation macros setting
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_VENDOR_CMD,y)
|
|
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_STATIC_SDD,y)
|
|
ccflags-y += $(call boolen_flag,P2P_MULTIVIF,y)
|
|
ccflags-y += $(call boolen_flag,AP_AGGREGATE_FW_FIX,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_BT,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WAPI_SUPPORT,y)
|
|
ccflags-y += $(call boolen_flag,WIFI_BT_COEXIST_EPTA_ENABLE,y)
|
|
ccflags-y += $(call boolen_flag,WIFI_BT_COEXIST_EPTA_FDD,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_DISABLE_BEACON_HINTS,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_NON_POWER_OF_TWO_BLOCKSIZES,y)
|
|
ccflags-y += $(call boolen_flag,BES2600_TX_MORE_RETRY,y)
|
|
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_ITP,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_DEBUGFS,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_BH_DEBUG,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WSM_DEBUG,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WSM_DUMPS,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WSM_DUMPS_SHORT,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_TXRX_DEBUG,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_TX_POLICY_DEBUG,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_STA_DEBUG,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_DUMP_ON_ERROR,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WOWLAN,y)
|
|
ccflags-y += $(call value_flag,CONFIG_BES2600_LISTEN_INTERVAL)
|
|
ccflags-y += $(call value_flag,BES2600_FASTPS_IDLE_TIME)
|
|
ccflags-y += $(call boolen_flag,BSS_LOSS_CHECK,y)
|
|
|
|
ccflags-y += $(call string_flag,BES2600_LOAD_FW_TOOL_PATH)
|
|
ccflags-y += $(call string_flag,BES2600_LOAD_FW_TOOL_DEVICE)
|
|
ccflags-y += $(call string_flag,BES2600_DRV_VERSION)
|
|
ccflags-y += $(call string_flag,BES2600_DPD_PATH)
|
|
ccflags-y += $(call string_flag,BES2600_DEFAULT_DPD_PATH)
|
|
ccflags-y += $(call string_flag,BES2600_DPD_GOLDEN_PATH)
|
|
|
|
ccflags-y += $(call boolen_flag,BES2600_INDEPENDENT_EVB,y)
|
|
ccflags-y += $(call boolen_flag,BES2600_INTEGRATED_MODULE_V1,y)
|
|
ccflags-y += $(call boolen_flag,BES2600_INTEGRATED_MODULE_V2,y)
|
|
ccflags-y += $(call boolen_flag,BES2600_INTEGRATED_MODULE_V3,y)
|
|
ccflags-y += $(call boolen_flag,SDIO_HOST_ADMA_SUPPORT,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_TESTMODE,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_KEEP_ALIVE,y)
|
|
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_WIFI_BOOT_ON,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_BT_BOOT_ON,y)
|
|
ccflags-y += $(call boolen_flag,CONFIG_BES2600_CALIB_FROM_LINUX,y)
|
|
|
|
ccflags-y += $(call value_flag,GET_MAC_ADDR_METHOD)
|
|
ccflags-y += $(call string_flag,PATH_WIFI_MACADDR)
|
|
ccflags-y += $(call string_flag,FACTORY_PATH)
|
|
ccflags-y += $(call string_flag,FACTORY_DEFAULT_PATH)
|
|
ccflags-y += $(call boolen_flag,FACTORY_SAVE_MULTI_PATH,y)
|
|
ccflags-y += $(call boolen_flag,FACTORY_CRC_CHECK,y)
|
|
|
|
ccflags-y += $(call boolen_flag,BES2600_GPIO_WAKEUP_AP,y)
|
|
ccflags-y += $(call boolen_flag,BES2600_WRITE_DPD_TO_FILE,y)
|
|
|
|
ccflags-y += $(call boolen_flag,BES2600_DUMP_FW_DPD_LOG,y)
|
|
ccflags-y += $(call string_flag,BES2600_DPD_LOG_PATH)
|
|
|
|
ccflags-y += $(call boolen_flag,STANDARD_FACTORY_EFUSE_FLAG,y)
|
|
|
|
# internal feature options
|
|
ccflags-y += -DAP_HT_CAP_UPDATE
|
|
ccflags-y += -DBES2600_RX_IN_BH
|
|
ccflags-y += -DDCW1260_DETECTION_LOGIC
|
|
|
|
# sdd options
|
|
ccflags-y += -DTEST_11B=0
|
|
ccflags-y += -DDPD_CALI=0
|
|
ccflags-y += -DDPD_CALI=0
|
|
ccflags-y += -DALI_CONFG=0
|
|
ccflags-y += -DCHIP_WIFI_ROM_VER=1
|
|
ccflags-y += -DWIFI_OUT_FEM=0
|
|
ccflags-y += -DRF_TX_CONTROL_IO=16
|
|
|
|
# stbc rx option
|
|
ccflags-y += -DSTBC_RX_24G=0
|
|
ccflags-y += -DSTBC_RX_5G=0
|
|
|
|
#ccflags-y += -DP2P_STA_COEX
|
|
#ccflags-y += -DMCAST_FWDING
|
|
#ccflags-y += -DAP_AGGREGATE_FW_FIX
|
|
# Extra IE for probe response from upper layer is needed in P2P GO
|
|
# For offloading probe response to FW, the extra IE must be included
|
|
# in the probe response template
|
|
#ccflags-y += -DPROBE_RESP_EXTRA_IE
|
|
ccflags-y += -DIPV6_FILTERING
|
|
|
|
# basic files for building module
|
|
bes2600-y := \
|
|
fwio.o \
|
|
txrx.o \
|
|
main.o \
|
|
queue.o \
|
|
hwio.o \
|
|
bh.o \
|
|
wsm.o \
|
|
sta.o \
|
|
ap.o \
|
|
scan.o \
|
|
bes_chardev.o \
|
|
tx_loop.o \
|
|
bes_fw.o \
|
|
bes_fw_common.o \
|
|
bes2600_factory.o \
|
|
bes2600_sdio.o
|
|
|
|
# compilation files select
|
|
bes2600-$(CONFIG_BES2600_DEBUGFS) += debug.o
|
|
bes2600-$(CONFIG_BES2600_ITP) += itp.o
|
|
bes2600-$(CONFIG_PM) += pm.o
|
|
bes2600-$(CONFIG_BES2600_BT) += bes2600_btusb.o
|
|
bes2600-$(CONFIG_BES2600_TESTMODE) += wifi_testmode_cmd.o
|
|
|
|
bes2600-$(WIFI_BT_COEXIST_EPTA_ENABLE) += epta_coex.o epta_request.o
|
|
bes2600-$(CONFIG_BES2600_WOWLAN) += bes_pwr.o
|
|
|
|
obj-$(BES2600) += bes2600.o
|
|
|
|
all: modules
|
|
|
|
modules clean:
|
|
$(MAKE) -C $(KERN_DIR) M=$(shell pwd) $@
|