From patchwork Fri Oct 22 23:57:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 12579195 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26EAAC433EF for ; Fri, 22 Oct 2021 23:58:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0303660724 for ; Fri, 22 Oct 2021 23:58:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232285AbhJWAAp (ORCPT ); Fri, 22 Oct 2021 20:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232241AbhJWAAp (ORCPT ); Fri, 22 Oct 2021 20:00:45 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22A9DC061764 for ; Fri, 22 Oct 2021 16:58:27 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id r134so7386013iod.11 for ; Fri, 22 Oct 2021 16:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HDS7qDHjHOaWOFZwMpIbasUAJZB8YLyW4e2fBz6JHaQ=; b=YSzqSWMAubbhHAheo3UGfbnP6ZHGIfBUiuOKXaagQp/0NGVfyeIXSPBYRLy8DyfSB9 n73i7f6FAdN6aqM2VmycTp6+BhhlQwB+xM5c4cKl98FYC2nyc0qsf70FYQNVzlMxDF+N /MPSzk9Mv3VAPlAZOgQ2SIH56zImPqoLfgvfs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HDS7qDHjHOaWOFZwMpIbasUAJZB8YLyW4e2fBz6JHaQ=; b=rkiCgZVMG/QiGDH1SBzqf5Ionez45asZLn+R3i3Kk+7YVhbajTEicywjaPGoy76Fl7 z8+Op2t76c+9C4ZQuEUITY2nhrXAmKMn2P4FVJqyuY1nHhR7T50Pij3lolaKPRZMZlB0 wFPERx9bF5/vyUyttK1s89TYGViCsnVhv57ywZLkRgq2r55aGVjhgYzMwtPhEHRuE9iP TVdr7V91wNi7BXY5Iq+Cle9p3c6O5Hj54e01XKHlhiaIMdir3Hrn4jBTVRzOmtH/0cL3 f8q1tQjayXUxJlc/19ZPF+vNKD8eMJ811gVW/Nd5S2zAkZzyqLPOuZGhOFdNDt0U2B6Z lpQQ== X-Gm-Message-State: AOAM533Dn8SAy4qNMFJiwk74UEBgfSW0FX1sOAy+jUcyLUhGnCwxH5dQ vo0BlvuuuGJcCFmxdfEKqnxQFQ== X-Google-Smtp-Source: ABdhPJwlcG4U/fvs7GLKW6fhpUoafn85mCdtXLVaK6ElzfOmSbH/J7pgw/ag96lYFBXBh4KjZPu1lg== X-Received: by 2002:a6b:ce03:: with SMTP id p3mr1672879iob.163.1634947106513; Fri, 22 Oct 2021 16:58:26 -0700 (PDT) Received: from localhost ([2600:6c50:4d00:cd01::382]) by smtp.gmail.com with ESMTPSA id o1sm4993337ilj.41.2021.10.22.16.58.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Oct 2021 16:58:25 -0700 (PDT) From: Benjamin Li To: Kalle Valo Cc: Bryan O'Donoghue , Loic Poulain , linux-arm-msm@vger.kernel.org, Benjamin Li , "David S. Miller" , Jakub Kicinski , wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] wcn36xx: Switch on Antenna diversity feature bit Date: Fri, 22 Oct 2021 16:57:37 -0700 Message-Id: <20211022235738.2970167-2-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022235738.2970167-1-benl@squareup.com> References: <20211022235738.2970167-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Bryan O'Donoghue Switches on Antenna diversity feature bit. Signed-off-by: Bryan O'Donoghue Signed-off-by: Benjamin Li --- drivers/net/wireless/ath/wcn36xx/smd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 3979171c92dd..be6442b3c80b 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -2394,8 +2394,10 @@ int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn) INIT_HAL_MSG(msg_body, WCN36XX_HAL_FEATURE_CAPS_EXCHANGE_REQ); set_feat_caps(msg_body.feat_caps, STA_POWERSAVE); - if (wcn->rf_id == RF_IRIS_WCN3680) + if (wcn->rf_id == RF_IRIS_WCN3680) { set_feat_caps(msg_body.feat_caps, DOT11AC); + set_feat_caps(msg_body.feat_caps, ANTENNA_DIVERSITY_SELECTION); + } PREPARE_HAL_BUF(wcn->hal_buf, msg_body); From patchwork Fri Oct 22 23:57:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 12579197 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C521C433F5 for ; Fri, 22 Oct 2021 23:58:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3242160724 for ; Fri, 22 Oct 2021 23:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232633AbhJWAAx (ORCPT ); Fri, 22 Oct 2021 20:00:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232514AbhJWAAt (ORCPT ); Fri, 22 Oct 2021 20:00:49 -0400 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F68BC061243 for ; Fri, 22 Oct 2021 16:58:31 -0700 (PDT) Received: by mail-il1-x135.google.com with SMTP id x1so5983808ilv.4 for ; Fri, 22 Oct 2021 16:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=squareup.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Si5lbp2a5j1U0HCfBdV44/FetwO/pG2+HucWazNTbKw=; b=DGLA132M8/FcLhmK+vR/nRo3FP1yMAFtCW/wpXyxgIuPQ4cAfUllbs2aMQTKChayMT ouvOy/ViIQ6lgP6RqHy9eK1V3UiZS9nC2NDrqj+fcF7iPabCMtmPhFpN9oifDJYDnv0E Q4n+llSZ3HBSJCUYzMarAU1D84l0/OZ9Rp1Yg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Si5lbp2a5j1U0HCfBdV44/FetwO/pG2+HucWazNTbKw=; b=5Q9ah/Pd4bL2ZhAZDaaWvXAaXlV7rl4fcV36xMeEYn3pylnZbBz92iY8sTHAsw4DhT dIwyu/fMOrphuEtUZ4hZ2SykkTnqLjjpSiO46ddHkCb/pyzyNfnyXXAKrsoMCtmvnlSI 3w44A+UfoODW6DA/YeRJ1hNFnnJjKkHOG5Sq71Cd63VZci9Did3qJ+P49cMKXibtaIC+ rsN4okzDyYpC+vMw20VInOSMFZDViebfrtPQ6udq07IYxHnvNKF2MhvXXJ/jNb8j1P/W 3E210nwZ/g2H919HmSt+PAQyVit77Cijpma1/O9P0pAkxhDqU8MV/7CZhrwqcArjpVcy aWZQ== X-Gm-Message-State: AOAM533IS6uzQmoCEEn7WSFqBTyJy91nz8+eb53rsKwJWXWy8X3J6mPF YYg1/wjYro15t6fjiOJ2T/QRIw== X-Google-Smtp-Source: ABdhPJzRtntF5c8V3sfCqUww06qkit5at7Z11doVNrjArRmWDnnYm4qe/iI+e9PNGrKVL0wN2RzvKQ== X-Received: by 2002:a05:6e02:1d13:: with SMTP id i19mr1815550ila.182.1634947110542; Fri, 22 Oct 2021 16:58:30 -0700 (PDT) Received: from localhost ([2600:6c50:4d00:cd01::382]) by smtp.gmail.com with ESMTPSA id z11sm4761784ilb.11.2021.10.22.16.58.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Oct 2021 16:58:29 -0700 (PDT) From: Benjamin Li To: Kalle Valo Cc: Bryan O'Donoghue , Loic Poulain , linux-arm-msm@vger.kernel.org, Benjamin Li , "David S. Miller" , Jakub Kicinski , wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] wcn36xx: add missing 5GHz channels 136 and 144 Date: Fri, 22 Oct 2021 16:57:38 -0700 Message-Id: <20211022235738.2970167-3-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022235738.2970167-1-benl@squareup.com> References: <20211022235738.2970167-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org These channels missing from scan results are a regression from downstream prima. Signed-off-by: Benjamin Li Reviewed-by: Bryan O'Donoghue --- drivers/net/wireless/ath/wcn36xx/main.c | 2 ++ drivers/net/wireless/ath/wcn36xx/smd.c | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 263af65a889a..13d09c66ae92 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -85,7 +85,9 @@ static struct ieee80211_channel wcn_5ghz_channels[] = { 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(5680, 136, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_40MHZ_LOW), CHAN5G(5700, 140, PHY_QUADRUPLE_CHANNEL_20MHZ_LOW_40MHZ_HIGH), + CHAN5G(5720, 144, PHY_QUADRUPLE_CHANNEL_20MHZ_HIGH_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), diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index be6442b3c80b..9785327593d2 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -2396,6 +2396,7 @@ int wcn36xx_smd_feature_caps_exchange(struct wcn36xx *wcn) set_feat_caps(msg_body.feat_caps, STA_POWERSAVE); if (wcn->rf_id == RF_IRIS_WCN3680) { set_feat_caps(msg_body.feat_caps, DOT11AC); + set_feat_caps(msg_body.feat_caps, WLAN_CH144); set_feat_caps(msg_body.feat_caps, ANTENNA_DIVERSITY_SELECTION); }