profiles: qca_ipq95xx: update Freedom to ATH 12.4.0 CS

* rename filenames due to generic subtarget introduction * wireless-freedom: add the configuration of static phy number and phy detection time * wireless-freedom: set vendor wireless uci only after the uci file is ready * mac80211-qca: attach guest vap to br-guest * mac80211-qca: disable ath12k cold_boot_cal * mac80211-qca: ath12k-validate data length before copying data * ipq95xx: Do not reset AQR PHY when booting * ipq95xx: update codebase to ATH12.4.0CS * aq_phy: Do not download AQR PHY firmware if it is ready by bootloader References: PCF-1176 Signed-off-by: Marvin Lu <marvin.lu@wnc.com.tw> Signed-off-by: Petr Štetiar <petr.stetiar@prplfoundation.org> [squash, commit facelift] (cherry picked from commit 776aa2bdd52bcbb9ef2dc3276f41a70a0db252a5)
2024-03-27 11:06:36 +08:00 · 2024-03-27 11:06:36 +08:00 · ab7a76517d
commit ab7a76517d
parent 8ef1f44672
7 changed files with 26 additions and 29 deletions
--- a/.gitlab/cdrouter/wnc-freedom.yml
+++ b/.gitlab/cdrouter/wnc-freedom.yml
@ -77,8 +77,8 @@ CDRouter-TR-069 Freedom eMMC:
  <<: *wnc_freedom
  variables:
    LABGRID_TARGET: wnc-freedom-emmc
-    TFTP_IMAGE_FILENAME: prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin
-    TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin/
+    TFTP_IMAGE_FILENAME: prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin
+    TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin/
    DUT_INIT_SCRIPTS: |
      .gitlab/scripts/dut-init/cdrouter-tr181-mockups.sh

