treewide: convert WiFi caldata size and offset to hexadecimal

[openwrt/openwrt.git] / target / linux / ipq40xx / base-files / etc / hotplug.d / firmware / 11-ath10k-caldata

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 59a809e792a7496255ac4ab88751907a2d8904ae..456017e30ba26be15d13bee2d27b016501caccb5 100644 (file)
--- 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
@@ -23,22 +23,22 @@ ath10kcal_die() {
 
 ath10kcal_extract() {
        local part=$1
-       local offset=$2
-       local count=$3
+       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 || \
+       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 offset=$(($2))
+       local count=$(($3))
        local ubidev
        local ubi
 
@@ -49,7 +49,7 @@ ath10kcal_ubi_extract() {
        [ -n "$ubi" ] || \
                ath10kcal_die "no UBI volume found for $part"
 
-       dd if=/dev/$ubi of=/lib/firmware/$FIRMWARE bs=1 skip=$offset count=$count 2>/dev/null || \
+       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"
 }
 
@@ -93,66 +93,90 @@ ath10kcal_is_caldata_valid() {
 
 board=$(board_name)
 
-
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:01:00.0.bin")
        case "$board" in
        meraki,mr33)
-               ath10kcal_ubi_extract "ART" 36864 2116
-               ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART" 36864 2116
-               ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 102) +1)
+               ath10kcal_ubi_extract "ART" 0x9000 0x844
+               ath10kcal_is_caldata_valid "4408" || ath10kcal_extract "ART" 0x9000 0x844
+               ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1)
                ;;
        esac
        ;;
 "ath10k/pre-cal-pci-0000:01:00.0.bin")
        case "$board" in
        asus,map-ac2200)
-               ath10kcal_ubi_extract "Factory" 36864 12064
+               ath10kcal_ubi_extract "Factory" 0x9000 0x2f20
                ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
                        /lib/firmware/ath10k/QCA9888/hw2.0/board.bin
                ;;
+       avm,fritzrepeater-3000)
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3D000 -e 0x212 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
+               ;;
+       linksys,ea8300)
+               ath10kcal_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" 36864 12064
+               ath10kcal_extract "0:ART" 0x9000 0x2f20
                ;;
        esac
        ;;
 "ath10k/pre-cal-ahb-a000000.wifi.bin")
        case "$board" in
        8dev,jalapeno |\
+       alfa-network,ap120c-ac |\
        glinet,gl-b1300 |\
        linksys,ea6350v3 |\
        qcom,ap-dk01.1-c1)
-               ath10kcal_extract "ART" 4096 12064
+               ath10kcal_extract "ART" 0x1000 0x2f20
                ;;
        asus,map-ac2200)
-               ath10kcal_ubi_extract "Factory" 4096 12064
+               ath10kcal_ubi_extract "Factory" 0x1000 0x2f20
                ;;
        asus,rt-ac58u)
                CI_UBIPART=UBI_DEV
-               ath10kcal_ubi_extract "Factory" 4096 12064
+               ath10kcal_ubi_extract "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")
                ;;
-       meraki,mr33)
-               ath10kcal_ubi_extract "ART" 4096 12064
-               ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 4096 12064
-               ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 102) +2)
-               ;;
-       netgear,ex6100v2 |\
-       netgear,ex6150v2)
-               ath10kcal_extract "ART" 4096 12064
-               ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0)
+       avm,fritzbox-7530 |\
+       avm,fritzrepeater-3000)
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3C000 -e 0x207 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
                ;;
        compex,wpj428 |\
        engenius,eap1300 |\
        openmesh,a42 |\
-       openmesh,a62)
-               ath10kcal_extract "0:ART" 4096 12064
+       openmesh,a62 |\
+       qxwlan,e2600ac-c1 |\
+       qxwlan,e2600ac-c2)
+               ath10kcal_extract "0:ART" 0x1000 0x2f20
+               ;;
+       engenius,ens620ext)
+               ath10kcal_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
+               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
+               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
+               ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0x0)
                ;;
        zyxel,nbg6617 |\
        zyxel,wre6606)
-               ath10kcal_extract "ART" 4096 12064
+               ath10kcal_extract "ART" 0x1000 0x2f20
                ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
                ;;
        esac
@@ -160,40 +184,56 @@ case "$FIRMWARE" in
 "ath10k/pre-cal-ahb-a800000.wifi.bin")
        case "$board" in
        8dev,jalapeno |\
+       alfa-network,ap120c-ac |\
        glinet,gl-b1300 |\
        linksys,ea6350v3 |\
        qcom,ap-dk01.1-c1)
-               ath10kcal_extract "ART" 20480 12064
+               ath10kcal_extract "ART" 0x5000 0x2f20
                ;;
        asus,map-ac2200)
-               ath10kcal_ubi_extract "Factory" 20480 12064
+               ath10kcal_ubi_extract "Factory" 0x5000 0x2f20
                ;;
        asus,rt-ac58u)
                CI_UBIPART=UBI_DEV
-               ath10kcal_ubi_extract "Factory" 20480 12064
+               ath10kcal_ubi_extract "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")
                ;;
-       meraki,mr33)
-               ath10kcal_ubi_extract "ART" 20480 12064
-               ath10kcal_is_caldata_valid "202f" || ath10kcal_extract "ART" 20480 12064
-               ath10kcal_patch_mac_crc $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 102) +3)
-               ;;
-       netgear,ex6100v2 |\
-       netgear,ex6150v2)
-               ath10kcal_extract "ART" 20480 12064
-               ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 12)
+       avm,fritzbox-7530 |\
+       avm,fritzrepeater-3000)
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader0") || \
+               /usr/bin/fritz_cal_extract -i 1 -s 0x3C800 -e 0x208 -l 12064 -o /lib/firmware/$FIRMWARE $(find_mtd_chardev "urlader1")
                ;;
        compex,wpj428 |\
        engenius,eap1300 |\
        openmesh,a42 |\
-       openmesh,a62)
-               ath10kcal_extract "0:ART" 20480 12064
+       openmesh,a62 |\
+       qxwlan,e2600ac-c1 |\
+       qxwlan,e2600ac-c2)
+               ath10kcal_extract "0:ART" 0x5000 0x2f20
+               ;;
+       engenius,ens620ext)
+               ath10kcal_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
+               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
+               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
+               ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0xc)
                ;;
        zyxel,nbg6617 |\
        zyxel,wre6606)
-               ath10kcal_extract "ART" 20480 12064
+               ath10kcal_extract "ART" 0x5000 0x2f20
                ath10kcal_patch_mac_crc $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
                ;;
        esac