ipq40xx: dynamically build board-2.bin for Mikrotik

Mikrotik devices ship with the boardfile data right on the board itself.
This script takes the data from the sysfs firmware "wlan_data" to
generate a custom board-2.bin for the ath10k driver to work with.

The qcom,ath10k-calibration-variant in each device's device-tree file
are being removed as well.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

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 2c56e53f9cd212b4a689b8f2cb88c424091dbf42..57c8d7a610ced7b4dc195ed14708ee58dbfa467c 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
@@ -6,6 +6,46 @@
 
 board=$(board_name)
 
+board2_add_entry()
+{
+       local file="$1"
+       local offset="$(($2))"
+       local size="$(($3))"
+
+       local id=$(dd iflag=skip_bytes if="$file" bs=1 count=1 skip=$((offset+32)) | hexdump -e '1/1 "%02d"')
+
+       # Qualcomm IDs are in the range of 16 to 30 it seems - taken from the board-2.bin
+       # This is there to skip the missing 2G on the SXTSQ 5 AC
+       [ "$id" -ge 16 -a "$id" -le 30 ] || return 0
+
+       printf "\x00\x00\x00\x00\x58\x2f\x00\x00\x00\x00\x00\x00\x25\x00\x00\x00"
+       printf "bus=ahb,bmi-chip-id=0,bmi-board-id=${id}\x00\x00\x00"
+       printf "\x01\x00\x00\x00\x20\x2f\x00\x00"
+
+       dd iflag=skip_bytes,fullblock if="$file" bs="$size" count=1 skip="$offset" >> "/lib/firmware/$FIRMWARE"
+}
+
+board2_create_for_mikrotik()
+{
+       wlan_data="/sys/firmware/mikrotik/hard_config/wlan_data"
+
+       [ -f "$wlan_data" ] && {
+               (
+                       printf "QCA-ATH10K-BOARD\x00\x00\x00\x00"
+                       board2_add_entry "$wlan_data" 0x2f20 0x2f20
+                       board2_add_entry "$wlan_data" 0xaf20 0x2f20
+               ) >> "/lib/firmware/$FIRMWARE"
+       } || true
+
+       [ -d "$wlan_data" ] && {
+               (
+                       printf "QCA-ATH10K-BOARD\x00\x00\x00\x00"
+                       board2_add_entry "$wlan_data/data_0" 0x2f20 0x2f20
+                       board2_add_entry "$wlan_data/data_2" 0x2f20 0x2f20
+               ) >> "/lib/firmware/$FIRMWARE"
+       } || true
+}
+
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:01:00.0.bin")
        case "$board" in
@@ -213,6 +253,16 @@ case "$FIRMWARE" in
                ;;
        esac
        ;;
+"ath10k/QCA4019/hw1.0/board-2.bin")
+case "$board" in
+       mikrotik,cap-ac |\
+       mikrotik,hap-ac2 |\
+       mikrotik,hap-ac3 |\
+       mikrotik,sxtsq-5-ac)
+               board2_create_for_mikrotik
+               ;;
+       esac
+       ;;
 *)
        exit 1
        ;;

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
index 1afbf97f393be42dc3ae8562d216c94cd1e9babb..3ebcb3ba5fb154b507fe844f271550304be717c2 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-cap-ac.dts
@@ -239,12 +239,8 @@
 
 &wifi0 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-cAP-ac";
 };
 
 &wifi1 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-cAP-ac";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
index d03409b556efca1bbaf6e5813262f20baedc9623..829028b5278c7585dcb97f801b960be2ac814ed9 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-hap-ac2.dts
@@ -262,12 +262,8 @@
 
 &wifi0 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-hAP-ac2";
 };
 
 &wifi1 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-hAP-ac2";
 };

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
index fd11229dbb531f4b8650e0c76146bde4e3e09143..f7772951772bf78407a5c63947770d2b91514197 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-sxtsq-5-ac.dts
@@ -225,8 +225,6 @@
 
 &wifi1 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-SXTsq-5-ac";
 };
 
 &gmac0 {

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
index 9aa58ffcb460681937e0964e072b6c9b3889f8cc..ebf169d0321b67d7d3af8cbe68b0c73e195a57f3 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-hap-ac3.dts
@@ -317,12 +317,8 @@
 
 &wifi0 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-hAP-ac3";
 };
 
 &wifi1 {
        status = "okay";
-
-       qcom,ath10k-calibration-variant = "MikroTik-hAP-ac3";
 };