ar71xx: backport ath10k firmware loading from trunk (as of r48711)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48825 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Felix Fietkau
2016-02-29 20:02:36 +00:00
parent 8a889cd632
commit 6a867d4368
3 changed files with 71 additions and 100 deletions

View File

@@ -8,50 +8,96 @@ 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:01:00.0.bin")
case $board in
rb-911g-5hpacd)
ath10kcal_from_file "/sys/firmware/routerboot/ext_wlan_data" 20480 $ath10kcal_tmp
;;
esac
;;
"ath10k/cal-pci-0000:00:00.0.bin")
case $board in
dlan-pro-1200-ac)
ath10kcal_from_file $(find_mtd_part "art") 20480 $ath10kcal_tmp
ath10kcal_extract "art" 20480 2116
;;
mc-mac1200r)
ath10kcal_extract "art" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -1)
;;
tl-wdr6500-v2)
ath10kcal_extract "art" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
;;
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)
;;
esr1750 | \
epg5000)
ath10kcal_from_file $(find_mtd_part "caldata") 20480 $ath10kcal_tmp
ath10kcal_extract "caldata" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
;;
mr1750)
ath10kcal_extract "ART" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
;;
unifiac)
ath10kcal_extract "EEPROM" 20480 2116
;;
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)
;;
nbg6616 | \
nbg6716)
ath10kcal_extract "RFdata" 20480 2116
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
;;
rb-911g-5hpacd)
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
}

View File

@@ -1,75 +0,0 @@
#!/bin/sh
. /lib/functions/system.sh
. /lib/ar71xx.sh
do_load_ath10k_board_bin() {
# load board.bin
case $(ar71xx_board_name) in
nbg6716)
dd if=/dev/mtdblock2 \
bs=1 skip=20480 count=2116 \
of=/tmp/ath10k-board.bin
;;
archer-c5 | \
archer-c7)
local mac
mac=$(macaddr_add $(cat /sys/class/net/eth1/address) -2)
dd if=/dev/mtdblock4 \
bs=1 skip=20480 count=6 \
of=/tmp/ath10k-board.bin
macaddr_2bin $mac >> /tmp/ath10k-board.bin
dd if=/dev/mtdblock4 \
bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
;;
mc-mac1200r)
local mac
mac=$(macaddr_add $(cat /sys/class/net/eth1/address) -1)
dd if=/dev/mtdblock4 \
bs=1 skip=20480 count=6 \
of=/tmp/ath10k-board.bin
macaddr_2bin $mac >> /tmp/ath10k-board.bin
dd if=/dev/mtdblock4 \
bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
;;
r6100)
local mac
mac=$(macaddr_add $(cat /sys/class/net/eth1/address) +2)
dd if=/dev/mtdblock2 \
bs=1 skip=20480 count=6 \
of=/tmp/ath10k-board.bin
macaddr_2bin $mac >> /tmp/ath10k-board.bin
dd if=/dev/mtdblock2 \
bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
;;
qihoo-c301)
local mac
mac=$(mtd_get_mac_ascii devdata wlan5mac)
if [ -z "$mac" ]; then
mac=$(macaddr_add $(cat /sys/class/net/eth0/address) -2)
fi
dd if=/dev/mtdblock10 \
bs=1 skip=20480 count=6 \
of=/tmp/ath10k-board.bin
macaddr_2bin $mac >> /tmp/ath10k-board.bin
dd if=/dev/mtdblock10 \
bs=1 skip=20492 count=2104 >> /tmp/ath10k-board.bin
;;
esac
[ -f /tmp/ath10k-board.bin ] || {
return
}
cmp -s /tmp/ath10k-board.bin /lib/firmware/ath10k/QCA988X/hw2.0/board.bin || {
cp /tmp/ath10k-board.bin /lib/firmware/ath10k/QCA988X/hw2.0/board.bin
rm /tmp/ath10k-board.bin
}
}
boot_hook_add preinit_main do_load_ath10k_board_bin

View File

@@ -5,14 +5,14 @@
do_patch_ath10k_firmware() {
local firmware_file="/lib/firmware/ath10k/QCA988X/hw2.0/firmware-4.bin"
local firmware_file="/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin"
# bail out if firmware does not exist
[ -f "$firmware_file" ] || {
return
}
local firmware_md5_orig="ab36ef267d15cfc02317ceeb38e8f548"
local firmware_md5_orig="fcb2fbd42d73a63fbf603505c718cbde"
local firmware_md5_current="$(md5sum $firmware_file)"
local firmware_md5_current="${firmware_md5_current%% *}"
@@ -23,7 +23,7 @@ do_patch_ath10k_firmware() {
# some boards have bogus mac in otp, patch the default mac in the firmware
case $(ar71xx_board_name) in
dgl-5500-a1)
dgl-5500-a1 | tew-823dru)
local mac
mac=$(mtd_get_mac_ascii nvram wlan1_mac)
@@ -42,7 +42,7 @@ do_patch_ath10k_firmware() {
check_patch_ath10k_firmware() {
case $(ar71xx_board_name) in
dgl-5500-a1)
dgl-5500-a1 | tew-823dru)
do_patch_ath10k_firmware
;;
esac