projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
treewide: move calibration data extraction function to library
[openwrt/openwrt.git] / target / linux / ath79 / base-files / etc / hotplug.d / firmware / 11-ath10k-caldata
diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 421fb7d66c3b1c79207d8e0b99a9b0a2cec33cdc..878f6443abd7f7954df61e54f016f02cdf7461fc 100644 (file)
--- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -1,50 +1,9 @@
 #!/bin/sh
 
 #!/bin/sh
 
-. /lib/functions/k2t.sh
-
-# xor multiple hex values of the same length
-xor() {
-       local val
-       local ret="0x$1"
-       local retlen=${#1}
-
-       shift
-       while [ -n "$1" ]; do
-               val="0x$1"
-               ret=$((ret ^ val))
-               shift
-       done
-
-       printf "%0${retlen}x" "$ret"
-}
-
-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"
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
 
 
-       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"
-}
+. /lib/functions/caldata.sh
+. /lib/functions/k2t.sh
 
 ath10kcal_patch_mac() {
        local mac=$1
 
 ath10kcal_patch_mac() {
        local mac=$1
@@ -77,11 +36,6 @@ ath10kcal_patch_mac_crc() {
        }
 }
 
        }
 }
 
-[ -e /lib/firmware/$FIRMWARE ] && exit 0
-
-. /lib/functions.sh
-. /lib/functions/system.sh
-
 board=$(board_name)
 
 case "$FIRMWARE" in
 board=$(board_name)
 
 case "$FIRMWARE" in
@@ -90,7 +44,7 @@ case "$FIRMWARE" in
        comfast,cf-wr650ac-v1|\
        comfast,cf-wr650ac-v2|\
        yuncore,a770)
        comfast,cf-wr650ac-v1|\
        comfast,cf-wr650ac-v2|\
        yuncore,a770)
-               ath10kcal_extract "art" 0x5000 0x844
+               caldata_extract "art" 0x5000 0x844
                ;;
        devolo,dvl1200e|\
        devolo,dvl1200i|\
                ;;
        devolo,dvl1200e|\
        devolo,dvl1200i|\
@@ -98,53 +52,54 @@ case "$FIRMWARE" in
        devolo,dvl1750e|\
        devolo,dvl1750i|\
        devolo,dvl1750x)
        devolo,dvl1750e|\
        devolo,dvl1750i|\
        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)
                ;;
        dlink,dir-859-a1)
                ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary art 0x0) -1)
                ;;
        dlink,dir-859-a1)
-               ath10kcal_extract "art" 0x5000 0x844
+               caldata_extract "art" 0x5000 0x844
                ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
                ;;
        elecom,wrc-1750ghbk2-i)
                ath10kcal_patch_mac $(mtd_get_mac_ascii devdata "wlan5mac")
                ;;
        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)
                ;;
        engenius,epg5000|\
        iodata,wn-ac1167dgr|\
        iodata,wn-ac1600dgr2)
                ath10kcal_patch_mac $(mtd_get_mac_ascii u-boot-env athaddr)
                ;;
        engenius,epg5000|\
        iodata,wn-ac1167dgr|\
        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)
                ;;
        engenius,ews511ap)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
                ;;
        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-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)
                ;;
        glinet,gl-x750)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1)
                ;;
        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)
                ;;
        nec,wg800hp)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
                ;;
        nec,wg800hp)
-               ath10kcal_extract "art" 0x5000 0x844
+               caldata_extract "art" 0x5000 0x844
                ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880)
                ;;
        ocedo,koala|\
        ocedo,ursus)
                ath10kcal_patch_mac_crc $(mtd_get_mac_text board_data 0x880)
                ;;
        ocedo,koala|\
        ocedo,ursus)
-               ath10kcal_extract "art" 0x5000 0x844
+               caldata_extract "art" 0x5000 0x844
                ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc)
                ;;
        openmesh,om5p-ac-v2)
                ath10kcal_patch_mac $(mtd_get_mac_binary art 0xc)
                ;;
        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)
                ;;
        qihoo,c301)
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
                ;;
        qihoo,c301)
