From patchwork Mon Oct 25 17:53:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 12582541 X-Patchwork-Delegate: kuba@kernel.org 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 4A8ECC433F5 for ; Mon, 25 Oct 2021 17:54:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24CCC61002 for ; Mon, 25 Oct 2021 17:54:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234081AbhJYR4e (ORCPT ); Mon, 25 Oct 2021 13:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234007AbhJYR4d (ORCPT ); Mon, 25 Oct 2021 13:56:33 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BB91C061745 for ; Mon, 25 Oct 2021 10:54:11 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id o4-20020a17090a3d4400b001a1c8344c3fso22523pjf.3 for ; Mon, 25 Oct 2021 10:54:11 -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=1gPoNo92iESFlBxWkikvbPoKmmzVPIkRedYKKP1zdBg=; b=c/w6uGKLxK0fHWgqwW03VkNNLB+5X2tI9LfAEGp3yrep3P7kUWdWrXbelId6QlnOjW D3bjyFCvZHvv/1i61dgLL3uICvR2AUfKNLoZIJgaBZKAhvr0wK+ASM/YLxrKSMaEnY6t GqcXy6v3OXhWLhpMZr/wPpLdvQBY6GUD4Pyf4= 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=1gPoNo92iESFlBxWkikvbPoKmmzVPIkRedYKKP1zdBg=; b=eg7nS+HR8SABvz0VFe5RJpnknH5zZX0fUUkWbb8TwWrNH+Jo9Ky9TtnEg5Mxk25oMi /7/wZ9NHrqsxHrACa2KyxqzFzDowgAGaCDPrHS1JlwJhDtZ98iF1Jb4l03w9ARTkRM4A yHK0PFEW1Dx6jmmYo8K8UPlTofj84FJUwhJ7BzbbjRoSqv25rB/m6nXAjpau5MqG5Lq/ /6BKS7YHEIkhpWolTyXW5Se5goNpqIH4z36ENhkpCLHpHEh0wXEh9i14kQRY6/kgYesC XjhVjk+kPRhqmFMCC1MV5+iZVZ2pYUEySEpi1QGBS8IaRqctmC3694W8K16Wq5HCTFAt ixng== X-Gm-Message-State: AOAM533idIRWiZKdrXZC6DUbSr4rXYa2cqVyC3KSLjA+9Tz2a8i2ex36 3JIJBf0zq4nTZplaqgvu837PaA== X-Google-Smtp-Source: ABdhPJw4DjI/4mA/YrILoYKVG0T9mBiDsZBAxrKs6I1r0g0nuM4QiC9BILDitCgYrC4dYvU/fbSXig== X-Received: by 2002:a17:902:ea04:b0:140:5023:f475 with SMTP id s4-20020a170902ea0400b001405023f475mr8038051plg.29.1635184450986; Mon, 25 Oct 2021 10:54:10 -0700 (PDT) Received: from localhost ([2600:6c50:4d00:cd01::382]) by smtp.gmail.com with ESMTPSA id d14sm20930669pfu.124.2021.10.25.10.54.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Oct 2021 10:54:10 -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 v2 1/2] wcn36xx: switch on antenna diversity feature bit Date: Mon, 25 Oct 2021 10:53:57 -0700 Message-Id: <20211025175359.3591048-2-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211025175359.3591048-1-benl@squareup.com> References: <20211025175359.3591048-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The official feature-complete WCN3680B driver (known as prima, open source but not upstream) sends this feature bit. As we wish to support the antenna diversity feature in upstream, we need to set this bit as well. 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 3979171c92dd2..be6442b3c80b1 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 Mon Oct 25 17:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Li X-Patchwork-Id: 12582543 X-Patchwork-Delegate: kuba@kernel.org 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 B8428C433EF for ; Mon, 25 Oct 2021 17:54:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A308960EB1 for ; Mon, 25 Oct 2021 17:54:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234179AbhJYR4k (ORCPT ); Mon, 25 Oct 2021 13:56:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234137AbhJYR4j (ORCPT ); Mon, 25 Oct 2021 13:56:39 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B00C4C061348 for ; Mon, 25 Oct 2021 10:54:16 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id y1so8452748plk.10 for ; Mon, 25 Oct 2021 10:54:16 -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=0b8Cy/SzLmseGiIUYAIo0JyRYpLjWYFrcuaB9VtxPw8=; b=SeU/8I56LhZgKHilc3Q8ccwtCrLudOwC5mMeNK26Xksa1sq/E8vQYC/O7Gslx9zC5r 8bg1vCjJKBICr5F+PzmXdeduyawzKD33vctaViIm3AqU9xvQ6DTMjfgUPw7mkKzY5Yvo YChPE5hbbRWc8l5Ouec7/EAwUGD/9dUEkYd7E= 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=0b8Cy/SzLmseGiIUYAIo0JyRYpLjWYFrcuaB9VtxPw8=; b=Jn4OOkIeovGO5uOCWIWLf001PRuZ9pWx4dE62EXQxj4Fp4KbVBBOshztwoNzBl/Yhe hjCpIe0xPd2O56OGKkiOAkiUNmHwrb5Y2gnHqmh5oY+tEyoKKYYMu2vvCgcZr3wMDFLz KI8qXABSEY6MOi2rutciqtluyI9FffdBZwWsvWgsJpxQpFUhYAfK93vt3jh1yy9QcNYU 9931btn+z5eMe/M5AE/JTK69M0MfAp/cDJmXZzF/i/hUWwKqQ7sprZivlP5d9bJY5tZU YGEKh0hwuOFePqfa7gGHbGQWqB2x6hOSf6ccrdO5kEKAcuBzSYyXhN7FiOeoQ5T7uCG8 NxLQ== X-Gm-Message-State: AOAM530N+JOAhh2sdi1H//J8zpmkCGtQbR1y3wSG5PXwsvXVo8C9CuUK 1J+scKPauQ7XXyRWKhcT+J1nOw== X-Google-Smtp-Source: ABdhPJwhSGpFuYwaM8jcys6JcXxW/N+o+8GBOK/mD7NCQWgVxJEYUv3D04jpODXTAFetFTb4oTMSog== X-Received: by 2002:a17:902:be0c:b0:13e:2b53:d3 with SMTP id r12-20020a170902be0c00b0013e2b5300d3mr17977669pls.86.1635184456224; Mon, 25 Oct 2021 10:54:16 -0700 (PDT) Received: from localhost ([2600:6c50:4d00:cd01::382]) by smtp.gmail.com with ESMTPSA id c6sm581421pfd.114.2021.10.25.10.54.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Oct 2021 10:54:15 -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 v2 2/2] wcn36xx: add missing 5GHz channels 136 and 144 Date: Mon, 25 Oct 2021 10:53:58 -0700 Message-Id: <20211025175359.3591048-3-benl@squareup.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211025175359.3591048-1-benl@squareup.com> References: <20211025175359.3591048-1-benl@squareup.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The official feature-complete WCN3680B driver (known as prima, open source but not upstream) supports channels 136 and 144. However, these channels are missing in upstream. Add them here to get closer to feature parity with 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 263af65a889ab..13d09c66ae921 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 be6442b3c80b1..9785327593d26 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); }