--- a/.gitlab/release.yml
+++ b/.gitlab/release.yml
@ -53,13 +53,13 @@ upload:
    # qca_ipq95xx
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-        --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb \
-        ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb
+        --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb \
+        ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb

    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" \
-        --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin \
-        ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin
+        --upload-file bin/targets/ipq95xx/generic/prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin \
+        ${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin

 release:
  stage: release
@ -82,7 +82,7 @@ release:
        --assets-link "{\"name\":\"prpl Haze initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/prpl-haze/${prplos_version}/prplos-ipq807x-generic-prpl_haze-initramfs-uImage.itb\"}" \
        --assets-link "{\"name\":\"Turris Omnia sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-initramfs-kernel.bin\"}" \
        --assets-link "{\"name\":\"Turris Omnia initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/turris-omnia/${prplos_version}/prplos-mvebu-cortexa9-cznic_turris-omnia-sysupgrade.img.gz\"}" \
-        --assets-link "{\"name\":\"WNC Freedom sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin\"}" \
-        --assets-link "{\"name\":\"WNC Freedom initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb\"}" \
+        --assets-link "{\"name\":\"WNC Freedom sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin\"}" \
+        --assets-link "{\"name\":\"WNC Freedom initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/wnc-freedom/${prplos_version}/prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb\"}" \
        --assets-link "{\"name\":\"x86/64 sysupgrade\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-squashfs-combined-efi.img\"}" \
        --assets-link "{\"name\":\"x86/64 initramfs\",\"url\":\"${PACKAGE_REGISTRY_URL}/x86-64/${prplos_version}/prplos-x86-64-generic-initramfs-kernel.bin\"}"
--- a/.gitlab/testbed/wnc-freedom.yml
+++ b/.gitlab/testbed/wnc-freedom.yml
@ -9,7 +9,7 @@
    DUT_CPU_SUBTYPE: neon-vfpv4
    DUT_WAN_INTERFACE: wan
    LABGRID_TARGET: wnc-freedom-initramfs
-    TFTP_IMAGE_FILENAME: prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb
-    TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb/
+    TFTP_IMAGE_FILENAME: prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb
+    TFTP_IMAGE_FILENAME_PATTERN: /.*prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb/
  tags:
    - dut-wnc-freedom
--- a/.gitlab/tests/cram/wnc-freedom/010-network.t
+++ b/.gitlab/tests/cram/wnc-freedom/010-network.t
@ -26,10 +26,10 @@ Check correct interface setup:
   miireg: <> mtu 0 qdisc noop state DOWN mode DEFAULT group default qlen 1000
   teql0: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 100
   wan: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc htb state UP mode DEFAULT group default qlen 1000
-   wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 4096
-   wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 4096
-   wlan1.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 4096
-   wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc mq master br-lan state DOWN mode DEFAULT group default qlen 4096
-   wlan2.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 4096
-   wlan2.2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 4096
-   wlan2: <BROADCAST,MULTICAST> mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 4096
+   wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000
+   wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue master br-lan state DOWN mode DEFAULT group default qlen 1000
+   wlan1.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000
+   wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue master br-lan state DOWN mode DEFAULT group default qlen 1000
+   wlan2.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-lan state DOWN mode DEFAULT group default qlen 1000
+   wlan2.2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop master br-guest state DOWN mode DEFAULT group default qlen 1000
+   wlan2: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
--- a/.testbed/labgrid/default.yaml
+++ b/.testbed/labgrid/default.yaml
@ -303,7 +303,7 @@ targets:
        init_commands:
          - setenv serverip 10.0.0.1
          - setenv ipaddr 10.0.0.2
-        boot_command: tftpboot prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm
+        boot_command: tftpboot prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb && bootm
        boot_command_delay: 3
      UBootStrategy: {}

@ -328,7 +328,7 @@ targets:
          - setenv serverip 10.0.0.1
          - setenv ipaddr 10.0.0.2
          - sleep 5
-          - tftpboot 0x44000000 prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin
+          - tftpboot 0x44000000 prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin
          - setenv untar_addr_kernel; setenv untar_addr_root; echo
          - untar 0x$fileaddr 0x$filesize kernel root
          - if test -n $untar_addr_kernel; then flash "0:HLOS" 0x$untar_addr_kernel 0x$untar_size_kernel; else echo "kernel is not found"; fi
--- a/.testbed/labgrid/testbed-02.yaml
+++ b/.testbed/labgrid/testbed-02.yaml
@ -185,7 +185,7 @@ targets:
        init_commands:
          - setenv serverip 10.0.0.1
          - setenv ipaddr 10.0.0.2
-        boot_command: tftpboot prplos-ipq95xx-prpl_freedom-initramfs-uImage.itb && bootm
+        boot_command: tftpboot prplos-ipq95xx-generic-prpl_freedom-initramfs-uImage.itb && bootm
        boot_command_delay: 3
      UBootStrategy: {}

@ -215,7 +215,7 @@ targets:
          - setenv serverip 10.0.0.1
          - setenv ipaddr 10.0.0.2
          - sleep 5
-          - tftpboot 0x44000000 prplos-ipq95xx-prpl_freedom-squashfs-sysupgrade.bin
+          - tftpboot 0x44000000 prplos-ipq95xx-generic-prpl_freedom-squashfs-sysupgrade.bin
          - setenv untar_addr_kernel; setenv untar_addr_root; echo
          - untar 0x$fileaddr 0x$filesize kernel root
          - if test -n $untar_addr_kernel; then flash "0:HLOS" 0x$untar_addr_kernel 0x$untar_size_kernel; else echo "kernel is not found"; fi
--- a/profiles/qca_ipq95xx.yml
+++ b/profiles/qca_ipq95xx.yml
@ -8,19 +8,20 @@ description: Build image for prpl Foundation Freedom board
 feeds:
  - name: feed_qca
    uri: https://gitlab.com/prpl-foundation/prplOS/feed-qca.git
-    tracking_branch: dev/ath12.2.0csu1-ipq95xx
-    revision: c8db2f270349b8b4ade2d102cfd2e3cbde8cab3a
+    tracking_branch: dev/ath12.4.0cs-ipq95xx
+    revision: 318fab375046a075d4c461232a0dba424d55a7bc

 packages:
  - ipq95xx
  - wireless-regdb
-  - hostapd-utils-qca
+  - hostapd-qca-utils
  - ath12k-wifi-qcom-qcn92xx
  - ath12k-caldata
  - aq-fw-download
  - aq_phy
  - qca-ssdk-shell
  - io-expander-freedom
+  - wireless-freedom
  - mod-whm-qca-ipq95xx
  - kmod-usb-phy-ipq807x
  - kmod-usb-dwc3-internal
@ -29,13 +30,9 @@ packages:
  - kmod-usb-storage-extras
  - kmod-usb-storage-uas
  - kmod-fs-vfat
+  - kmod-telemetry-agent

 diffconfig: |
-  CONFIG_DEVEL=y
-  CONFIG_KERNEL_GIT_CLONE_URI="https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4.git"
-  CONFIG_KERNEL_GIT_REF="f2ee796db820c"
-  CONFIG_KERNEL_GIT_DEPTH=50
-  CONFIG_KERNEL_GIT_BRANCH="NHSS.QSDK.12.2.5"
  CONFIG_TARGET_INITRAMFS_COMPRESSION_LZMA=y
  CONFIG_BUSYBOX_CUSTOM=y
  CONFIG_BUSYBOX_CONFIG_I2CSET=y