Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: move calibration data extraction function to library

Browse source 
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>
This commit is contained in:
Adrian Schmutzler 2019-09-22 11:57:13 +02:00 committed by David Bauer
parent c1388a2deb
commit 5b6a809092
11 changed files with 207 additions and 420 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
package/base-files/files/lib/functions/caldata.sh Normal file
View file

@ -0,0 +1,75 @@
# Copyright (C) 2019 OpenWrt.org
. /lib/functions.sh
. /lib/functions/system.sh
caldata_die() {
echo "caldata: " "$*"
exit 1
}
caldata_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || caldata_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 || \
caldata_die "failed to extract calibration data from $mtd"
}
caldata_extract_ubi() {
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" ] || caldata_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 || \
caldata_die "failed to extract calibration data from $ubi"
}
caldata_extract_reverse() {
local part=$1
local offset=$2
local count=$(($3))
local mtd
local reversed
local caldata
mtd=$(find_mtd_chardev "$part")
reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd)
for byte in $reversed; do
caldata="\x${byte}${caldata}"
done
printf "%b" "$caldata" > /lib/firmware/$FIRMWARE
}
caldata_from_file() {
local source=$1
local offset=$(($2))
local count=$(($3))
dd if=$source of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
caldata_die "failed to extract calibration data from $source"
}
caldata_valid() {
local expected="$1"
magic=$(hexdump -v -n 2 -e '1/1 "%02x"' /lib/firmware/$FIRMWARE)
[[ "$magic" == "$expected" ]]
return $?
}

49
target/linux/apm821xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -2,42 +2,7 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions/caldata.sh
. /lib/functions/system.sh
ath9k_eeprom_die() {
echo "ath9k eeprom: " "$*"
exit 1
}
ath9k_eeprom_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || \
ath9k_eeprom_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 || \
ath9k_eeprom_die "failed to extract from $mtd"
}
ath9k_ubi_eeprom_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local ubidev=$(nand_find_ubi $CI_UBIPART)
local ubi
ubi=$(nand_find_volume $ubidev $part)
[ -n "$ubi" ] || \
ath9k_eeprom_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 || \
ath9k_eeprom_die "failed to extract from $ubi"
}
ath9k_patch_firmware_mac() { ath9k_patch_firmware_mac() {
local mac=$1 local mac=$1
@ -56,14 +21,14 @@ case "$FIRMWARE" in
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
if [ -n "$(nand_find_volume ubi0 caldata)" ]; then if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
ath9k_ubi_eeprom_extract "caldata" 0x5000 0x1000 caldata_extract_ubi "caldata" 0x5000 0x1000
else else
ath9k_eeprom_extract "wifi_data" 0x5000 0x1000 caldata_extract "wifi_data" 0x5000 0x1000
ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc) ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0xc)
fi fi
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;
@ -74,14 +39,14 @@ case "$FIRMWARE" in
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
if [ -n "$(nand_find_volume ubi0 caldata)" ]; then if [ -n "$(nand_find_volume ubi0 caldata)" ]; then
ath9k_ubi_eeprom_extract "caldata" 0x1000 0x1000 caldata_extract_ubi "caldata" 0x1000 0x1000
else else
ath9k_eeprom_extract "wifi_data" 0x1000 0x1000 caldata_extract "wifi_data" 0x1000 0x1000
ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0) ath9k_patch_firmware_mac $(mtd_get_mac_binary wifi_data 0x0)
fi fi
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

