From patchwork Tue Jan 3 11:03:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9494717 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 83B3160405 for ; Tue, 3 Jan 2017 11:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76ED51FE7A for ; Tue, 3 Jan 2017 11:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B9E5268AE; Tue, 3 Jan 2017 11:04:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19AA41FE7A for ; Tue, 3 Jan 2017 11:04:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758014AbdACLEE (ORCPT ); Tue, 3 Jan 2017 06:04:04 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35115 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757925AbdACLD7 (ORCPT ); Tue, 3 Jan 2017 06:03:59 -0500 Received: by mail-lf0-f67.google.com with SMTP id x140so27822767lfa.2; Tue, 03 Jan 2017 03:03:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fq1VnqcmMTXMH/Hfcz8KmIqWwYuZNV6YWzgTpY/JADI=; b=NCucv/JUkHgCLJHg9im9xN0hlDtjeM8oRIvxQzQjwOqgtgR7dbpORHRicY6c8mGDYk s+TfIXapieDuFZ03trPIPx/pe+jh2O+5halkGHyvLcOpgNW+5GhC/JITDdBWUJZ+BGK3 Z0WAD5sIFq8hk5/HRbzxoq2mwkotH/dkHICBUo1b65mtL1cYnU+3enXL8GkDy8o+eaRh wy66oAsYzsqNlRZEOwgVJi4Vy+Brp1MmiG7rYAONRjmeFDRFYT/kMQ/luM1HH+j5xPQ7 xgXwahMamTljNnSeovyfVsXlnoPURxFT1dJlTqHpa+9wnG6GA6BNWgARaQzWWux6IovR NgFg== 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=fq1VnqcmMTXMH/Hfcz8KmIqWwYuZNV6YWzgTpY/JADI=; b=SRa8qrVyAH/+kCwFUTU42Rmtg2b5ZaCY/V5Segadz1VG4/9FOme/P0l9HJ9JyqJTjB uQfeZsfGH0pulEa092xZ+T+UlYsORFCFnSxWyU/yNkypVEBj8997lU0c4d5g/0JHgbkg yLdfS5uDRQMgLfvkNwxt30KZRIBxEHupYMmSP0XLfk1umd1Cmf71u7WWEtCHjlk44QxR 8LB59F1rBNKICI71fJ83sG8Sb9FWe/C+5r9jh9Qezw2lRGrdfCgN0jS1bouMVdBuPNJk +nBFGZ+yONgylEMISbZpX89DvTodLZQEM7ztGNkC9XgkPxPi9n2RtH0Oz6bigPggt3Mx XC6A== X-Gm-Message-State: AIkVDXIMBZFxMBCKkFrESdphZ7/+MLcwfKY4+AsF3kqVfBoAvlVRW7wrvkxVpzlAtqCC0g== X-Received: by 10.25.202.66 with SMTP id h2mr22398941lfj.131.1483441437529; Tue, 03 Jan 2017 03:03:57 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id c75sm16594496lfe.28.2017.01.03.03.03.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 03:03:56 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Johannes Berg , linux-wireless@vger.kernel.org Cc: Martin Blumenstingl , Felix Fietkau , Arend van Spriel , Arnd Bergmann , devicetree@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V4 3/2] brcmfmac: use wiphy_read_of_freq_limits to respect extra limits Date: Tue, 3 Jan 2017 12:03:40 +0100 Message-Id: <20170103110340.23249-3-zajec5@gmail.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170103110340.23249-1-zajec5@gmail.com> References: <20170103110340.23249-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafał Miłecki There are some devices (e.g. Netgear R8000 home router) with one chipset model used for different radios, some of them limited to subbands. NVRAM entries don't contain any extra info on such limitations and firmware reports full list of channels to us. We need to store extra limitation info on DT to support such devices properly. This patch adds check for channel being disabled with orig_flags which is how this wiphy helper works. Signed-off-by: Rafał Miłecki --- This patch should probably go through wireless-driver-next, I'm sending it just as a proof of concept. It was succesfully tested on SmartRG SR400ac with BCM43602. V4: Respect IEEE80211_CHAN_DISABLED in orig_flags --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index ccae3bb..f95e316 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5886,6 +5886,9 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg, band->band); channel[index].hw_value = ch.control_ch_num; + if (channel->orig_flags & IEEE80211_CHAN_DISABLED) + continue; + /* assuming the chanspecs order is HT20, * HT40 upper, HT40 lower, and VHT80. */ @@ -6477,6 +6480,7 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp) wiphy->bands[NL80211_BAND_5GHZ] = band; } } + wiphy_read_of_freq_limits(wiphy); err = brcmf_setup_wiphybands(wiphy); return err; }