-               ath10kcal_extract "radiocfg" 0x5000 0x844
+               caldata_extract "radiocfg" 0x5000 0x844
                ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
                ;;
        tplink,archer-a7-v5|\
                ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
                ;;
        tplink,archer-a7-v5|\
@@ -152,29 +107,29 @@ case "$FIRMWARE" in
        tplink,archer-c7-v4|\
        tplink,archer-c7-v5|\
        tplink,archer-c25-v1)
        tplink,archer-c7-v4|\
        tplink,archer-c7-v5|\
        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)
                ;;
        tplink,archer-c5-v1|\
        tplink,archer-c7-v2)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) -1)
                ;;
        tplink,archer-c5-v1|\
        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)
                ;;
        tplink,archer-d50-v1)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x1fc00) -1)
                ;;
        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)
                ;;
        tplink,re350k-v1)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary romfile 0xf100) +2)
                ;;
        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)
                ;;
        tplink,re355-v1|\
        tplink,re450-v1)
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary config 0x10008) +2)
                ;;
        tplink,re355-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)
                ;;
        tplink,re450-v2)
                ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
                ;;
        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)
                ;;
        ubnt,unifiac-lite|\
                ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
                ;;
        ubnt,unifiac-lite|\
@@ -185,38 +140,46 @@ case "$FIRMWARE" in
        ubnt,nanostation-ac|\
        ubnt,nanostation-ac-loco|\
        ubnt,unifiac-pro)
        ubnt,nanostation-ac|\
        ubnt,nanostation-ac-loco|\
        ubnt,unifiac-pro)
-               ath10kcal_extract "EEPROM" 0x5000 0x844
+               caldata_extract "EEPROM" 0x5000 0x844
                ;;
        esac
        ;;
 "ath10k/pre-cal-pci-0000:00:00.0.bin")
        case $board in
                ;;
        esac
        ;;
 "ath10k/pre-cal-pci-0000:00:00.0.bin")
        case $board in
+       comfast,cf-e313ac)
+               caldata_extract "art" 0x5000 0x2f20
+               ath10kcal_patch_mac_crc $(mtd_get_mac_binary art 0x6)
+               ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
+                       /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
+               rm /lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin
+               ;;
        dlink,dir-842-c1|\
        dlink,dir-842-c2|\
        dlink,dir-842-c3|\
        nec,wg1200cr)
        dlink,dir-842-c1|\
        dlink,dir-842-c2|\
        dlink,dir-842-c3|\
        nec,wg1200cr)
-               ath10kcal_extract "art" 0x5000 0x2f20
+               caldata_extract "art" 0x5000 0x2f20
                ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
        netgear,ex6400|\
        netgear,ex7300)
                ath10kcal_patch_mac_crc $(mtd_get_mac_ascii devdata wlan5mac)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
        netgear,ex6400|\
        netgear,ex7300)
-               ath10kcal_extract "caldata" 0x5000 0x2f20
+               caldata_extract "caldata" 0x5000 0x2f20
                ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc)
                ;;
        phicomm,k2t)
                ath10kcal_patch_mac $(mtd_get_mac_binary caldata 0xc)
                ;;
        phicomm,k2t)
-               ath10kcal_extract "art" 0x5000 0x2f20
+               caldata_extract "art" 0x5000 0x2f20
                ath10kcal_patch_mac_crc $(k2t_get_mac "5g_mac")
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
        tplink,archer-c58-v1|\
        tplink,archer-c59-v1|\
                ath10kcal_patch_mac_crc $(k2t_get_mac "5g_mac")
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
        tplink,archer-c58-v1|\
        tplink,archer-c59-v1|\
+       tplink,archer-c59-v2|\
        tplink,archer-c60-v1|\
        tplink,archer-c60-v2|\
        tplink,archer-c6-v2)
        tplink,archer-c60-v1|\
        tplink,archer-c60-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)
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                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 \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
OpenWrt Source Repository