90
target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -2,45 +2,7 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions/caldata.sh
. /lib/functions/system.sh
ath9k_eeprom_die() {
echo "ath9k eeprom: " "$*"
exit 1
}
ath9k_eeprom_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || \
ath9k_eeprom_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 || \
ath9k_eeprom_die "failed to extract from $mtd"
}
ath9k_eeprom_extract_reverse() {
local part=$1
local offset=$2
local count=$(($3))
local mtd
local reversed
local caldata
mtd=$(find_mtd_chardev "$part")
reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd)
for byte in $reversed; do
caldata="\x${byte}${caldata}"
done
printf "%b" "$caldata" > /lib/firmware/$FIRMWARE
}
ath9k_patch_fw_mac() { ath9k_patch_fw_mac() {
local mac=$1 local mac=$1
@ -83,11 +45,11 @@ case "$FIRMWARE" in
"ath9k-eeprom-ahb-18100000.wmac.bin") "ath9k-eeprom-ahb-18100000.wmac.bin")
case $board in case $board in
avm,fritz4020) avm,fritz4020)
ath9k_eeprom_extract_reverse "urlader" 0x1541 0x440 caldata_extract_reverse "urlader" 0x1541 0x440
;; ;;
dlink,dir-825-c1|\ dlink,dir-825-c1|\
dlink,dir-835-a1) dlink,dir-835-a1)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_text "mac" 0x4) 0x2 ath9k_patch_fw_mac $(mtd_get_mac_text "mac" 0x4) 0x2
;; ;;
dlink,dir-842-c1|\ dlink,dir-842-c1|\
@ -96,11 +58,11 @@ case "$FIRMWARE" in
dlink,dir-859-a1|\ dlink,dir-859-a1|\
nec,wg1200cr|\ nec,wg1200cr|\
wd,mynet-n750) wd,mynet-n750)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2 ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2
;; ;;
engenius,ecb1750) engenius,ecb1750)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env "athaddr") +1) 0x2 ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env "athaddr") +1) 0x2
;; ;;
engenius,epg5000|\ engenius,epg5000|\
@ -108,39 +70,39 @@ case "$FIRMWARE" in
iodata,wn-ac1600dgr|\ iodata,wn-ac1600dgr|\
iodata,wn-ac1600dgr2|\ iodata,wn-ac1600dgr2|\
iodata,wn-ag300dgr) iodata,wn-ag300dgr)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_ascii u-boot-env ethaddr) 0x2 ath9k_patch_fw_mac $(mtd_get_mac_ascii u-boot-env ethaddr) 0x2
;; ;;
nec,wg800hp) nec,wg800hp)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_text board_data 0x680) 0x2 ath9k_patch_fw_mac $(mtd_get_mac_text board_data 0x680) 0x2
;; ;;
qihoo,c301) qihoo,c301)
ath9k_eeprom_extract "radiocfg" 0x1000 0x440 caldata_extract "radiocfg" 0x1000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2 ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan24mac") 0x2
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;
"ath9k-eeprom-pci-0000:00:00.0.bin") "ath9k-eeprom-pci-0000:00:00.0.bin")
case $board in case $board in
avm,fritz300e) avm,fritz300e)
ath9k_eeprom_extract_reverse "urloader" 0x1541 0x440 caldata_extract_reverse "urloader" 0x1541 0x440
;; ;;
buffalo,whr-g301n|\ buffalo,whr-g301n|\
buffalo,wzr-hp-g302h-a1a0|\ buffalo,wzr-hp-g302h-a1a0|\
tplink,tl-wr841-v5|\ tplink,tl-wr841-v5|\
tplink,tl-wr941-v4) tplink,tl-wr941-v4)
ath9k_eeprom_extract "art" 0x1000 0xeb8 caldata_extract "art" 0x1000 0xeb8
;; ;;
buffalo,wzr-hp-g450h) buffalo,wzr-hp-g450h)
ath9k_eeprom_extract "art" 0x1000 0x440 caldata_extract "art" 0x1000 0x440
;; ;;
dlink,dir-825-c1|\ dlink,dir-825-c1|\
dlink,dir-835-a1) dlink,dir-835-a1)
ath9k_eeprom_extract "art" 0x5000 0x440 caldata_extract "art" 0x5000 0x440
ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) 0x2 ath9k_patch_fw_mac $(macaddr_add $(mtd_get_mac_text "mac" 0x18) 1) 0x2
;; ;;
ocedo,raccoon|\ ocedo,raccoon|\
@ -149,7 +111,7 @@ case "$FIRMWARE" in
tplink,tl-wdr4300-v1|\ tplink,tl-wdr4300-v1|\
tplink,tl-wdr4900-v2|\ tplink,tl-wdr4900-v2|\
winchannel,wb2000) winchannel,wb2000)
ath9k_eeprom_extract "art" 0x5000 0x440 caldata_extract "art" 0x5000 0x440
;; ;;
netgear,wnr612-v2|\ netgear,wnr612-v2|\
on,n150r|\ on,n150r|\
@ -167,24 +129,24 @@ case "$FIRMWARE" in
ubnt,bullet-m|\ ubnt,bullet-m|\
ubnt,nano-m|\ ubnt,nano-m|\
ubnt,rocket-m) ubnt,rocket-m)
ath9k_eeprom_extract "art" 0x1000 0x1000 caldata_extract "art" 0x1000 0x1000
;; ;;
pqi,air-pen) pqi,air-pen)
ath9k_eeprom_extract "art" 0x1000 0x7d2 caldata_extract "art" 0x1000 0x7d2
;; ;;
ubnt,unifi) ubnt,unifi)
ath9k_eeprom_extract "art" 0x1000 0x800 caldata_extract "art" 0x1000 0x800
;; ;;
wd,mynet-n750) wd,mynet-n750)
ath9k_eeprom_extract "art" 0x5000 0x440 caldata_extract "art" 0x5000 0x440
ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan5mac") 0x2 ath9k_patch_fw_mac $(mtd_get_mac_ascii devdata "wlan5mac") 0x2
;; ;;
wd,mynet-wifi-rangeextender) wd,mynet-wifi-rangeextender)
ath9k_eeprom_extract "art" 0x1000 0x1000 caldata_extract "art" 0x1000 0x1000
ath9k_patch_fw_mac $(nvram get wl0_hwaddr) "$mac" 0x2 ath9k_patch_fw_mac $(nvram get wl0_hwaddr) "$mac" 0x2
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;
@ -195,14 +157,14 @@ case "$FIRMWARE" in
netgear,wndr3700v2|\ netgear,wndr3700v2|\
netgear,wndr3800|\ netgear,wndr3800|\
netgear,wndr3800ch) netgear,wndr3800ch)
ath9k_eeprom_extract "art" 0x1000 0xeb8 caldata_extract "art" 0x1000 0xeb8
;; ;;
dlink,dir-825-b1) dlink,dir-825-b1)
ath9k_eeprom_extract "caldata" 0x1000 0xeb8 caldata_extract "caldata" 0x1000 0xeb8
ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 0xffa0) 0x20c ath9k_patch_fw_mac_crc $(mtd_get_mac_text "caldata" 0xffa0) 0x20c
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;
@ -213,14 +175,14 @@ case "$FIRMWARE" in
netgear,wndr3700v2|\ netgear,wndr3700v2|\
netgear,wndr3800|\ netgear,wndr3800|\
netgear,wndr3800ch) netgear,wndr3800ch)
ath9k_eeprom_extract "art" 0x5000 0xeb8 caldata_extract "art" 0x5000 0xeb8
;; ;;
dlink,dir-825-b1) dlink,dir-825-b1)
ath9k_eeprom_extract "caldata" 0x5000 0xeb8 caldata_extract "caldata" 0x5000 0xeb8
ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 0xffb4) 1) 0x20c ath9k_patch_fw_mac_crc $(macaddr_add $(mtd_get_mac_text "caldata" 0xffb4) 1) 0x20c
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

