This merges the ath10k-caldata extraction into the common
eeprom.sh.
Signed-off-by: Adrian Schmutzler <freif...@adrianschmutzler.de>
---
New in v3:
Moved over from alternate patchset
---
package/base-files/files/lib/functions/eeprom.sh | 5 +-
.../etc/hotplug.d/firmware/11-ath10k-caldata | 82 ++++++----------------
2 files changed, 26 insertions(+), 61 deletions(-)
diff --git a/package/base-files/files/lib/functions/eeprom.sh
b/package/base-files/files/lib/functions/eeprom.sh
index 80df3bb359..48c7fd362d 100644
--- a/package/base-files/files/lib/functions/eeprom.sh
+++ b/package/base-files/files/lib/functions/eeprom.sh
@@ -67,9 +67,12 @@ ubi_eeprom_extract() {
local part=$1
local offset=$2
local count=$3
- local ubidev=$(nand_find_ubi $CI_UBIPART)
+ local ubidev
local ubi
+ . /lib/upgrade/nand.sh
+
+ ubidev=$(nand_find_ubi $CI_UBIPART)
ubi=$(nand_find_volume $ubidev $part)
[ -n "$ubi" ] || \
eeprom_die "no UBI volume found for $part"
diff --git
a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 718224f1e0..c13b3e9ecd 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -1,5 +1,7 @@
#!/bin/sh
+. /lib/functions/eeprom.sh
+
# xor multiple hex values of the same length
xor() {
local val
@@ -16,43 +18,6 @@ xor() {
printf "%0${retlen}x" "$ret"
}
-ath10kcal_die() {
- echo "ath10cal: " "$*"
- exit 1
-}
-
-ath10kcal_extract() {
- local part=$1
- local offset=$2
- local count=$3
- local mtd
-
- mtd=$(find_mtd_chardev $part)
- [ -n "$mtd" ] || \
- ath10kcal_die "no mtd device found for partition $part"
-
- dd if=$mtd of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count
skip=$offset count=1 2>/dev/null || \
- ath10kcal_die "failed to extract calibration data from $mtd"
-}
-
-ath10kcal_ubi_extract() {
- local part=$1
- local offset=$2
- local count=$3
- local ubidev
- local ubi
-
- . /lib/upgrade/nand.sh
-
- ubidev=$(nand_find_ubi $CI_UBIPART)
- ubi=$(nand_find_volume $ubidev $part)
- [ -n "$ubi" ] || \
- ath10kcal_die "no UBI volume found for $part"
-
- dd if=/dev/$ubi of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count
skip=$offset count=1 2>/dev/null || \
- ath10kcal_die "failed to extract from $ubi"
-}
-
ath10kcal_patch_mac_crc() {
local mac=$1
local mac_offset=6
@@ -88,9 +53,6 @@ ath10kcal_is_caldata_valid() {
[ -e /lib/firmware/$FIRMWARE ] && exit 0
-. /lib/functions.sh
-. /lib/functions/system.sh
-
board=$(board_name)
@@ -98,8 +60,8 @@ case "$FIRMWARE" in
"ath10k/cal-pci-0000:01:00.0.bin")
case "$board" in
meraki,mr33)
- ath10kcal_ubi_extract "ART" 36864 2116
- ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART"
36864 2116
+ ubi_eeprom_extract "ART" 36864 2116
+ ath10kcal_is_caldata_valid "4408" || mtd_eeprom_extract "ART"
36864 2116
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary
"/sys/bus/i2c/devices/0-0050/eeprom" 102) +1)
;;
esac
@@ -107,12 +69,12 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case "$board" in
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 36864 12064
+ ubi_eeprom_extract "Factory" 36864 12064
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
openmesh,a62)
- ath10kcal_extract "0:ART" 36864 12064
+ mtd_eeprom_extract "0:ART" 36864 12064
;;
esac
;;
@@ -123,37 +85,37 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 4096 12064
+ mtd_eeprom_extract "ART" 4096 12064
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 4096 12064
+ ubi_eeprom_extract "Factory" 4096 12064
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 4096 12064
+ ubi_eeprom_extract "Factory" 4096 12064
;;
avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x207 -l 12064 -o
/lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 4096 12064
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART"
4096 12064
+ ubi_eeprom_extract "ART" 4096 12064
+ ath10kcal_is_caldata_valid "202f" || mtd_eeprom_extract "ART"
4096 12064
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary
"/sys/bus/i2c/devices/0-0050/eeprom" 102) +2)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 4096 12064
+ mtd_eeprom_extract "ART" 4096 12064
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0)
;;
compex,wpj428 |\
engenius,eap1300 |\
openmesh,a42 |\
openmesh,a62)
- ath10kcal_extract "0:ART" 4096 12064
+ mtd_eeprom_extract "0:ART" 4096 12064
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 4096 12064
+ mtd_eeprom_extract "ART" 4096 12064
ath10kcal_patch_mac_crc $(macaddr_add $(cat
/sys/class/net/eth0/address) -2)
;;
esac
@@ -165,37 +127,37 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 20480 12064
+ mtd_eeprom_extract "ART" 20480 12064
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 20480 12064
+ ubi_eeprom_extract "Factory" 20480 12064
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 20480 12064
+ ubi_eeprom_extract "Factory" 20480 12064
;;
avm,fritzbox-4040)
/usr/bin/fritz_cal_extract -i 1 -s 0x400 -e 0x208 -l 12064 -o
/lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader_config")
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 20480 12064
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART"
20480 12064
+ ubi_eeprom_extract "ART" 20480 12064
+ ath10kcal_is_caldata_valid "202f" || mtd_eeprom_extract "ART"
20480 12064
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary
"/sys/bus/i2c/devices/0-0050/eeprom" 102) +3)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 20480 12064
+ mtd_eeprom_extract "ART" 20480 12064
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 12)
;;
compex,wpj428 |\
engenius,eap1300 |\
openmesh,a42 |\
openmesh,a62)
- ath10kcal_extract "0:ART" 20480 12064
+ mtd_eeprom_extract "0:ART" 20480 12064
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 20480 12064
+ mtd_eeprom_extract "ART" 20480 12064
ath10kcal_patch_mac_crc $(macaddr_add $(cat
/sys/class/net/eth0/address) -1)
;;
esac
--
2.11.0
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
