diff options
| author | John Crispin <blogic@openwrt.org> | 2015-07-07 13:47:57 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-07-07 13:47:57 +0000 |
| commit | 53434afeed4a4f873eb7d66cc120a5473c289c40 (patch) | |
| tree | cd38b65a189e3f9fd280d564669132c4a486a2eb /target/linux/ar71xx/base-files/etc/hotplug.d | |
| parent | 6a6663dc27f27e88bcd345a3d02efa524bdb07bc (diff) | |
| download | master-187ad058-53434afeed4a4f873eb7d66cc120a5473c289c40.tar.gz master-187ad058-53434afeed4a4f873eb7d66cc120a5473c289c40.tar.bz2 master-187ad058-53434afeed4a4f873eb7d66cc120a5473c289c40.zip | |
ar71xx: Unify ath10k calibration data loading
Currently one board uses the "proper" way of providing firmware
with the name ath10k/cal-pci-<pci address>.bin, whereas other
boards patch board.bin template in preinit and rely on a custom
ath10k patch to use calibration data from the template.
This patch makes all boards use the first method.
Signed-off-by: Matti Laakso <malaakso@elisanet.fi>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46244 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/base-files/etc/hotplug.d')
| -rw-r--r-- | target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 61 |
1 files changed, 49 insertions, 12 deletions
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 164d3abd39..50f7425128 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -8,38 +8,75 @@ ath10kcal_die() { ath10kcal_from_file() { local source=$1 local offset=$2 - local target=$3 + local count=$3 - dd if=$source of=$target bs=1 skip=$offset count=2116 2>/dev/null || \ + 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() { + local mac=$1 + + [ -z "$mac" ] && return + + macaddr_2bin $mac | dd of=/lib/firmware/$FIRMWARE conv=notrunc bs=1 seek=6 count=6 +} + [ -e /lib/firmware/$FIRMWARE ] && exit 0 . /lib/ar71xx.sh . /lib/functions.sh . /lib/functions/system.sh -ath10kcal_mac="" -ath10kcal_tmp="/tmp/ath10k-caldata.bin" - board=$(ar71xx_board_name) case "$FIRMWARE" in +"ath10k/cal-pci-0000:00:00.0.bin") + case $board in + mc-mac1200r) + ath10kcal_extract "art" 20480 2116 + ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1) + ;; + r6100) + ath10kcal_extract "caldata" 20480 2116 + ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) +2) + ;; + qihoo-c301) + ath10kcal_extract "radiocfg" 20480 2116 + ath10kcal_patch_mac $(mtd_get_mac_ascii devdata wlan5mac) + ;; + esac + ;; "ath10k/cal-pci-0000:01:00.0.bin") case $board in + archer-c5 | \ + archer-c7) + ath10kcal_extract "art" 20480 2116 + ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2) + ;; + nbg6716) + ath10kcal_extract "RFdata" 20480 2116 + ;; rb-911g-5hpacd) - ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 $ath10kcal_tmp + ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 2116 ;; esac ;; - *) exit 1 ;; esac - -[ -f $ath10kcal_tmp ] && { - cp $ath10kcal_tmp /lib/firmware/$FIRMWARE - rm -f $ath10kcal_tmp -} |