86
target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -1,36 +1,10 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh
. /lib/functions/k2t.sh . /lib/functions/k2t.sh
ath10kcal_die() {
echo "ath10cal: " "$*"
exit 1
}
ath10kcal_from_file() {
local source=$1
local offset=$(($2))
local count=$(($3))
dd if=$source of=/lib/firmware/$FIRMWARE iflag=skip_bytes bs=$count skip=$offset count=1 2>/dev/null || \
ath10kcal_die "failed to extract calibration data from $source"
}
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_patch_mac() { ath10kcal_patch_mac() {
local mac=$1 local mac=$1
@ -62,10 +36,6 @@ ath10kcal_patch_mac_crc() {
} }
} }
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/system.sh
board=$(board_name) board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
@ -74,7 +44,7 @@ case "$FIRMWARE" in
comfast,cf-wr650ac-v1|\ comfast,cf-wr650ac-v1|\
comfast,cf-wr650ac-v2|\ comfast,cf-wr650ac-v2|\
yuncore,a770) yuncore,a770)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
;; ;;
devolo,dvl1200e|\ devolo,dvl1200e|\
devolo,dvl1200i|\ devolo,dvl1200i|\
@ -82,54 +52,54 @@ case "$FIRMWARE" in
devolo,dvl1750e|\ devolo,dvl1750e|\
devolo,dvl1750i|\ devolo,dvl1750i|\
devolo,dvl1750x) devolo,dvl1750x)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) -1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
;; ;;
dlink,dir-859-a1) dlink,dir-859-a1)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac") ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
;; ;;
elecom,wrc-1750ghbk2-i) elecom,wrc-1750ghbk2-i)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
;; ;;
engenius,ecb1750) engenius,ecb1750)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr) ath10kcal_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
;; ;;
engenius,epg5000|\ engenius,epg5000|\
iodata,wn-ac1167dgr|\ iodata,wn-ac1167dgr|\
iodata,wn-ac1600dgr2) iodata,wn-ac1600dgr2)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
;; ;;
engenius,ews511ap) engenius,ews511ap)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
;; ;;
glinet,gl-ar750|\ glinet,gl-ar750|\
glinet,gl-ar750s) glinet,gl-ar750s)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1)
;; ;;
glinet,gl-x750) glinet,gl-x750)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
;; ;;
nec,wg800hp) nec,wg800hp)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880) ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880)
;; ;;
ocedo,koala|\ ocedo,koala|\
ocedo,ursus) ocedo,ursus)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc) ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc)
;; ;;
openmesh,om5p-ac-v2) openmesh,om5p-ac-v2)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
;; ;;
qihoo,c301) qihoo,c301)
ath10kcal_extract "radiocfg" 0x5000 0x844 caldata_extract "radiocfg" 0x5000 0x844
ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac) ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
;; ;;
tplink,archer-a7-v5|\ tplink,archer-a7-v5|\
@ -137,29 +107,29 @@ case "$FIRMWARE" in
tplink,archer-c7-v4|\ tplink,archer-c7-v4|\
tplink,archer-c7-v5|\ tplink,archer-c7-v5|\
tplink,archer-c25-v1) tplink,archer-c25-v1)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1)
;; ;;
tplink,archer-c5-v1|\ tplink,archer-c5-v1|\
tplink,archer-c7-v2) tplink,archer-c7-v2)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1)
;; ;;
tplink,archer-d50-v1) tplink,archer-d50-v1)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary romfile 0xf100) +2) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary romfile 0xf100) +2)
;; ;;
tplink,re350k-v1) tplink,re350k-v1)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2)
;; ;;
tplink,re355-v1|\ tplink,re355-v1|\
tplink,re450-v1) tplink,re450-v1)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2) ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
;; ;;
tplink,re450-v2) tplink,re450-v2)
ath10kcal_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1) ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
;; ;;
ubnt,unifiac-lite|\ ubnt,unifiac-lite|\
@ -170,14 +140,14 @@ case "$FIRMWARE" in
ubnt,nanostation-ac|\ ubnt,nanostation-ac|\
ubnt,nanostation-ac-loco|\ ubnt,nanostation-ac-loco|\
ubnt,unifiac-pro) ubnt,unifiac-pro)
ath10kcal_extract "EEPROM" 0x5000 0x844 caldata_extract "EEPROM" 0x5000 0x844
;; ;;
esac esac
;; ;;
"ath10k/pre-cal-pci-0000:00:00.0.bin") "ath10k/pre-cal-pci-0000:00:00.0.bin")
case $board in case $board in
comfast,cf-e313ac) comfast,cf-e313ac)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary art 0x6) ath10kcal_patch_mac_crc $(mtd_get_mac_binary art 0x6)
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
@ -187,18 +157,18 @@ case "$FIRMWARE" in
dlink,dir-842-c2|\ dlink,dir-842-c2|\
dlink,dir-842-c3|\ dlink,dir-842-c3|\
nec,wg1200cr) nec,wg1200cr)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac) ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
;; ;;
netgear,ex6400|\ netgear,ex6400|\
netgear,ex7300) netgear,ex7300)
ath10kcal_extract "caldata" 0x5000 0x2f20 caldata_extract "caldata" 0x5000 0x2f20
ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc) ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc)
;; ;;
phicomm,k2t) phicomm,k2t)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(k2t_get_mac "5g_mac") ath10kcal_patch_mac_crc $(k2t_get_mac "5g_mac")
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
@ -209,7 +179,7 @@ case "$FIRMWARE" in
tplink,archer-c60-v1|\ tplink,archer-c60-v1|\
tplink,archer-c60-v2|\ tplink,archer-c60-v2|\
tplink,archer-c6-v2) tplink,archer-c6-v2)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mac 0x8) -1)
ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.bin /lib/firmware/ath10k/QCA9888/hw2.0/board.bin

