From patchwork Thu May 28 08:49:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muna Sinada X-Patchwork-Id: 11575315 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD48192A for ; Thu, 28 May 2020 08:49:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AABE32075F for ; Thu, 28 May 2020 08:49:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="C6Sn3WIL"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="wEqZXaYq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AABE32075F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org 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: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=og7aGjnrRCdWL5YJHmbMNKNF3R1SRepmfHEJ0/TxlI0=; b=C6S n3WIL7sqpo3+J5lRxM8JPMti1/1NV4kzNXysBtpZIJEK382kWLiBPtxHOTvlp8tn2xCVUW8Uiotj4 bGx5f9vQRLDFCSmg4LQXZDDXk7ngkse7DIUvU0wppVzPzzQqPEoQpOWaGlGNcqvfw/kybshroJUmi R3DU6v23SZIKYQyzlV//sru3bknPkExhSit8PVG6cuwGBIUIlr5BWthTypxHMHbBkLlJ8gBH1DNd4 R08SPvTS2cIFAdvQcXDRwuWi3qEc4x5ZdKaYPquptDPUGvRk1b6u736xZbF9+1hYdPvTA90KBvQoo nNqV4yZc7Y9YxiPWcL55Wygpq0QzQog==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeEEd-0000gb-Sd; Thu, 28 May 2020 08:49:55 +0000 Received: from mail27.static.mailgun.info ([104.130.122.27]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jeEEY-0000g9-JX for ath11k@lists.infradead.org; Thu, 28 May 2020 08:49:54 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1590655792; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=hySI25lC4e9I+AGlBCntZ59v9h0qDPXapukEFpgoQes=; b=wEqZXaYq9+nN0Nu9Rur4sThAZjht55PhSBl7B46PndMJwuKh3uDtJxnyEK/x5MCeg4JaxHAt xWegJ0TxePOUUzM2OOXSLr9UpKM4PGDTdgnVoNtL5pv7iDB84AcJR6PAd95VxkeYeStzfth/ mK38xBBorI7o6e9vROEDxOm1DR0= X-Mailgun-Sending-Ip: 104.130.122.27 X-Mailgun-Sid: WyJmOGQ2ZiIsICJhdGgxMWtAbGlzdHMuaW5mcmFkZWFkLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 5ecf7b2b2c5499847527e092 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 28 May 2020 08:49:47 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 55977C433CA; Thu, 28 May 2020 08:49:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=ham autolearn_force=no version=3.4.0 Received: from msinada-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: msinada) by smtp.codeaurora.org (Postfix) with ESMTPSA id C1AA9C433C9; Thu, 28 May 2020 08:49:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C1AA9C433C9 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=msinada@codeaurora.org From: Muna Sinada To: ath11k@lists.infradead.org Subject: [PATCH] nl80211: Add HE UL MU fixed rate setting Date: Thu, 28 May 2020 01:49:31 -0700 Message-Id: <1590655771-12984-1-git-send-email-msinada@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200528_014952_908460_76234C94 X-CRM114-Status: UNSURE ( 9.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [104.130.122.27 listed in list.dnswl.org] -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_VALID Message has at least one valid DKIM or DK signature 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [104.130.122.27 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Muna Sinada MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org This patch adds nl80211 definitions, policies and parsing code required to pass HE UL MU fixed rate settings. Signed-off-by: Muna Sinada --- include/net/cfg80211.h | 1 + include/uapi/linux/nl80211.h | 2 ++ net/wireless/nl80211.c | 9 +++++++++ 3 files changed, 12 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 96bf879c049b..a6cc2c8a8c92 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1039,6 +1039,7 @@ struct cfg80211_bitrate_mask { enum nl80211_txrate_gi gi; enum nl80211_he_gi he_gi; enum nl80211_he_ltf he_ltf; + u16 he_ul_mcs[NL80211_HE_NSS_MAX]; } control[NUM_NL80211_BANDS]; }; diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 69e2cf22a329..e418c6be9494 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4685,6 +4685,7 @@ enum nl80211_key_attributes { * see &struct nl80211_txrate_he * @NL80211_TXRATE_HE_GI: configure HE GI, 0.8us, 1.6us and 3.2us. * @NL80211_TXRATE_HE_LTF: configure HE LTF, 1XLTF, 2XLTF and 4XLTF. + * @NL80211_TXRATE_HE_UL: HE MCS rates of connected HE STA for uplink traffic. * @__NL80211_TXRATE_AFTER_LAST: internal * @NL80211_TXRATE_MAX: highest TX rate attribute */ @@ -4697,6 +4698,7 @@ enum nl80211_tx_rate_attributes { NL80211_TXRATE_HE, NL80211_TXRATE_HE_GI, NL80211_TXRATE_HE_LTF, + NL80211_TXRATE_HE_UL, /* keep last */ __NL80211_TXRATE_AFTER_LAST, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 33f1ad127e8f..b057168941c9 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4467,6 +4467,10 @@ static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = { [NL80211_TXRATE_HE_LTF] = NLA_POLICY_RANGE(NLA_U8, NL80211_RATE_INFO_HE_1XLTF, NL80211_RATE_INFO_HE_4XLTF), + [NL80211_TXRATE_HE_UL] = { + .type = NLA_EXACT_LEN, + .len = sizeof(struct nl80211_txrate_he), + }, }; static int nl80211_parse_tx_bitrate_mask(struct genl_info *info, @@ -4575,6 +4579,11 @@ static int nl80211_parse_tx_bitrate_mask(struct genl_info *info, if (tb[NL80211_TXRATE_HE_LTF]) mask->control[band].he_ltf = nla_get_u8(tb[NL80211_TXRATE_HE_LTF]); + if (tb[NL80211_TXRATE_HE_UL] && + !he_set_mcs_mask(info, sband, + nla_data(tb[NL80211_TXRATE_HE_UL]), + mask->control[band].he_ul_mcs)) + return -EINVAL; if (mask->control[band].legacy == 0) { /* don't allow empty legacy rates if HT or VHT