From patchwork Tue Sep 1 23:14:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 1355452 X-Patchwork-Delegate: stijn@linux-ipv6.be Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux-ipv6.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=tlC7UAd7; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8 header.b=TZceaGY8; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bh2yh3TYjz9sTv for ; Wed, 2 Sep 2020 09:17:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=u1QqlXhDqaDCiAG/d/FEmB13rkKSFC31G5aamw38bLo=; b=tlC7UAd7gpE7/Ud8FqS2XmxN3l DWbVBnl/KwAcWtY4fY1vzCql4KJXymhXQYLlmIraE+NiEpO6prwz+WB5BRmyc4M0hZBlLj+Z8DPvr spnuQSKI88Fnildkpsn+UMPg2AX/djgZ0uQFR07HPIBR/4yf6PCaZmIc2obNNv9Mqzbu1DcGAXYKl NXX81INR/enhVWJWlOjil6Hcppww8/H0L62w8l2SZ1Y5PC1u0fQvjWXy/Zw+Avw/YdIdaDABNJHlZ sgluulFYgkdjVGsNYXe1rx95pxCdh+Uz7ROW0S/zcBhGOEN66XKYWL0BEpnY/hiTmbUkOgElYpc2I KeerGHYQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDFUJ-0005Qu-Ke; Tue, 01 Sep 2020 23:14:51 +0000 Received: from mail.tintel.eu ([51.83.127.189]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDFUF-0005QR-R9 for openwrt-devel@lists.openwrt.org; Tue, 01 Sep 2020 23:14:48 +0000 Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 8CEB94657098 for ; Wed, 2 Sep 2020 01:14:34 +0200 (CEST) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id h9gurV2-mcgM for ; Wed, 2 Sep 2020 01:14:33 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id D12E14709AFD for ; Wed, 2 Sep 2020 01:14:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu D12E14709AFD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be; s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1599002073; bh=oG8KKAe8v6DhHUP1Nda49+252Z6Y27ceQhjwYS1mb84=; h=From:To:Date:Message-Id:MIME-Version; b=TZceaGY883frbkseiWrKvVpISw4u+D24kFmS4SBPG5rqwlVFme+Uol2SzPO9JnxYv Ph7ZH5TV+qfMwV5Xwi7XFOLJx7x1N9Kyorq2ARHad++u0TZBiE8/osc6Gqba5uC6oY KyBLBNPSCGFwAuwyOvdzbjzs3/xu9sJRzap0riuQ= X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id G2laAuEODRk3 for ; Wed, 2 Sep 2020 01:14:33 +0200 (CEST) Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20:52bf:b29c:6e1e:7c70]) by mail.tintel.eu (Postfix) with SMTP id 8EC824657098 for ; Wed, 2 Sep 2020 01:14:33 +0200 (CEST) Received: (nullmailer pid 414635 invoked by uid 1000); Tue, 01 Sep 2020 23:14:33 -0000 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ath10k-ct: update to version 2018-08-25 Date: Wed, 2 Sep 2020 02:14:33 +0300 Message-Id: <20200901231433.414585-1-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Rspamd-Queue-Id: 8EC824657098 X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]; IP_WHITELIST(0.00)[2001:67c:21bc:20:52bf:b29c:6e1e:7c70] X-Rspamd-Server: skulls X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_191448_066698_D312FF3C X-CRM114-Status: GOOD ( 11.90 ) X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org And since we are using mac80211 5.8, let's also switch the ath10k-ct driver to the new 5.8 version. Signed-off-by: Stijn Tintel Tested-by: Sander Vanheule --- package/kernel/ath10k-ct/Makefile | 10 +++++----- .../164-ath10k-commit-rates-from-mac80211.patch | 6 +++--- ...GPIO-controlling-support-for-various-chipsets.patch | 6 +++--- .../202-ath10k-use-tpt-trigger-by-default.patch | 2 +- .../205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index 76077ec156..ad80c75eaf 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -8,14 +8,14 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-06-30 -PKG_SOURCE_VERSION:=edfbf9161ab75e4831981284ab2d5b1b9fb6ef72 -PKG_MIRROR_HASH:=98b7f88baea7314144fa8f8d141ad0dbbf2816f9606b0a89afb396761b558d14 +PKG_SOURCE_DATE:=2020-08-25 +PKG_SOURCE_VERSION:=13319ff0b5dc3c86e8313f49fca583b829878736 +PKG_MIRROR_HASH:=4a082f9c5ee26fea1eb2f86382b9db4aecec268c918f43e9a0729a0433e262da -# Build the 5.4 ath10k-ct driver version. Other option is "-4.19". +# Build ath10k-ct driver version 5.8. Other options are "-4.19", "-5.4", "-5.7". # Probably this should match as closely as # possible to whatever mac80211 backports version is being used. -CT_KVER="-5.4" +CT_KVER="-5.8" PKG_MAINTAINER:=Ben Greear PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch index 4e88c8a19f..b913bbdc82 100644 --- a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch +++ b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch @@ -11,7 +11,7 @@ Signed-off-by: Sven Eckelmann --- a/ath10k-5.4/mac.c +++ b/ath10k-5.4/mac.c -@@ -6793,6 +6793,7 @@ static void ath10k_bss_info_changed(stru +@@ -6796,6 +6796,7 @@ static void ath10k_bss_info_changed(stru "mac vdev %d mcast_rate %x\n", arvif->vdev_id, rate); @@ -19,7 +19,7 @@ Signed-off-by: Sven Eckelmann vdev_param = ar->wmi.vdev_param->mcast_data_rate; ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param, rate); -@@ -6801,6 +6802,7 @@ static void ath10k_bss_info_changed(stru +@@ -6804,6 +6805,7 @@ static void ath10k_bss_info_changed(stru "failed to set mcast rate on vdev %i: %d\n", arvif->vdev_id, ret); @@ -27,7 +27,7 @@ Signed-off-by: Sven Eckelmann vdev_param = ar->wmi.vdev_param->bcast_data_rate; ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param, rate); -@@ -6827,6 +6829,7 @@ static void ath10k_bss_info_changed(stru +@@ -6830,6 +6832,7 @@ static void ath10k_bss_info_changed(stru return; } diff --git a/package/kernel/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch b/package/kernel/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch index 15343abd5f..5291732f25 100644 --- a/package/kernel/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch +++ b/package/kernel/ath10k-ct/patches/201-ath10k-add-LED-and-GPIO-controlling-support-for-various-chipsets.patch @@ -396,7 +396,7 @@ v13: /* Rates */ --- a/ath10k-5.4/wmi-ops.h +++ b/ath10k-5.4/wmi-ops.h -@@ -218,7 +218,10 @@ struct wmi_ops { +@@ -219,7 +219,10 @@ struct wmi_ops { struct sk_buff *(*gen_bb_timing) (struct ath10k *ar, const struct wmi_bb_timing_cfg_arg *arg); @@ -407,7 +407,7 @@ v13: }; int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id); -@@ -1105,6 +1108,35 @@ ath10k_wmi_force_fw_hang(struct ath10k * +@@ -1115,6 +1118,35 @@ ath10k_wmi_force_fw_hang(struct ath10k * return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid); } @@ -445,7 +445,7 @@ v13: { --- a/ath10k-5.4/wmi-tlv.c +++ b/ath10k-5.4/wmi-tlv.c -@@ -4367,6 +4367,8 @@ static const struct wmi_ops wmi_tlv_ops +@@ -4382,6 +4382,8 @@ static const struct wmi_ops wmi_tlv_ops .gen_echo = ath10k_wmi_tlv_op_gen_echo, .gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf, .gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable, diff --git a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch index dd35e2937c..838158c7e0 100644 --- a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch +++ b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch @@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin if (ret) --- a/ath10k-5.4/mac.c +++ b/ath10k-5.4/mac.c -@@ -10383,7 +10383,7 @@ int ath10k_mac_register(struct ath10k *a +@@ -10386,7 +10386,7 @@ int ath10k_mac_register(struct ath10k *a ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; #ifdef CPTCFG_MAC80211_LEDS diff --git a/package/kernel/ath10k-ct/patches/205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch b/package/kernel/ath10k-ct/patches/205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch index 33d69e7975..09dd13e9a4 100644 --- a/package/kernel/ath10k-ct/patches/205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch +++ b/package/kernel/ath10k-ct/patches/205-ath10k-Add-NL80211_EXT_FEATURE_AQL-flag.patch @@ -1,6 +1,6 @@ --- a/ath10k-5.4/mac.c +++ b/ath10k-5.4/mac.c -@@ -10182,6 +10182,7 @@ int ath10k_mac_register(struct ath10k *a +@@ -10185,6 +10185,7 @@ int ath10k_mac_register(struct ath10k *a wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_SET_SCAN_DWELL);