27
target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
View file

@ -1,28 +1,9 @@
#!/bin/sh #!/bin/sh
# Based on gabors ralink wisoc implementation. # Based on gabors ralink wisoc implementation.
rt2x00_eeprom_die() {
echo "rt2x00 eeprom: " "$*"
exit 1
}
rt2x00_eeprom_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
rt2x00_eeprom_die "no mtd device found for partition $part"
dd if=$mtd of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count || \
rt2x00_eeprom_die "failed to extract from $mtd"
}
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions/caldata.sh
board=$(board_name) board=$(board_name)
@ -30,14 +11,14 @@ case "$FIRMWARE" in
"rt2x00.eeprom" ) "rt2x00.eeprom" )
case $board in case $board in
hg556a_c) hg556a_c)
rt2x00_eeprom_extract "cal_data" 0x1fe00 0x200 caldata_extract "cal_data" 0x1fe00 0x200
;; ;;
hg622 |\ hg622 |\
hg655b) hg655b)
rt2x00_eeprom_extract "cal_data" 0x0 0x200 caldata_extract "cal_data" 0x0 0x200
;; ;;
*) *)
rt2x00_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

101
target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -1,43 +1,8 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh [ -e /lib/firmware/$FIRMWARE ] && exit 0
ath10kcal_die() { . /lib/functions/caldata.sh
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() { ath10kcal_patch_mac_crc() {
local mac=$1 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 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) board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
"ath10k/cal-pci-0000:01:00.0.bin") "ath10k/cal-pci-0000:01:00.0.bin")
case "$board" in case "$board" in
meraki,mr33) meraki,mr33)
ath10kcal_ubi_extract "ART" 0x9000 0x844 caldata_extract_ubi "ART" 0x9000 0x844
ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "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) ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1)
;; ;;
esac esac
@ -91,7 +44,7 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin") "ath10k/pre-cal-pci-0000:01:00.0.bin")
case "$board" in case "$board" in
asus,map-ac2200) 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 \ ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
/lib/firmware/ath10k/QCA9888/hw2.0/board.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") /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
;; ;;
linksys,ea8300) linksys,ea8300)
ath10kcal_extract "ART" 0x9000 0x2f20 caldata_extract "ART" 0x9000 0x2f20
# OEM assigns 4 sequential MACs # OEM assigns 4 sequential MACs
ath10kcal_patch_mac_crc $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4)) ath10kcal_patch_mac_crc $(macaddr_setbit_la $(macaddr_add "$(cat /sys/class/net/eth0/address)" 4))
;; ;;
openmesh,a62) openmesh,a62)
ath10kcal_extract "0:ART" 0x9000 0x2f20 caldata_extract "0:ART" 0x9000 0x2f20
;; ;;
esac esac
;; ;;
@ -120,14 +73,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\ glinet,gl-b1300 |\
linksys,ea6350v3 |\ linksys,ea6350v3 |\
qcom,ap-dk01.1-c1) qcom,ap-dk01.1-c1)
ath10kcal_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
;; ;;
asus,map-ac2200) asus,map-ac2200)
ath10kcal_ubi_extract "Factory" 0x1000 0x2f20 caldata_extract_ubi "Factory" 0x1000 0x2f20
;; ;;
asus,rt-ac58u) asus,rt-ac58u)
CI_UBIPART=UBI_DEV CI_UBIPART=UBI_DEV
ath10kcal_ubi_extract "Factory" 0x1000 0x2f20 caldata_extract_ubi "Factory" 0x1000 0x2f20
;; ;;
avm,fritzbox-4040) 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") /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 |\ openmesh,a62 |\
qxwlan,e2600ac-c1 |\ qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2) qxwlan,e2600ac-c2)
ath10kcal_extract "0:ART" 0x1000 0x2f20 caldata_extract "0:ART" 0x1000 0x2f20
;; ;;
engenius,ens620ext) 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) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
;; ;;
linksys,ea8300) 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) ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
;; ;;
meraki,mr33) meraki,mr33)
ath10kcal_ubi_extract "ART" 0x1000 0x2f20 caldata_extract_ubi "ART" 0x1000 0x2f20
ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "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) ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +2)
;; ;;
netgear,ex6100v2 |\ netgear,ex6100v2 |\
netgear,ex6150v2) netgear,ex6150v2)
ath10kcal_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0x0) ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0x0)
;; ;;
zyxel,nbg6617 |\ zyxel,nbg6617 |\
zyxel,wre6606) 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) ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
;; ;;
esac esac
@ -181,14 +134,14 @@ case "$FIRMWARE" in
glinet,gl-b1300 |\ glinet,gl-b1300 |\
linksys,ea6350v3 |\ linksys,ea6350v3 |\
qcom,ap-dk01.1-c1) qcom,ap-dk01.1-c1)
ath10kcal_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20
;; ;;
asus,map-ac2200) asus,map-ac2200)
ath10kcal_ubi_extract "Factory" 0x5000 0x2f20 caldata_extract_ubi "Factory" 0x5000 0x2f20
;; ;;
asus,rt-ac58u) asus,rt-ac58u)
CI_UBIPART=UBI_DEV CI_UBIPART=UBI_DEV
ath10kcal_ubi_extract "Factory" 0x5000 0x2f20 caldata_extract_ubi "Factory" 0x5000 0x2f20
;; ;;
avm,fritzbox-4040) 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") /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 |\ openmesh,a62 |\
qxwlan,e2600ac-c1 |\ qxwlan,e2600ac-c1 |\
qxwlan,e2600ac-c2) qxwlan,e2600ac-c2)
ath10kcal_extract "0:ART" 0x5000 0x2f20 caldata_extract "0:ART" 0x5000 0x2f20
;; ;;
engenius,ens620ext) 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) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
;; ;;
linksys,ea8300) 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) ath10kcal_patch_mac_crc $(macaddr_add "$(cat /sys/class/net/eth0/address)" 3)
;; ;;
meraki,mr33) meraki,mr33)
ath10kcal_ubi_extract "ART" 0x5000 0x2f20 caldata_extract_ubi "ART" 0x5000 0x2f20
ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "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) ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
;; ;;
netgear,ex6100v2 |\ netgear,ex6100v2 |\
netgear,ex6150v2) netgear,ex6150v2)
ath10kcal_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0xc) ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0xc)
;; ;;
zyxel,nbg6617 |\ zyxel,nbg6617 |\
zyxel,wre6606) 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) ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
;; ;;
esac esac

