aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-09-22 11:57:13 +0200
committerDavid Bauer <mail@david-bauer.net>2019-10-13 21:48:58 +0200
commit5b6a80909280cafcb1e28ca120eed6922d68dc5a (patch)
tree5b779cd9deec7067178b20a329d48d663b4a6820 /target/linux/ipq40xx
parentc1388a2deb00b65ee4a06c0a1d4c461f2194ef38 (diff)
downloadupstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.tar.gz
upstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.tar.bz2
upstream-5b6a80909280cafcb1e28ca120eed6922d68dc5a.zip
treewide: move calibration data extraction function to library
This moves the almost identical calibration data extraction functions present multiple times in several targets to a single library file /lib/functions/caldata.sh. Functions are renamed with more generic names to merge different variants that only differ in their names. Most of the targets used find_mtd_chardev, while some used find_mtd_part inside the extraction code. To merge them, the more abundant version with find_mtd_chardev is used in the common code. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> [rebase on latest master; add mpc85xx] Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata101
1 files changed, 27 insertions, 74 deletions
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 dfb0a0cf76..61597ea669 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,43 +1,8 @@
#!/bin/sh
-. /lib/functions.sh
-
-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"
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
- 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"
-}
+. /lib/functions/caldata.sh
ath10kcal_patch_mac_crc() {
local mac=$1
@@ -64,26 +29,14 @@ ath10kcal_patch_mac_crc() {
dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$chksum_offset count=2
}
-ath10kcal_is_caldata_valid() {
- local expected="$1"
-
- magic=$(hexdump -v -n 2 -e '1/1 "%02x"' /lib/firmware/$FIRMWARE)
- [[ "$magic" == "$expected" ]]
- return $?
-}
-
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
-
-. /lib/functions/system.sh
-
board=$(board_name)
case "$FIRMWARE" in
"ath10k/cal-pci-0000:01:00.0.bin")
case "$board" in
meraki,mr33)
- ath10kcal_ubi_extract "ART" 0x9000 0x844
- ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART" 0x9000 0x844
+ caldata_extract_ubi "ART" 0x9000 0x844
+ caldata_valid "4408" || caldata_extract "ART" 0x9000 0x844
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1)
;;
esac
@@ -91,7 +44,7 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case "$board" in
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 0x9000 0x2f20
+ caldata_extract_ubi "Factory" 0x9000 0x2f20
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;;
@@ -104,12 +57,12 @@ case "$FIRMWARE" in
/usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
;;
linksys,ea8300)
- ath10kcal_extract "ART" 0x9000 0x2f20
+ caldata_extract "ART" 0x9000 0x2f20
# OEM assigns 4 sequential MACs
ath10kcal_patch_mac_crc $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
;;
openmesh,a62)
- ath10kcal_extract "0:ART" 0x9000 0x2f20
+ caldata_extract "0:ART" 0x9000 0x2f20
;;
esac
;;
@@ -120,14 +73,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract "ART" 0x1000 0x2f20
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 0x1000 0x2f20
+ caldata_extract_ubi "Factory" 0x1000 0x2f20
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 0x1000 0x2f20
+ caldata_extract_ubi "Factory" 0x1000 0x2f20
;;
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")
@@ -147,29 +100,29 @@ case "$FIRMWARE" in
openmesh,a62 |\
qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2)
- ath10kcal_extract "0:ART" 0x1000 0x2f20
+ caldata_extract "0:ART" 0x1000 0x2f20
;;
engenius,ens620ext)
- ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
;;
linksys,ea8300)
- ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 0x1000 0x2f20
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract_ubi "ART" 0x1000 0x2f20
+ caldata_valid "202f" || caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +2)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0x0)
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 0x1000 0x2f20
+ caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
;;
esac
@@ -181,14 +134,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\
linksys,ea6350v3 |\
qcom,ap-dk01.1-c1)
- ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract "ART" 0x5000 0x2f20
;;
asus,map-ac2200)
- ath10kcal_ubi_extract "Factory" 0x5000 0x2f20
+ caldata_extract_ubi "Factory" 0x5000 0x2f20
;;
asus,rt-ac58u)
CI_UBIPART=UBI_DEV
- ath10kcal_ubi_extract "Factory" 0x5000 0x2f20
+ caldata_extract_ubi "Factory" 0x5000 0x2f20
;;
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")
@@ -208,29 +161,29 @@ case "$FIRMWARE" in
openmesh,a62 |\
qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2)
- ath10kcal_extract "0:ART" 0x5000 0x2f20
+ caldata_extract "0:ART" 0x5000 0x2f20
;;
engenius,ens620ext)
- ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
;;
linksys,ea8300)
- ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
;;
meraki,mr33)
- ath10kcal_ubi_extract "ART" 0x5000 0x2f20
- ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract_ubi "ART" 0x5000 0x2f20
+ caldata_valid "202f" || caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
;;
netgear,ex6100v2 |\
netgear,ex6150v2)
- ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0xc)
;;
zyxel,nbg6617 |\
zyxel,wre6606)
- ath10kcal_extract "ART" 0x5000 0x2f20
+ caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;;
esac