aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79
diff options
context:
space:
mode:
authorThibaut VARÈNE <hacks@slashdirt.org>2020-04-19 17:17:03 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-08 15:17:17 +0200
commit9242d691ec847e20b68a2dcfca3ae3a7f6674be2 (patch)
tree1208a5214d0b945d80ec06a8ab67b3b8ce6f725d /target/linux/ath79
parent02a9d3d6a932cdf707f8bcf4555d095839ce8d24 (diff)
downloadupstream-9242d691ec847e20b68a2dcfca3ae3a7f6674be2.tar.gz
upstream-9242d691ec847e20b68a2dcfca3ae3a7f6674be2.tar.bz2
upstream-9242d691ec847e20b68a2dcfca3ae3a7f6674be2.zip
ath79/mikrotik: load caldata via sysfs loader
This commit takes advantages of base-files 220 which introduces routines to perform caldata loading directly via the kernel sysfs loader helper. This has the benefits of not wasting flash space to store caldata. Memory footprint is reduced to the bare minimum: for devices that don't need MAC patching, the caldata is loaded directly, for devices that do need MAC patching, the caldata is extracted to /tmp, patched and then loaded. Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r--target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom6
-rw-r--r--target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata4
2 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 884e150bbb..d16190d803 100644
--- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -13,8 +13,10 @@ case "$FIRMWARE" in
"ath9k-eeprom-ahb-18100000.wmac.bin")
case $board in
mikrotik,routerboard-wap-g-5hact2hnd)
- caldata_from_file $wlan_data 0x1000 0x440
- ath9k_patch_mac $(macaddr_add "$mac_base" +2)
+ caldata_from_file $wlan_data 0x1000 0x440 /tmp/$FIRMWARE
+ ath9k_patch_mac $(macaddr_add "$mac_base" +2) /tmp/$FIRMWARE
+ caldata_sysfsload_from_file /tmp/$FIRMWARE 0x0 0x440
+ rm -f /tmp/$FIRMWARE
;;
*)
caldata_die "board $board is not supported yet"
diff --git a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index b486a5720d..531c21678f 100644
--- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -12,14 +12,14 @@ case "$FIRMWARE" in
"ath10k/cal-pci-0000:00:00.0.bin")
case $board in
mikrotik,routerboard-wap-g-5hact2hnd)
- caldata_from_file $wlan_data 0x5000 0x844
+ caldata_sysfsload_from_file $wlan_data 0x5000 0x844
;;
esac
;;
"ath10k/cal-pci-0000:01:00.0.bin")
case $board in
mikrotik,routerboard-922uags-5hpacd)
- caldata_from_file $wlan_data 0x5000 0x844
+ caldata_sysfsload_from_file $wlan_data 0x5000 0x844
;;
esac
;;