62
target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -1,34 +1,8 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh [ -e /lib/firmware/$FIRMWARE ] && exit 0
ath10kcal_die() { . /lib/functions/caldata.sh
echo "ath10cal: " "$*"
exit 1
}
ath10kcal_from_file() {
local source=$1
local offset=$(($2))
local count=$(($3))
dd if=$source of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \
ath10kcal_die "failed to extract calibration data from $source"
}
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 bs=1 skip=$offset count=$count 2>/dev/null || \
ath10kcal_die "failed to extract calibration data from $mtd"
}
ath10kcal_patch_mac_crc() { ath10kcal_patch_mac_crc() {
local mac=$1 local mac=$1
@ -55,43 +29,39 @@ ath10kcal_patch_mac_crc() {
dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$chksum_offset count=2 dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=$chksum_offset count=2
} }
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/system.sh
board=$(board_name) board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin") "ath10k/pre-cal-pci-0000:01:00.0.bin")
case $board in case $board in
buffalo,wxr-2533dhp) buffalo,wxr-2533dhp)
ath10kcal_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary ART 0x1e) ath10kcal_patch_mac_crc $(mtd_get_mac_binary ART 0x1e)
;; ;;
linksys,ea8500) linksys,ea8500)
ath10kcal_extract "art" 0x1000 0x2f20 caldata_extract "art" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) +1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) +1)
;; ;;
nec,wg2600hp) nec,wg2600hp)
ath10kcal_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary PRODUCTDATA 0xc) +1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary PRODUCTDATA 0xc) +1)
;; ;;
netgear,d7800 |\ netgear,d7800 |\
netgear,r7500v2 |\ netgear,r7500v2 |\
netgear,r7800) netgear,r7800)
ath10kcal_extract "art" 0x1000 0x2f20 caldata_extract "art" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x6) +1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x6) +1)
;; ;;
tplink,c2600) tplink,c2600)
ath10kcal_extract "radio" 0x1000 0x2f20 caldata_extract "radio" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary default-mac 0x8) -1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary default-mac 0x8) -1)
;; ;;
tplink,vr2600v) tplink,vr2600v)
ath10kcal_extract "ART" 0x1000 0x2f20 caldata_extract "ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1)
;; ;;
zyxel,nbg6817) zyxel,nbg6817)
ath10kcal_extract "0:ART" 0x1000 0x2f20 caldata_extract "0:ART" 0x1000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1)
;; ;;
esac esac
@ -99,33 +69,33 @@ case "$FIRMWARE" in
"ath10k/pre-cal-pci-0001:01:00.0.bin") "ath10k/pre-cal-pci-0001:01:00.0.bin")
case $board in case $board in
buffalo,wxr-2533dhp) buffalo,wxr-2533dhp)
ath10kcal_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary ART 0x18) ath10kcal_patch_mac_crc $(mtd_get_mac_binary ART 0x18)
;; ;;
linksys,ea8500) linksys,ea8500)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) +2) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) +2)
;; ;;
nec,wg2600hp) nec,wg2600hp)
ath10kcal_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary PRODUCTDATA 0xc) ath10kcal_patch_mac_crc $(mtd_get_mac_binary PRODUCTDATA 0xc)
;; ;;
netgear,d7800 |\ netgear,d7800 |\
netgear,r7500v2 |\ netgear,r7500v2 |\
netgear,r7800) netgear,r7800)
ath10kcal_extract "art" 0x5000 0x2f20 caldata_extract "art" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x6) +2) ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x6) +2)
;; ;;
tplink,c2600) tplink,c2600)
ath10kcal_extract "radio" 0x5000 0x2f20 caldata_extract "radio" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary default-mac 0x8) ath10kcal_patch_mac_crc $(mtd_get_mac_binary default-mac 0x8)
;; ;;
tplink,vr2600v) tplink,vr2600v)
ath10kcal_extract "ART" 0x5000 0x2f20 caldata_extract "ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_binary default-mac 0x0) ath10kcal_patch_mac_crc $(mtd_get_mac_binary default-mac 0x0)
;; ;;
zyxel,nbg6817) zyxel,nbg6817)
ath10kcal_extract "0:ART" 0x5000 0x2f20 caldata_extract "0:ART" 0x5000 0x2f20
ath10kcal_patch_mac_crc $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) ath10kcal_patch_mac_crc $(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
;; ;;
esac esac

28
target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file

@ -3,29 +3,7 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions/caldata.sh
. /lib/functions/system.sh
. /lib/upgrade/nand.sh
ath10k_caldata_die() {
echo "ath10k caldata: " "$*"
exit 1
}
ath10k_caldata_extract_ubi() {
local part=$1
local offset=$2
local count=$3
local ubidev=$(nand_find_ubi $CI_UBIPART)
local ubi
ubi=$(nand_find_volume $ubidev $part)
[ -n "$ubi" ] || \
ath10k_caldata_die "no UBI volume found for $part"
dd if=/dev/$ubi of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \
ath10k_caldata_die "failed to extract from $ubi"
}
ath10k_caldata_set_macaddr() { ath10k_caldata_set_macaddr() {
local macaddr=$1 local macaddr=$1
@ -39,11 +17,11 @@ case "$FIRMWARE" in
board=$(board_name) board=$(board_name)
case $board in case $board in
bt,homehub-v5a) bt,homehub-v5a)
ath10k_caldata_extract_ubi "caldata" 20480 2116 caldata_extract_ubi "caldata" 0x5000 0x844
ath10k_caldata_set_macaddr $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) +3) ath10k_caldata_set_macaddr $(macaddr_add $(mtd_get_mac_binary_ubi caldata 0x110c) +3)
;; ;;
*) *)
ath10k_caldata_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

