From patchwork Tue Mar 20 22:39:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 888468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oydctu3p"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 405SZQ5W08z9s0v for ; Wed, 21 Mar 2018 09:40:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kDPdGoJXJ0S4FOz4calStVcypd420w49bfMuID+4gAQ=; b=oydctu3p1c0dQe Qa+bUm5p0745KO7x3KG/ryDpDCOppPPGp4kzwcEMOGCdIOW2/e9JSMdq+yxrWv3HEOXKoJF5kZG/8 4Q5ZXhvFKfDkQEbItmBXFnJqwVfh/kToNCaRLNxlEsFEAdnvnK3ZEbhEYOzR9zY6HHXl7OJ6kV2Dy rJW7bSJuctV0vHh6munHwifk0uVLvOAGpk1+sP+wi3k8TyK5BDpS0dLIgL7rTBa5J/fu/iCilvWuV kFpQhDgD6Q0EuQ53ejVBLvUHZ9EgG7f1F/BeoLPJgnUB34miRQwfy5RdK4VzLFJ/sbrFryD9epbmM OQ4wHURK6Brdj2Q4gmuA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPvc-0001Jx-K8; Tue, 20 Mar 2018 22:40:24 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPvY-0000k5-PW for lede-dev@lists.infradead.org; Tue, 20 Mar 2018 22:40:22 +0000 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id 71A2B40A5C4; Tue, 20 Mar 2018 15:40:04 -0700 (PDT) From: greearb@candelatech.com To: lede-dev@lists.infradead.org Date: Tue, 20 Mar 2018 15:39:52 -0700 Message-Id: <1521585595-23155-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180320_154020_965969_78CF40F9 X-CRM114-Status: UNSURE ( 8.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Subject: [LEDE-DEV] [PATCH 1/4] ath10k-ct: Update DEPENDS and PROVIDES X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear Update DEPENDS and PROVIDES so that ath10k-ct firmware and drivers can be used to replace stock firmware and drivers. The -htt firmware variant, which requires ath10k-ct driver now selects ath10k-ct driver when the firmware is selected. Signed-off-by: Ben Greear --- NOTE: This patch series is meant to go on top of the pending 3 ath10k-ct patches that received verbal approval for inclusion today on IRC. package/firmware/ath10k-firmware/Makefile | 8 ++++++++ package/kernel/ath10k-ct/Makefile | 1 + 2 files changed, 9 insertions(+) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index 78d01d9..aa925a4 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -125,6 +125,7 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.1 firmware for QCA988x devices SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca988x endef define Package/ath10k-firmware-qca9887-ct @@ -132,6 +133,7 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.1 firmware for QCA9887 devices SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca9887 endef define Package/ath10k-firmware-qca988x-ct/description @@ -198,6 +200,7 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 firmware for QCA99x0 devices SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca99x0 endef define Package/ath10k-firmware-qca9984-ct @@ -205,6 +208,7 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 firmware for QCA9984 devices SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca9984 endef define Package/ath10k-firmware-qca4019-ct-htt @@ -212,12 +216,15 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9 SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca4019 + DEPENDS:=+kmod-ath10k-ct endef define Package/ath10k-firmware-qca4019-ct $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 firmware for QCA4018/9 SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca4019 endef define Package/ath10k-firmware-qca9888-ct @@ -225,6 +232,7 @@ $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 fw for QCA9886/8 devices SECTION:=firmware CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca9888 endef define Package/ath10k-firmware-qca9984 diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index 8f9a8dd..0e416aa 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -34,6 +34,7 @@ define KernelPackage/ath10k-ct $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \ $(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko AUTOLOAD:=$(call AutoProbe,mac80211 ath ath10k_pci) + PROVIDES:=kmod-ath10k endef NOSTDINC_FLAGS = \ From patchwork Tue Mar 20 22:39:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 888470 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="U0YI/XUh"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 405SZr4bmfz9s0v for ; Wed, 21 Mar 2018 09:41:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k0h8aqCA2aI+s/wYZoz+F8Z9GQCyw2VA74N1SztTci8=; b=U0YI/XUhs4qBJc IuJRSmtUL6P46nZxxePxKi24Y/WW53rtEZsOP4f4Lfz+QkFu1NNbTsZzjRb6VI8h3nR5Va01JV8o/ QEmqz4Q5TGkrxmxvDlkBZL1oOAb9z6zxVMZkeXceJ+V9SyQUcDOEmIDX/kpCD3T4VqVyqVWOghn8r 5rEKJtrvIbBqjxSbIADMwndKVq5ew6VOY7CnYrK7uAzZvDKOX5KbLGtktElcXrQjE0Q+7cnbdF5/L UIbxAm/tIouRJ78YWNeXc838JsH8JgHlN3rjcV9E7MB2hB0oiFP7pC3qs4GFoLITSxmTq5hVNtU63 uDhdpcLzmWv5ZJLtdjOg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPwB-0001kC-23; Tue, 20 Mar 2018 22:40:59 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPvY-0000wb-PX for lede-dev@lists.infradead.org; Tue, 20 Mar 2018 22:40:25 +0000 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id 99F1E40A5ED; Tue, 20 Mar 2018 15:40:04 -0700 (PDT) From: greearb@candelatech.com To: lede-dev@lists.infradead.org Date: Tue, 20 Mar 2018 15:39:54 -0700 Message-Id: <1521585595-23155-3-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1521585595-23155-1-git-send-email-greearb@candelatech.com> References: <1521585595-23155-1-git-send-email-greearb@candelatech.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180320_154020_979566_55443522 X-CRM114-Status: GOOD ( 23.64 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Subject: [LEDE-DEV] [PATCH 3/4] ath10k-ct: Update wave-1 and wave-2 firmware to latest. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear This updates to latest ath10k-ct firmware. Hopefully we are at the end of the development cycle for this firmware release, so these should be stable. wave-1 changes since last release: Release 20 * Allow flushing peer when deleting. Hopefully this will allow the peer delete command to happen in a reasonable amount of time even if the RF environment is busy (or peer has died). To enable this, set the high flag in the mac-addr second word in the ath10k driver near end of the ath10k_wmi_op_gen_peer_delete method: cmd->peer_macaddr.word1 |= __cpu_to_le32(0x80000000); * Attempt to fix crash seen in resmgr-ocs, appearantly due to list corruption. Use a temporary list instead of trying to rely on for-each-safe. * Add flag to tx-descriptor to allow driver to request no-ack on data frames. This is bit 15 on the flag1 field (previously un-used). * Add option to support specifying the tx-rate-code and retry count on a per-packet basis. Only a single series is supported at this time. Useful mainly for radiotap monitor-tx type testing at this point. * Fix crash on startup when chip is at -40 deg C and calibration fails. Instead of asserting, just keep retrying calibration, which appears to start working after a few minutes (when the chip warms up). * Allow reporting per-chain rssi for management frames. We pack the values into empty space in the mgt-frame wmi header. This will only be enabled if the driver requests it, since otherwise the driver is assumed to not understand the new API. ath10k-ct drivers that support this feature will automatically enable it. * A customer reports a case that appears to be the hardware not properly detecting end of AMPDU, so frames were being mis-delivered to the wrong peer. Attempt to work around this, and in doing so, clean up a bunch of void* abuse in the block-ack reordering code (could not ever confirm there was a problem in this area). * Re-work the rx-mem logic to be less complicated and to use less memory. * Attempt to fix crash that appearanty happens because the driver can sometimes delete a vdev in 'up' state. * Attempt to fix hung scan state machine issues. * Fix crash in tx path due to un-initialized memory. wave-2 changes since last release: Release 10 * Fix an assert related to tx scheduling. This hopefully fixes what appears to be a regression that I added some time back. * Enable CSI reporting for 9984, and maybe 9888/9886. Only in non-trimmed builds. * Other stability improvements, including regression fixes from some tricky bugs introduced in earlier releases. * Allow compiling for IPQ4019 chipset. * Firmware will now send txbf frames to the host (driver) if the TXBF (0xF00000001) set-special feature is enabled, or when the radio is in monitor mode. But, if the frame is consumed by the txbf_cv logic, then the pkt cannot be delivered to the host in this manner. Instead, a WMI event will be sent and host can find the txbf_cv data in shared memory. See ath10k_wmi_event_txbf_cv_mesg() in ath10k-ct driver. * Support rx-all-mgt option. When enabled, the firmware will deliver all management frames that it can to the host. No RX filters are changed when this option is enabled. * Fix at least some problems with sending tx-beamforming frames to SU-MIMO peers. Looks like this was a regression in my code. * Fix a crash in rate-ctrl due to nss mismatch. This was something I introduced while trying to fix other bugs in rate-ctrl some time back. * Attempt to fix a sw-peer-key object leak in IBSS mode. The peer key code is very complex, and shares some pointers as union members. I think I fixed at least some of the issues, but would not be surprised if more exist. * Improve ath10k user guide to document CT firmware features: https://www.candelatech.com/ath10k-ug.php * Add ct-special option to configure the txbf sounding time. See ath10k-ug.php * Fix and allow the driver to tell the firmware to send sounding frames. See ath10k-ug.php In further testing, this seems to fail much of the time, and I am not sure why. Disabling this in diet (trimmed) builds. * Fix crashes related to deleting peers while they are in power-save mode. Reported by LEDE user on r7800 with 9984 NIC. * Make rate-ctrl txbf probe work better. If enabled, the rate-ctrl logic will periodically send out probes at an NSS that can to txbf. Previously, txbf probes would not reliably happen if both AP and peer had the same nss (ie, 2x2 talking to 2x2). To enable this feature, you need to enable the fwtest-cmdid number 20. * Report rx-timeout error counters. These were previously un-reported, though the field existed in the wmi struct already. * txbf: Ignore frames not destined for us. If NIC is in promisc mode, it could acquire and process NDPA frames that were not destined for it. Check the dest-MAC and ignore frames not for us (pass them up the stack for monitor mode instead of save them in the peer's rate-ctrl logic.) * Port ping-pong crash handling and othe related features to IPQ4019 target. It should now act similar to 9984 in this regard. * Fix a few asserts related to txbf and tx-seq logic. * Add custom-stats support, for rx-reorder-stats. Similar to what I did for wave-1. * Disable AMSDU for IBSS. This now matches what I did for peregrine. It seems to work better this way, though I did not debug it in detail. * Enable the set-special command to re-enable AMSDU for IBSS if user wants to experiment. * Fix bug where dbglog did not disable IRQs, so if you made dbglog messages from the IRQ handler, it could cause corruption that could crash the firmware and/or corrupt the log message buffers. * Don't assert if there are no buffer descriptors for RX of non-data frame. * Retry any stuck block-ack sessions every 20 seconds instead of just disabling BA for ever when we get too many failures. * Fix SGI flag when reporting tx-rate info. The flag moved since wave-1 days, and I did not notice that when I ported my changes forward to wave-2. * Allow disabling special CCA handling for IBSS txqs. Earlier testing indicated this might improve throughput in some testing on 9984 chips in IBSS mode, but subsequent testing looks about the same without it. Since I do not really understand what this setting exists for, leave it at upstream defaults. A new set-special API command (0x12) can be used to enable this hack for testing. Setting 0x1 bit disables special CCA handling for non-beacon IBSS txqs, setting 0x2 bit disables it for beacon queues as well. * Add MCAST-BCAST feature flag. This tells driver we do not need a monitor interface to do MESH. * When calculating the rx-address filter (affects ACK & BLOCK-ACK, among other things), to not add in monitor interfaces if other interfaces are up. There is no need for a monitor device to ACK frames. Signed-off-by: Ben Greear --- package/firmware/ath10k-firmware/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index aa925a4..9dccd12 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -64,52 +64,52 @@ define Download/ct-firmware-htt URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT) endef -QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-19.bin.lede +QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-20.bin.lede.001 define Download/ath10k-firmware-qca988x-ct $(call Download/ct-firmware,QCA988X,) - HASH:=bff98f028062dae9fc638c7596aec3c79bf9eddaff65cfacba067f6d72f217cd + HASH:=77a57d4e0da5fa1efab64cb36e0363ce49d7b7638bcfd1e8c8e323673c4abef8 endef $(eval $(call Download,ath10k-firmware-qca988x-ct)) -QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-19.bin.lede +QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-20.bin.lede.001 define Download/ath10k-firmware-qca9887-ct $(call Download/ct-firmware,QCA9887,ath10k-9887) - HASH:=95dc106f98672bd9c7d3fe6881ed79ab079cb49b0a995650991b1beaff2b0101 + HASH:=94081f86e7058083170fe25fa3735026a99fe535890b80ac81b28d0f5e0cc089 endef $(eval $(call Download,ath10k-firmware-qca9887-ct)) -QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-9.bin-lede.004 +QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.001 define Download/ath10k-firmware-qca99x0-ct $(call Download/ct-firmware,QCA99X0,ath10k-10-4) - HASH:=993c29fd64bb2a59b86d34f58601a1a48b83b541750bc511f78cc17152829b4d + HASH:=5d0765496982cb504a233395b91407b10b82a334adb928324489c67916f349f1 endef $(eval $(call Download,ath10k-firmware-qca99x0-ct)) -QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-9.bin-lede.004 +QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.001 define Download/ath10k-firmware-qca9984-ct $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4) - HASH:=d997eed9a8bc6809c01d367759ba8545c10e3be93ea1f33d6d753127ef0f7c5e + HASH:=1bb526349182e23be79f73ca4e9761bc0f20b2672efdce9976f31804df750e96 endef $(eval $(call Download,ath10k-firmware-qca9984-ct)) -QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.002 +QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.003 define Download/ath10k-firmware-qca4019-ct-htt $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4) - HASH:=e67bbc8eba56bc72c1aa99a6304ea98345bddc34f4844d5d79a51db1d6d8c425 + HASH:=7648902c9bc7b173b0845da79b7e469b87c192efb387e25505007edbe5661a17 endef $(eval $(call Download,ath10k-firmware-qca4019-ct-htt)) -QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.002 +QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.003 define Download/ath10k-firmware-qca4019-ct $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4) - HASH:=f1ebb73903e4e6a6209b8acdc623bc43d355d32cce838ce0448befe9196c7866 + HASH:=5167a5a3792bbd25c4285c8e6e44fc4564ebd0046597b00eb9bbcb1836a388bb endef $(eval $(call Download,ath10k-firmware-qca4019-ct)) -QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-9.bin-lede.004 +QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.003 define Download/ath10k-firmware-qca9888-ct $(call Download/ct-firmware,QCA9888,ath10k-9888-10-4) - HASH:=bbaa71bc7dcaa264c5875e86639f174908fed09fbace975e325959d42f3754ff + HASH:=5fe7208894f52a11e99c45005370161c8f919e10b396b978652af06f43234ed2 endef $(eval $(call Download,ath10k-firmware-qca9888-ct)) From patchwork Tue Mar 20 22:39:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 888471 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=candelatech.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LXPJNNs9"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 405SbB64kjz9s0v for ; Wed, 21 Mar 2018 09:41:26 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UcJf9Ud23ok82q6GnWvxop0D2jQqCC9RFbeaKf3XQhk=; b=LXPJNNs9huYn43 9gRUIhR6vO3U9UfITQwl6sbv+rs2JjVW/tka1n+mdCf86YfZ95+hNFptpBs+dhYkeQI6ixzIYKXG6 HVWmwr+5ch26x1ICzDNldDxpGjsjKQyTMGdFEVfs9ZEprnn0A0RqkROMu2KO6YnC291WLapSM0zyR EtdYcaNDGVArq4XPUUOMjS1+s6KgkrgBpetSdufIFoxYW2eus0Hu2kqapDHB3ttbztwiJSORtAA4r +zBTIpbnFeTWrx8pIff603j41JeNLmWF6bPxXwM2tHCrYK4cU4e/TBQTEJ1M4zrzv5VJ10rANgCog plC9XX6yLv/LbRGYZJYg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPwU-0001zU-Cu; Tue, 20 Mar 2018 22:41:18 +0000 Received: from mail2.candelatech.com ([208.74.158.173]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyPvY-0000m0-PW for lede-dev@lists.infradead.org; Tue, 20 Mar 2018 22:40:26 +0000 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id B18D540A626; Tue, 20 Mar 2018 15:40:04 -0700 (PDT) From: greearb@candelatech.com To: lede-dev@lists.infradead.org Date: Tue, 20 Mar 2018 15:39:55 -0700 Message-Id: <1521585595-23155-4-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1521585595-23155-1-git-send-email-greearb@candelatech.com> References: <1521585595-23155-1-git-send-email-greearb@candelatech.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180320_154020_975873_CBA80E37 X-CRM114-Status: UNSURE ( 8.68 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Subject: [LEDE-DEV] [PATCH 4/4] ath10k-ct: Add htt-mgt variants of ath10k-ct firmware. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Greear MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ben Greear The HTT-MGT variants transport management frames over the normal HTT tx path, just like data frames. This saves limitted WMI buffers which can become depleted if lots of management frames become stuck in TX queues due to peer that went away. In addition, at least for the wave-1 firmware, htt-mgt is required in order for 802.11r (fast roaming) authentication to function properly. The htt-mgt firmware requires the use of the ath10k-ct driver. Normal non-htt-mgt ath10k-ct firmware should work with stock drivers. Signed-off-by: Ben Greear --- package/firmware/ath10k-firmware/Makefile | 250 ++++++++++++++++++++++++++---- 1 file changed, 217 insertions(+), 33 deletions(-) diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile index 9dccd12..0099146 100644 --- a/package/firmware/ath10k-firmware/Makefile +++ b/package/firmware/ath10k-firmware/Makefile @@ -71,6 +71,14 @@ define Download/ath10k-firmware-qca988x-ct endef $(eval $(call Download,ath10k-firmware-qca988x-ct)) +QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-20.bin.lede.001 +define Download/ath10k-firmware-qca988x-ct-htt + $(call Download/ct-firmware-htt,QCA988X,) + HASH:=a1f90d9de19bb148f3e4c6570bf7572cf90c7c6870d0afcf8a87d67114eab701 +endef +$(eval $(call Download,ath10k-firmware-qca988x-ct-htt)) + + QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-20.bin.lede.001 define Download/ath10k-firmware-qca9887-ct $(call Download/ct-firmware,QCA9887,ath10k-9887) @@ -78,6 +86,14 @@ define Download/ath10k-firmware-qca9887-ct endef $(eval $(call Download,ath10k-firmware-qca9887-ct)) +QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-20.bin.lede.001 +define Download/ath10k-firmware-qca9887-ct-htt + $(call Download/ct-firmware-htt,QCA9887,ath10k-9887) + HASH:=f31e5f5f546ef7c104b9526d0a95faf4c291b21e7512a19f624c5a015dee80f1 +endef +$(eval $(call Download,ath10k-firmware-qca9887-ct-htt)) + + QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.001 define Download/ath10k-firmware-qca99x0-ct $(call Download/ct-firmware,QCA99X0,ath10k-10-4) @@ -85,6 +101,14 @@ define Download/ath10k-firmware-qca99x0-ct endef $(eval $(call Download,ath10k-firmware-qca99x0-ct)) +QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.001 +define Download/ath10k-firmware-qca99x0-ct-htt + $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4) + HASH:=520f0ecfeba034056a196793d2f0e628d4c89bd1080c6a811fdc3a4b35bfe8d6 +endef +$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt)) + + QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.001 define Download/ath10k-firmware-qca9984-ct $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4) @@ -92,6 +116,14 @@ define Download/ath10k-firmware-qca9984-ct endef $(eval $(call Download,ath10k-firmware-qca9984-ct)) +QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.001 +define Download/ath10k-firmware-qca9984-ct-htt + $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4) + HASH:=cf18bd88f8995d383be25fe302b205b8cde3f593b88e34bdffe05732520abfde +endef +$(eval $(call Download,ath10k-firmware-qca9984-ct-htt)) + + QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.003 define Download/ath10k-firmware-qca4019-ct-htt $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4) @@ -106,6 +138,7 @@ define Download/ath10k-firmware-qca4019-ct endef $(eval $(call Download,ath10k-firmware-qca4019-ct)) + QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-10.bin-lede.003 define Download/ath10k-firmware-qca9888-ct $(call Download/ct-firmware,QCA9888,ath10k-9888-10-4) @@ -113,6 +146,14 @@ define Download/ath10k-firmware-qca9888-ct endef $(eval $(call Download,ath10k-firmware-qca9888-ct)) +QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-10.bin-lede.003 +define Download/ath10k-firmware-qca9888-ct-htt + $(call Download/ct-firmware-htt,QCA9888,ath10k-9888-10-4) + HASH:=dc35c392cf2688a97ed5c4ca6490bd7a3d622bb711edb246b09a3d9a0b9dc0d0 +endef +$(eval $(call Download,ath10k-firmware-qca9888-ct-htt)) + + define Package/ath10k-firmware-qca99x0 $(Package/ath10k-firmware-default) TITLE:=ath10k firmware for QCA99x0 devices @@ -127,6 +168,14 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca988x endef +define Package/ath10k-firmware-qca988x-ct-htt +$(Package/ath10k-firmware-default) + TITLE:=ath10k CT 10.1 htt-mgt fw for QCA988x + SECTION:=firmware + CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca988x + DEPENDS:=+kmod-ath10k-ct +endef define Package/ath10k-firmware-qca9887-ct $(Package/ath10k-firmware-default) @@ -135,6 +184,14 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9887 endef +define Package/ath10k-firmware-qca9887-ct-htt +$(Package/ath10k-firmware-default) + TITLE:=ath10k CT 10.1 htt-mgt fw for QCA9887 + SECTION:=firmware + CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca9887 + DEPENDS:=+kmod-ath10k-ct +endef define Package/ath10k-firmware-qca988x-ct/description Alternative ath10k firmware for QCA988X from Candela Technologies. @@ -144,6 +201,14 @@ This firmware will NOT be used unless the standard ath10k-firmware-qca988x is un-selected since the driver will try to load firmware-5.bin before firmware-2.bin endef +define Package/ath10k-firmware-qca988x-ct-htt/description +Alternative ath10k firmware for QCA988X from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and fixes .11r authentication. +Enables IBSS and other features. See: +http://www.candelatech.com/ath10k-10.1.php +This firmware selects and requires the ath10k-ct driver. +endef define Package/ath10k-firmware-qca9887-ct/description Alternative ath10k firmware for QCA9887 from Candela Technologies. @@ -152,6 +217,14 @@ http://www.candelatech.com/ath10k-10.1.php This firmware conflicts with the standard 9887 firmware, so select only one. endef +define Package/ath10k-firmware-qca9887-ct-htt/description +Alternative ath10k firmware for QCA9887 from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and fixes .11r authentication. +Enables IBSS and other features. See: +http://www.candelatech.com/ath10k-10.1.php +This firmware selects and requires the ath10k-ct driver. +endef define Package/ath10k-firmware-qca99x0-ct/description Alternative ath10k firmware for QCA99x0 from Candela Technologies. @@ -160,6 +233,14 @@ http://www.candelatech.com/ath10k-10.4.php This firmware conflicts with the standard 99x0 firmware, so select only one. endef +define Package/ath10k-firmware-qca99x0-ct-htt/description +Alternative ath10k firmware for QCA99x0 from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and may be required for .11r authentication. +Enables IBSS and other features. See: +http://www.candelatech.com/ath10k-10.4.php +This firmware selects and requires the ath10k-ct driver. +endef define Package/ath10k-firmware-qca9984-ct/description Alternative ath10k firmware for QCA9984 from Candela Technologies. @@ -168,11 +249,13 @@ http://www.candelatech.com/ath10k-10.4.php This firmware conflicts with the standard 9984 firmware, so select only one. endef - -define Package/ath10k-firmware-qca4019-ct-htt/description -Alternative ath10k firmware for IPQ4019 radio from Candela Technologies. -Enables IBSS and other features. Requires ath10k-ct driver to function. -See: http://www.candelatech.com/ath10k-10.4.php +define Package/ath10k-firmware-qca9984-ct-htt/description +Alternative ath10k firmware for QCA9984 from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and may be required for .11r authentication. +Enables IBSS and other features. See: +http://www.candelatech.com/ath10k-10.4.php +This firmware selects and requires the ath10k-ct driver. endef define Package/ath10k-firmware-qca4019-ct/description @@ -180,6 +263,14 @@ Alternative ath10k firmware for IPQ4019 radio from Candela Technologies. Enables IBSS and other features. Works with standard or ath10k-ct driver. See: http://www.candelatech.com/ath10k-10.4.php endef +define Package/ath10k-firmware-qca4019-ct-htt/description +Alternative ath10k firmware for IPQ4019 radio from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and may be required for .11r authentication. +Enables IBSS and other features. +See: http://www.candelatech.com/ath10k-10.4.php +This firmware selects and requires the ath10k-ct driver. +endef define Package/ath10k-firmware-qca9888-ct/description Alternative ath10k firmware for QCA9886 and QCA9888 from Candela Technologies. @@ -188,6 +279,15 @@ http://www.candelatech.com/ath10k-10.4.php This firmware conflicts with the standard 9886 and 9888 firmware, so select only one. endef +define Package/ath10k-firmware-qca9888-ct-htt/description +Alternative ath10k firmware for QCA9886 and QCA9888 from Candela Technologies. +Uses normal HTT TX data path for management frames, which improves +stability in busy networks and may be required for .11r authentication. +Enables IBSS and other features. See: +http://www.candelatech.com/ath10k-10.4.php +This firmware selects and requires the ath10k-ct driver. +endef + define Package/ath10k-firmware-qca99x0/description Standard ath10k firmware for QCA99x0 from QCA @@ -202,6 +302,14 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca99x0 endef +define Package/ath10k-firmware-qca99x0-ct-htt +$(Package/ath10k-firmware-default) + TITLE:=ath10k CT 10.4 htt-mgt fw for QCA99x0 + SECTION:=firmware + CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca99x0 + DEPENDS:=+kmod-ath10k-ct +endef define Package/ath10k-firmware-qca9984-ct $(Package/ath10k-firmware-default) @@ -210,15 +318,15 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9984 endef - -define Package/ath10k-firmware-qca4019-ct-htt +define Package/ath10k-firmware-qca9984-ct-htt $(Package/ath10k-firmware-default) - TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9 + TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9984 SECTION:=firmware CATEGORY:=Firmware - PROVIDES:=ath10k-firmware-qca4019 + PROVIDES:=ath10k-firmware-qca9984 DEPENDS:=+kmod-ath10k-ct endef + define Package/ath10k-firmware-qca4019-ct $(Package/ath10k-firmware-default) TITLE:=ath10k CT 10.4 firmware for QCA4018/9 @@ -226,6 +334,14 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca4019 endef +define Package/ath10k-firmware-qca4019-ct-htt +$(Package/ath10k-firmware-default) + TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9 + SECTION:=firmware + CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca4019 + DEPENDS:=+kmod-ath10k-ct +endef define Package/ath10k-firmware-qca9888-ct $(Package/ath10k-firmware-default) @@ -234,6 +350,16 @@ $(Package/ath10k-firmware-default) CATEGORY:=Firmware PROVIDES:=ath10k-firmware-qca9888 endef +define Package/ath10k-firmware-qca9888-ct-htt +$(Package/ath10k-firmware-default) + TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9886/8 + SECTION:=firmware + CATEGORY:=Firmware + PROVIDES:=ath10k-firmware-qca9888 + DEPENDS:=+kmod-ath10k-ct +endef + + define Package/ath10k-firmware-qca9984 $(Package/ath10k-firmware-default) @@ -311,6 +437,37 @@ define Package/ath10k-firmware-qca988x/install $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin endef +define Package/ath10k-firmware-qca6174/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k + $(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/ +endef + +define Package/ath10k-firmware-qca99x0/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 + $(INSTALL_DATA) \ + $(DL_DIR)/$(QCA99X0_BOARD_FILE) \ + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \ + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA99X0/hw2.0/firmware-5.bin_10.4.1.00030-1 \ + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin +endef + +define Package/ath10k-firmware-qca9984/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \ + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA9984/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00053 \ + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin +endef + + +# CT related firmware + define Package/ath10k-firmware-qca9887-ct/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0 $(INSTALL_DATA) \ @@ -320,6 +477,15 @@ define Package/ath10k-firmware-qca9887-ct/install $(PKG_BUILD_DIR)/QCA9887/hw1.0/board.bin \ $(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin endef +define Package/ath10k-firmware-qca9887-ct-htt/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0 + $(INSTALL_DATA) \ + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9887) \ + $(1)/lib/firmware/ath10k/QCA9887/hw1.0/ct-firmware-2.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA9887/hw1.0/board.bin \ + $(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin +endef define Package/ath10k-firmware-qca988x-ct/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0 @@ -330,13 +496,17 @@ define Package/ath10k-firmware-qca988x-ct/install $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA988X) \ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin endef - -define Package/ath10k-firmware-qca6174/install - $(INSTALL_DIR) $(1)/lib/firmware/ath10k - $(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/ +define Package/ath10k-firmware-qca988x-ct-htt/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \ + $(1)/lib/firmware/ath10k/QCA988X/hw2.0/ + $(INSTALL_DATA) \ + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA988X) \ + $(1)/lib/firmware/ath10k/QCA988X/hw2.0/ct-firmware-2.bin endef -define Package/ath10k-firmware-qca99x0/install +define Package/ath10k-firmware-qca99x0-ct/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 $(INSTALL_DATA) \ $(DL_DIR)/$(QCA99X0_BOARD_FILE) \ @@ -345,11 +515,10 @@ define Package/ath10k-firmware-qca99x0/install $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/QCA99X0/hw2.0/firmware-5.bin_10.4.1.00030-1 \ + $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA99X0) \ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin endef - -define Package/ath10k-firmware-qca99x0-ct/install +define Package/ath10k-firmware-qca99x0-ct-htt/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0 $(INSTALL_DATA) \ $(DL_DIR)/$(QCA99X0_BOARD_FILE) \ @@ -358,48 +527,46 @@ define Package/ath10k-firmware-qca99x0-ct/install $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin $(INSTALL_DATA) \ - $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA99X0) \ - $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA99X0) \ + $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/ct-firmware-5.bin endef -define Package/ath10k-firmware-qca9984/install +define Package/ath10k-firmware-qca9984-ct/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0 $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/QCA9984/hw1.0/3.5.3/firmware-5.bin_10.4-3.5.3-00053 \ + $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9984) \ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin endef - -define Package/ath10k-firmware-qca9984-ct/install +define Package/ath10k-firmware-qca9984-ct-htt/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0 $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin $(INSTALL_DATA) \ - $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9984) \ - $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9984) \ + $(1)/lib/firmware/ath10k/QCA9984/hw1.0/ct-firmware-5.bin endef -define Package/ath10k-firmware-qca4019-ct-htt/install +define Package/ath10k-firmware-qca4019-ct/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0 $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/QCA4019/hw1.0/board-2.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/ $(INSTALL_DATA) \ - $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA4019) \ - $(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin + $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA4019) \ + $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin endef - -define Package/ath10k-firmware-qca4019-ct/install +define Package/ath10k-firmware-qca4019-ct-htt/install $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA4019/hw1.0 $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/QCA4019/hw1.0/board-2.bin \ $(1)/lib/firmware/ath10k/QCA4019/hw1.0/ $(INSTALL_DATA) \ - $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA4019) \ - $(1)/lib/firmware/ath10k/QCA4019/hw1.0/firmware-5.bin + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA4019) \ + $(1)/lib/firmware/ath10k/QCA4019/hw1.0/ct-firmware-5.bin endef define Package/ath10k-firmware-qca9888-ct/install @@ -414,6 +581,18 @@ define Package/ath10k-firmware-qca9888-ct/install $(DL_DIR)/$(call CT_FIRMWARE_FILE,QCA9888) \ $(1)/lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin endef +define Package/ath10k-firmware-qca9888-ct-htt/install + $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9888/hw2.0 + ln -s \ + ../../cal-pci-0000:01:00.0.bin \ + $(1)/lib/firmware/ath10k/QCA9888/hw2.0/board.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/QCA9888/hw2.0/board-2.bin \ + $(1)/lib/firmware/ath10k/QCA9888/hw2.0/board-2.bin + $(INSTALL_DATA) \ + $(DL_DIR)/$(call CT_FIRMWARE_FILE_HTT,QCA9888) \ + $(1)/lib/firmware/ath10k/QCA9888/hw2.0/ct-firmware-5.bin +endef $(eval $(call BuildPackage,ath10k-firmware-qca9887)) $(eval $(call BuildPackage,ath10k-firmware-qca9888)) @@ -424,9 +603,14 @@ $(eval $(call BuildPackage,ath10k-firmware-qca9984)) $(eval $(call BuildPackage,ath10k-firmware-qca4019)) $(eval $(call BuildPackage,ath10k-firmware-qca9887-ct)) +$(eval $(call BuildPackage,ath10k-firmware-qca9887-ct-htt)) $(eval $(call BuildPackage,ath10k-firmware-qca988x-ct)) +$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct-htt)) $(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct)) +$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct-htt)) $(eval $(call BuildPackage,ath10k-firmware-qca9984-ct)) -$(eval $(call BuildPackage,ath10k-firmware-qca4019-ct-htt)) +$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct-htt)) $(eval $(call BuildPackage,ath10k-firmware-qca4019-ct)) +$(eval $(call BuildPackage,ath10k-firmware-qca4019-ct-htt)) $(eval $(call BuildPackage,ath10k-firmware-qca9888-ct)) +$(eval $(call BuildPackage,ath10k-firmware-qca9888-ct-htt))