From patchwork Wed Sep 9 15:36:56 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: 11765857 X-Patchwork-Delegate: kvalo@adurom.com 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 3073F746 for ; Wed, 9 Sep 2020 17:06:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 060E821D91 for ; Wed, 9 Sep 2020 17:06:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ryl0P748" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730277AbgIIPkL (ORCPT ); Wed, 9 Sep 2020 11:40:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730357AbgIIPgO (ORCPT ); Wed, 9 Sep 2020 11:36:14 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B040CC061347 for ; Wed, 9 Sep 2020 08:36:13 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id e17so2730484wme.0 for ; Wed, 09 Sep 2020 08:36:13 -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=yBk3qb6esZU21s8yt3ET2KrYd742m2TmS8YznjO4lK8=; b=ryl0P748MZ8rG9TDba0ufAdoBfzNc1lAOrSkQpNfJGTGL1xxNXSKZEu7krXwZiErCo yz65cPyF7XXpl87SBMs3J7aZJKCzF1kcQGM19d4DBEDoHtgPJXQtxg5U2l8uAg97dtli krj4Ib0VH/5fdgT4WutCYHLWeV37MbgWCG32IDsAgV4tVQMrX1+2wuv4cNhBuAG4mDmb Nq6WFCqeO7EPuP/15IhkvAWY1eF2XRicU5RhhI0W8SDCPbseS/6Xzv808rApiJqB0TCT ZctVhcFvf96HqEehmvm8ihygjR75Hfom6qrE6CKgiizx0QL5q+sdZkrVXBdZBpFYkz4L Hcbg== 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=yBk3qb6esZU21s8yt3ET2KrYd742m2TmS8YznjO4lK8=; b=Jklf1H5HBGqH2tL91R1p7JBQKWpA3x0r5G4JvlkePwp4E6CuqSFafW096RgeY2WuJc Rkj895ZCF1TCWiDM/o1TFwmJoL7/l/SQy1WJrIwJU7a8gxLoMudInFqPxJcFIrBVEwOY fKxaqLdRlnvjkz516FiKR/FkzHRDp5w5YP5aNQxbEK++kpv8uB9Tv9i9CI+rjeF4sO/2 GWzERM3T6vgveZCUuQhhouE8MabUUvXrGXb1629/jJ9ADsc6TC9+pXDnzAGxdtTZeooE 5NtaIkgCs3smOo7ByZenvVnLxVMQ/cV7mVLVW+c/4dIzB0/7ZX6S3ntZLWVBBsLa+F42 M/WQ== X-Gm-Message-State: AOAM533j+tBo7aQzNKbs6y7seFn+iJPPSBKhjXU1EwZ9KuGzm2B8tZL/ AuSNOWTBTvSI/CouN+GWXssfIg== X-Google-Smtp-Source: ABdhPJwIywolo+xm8jMUXzeMTWkjtZ1rJbb5aBOpTZQ/K8pzRtWSp7SNK6PPWrw9JRNtlB2Z4kNTmg== X-Received: by 2002:a1c:2903:: with SMTP id p3mr4281537wmp.170.1599665772328; Wed, 09 Sep 2020 08:36:12 -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 v204sm4619807wmg.20.2020.09.09.08.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:11 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Subject: [PATCH v4 1/5] wcn36xx: Add accessor macro HW_VALUE_CHANNEL for hardware channels Date: Wed, 9 Sep 2020 16:36:56 +0100 Message-Id: <20200909153700.2904977-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> References: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Adds HW_VALUE_CHANNEL(hw_value) an access macro that will be used to extract the channel number from struct ieee80211_channel->hw_value in preparation for also storing PHY settings for 802.11ac in the upper bits of hw_value. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index 2da81d9926c4..ebce1ed7adf7 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -83,7 +83,9 @@ enum wcn36xx_ampdu_state { WCN36XX_AMPDU_OPERATIONAL, }; -#define WCN36XX_HW_CHANNEL(__wcn) (__wcn->hw->conf.chandef.chan->hw_value) +#define HW_VALUE_CHANNEL(hw_value) ((hw_value) & 0xFF) +#define WCN36XX_HW_CHANNEL(__wcn)\ + HW_VALUE_CHANNEL(__wcn->hw->conf.chandef.chan->hw_value) #define WCN36XX_BAND(__wcn) (__wcn->hw->conf.chandef.chan->band) #define WCN36XX_CENTER_FREQ(__wcn) (__wcn->hw->conf.chandef.chan->center_freq) #define WCN36XX_LISTEN_INTERVAL(__wcn) (__wcn->hw->conf.listen_interval) From patchwork Wed Sep 9 15:36:57 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: 11765673 X-Patchwork-Delegate: kvalo@adurom.com 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 9489059D for ; Wed, 9 Sep 2020 15:40:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7388E20672 for ; Wed, 9 Sep 2020 15:40:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="TMXzdi0w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730294AbgIIPjM (ORCPT ); Wed, 9 Sep 2020 11:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730358AbgIIPgP (ORCPT ); Wed, 9 Sep 2020 11:36:15 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 959C0C061348 for ; Wed, 9 Sep 2020 08:36:14 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id b79so2823140wmb.4 for ; Wed, 09 Sep 2020 08:36:14 -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=Bt8Tpyo9+uK9+uEwdNPTeV0vFTeTDzA61bzY9RGScBk=; b=TMXzdi0wCRf4hKgmK5t/ZwcD6+/6c7iCEsFgriLi00G89djhGOJw5Dk663lc9aQhq+ 8/SKK+39/9bDDqEZnSgyzhsr4L8mTjOtcEQJhXYDHkuHTPhPQugNVWYGl38KkM7QLcsQ 6IH0mWXRYqo9Hc5zQFAEV+i9Q7IhJAhaAUSJPgBvowDkSncOyLBpCCkVutZ5lSzPSLkz aY5pVKRMgwW7t3S5oAIcK0Tbj5W8QxftN/WQvs5rQvfcgwul1lCHRYEDxdcSj/g9Lp56 NGI4XVl8ZPwAs6PvyxWo5V3JmVEP6+JL0EgEXY7D+vhKParrqVr5L4YDVeh17vPaEM+5 s5zg== 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=Bt8Tpyo9+uK9+uEwdNPTeV0vFTeTDzA61bzY9RGScBk=; b=Boc/H10zJQB+2Kl5cQkz2nrCCFIkfy/2iUMfNfa1q8WC0AOhoyjm6Plnlt7EnsfIqM YlFFqERywdGB9y/yFryudbmyUA6g3b1gimB1wwCZ4/q0/47t3gwTZ8Ks2Ez737zssE43 CJN8xh2oQy7HpTJmJ1ZmI6kbIyTG5O0dZRG+arymEeXv00ae39PbTooSd8t8bAzE/cpH gFTdSnVPNNRu+XNAuyq4KJqmYARIUE5Rw5KyY9/GdOr2Q6O1D8rdiXbSQqSvVO9MmlHW ZMCrr1wI9f/0jIzQcVkIJjxnU5P20zNrBxOQc1eYtcIdIBr+B7eTJ0BaODREl3l0MMQR xUTQ== X-Gm-Message-State: AOAM533GXvpnczVqR4D6oxyuJ1jG6BEZmEqtJna55UR8PSwf3mRjxLdS uSwPsaCbiWDllRVqNhhhLJWUFA== X-Google-Smtp-Source: ABdhPJwBFoLdgT35KDHIJzm7xrewNIq9qTf1OKaDycVsrRNk8RotPEDHcLl80CYeyknzOZZUNZVCCw== X-Received: by 2002:a1c:f704:: with SMTP id v4mr4145142wmh.4.1599665773319; Wed, 09 Sep 2020 08:36:13 -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 v204sm4619807wmg.20.2020.09.09.08.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:12 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Subject: [PATCH v4 2/5] wcn36xx: Use HW_VALUE_CHANNEL macro to get channel number Date: Wed, 9 Sep 2020 16:36:57 +0100 Message-Id: <20200909153700.2904977-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> References: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Uses HW_VALUE_CHANNEL() to extract the channel number from a struct ieee80211_channel->hw_value. Once done we can use the upper bits of the hw_value to encode PHY related data. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/smd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index ce6536a3185c..a28bf52a60c5 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -760,8 +760,10 @@ int wcn36xx_smd_start_hw_scan(struct wcn36xx *wcn, struct ieee80211_vif *vif, msg_body->num_channel = min_t(u8, req->n_channels, sizeof(msg_body->channels)); - for (i = 0; i < msg_body->num_channel; i++) - msg_body->channels[i] = req->channels[i]->hw_value; + for (i = 0; i < msg_body->num_channel; i++) { + msg_body->channels[i] = + HW_VALUE_CHANNEL(req->channels[i]->hw_value); + } msg_body->header.len -= WCN36XX_MAX_SCAN_IE_LEN; From patchwork Wed Sep 9 15:36:58 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: 11765671 X-Patchwork-Delegate: kvalo@adurom.com 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 CCDD459D for ; Wed, 9 Sep 2020 15:39:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7A8620672 for ; Wed, 9 Sep 2020 15:39:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oh+Ig/0o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730359AbgIIPis (ORCPT ); Wed, 9 Sep 2020 11:38:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730240AbgIIPgQ (ORCPT ); Wed, 9 Sep 2020 11:36:16 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DE65C06134A for ; Wed, 9 Sep 2020 08:36:15 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id g4so3462061wrs.5 for ; Wed, 09 Sep 2020 08:36:15 -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=gyyyc+eVVPBc5oNmWeDufnX8Vdj7EzlctFSImbJVqV4=; b=oh+Ig/0oFiVrEM89eAzw62FS/G8US3yu3On4UDMdTE3hqwEU6ecAmGjix+AJh3sP8X t/IgnZsBUsraKwC5ZKK074Ze43E62JZwAEXILk261HOdaDwpQC6Tj9yntg00lSnlx4fd hG/hsMuYK6POV5/dI6L59eDB/N04UlOJpH0lUeXd+clc57fxZWjshtvQ5sxoyxhAc7x/ 9cHA99QvaM6E0cYVj7JJBFRSOO65tnG+RMUB/lkngEVSpu34qXsem6h8gc07Zi3U41O7 zKMZiPH05F8gScmkmWP0mrvXC7WKyRAH2LTuLnwJeaDxqExHNWAS3crlmOfWQVqNgtgn NoZQ== 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=gyyyc+eVVPBc5oNmWeDufnX8Vdj7EzlctFSImbJVqV4=; b=aYLNlNdnZgi6AIbrhSjEXqBgKYqiQGXq9gQxwYiQeVyh98BaENZSVu1yL2fKGSN1Ve 59fc4KQaY72eW2I30uMH729TSfbcTNQm31sbxIMIKYlOGY8z6VAVoUHyac7MSYlCYm8d fX/mceuiInssVHrX/l336513rG9XBmRmVXV2zPVifAxegUWQeaipMHQGcn27I+jvy73M EjVDUd3puvmk/n4m4TQja6m7QQa4jCKfuoJ4CXRtVGPhmEQbifHU0uYq+l2sc/oDUMer tXfW7ZMBXY7homE/sAqGLOA2jvoIEjbKUbVs1tDK6ciKr4eZMbjitgBSytMyRMlBwh0O PSUg== X-Gm-Message-State: AOAM5333emBc2aAilzbUqE6Aq0Juua7X96rHLDX/gJIwc8Z0dt7821ie EfT23yQQXBP3dOXXob+jxSCLDQ== X-Google-Smtp-Source: ABdhPJyPicumd4X0LF+oGgNS3/ezc40BruS2GaxspNt3jnrsANfXY0TsODjHCWyjt/7ZUW3vorlG9Q== X-Received: by 2002:a5d:610d:: with SMTP id v13mr4284377wrt.23.1599665774397; Wed, 09 Sep 2020 08:36:14 -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 v204sm4619807wmg.20.2020.09.09.08.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:13 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Subject: [PATCH v4 3/5] wcn36xx: Add accessor macro HW_VALUE_PHY for PHY settings Date: Wed, 9 Sep 2020 16:36:58 +0100 Message-Id: <20200909153700.2904977-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> References: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Adds HW_VALUE_PHY(hw_value) an access macro that will be used to extract a hardware specific PHY setting for a given channel. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h index ebce1ed7adf7..71fa9992b118 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -83,6 +83,8 @@ enum wcn36xx_ampdu_state { WCN36XX_AMPDU_OPERATIONAL, }; +#define HW_VALUE_PHY_SHIFT 8 +#define HW_VALUE_PHY(hw_value) ((hw_value) >> HW_VALUE_PHY_SHIFT) #define HW_VALUE_CHANNEL(hw_value) ((hw_value) & 0xFF) #define WCN36XX_HW_CHANNEL(__wcn)\ HW_VALUE_CHANNEL(__wcn->hw->conf.chandef.chan->hw_value) From patchwork Wed Sep 9 15:36:59 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: 11765669 X-Patchwork-Delegate: kvalo@adurom.com 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 1E256618 for ; Wed, 9 Sep 2020 15:38:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEC042078E for ; Wed, 9 Sep 2020 15:38:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Y2/PyBWd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730411AbgIIPij (ORCPT ); Wed, 9 Sep 2020 11:38:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730359AbgIIPgU (ORCPT ); Wed, 9 Sep 2020 11:36:20 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6C7CC06134E for ; Wed, 9 Sep 2020 08:36:16 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id s12so3438747wrw.11 for ; Wed, 09 Sep 2020 08:36:16 -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=mNr+Pfqwu/0aRFo1Po43D8D7g7/h15rV4ULpD0JgPO4=; b=Y2/PyBWdxg1P1jEbkeXKlpmoigQdCKRo87k2Le3pRYeEoxfnA4NvrUfQnpkcmkSMJ9 SgRep61lw1lGaYH/GbF+9b41ELuBMcS8XeftkoU8zvRnWIKmIKA4Pb0j3RSQdUx1SZKn 5uSzSIdhrKdwIU6aWO4extuXuHSkLpCBdYNmjVvP8OCqYYTOJL0d4Hsj6eu4fDYts4dU TeTLwLskJ6tz+iN72GL2kpUoZicGvsO1kZtP+ffojLjVCZqos1JHGAYgBMPijYbJle8C zi1BOM6+rJXuBPEU21VFEp3v+/q7OzomQwjBzUh0DxCUxnSgbWZmlWvj9v7FJdbpyAiw 5h6Q== 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=mNr+Pfqwu/0aRFo1Po43D8D7g7/h15rV4ULpD0JgPO4=; b=k8UfFVrnr7kVVa06XZUXCLj6JA9C9V4btbpXeKN1/AnK4YgThSpxzybrkwyOv9uUS/ IfXo9dAO/kLy+pN5xDbWEohYLdpIc21xpTT8fT5WVj+J3xoCg1ikWhLzdmVTjhai6pw8 U3bkY1FQ0RzjmYsuOccOIX7q7w8gzBzWJRmf0cVPdoLrrc9tk4a70hS7P7RNXCm6SVFz mJOANoL4QXh2oJYmbz9G/ldqYb3eLY7haAhWIzeYcGZyP6+sgqCbq2uFrvGDuUJbYlpf MfjTxEKty8Q4hzFV4rSt++OesNeEuWP+BhgjMVRXbz0by3fhjjdHMnB49GNl9rtGVG4h EEqQ== X-Gm-Message-State: AOAM530W+/bqM0v0/n+N5wzrkbTVRE9uCOipEuqzj7nbjiCUj998Z0Av 8rbtawA+FmpFb2rx6bCrHNx8OQ== X-Google-Smtp-Source: ABdhPJwJYAk5aw/RdYlLTmolBuMN2pPC4JFvfCb3/5Pf+V5Eb/UyIUUQau5yUUBgX9XrkHoJWphptg== X-Received: by 2002:adf:e4c5:: with SMTP id v5mr4282315wrm.320.1599665775342; Wed, 09 Sep 2020 08:36:15 -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 v204sm4619807wmg.20.2020.09.09.08.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:14 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Subject: [PATCH v4 4/5] wcn36xx: Encode PHY mode for 80MHz channel in hw_value Date: Wed, 9 Sep 2020 16:36:59 +0100 Message-Id: <20200909153700.2904977-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> References: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This commit encodes the 802.11ac PHY mode for a given channel in the upper bits of the hw_value field. This allows for a neat read-out and application of the relevant PHY setting. Signed-off-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/main.c | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index ab6685dc956b..36cfa7043bc3 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -39,10 +39,10 @@ MODULE_PARM_DESC(debug_mask, "Debugging mask"); .max_power = 25, \ } -#define CHAN5G(_freq, _idx) { \ +#define CHAN5G(_freq, _idx, _phy_val) { \ .band = NL80211_BAND_5GHZ, \ .center_freq = (_freq), \ - .hw_value = (_idx), \ + .hw_value = (_phy_val) << HW_VALUE_PHY_SHIFT | HW_VALUE_CHANNEL(_idx), \ .max_power = 25, \ } @@ -67,29 +67,29 @@ static struct ieee80211_channel wcn_2ghz_channels[] = { }; static struct ieee80211_channel wcn_5ghz_channels[] = { - CHAN5G(5180, 36), - CHAN5G(5200, 40), - CHAN5G(5220, 44), - CHAN5G(5240, 48), - CHAN5G(5260, 52), - CHAN5G(5280, 56), - CHAN5G(5300, 60), - CHAN5G(5320, 64), - CHAN5G(5500, 100), - CHAN5G(5520, 104), - CHAN5G(5540, 108), - CHAN5G(5560, 112), - CHAN5G(5580, 116), - CHAN5G(5600, 120), - CHAN5G(5620, 124), - CHAN5G(5640, 128), - CHAN5G(5660, 132), - CHAN5G(5700, 140), - CHAN5G(5745, 149), - CHAN5G(5765, 153), - CHAN5G(5785, 157), - CHAN5G(5805, 161), - CHAN5G(5825, 165) + CHAN5G(5180, 36, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5200, 40, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), + CHAN5G(5220, 44, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5240, 48, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH), + CHAN5G(5260, 52, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5280, 56, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), + CHAN5G(5300, 60, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5320, 64, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH), + CHAN5G(5500, 100, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5520, 104, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), + CHAN5G(5540, 108, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5560, 112, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH), + CHAN5G(5580, 116, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5600, 120, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), + CHAN5G(5620, 124, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5640, 128, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH), + CHAN5G(5660, 132, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5700, 140, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5745, 149, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_LOW), + CHAN5G(5765, 153, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), + CHAN5G(5785, 157, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5805, 161, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_HIGH), + CHAN5G(5825, 165, 0) }; #define RATE(_bitrate, _hw_rate, _flags) { \ From patchwork Wed Sep 9 15:37:00 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: 11765859 X-Patchwork-Delegate: kvalo@adurom.com 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 C10FC746 for ; Wed, 9 Sep 2020 17:06:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5E5821919 for ; Wed, 9 Sep 2020 17:06:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b71P0uq3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730367AbgIIPiR (ORCPT ); Wed, 9 Sep 2020 11:38:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730361AbgIIPgV (ORCPT ); Wed, 9 Sep 2020 11:36:21 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E22AC061364 for ; Wed, 9 Sep 2020 08:36:17 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id y15so2846018wmi.0 for ; Wed, 09 Sep 2020 08:36:17 -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=ALkvRKCUevbeFhjBwQhyolUataIAPGgfoMc2+wbgZyY=; b=b71P0uq3o1CkXwB1hBnlO+YSTdS7UzGiatB+Dy9bTJR90GXL+4ZqjeMkw9jeDU1rrq rJ4oqyIM2kI8PINP2FPnIyP9eyt8XPIBrfBj96GCGNmx5oWbxQNG38s8cziTUPSQyKwy cNmOCzFpk4R+iN3msgGsE3eT6Lxpm/+lycNdDnBstcQpYj70dpF9bg0y0uU9rE53HDr7 zO/x+4wEYYKqaTkURKCSlA4AntuS1jDnXLqjZii3VOwYbNAI3bQnczwiGdadl96OqT2P xpZf81ZDApuK5285oqFokvShTZjOzMfiRQbCyQU/4q9Js/ULB+nAKjF4coRnkW2w2Vgn YxIw== 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=ALkvRKCUevbeFhjBwQhyolUataIAPGgfoMc2+wbgZyY=; b=bvV7yj+4R9Sv10o0rReaU/B5HIl1A7dovKnPWrx0xOcgQdh01CbhXAk2WewK5qRDMJ FXAZrBnQI//IQ9ufjP+XRH3Q1ZOYjNCh1mplJraY9dLQ5CDZKiSxbSMIWaqQvPAUfM/N 3vTRM9KOkrlCngkwSDeVJb9dWxGWHw9z7uDrjyD9ZhQ+A3M0HEbCFrkRsgHjgCNHFdt4 YkRIaT340u3Tvx33q6P2qXEzBncBnSpIRapO2weAUGkfFWKIXbDeTkW7KVQk/HbFYcIQ rX2SwHDVTZE6KEv7QCOaZJaJjNMDqDIRLJ8repBBgNXb7neCzExF9LATsh6rrMvXGBto Tzzw== X-Gm-Message-State: AOAM533rYwanI1wRIedego7kD/PpZx0Cgrc6Yl86YhghJR55ekcyz2T6 JRN/qoPfE0oA44902uz0PBRnxg== X-Google-Smtp-Source: ABdhPJw7+UPY8SxPXMnieK/m8NJH6L+DNNkzzxgf7aWbfNZuAfY1oiqmW6mt1HZO8Wuup6ZNsLhRTA== X-Received: by 2002:a1c:2ed0:: with SMTP id u199mr3998553wmu.125.1599665776313; Wed, 09 Sep 2020 08:36:16 -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 v204sm4619807wmg.20.2020.09.09.08.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 08:36:15 -0700 (PDT) From: Bryan O'Donoghue To: kvalo@codeaurora.org, wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org Cc: bryan.odonoghue@linaro.org, shawn.guo@linaro.org, loic.poulain@linaro.org Subject: [PATCH v4 5/5] wcn36xx: Set PHY into correct mode for 80MHz channel width Date: Wed, 9 Sep 2020 16:37:00 +0100 Message-Id: <20200909153700.2904977-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> References: <20200909153700.2904977-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.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(-) diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index a28bf52a60c5..55d2609bd9a1 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -1487,6 +1487,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); @@ -1526,7 +1527,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;