36
target/linux/lantiq/base-files/etc/hotplug.d/firmware/12-ath9k-eeprom
View file

@ -3,15 +3,9 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions.sh . /lib/functions/caldata.sh
. /lib/functions/system.sh
. /lib/upgrade/nand.sh . /lib/upgrade/nand.sh
ath9k_eeprom_die() {
echo "ath9k eeprom: $*"
exit 1
}
ath9k_eeprom_extract_raw() { ath9k_eeprom_extract_raw() {
local source=$1 local source=$1
local offset=$(($2)) local offset=$(($2))
@ -28,25 +22,7 @@ ath9k_eeprom_extract_raw() {
fi fi
dd if=$source of=/lib/firmware/$FIRMWARE bs=$bs skip=$offset count=$size $conv 2>/dev/null || \ dd if=$source of=/lib/firmware/$FIRMWARE bs=$bs skip=$offset count=$size $conv 2>/dev/null || \
ath9k_eeprom_die "failed to extract from $mtd" caldata_die "failed to extract from $mtd"
}
ath9k_eeprom_extract_reverse() {
local part=$1
local offset=$2
local count=$(($3))
local mtd
local reversed
local caldata
mtd=$(find_mtd_chardev "$part")
reversed=$(hexdump -v -s $offset -n $count -e '/1 "%02x "' $mtd)
for byte in $reversed; do
caldata="\x${byte}${caldata}"
done
printf "%b" "$caldata" > /lib/firmware/$FIRMWARE
} }
ath9k_eeprom_extract() { ath9k_eeprom_extract() {
@ -57,7 +33,7 @@ ath9k_eeprom_extract() {
mtd=$(find_mtd_chardev $part) mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || \ [ -n "$mtd" ] || \
ath9k_eeprom_die "no mtd device found for partition $part" caldata_die "no mtd device found for partition $part"
ath9k_eeprom_extract_raw $mtd $offset $swap ath9k_eeprom_extract_raw $mtd $offset $swap
} }
@ -71,7 +47,7 @@ ath9k_ubi_eeprom_extract() {
ubi=$(nand_find_volume $ubidev $part) ubi=$(nand_find_volume $ubidev $part)
[ -n "$ubi" ] || \ [ -n "$ubi" ] || \
ath9k_eeprom_die "no UBI volume found for $part" caldata_die "no UBI volume found for $part"
ath9k_eeprom_extract_raw /dev/$ubi $offset $swap ath9k_eeprom_extract_raw /dev/$ubi $offset $swap
} }
@ -143,7 +119,7 @@ case "$FIRMWARE" in
avm,fritz3370-rev2-hynix|\ avm,fritz3370-rev2-hynix|\
avm,fritz3370-rev2-micron|\ avm,fritz3370-rev2-micron|\
avm,fritz7362sl) avm,fritz7362sl)
ath9k_eeprom_extract_reverse "urlader" 0x1541 0x440 caldata_extract_reverse "urlader" 0x1541 0x440
;; ;;
avm,fritz7312|avm,fritz7320|avm,fritz7360sl) avm,fritz7312|avm,fritz7320|avm,fritz7360sl)
ath9k_eeprom_extract "urlader" 0x985 0 ath9k_eeprom_extract "urlader" 0x985 0
@ -155,7 +131,7 @@ case "$FIRMWARE" in
ath9k_eeprom_extract "boardconfig" 0x21000 0 ath9k_eeprom_extract "boardconfig" 0x21000 0
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

