From patchwork Mon Jun 17 13:00:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 10999229 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C5EF14B6 for ; Mon, 17 Jun 2019 13:00:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 178D628699 for ; Mon, 17 Jun 2019 13:00:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 159222890E; Mon, 17 Jun 2019 13:00:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8DFC22890C for ; Mon, 17 Jun 2019 13:00:53 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=GiQQOhainH481C80nK6YJMDRuMbKvuHTqEdjySu/R0w=; b=Qmp/skYzR+Npn9 iPfM7hmrMAE/Os6QYyrTdxIZM6dSVlmCdseW15rnUaXOsA0TJgTJMQynxHlS13451/zhxXTVFo9As VGLsFyZUZ2clJeh9rfF/MCJfKANxWLImxD7VURGecHcpy+r2KjZm00qv4zSxCMvKnoyrmrL+JIAQ7 6XEExcO9D3RxzcXbaTspLzoP67xvHwyyhHYq4UYerU8IJF4/WeIEm18oiHtZklbYmLjLmDwPJlIMi iUHIV3/asw/Szz8oQknQUOJgGqUjcLhCqWToC6dSO39cUfJf3MHPDnH8vjXwON0Ed50ZBRIrwVygV 5uhyhs13XDbbmAUqEfsA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hcrFk-0001sW-Ta; Mon, 17 Jun 2019 13:00:52 +0000 Received: from nbd.name ([2a01:4f8:221:3d45::2]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hcrFg-0001rx-F1 for ath11k@lists.infradead.org; Mon, 17 Jun 2019 13:00:51 +0000 Received: from p5dcfbbb8.dip0.t-ipconnect.de ([93.207.187.184] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hcrFd-0007rD-Uh; Mon, 17 Jun 2019 15:00:46 +0200 From: John Crispin To: Kalle Valo Subject: [PATCH] ath11k: set additional values inside wmi_peer_assoc_complete_cmd Date: Mon, 17 Jun 2019 15:00:42 +0200 Message-Id: <20190617130042.31734-1-john@phrozen.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190617_060049_693148_CEE30B44 X-CRM114-Status: GOOD ( 10.25 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Miles Hu , ath11k@lists.infradead.org, John Crispin Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The firmware can take 2 additional values for he_mac_cap that were not set yet. Signed-off-by: John Crispin --- drivers/net/wireless/ath/ath11k/mac.c | 1 + drivers/net/wireless/ath/ath11k/wmi.c | 4 +++- drivers/net/wireless/ath/ath11k/wmi.h | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index acd9a0c3e910..e9965983c2a1 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -1267,6 +1267,7 @@ static void ath11k_peer_assoc_h_he(struct ath11k *ar, sizeof(arg->peer_he_cap_phyinfo)); memcpy(&arg->peer_he_ops, &vif->bss_conf.he_operation, sizeof(arg->peer_he_ops)); + arg->peer_he_cap_macinfo_internal = 0x0; if (he_cap->he_cap_elem.phy_cap_info[6] & IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) { diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index ba44ba148435..66455a2d8cb5 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -1707,7 +1707,9 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, cmd->peer_phymode = param->peer_phymode; /* Update 11ax capabilities */ - cmd->peer_he_cap_info = param->peer_he_cap_macinfo; + cmd->peer_he_cap_info = param->peer_he_cap_macinfo[0]; + cmd->peer_he_cap_info_ext = param->peer_he_cap_macinfo[1]; + cmd->peer_he_cap_info_internal = param->peer_he_cap_macinfo_internal; cmd->peer_he_ops = param->peer_he_ops; memcpy(&cmd->peer_he_cap_phy, ¶m->peer_he_cap_phyinfo, sizeof(param->peer_he_cap_phyinfo)); diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h index f1d87ef1c691..8feae5c31ee3 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -3971,7 +3971,8 @@ struct peer_assoc_params { u8 peer_mac[ETH_ALEN]; bool he_flag; - u32 peer_he_cap_macinfo; + u32 peer_he_cap_macinfo[2]; + u32 peer_he_cap_macinfo_internal; u32 peer_he_ops; u32 peer_he_cap_phyinfo[WMI_HOST_MAX_HECAP_PHY_SIZE]; u32 peer_he_mcs_count; @@ -4007,6 +4008,8 @@ struct wmi_peer_assoc_complete_cmd { u32 peer_he_ops; u32 peer_he_cap_phy[WMI_MAX_HECAP_PHY_SIZE]; u32 peer_he_mcs; + u32 peer_he_cap_info_ext; + u32 peer_he_cap_info_internal; } __packed; struct wmi_stop_scan_cmd {