From patchwork Thu Sep 10 15:07:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 249650 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ecf:0:0:0:0 with SMTP id i15csp826615ilk; Thu, 10 Sep 2020 08:06:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzL5RoYxzLg+q5fsMOmMU4LdCPb99pNyGp1bMhLJcGZ6W+Luv2ik0C1OQXkdoIGaiT+5igf X-Received: by 2002:a5d:914a:: with SMTP id y10mr8049121ioq.108.1599750391963; Thu, 10 Sep 2020 08:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599750391; cv=none; d=google.com; s=arc-20160816; b=KTy885s7cjoyPds8qnF3F4lXQ29qG3nQKJFAmAE+hjLudg/MN8m3msqsGTuTqKiRqZ F/ZXzmd/l1pAaxzDJZj3um4lup+hDfCqg+Tlg30r4uko3dJSQHinXIXxaw7vctNIbHuw tEE1R9ngNZ2p1sCeZYwNLDvBZf0FD0YYncIdLD2uDfeaFdAF7qDrpMVRSN9gjx6CmBga qVioIRskStWpWQtiyU8NqmXxJsgIFuF9+y/kABO+Hx/1M72eVH6qLAECmIjaBvE8LhXK mzOTJ4jnsWnNdpISygRnU/L5JM3el+gHE2+afI4/Xc3PRzA+jZCE7e43gzkqdHRyMx0e JpKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:dkim-signature; bh=T1+tElhCmVZ6QO/fGgPQvdf8mWsHXS0X1j5a20OmXfk=; b=c95jexWT3hoeB2Ikz5svaLlSCowOtdjSE3hD82S2mKhJlCO2AN2Hqcsnm3Jsff7hv6 qsPdOBEpUnkzl/hK8cO5R/lyR2oy9cUz8TuI03qJAQo9t0wXQ78yWmmc+Ge2ZuWDYcPW 0uzO3JjSYaW0QbI7Ti1kAUFodWGBBRenVzUauduL69pTKJWH7HrHeu/sdOEmZJukqSjI 6CHAoW0dwthCr4ZpqPkN0AVxVj93D0/G5x49RM/NtvE2vywRJQxeB3bIyIuyh3XjUxSY qrl5loVbw91ChbZMrPLGfTxQFGnpO2+LKdKuAcSsZ7eU2ha3MPEoqC93ZIeqdw864keU 3/xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=3Ai3UnHT; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="U/XYFWpn"; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from merlin.infradead.org (merlin.infradead.org. [2001:8b0:10b:1231::1]) by mx.google.com with ESMTPS id c64si1471384ilg.30.2020.09.10.08.06.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 08:06:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) client-ip=2001:8b0:10b:1231::1; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.infradead.org header.s=merlin.20170209 header.b=3Ai3UnHT; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="U/XYFWpn"; spf=pass (google.com: best guess record for domain of wcn36xx-bounces+patch=linaro.org@lists.infradead.org designates 2001:8b0:10b:1231::1 as permitted sender) smtp.mailfrom="wcn36xx-bounces+patch=linaro.org@lists.infradead.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=T1+tElhCmVZ6QO/fGgPQvdf8mWsHXS0X1j5a20OmXfk=; b=3Ai3UnHTV6wcNX8kxQgE2hJBj 2Bf279Xf4aGog+YkX4qPEviNo+6/6D5rOQ7Swi213r4fBHMsqVXNFSPcU93OTjaTRBzBbqVhe23Tz k0yM3lndkLfUh9dkvthlJMzSef8T0FcYvA7uegl6Re866b7aUYyay2J2ubeUs1hioDrLn+XyBH0wL mLqtPsAweHjU2vL2aAlNqqUExAzNnyb1LwaTr5happYrYkv3jprSuqemo5XzV1GOaTiN2c1QwS8ce XeNpuw1tbqVOan8PnKghzawu/wJMGCRrEA6Cn1I37AHoi/ayBbg7KmlwAuRAzSg0VaKh/GACq7ATq EcQFzrx4g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGO9d-0007rS-2M; Thu, 10 Sep 2020 15:06:29 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGO9a-0007pn-Fg for wcn36xx@lists.infradead.org; Thu, 10 Sep 2020 15:06:27 +0000 Received: by mail-wr1-x443.google.com with SMTP id j2so7085102wrx.7 for ; Thu, 10 Sep 2020 08:06:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kbuSpUHUK9Xf5kW5O/ETlw8jaTEXI5Gq5SIeCS+jaOg=; b=U/XYFWpntw9A4GcKyqUzPvxG99HZUxnQeS7+9JsXO8alW/1bYOJ4OnvAEUISI1Zzn/ m8D1VDmaL08oBdQojRiAPCQBb05ZaVsxLV6JajOLFYdb+yQeXnoz3slcz7cexpvjfLJr 6Rd/AJvjGRcbAJMfTQfHrwvyQfXnN4+maGPuEvtuvs+JDQGYYy5JqTRbs8VrKSgUq2bG Ye88eCMy1KntLfI2LblzmDLKWI6hME70yC4BTmkCv7BcW30IbtaRHWenrhi8wJH2ft68 co9/CsjrUCIlQJJ0do+yebvunCaJWInlHp1ParrKO9JdEBxpNmN0/J3ZzD78iyYyzEiN Ao9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kbuSpUHUK9Xf5kW5O/ETlw8jaTEXI5Gq5SIeCS+jaOg=; b=tDNYupLMOX8KPLLMK7sa6t6I+Sf4AqFnjYx2Y0E3G1Jhx85m61oRlBTnO8O9i2BHGA J9cgzG7FKd1eGxHVsLXgRoz1JFC9SL+CaXfVi7VkVqxD7QHOGyCP0RNGddo1U44RvH/4 eflMIdPkpXmHC9yIkxcpiAtgAGCz1832iMkqNK/Jo0ewU1FoaRoVwmlX04zQs9fl6rvu rsAUym5MQU7tzCVbYKWrJlq4ijMbV03NGoiwW5zL+dw/OA3ODWGECBQGJmrmv/MTaUmg dBCZa8nuTwz53pJjag4zfHfDtW+mq3vwBaAuEBBpcEbk9w7vMj241qcCt8iiAwAzGDea 4/fQ== X-Gm-Message-State: AOAM533zriMxBe5M+rD5ybpH3guMDynI63i8dLNQ7KRhOJVoqzZe7Lmr yzL5BMQAXsuEM+vjgCrryQ7oaw== X-Received: by 2002:adf:ef48:: with SMTP id c8mr9613696wrp.370.1599750385515; Thu, 10 Sep 2020 08:06:25 -0700 (PDT) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id i11sm8778906wre.32.2020.09.10.08.06.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 08:06:25 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Subject: [PATCH v5 5/5] wcn36xx: Set PHY into correct mode for 80MHz channel width Date: Thu, 10 Sep 2020 16:07:08 +0100 Message-Id: <20200910150708.2179043-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200910150708.2179043-1-bryan.odonoghue@linaro.org> References: <20200910150708.2179043-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200910_110626_546408_969FAE04 X-CRM114-Status: GOOD ( 14.37 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: wcn36xx@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Sender: "wcn36xx" Errors-To: wcn36xx-bounces+patch=linaro.org@lists.infradead.org For the 80MHz channel we need to set the PHY mode to one of four PHY modes that span the 80MHz range. This patch latches the hw_value PHY field previously defined for 5GHz channels directly to the parameter passed to the firmware. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.27.0 _______________________________________________ wcn36xx mailing list wcn36xx@lists.infradead.org http://lists.infradead.org/mailman/listinfo/wcn36xx diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index feeb27851f7a..7dada66b9f87 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -1508,6 +1508,7 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn, struct wcn36xx_hal_config_bss_params_v1 *bss; struct wcn36xx_hal_config_bss_params bss_v0; struct wcn36xx_hal_config_sta_params_v1 *sta; + struct cfg80211_chan_def *chandef; int ret; msg_body = kzalloc(sizeof(*msg_body), GFP_KERNEL); @@ -1547,7 +1548,13 @@ static int wcn36xx_smd_config_bss_v1(struct wcn36xx *wcn, bss->dtim_period = bss_v0.dtim_period; bss->tx_channel_width_set = bss_v0.tx_channel_width_set; bss->oper_channel = bss_v0.oper_channel; - bss->ext_channel = bss_v0.ext_channel; + + if (wcn->hw->conf.chandef.width == NL80211_CHAN_WIDTH_80) { + chandef = &wcn->hw->conf.chandef; + bss->ext_channel = HW_VALUE_PHY(chandef->chan->hw_value); + } else { + bss->ext_channel = bss_v0.ext_channel; + } bss->reserved = bss_v0.reserved;