36
target/linux/mpc85xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View file

@ -1,25 +1,8 @@
#!/bin/sh #!/bin/sh
FW_FILE="/lib/firmware/$FIRMWARE" [ -e /lib/firmware/$FIRMWARE ] && exit 0
ath9k_eeprom_die() { . /lib/functions/caldata.sh
echo "ath9k eeprom: " "$*" >&2
exit 1
}
ath9k_eeprom_extract() {
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_chardev $part)
[ -n "$mtd" ] || \
ath9k_eeprom_die "no mtd device found for partition $part"
dd if=$mtd bs=$offset skip=1 count=1 2>/dev/null | dd of=$FW_FILE bs=$count count=1 2>/dev/null || \
ath9k_eeprom_die "failed to extract from $mtd"
}
tpl_set_wireless_mac() tpl_set_wireless_mac()
{ {
@ -29,25 +12,20 @@ tpl_set_wireless_mac()
mac=$(mtd_get_mac_binary u-boot 0x4fc00) mac=$(mtd_get_mac_binary u-boot 0x4fc00)
mac=$(macaddr_add $mac $offset) mac=$(macaddr_add $mac $offset)
macaddr_2bin $mac | dd bs=1 count=6 seek=2 conv=notrunc of=$FW_FILE 2>/dev/null macaddr_2bin $mac | dd bs=1 count=6 seek=2 conv=notrunc of=/lib/firmware/$FIRMWARE 2>/dev/null
} }
[ -e $FW_FILE ] && exit 0
. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name) board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
"pci_wmac0.eeprom") "pci_wmac0.eeprom")
case $board in case $board in
tplink,tl-wdr4900-v1) tplink,tl-wdr4900-v1)
ath9k_eeprom_extract "caldata" 0x1000 0x800 caldata_extract "caldata" 0x1000 0x800
tpl_set_wireless_mac 0 tpl_set_wireless_mac 0
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;
@ -55,11 +33,11 @@ case "$FIRMWARE" in
"pci_wmac1.eeprom") "pci_wmac1.eeprom")
case $board in case $board in
tplink,tl-wdr4900-v1) tplink,tl-wdr4900-v1)
ath9k_eeprom_extract "caldata" 0x5000 0x800 caldata_extract "caldata" 0x5000 0x800
tpl_set_wireless_mac -1 tpl_set_wireless_mac -1
;; ;;
*) *)
ath9k_eeprom_die "board $board is not supported yet" caldata_die "board $board is not supported yet"
;; ;;
esac esac
;; ;;

37
target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
View file

@ -1,23 +1,8 @@
#!/bin/sh #!/bin/sh
rt2x00_eeprom_die() { [ -e /lib/firmware/$FIRMWARE ] && exit 0
echo "rt2x00 eeprom: " "$*"
exit 1
}
rt2x00_eeprom_extract() { . /lib/functions/caldata.sh
local part=$1
local offset=$(($2))
local count=$(($3))
local mtd
mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \
rt2x00_eeprom_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 || \
rt2x00_eeprom_die "failed to extract from $mtd"
}
jboot_eeprom_extract() { jboot_eeprom_extract() {
local part=$1 local part=$1
@ -26,29 +11,23 @@ jboot_eeprom_extract() {
mtd=$(find_mtd_part $part) mtd=$(find_mtd_part $part)
[ -n "$mtd" ] || \ [ -n "$mtd" ] || \
rt2x00_eeprom_die "no mtd device found for partition $part" caldata_die "no mtd device found for partition $part"
jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE 2>/dev/null || \ jboot_config_read -i $mtd -o $offset -e /lib/firmware/$FIRMWARE 2>/dev/null || \
rt2x00_eeprom_die "failed to extract from $mtd" caldata_die "failed to extract from $mtd"
} }
rt2x00_eeprom_set_macaddr() { rt2x00_eeprom_set_macaddr() {
local macaddr=$1 local macaddr=$1
[ -n "$macaddr" ] || \ [ -n "$macaddr" ] || \
rt2x00_eeprom_die "invalid wlan mac address" caldata_die "invalid wlan mac address"
macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \ macaddr_2bin $macaddr | dd of=/lib/firmware/$FIRMWARE \
conv=notrunc oflag=seek_bytes bs=6 seek=4 count=1 2>/dev/null || \ conv=notrunc oflag=seek_bytes bs=6 seek=4 count=1 2>/dev/null || \
rt2x00_eeprom_die "failed to write mac address to eeprom file" caldata_die "failed to write mac address to eeprom file"
} }
FW="/lib/firmware/$FIRMWARE"
[ -e "$FW" ] && exit 0
. /lib/functions.sh
. /lib/functions/system.sh
board=$(board_name) board=$(board_name)
case "$FIRMWARE" in case "$FIRMWARE" in
@ -68,11 +47,11 @@ case "$FIRMWARE" in
;; ;;
dovado,tiny-ac) dovado,tiny-ac)
wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR) wifi_mac=$(mtd_get_mac_ascii u-boot-env INIC_MAC_ADDR)
rt2x00_eeprom_extract "factory" 0x0 0x200 caldata_extract "factory" 0x0 0x200
rt2x00_eeprom_set_macaddr $wifi_mac rt2x00_eeprom_set_macaddr $wifi_mac
;; ;;
*) *)
rt2x00_eeprom_die "Please define mtd-eeprom in $board DTS file!" caldata_die "Please define mtd-eeprom in $board DTS file!"
;; ;;
esac esac
;; ;;