From patchwork Tue Jan 3 11:03:39 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: 9494715 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 1F33F60405 for ; Tue, 3 Jan 2017 11:04:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 116741FE7A for ; Tue, 3 Jan 2017 11:04:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06117268AE; Tue, 3 Jan 2017 11:04:03 +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 552611FE7A for ; Tue, 3 Jan 2017 11:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757963AbdACLEA (ORCPT ); Tue, 3 Jan 2017 06:04:00 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35108 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756113AbdACLD5 (ORCPT ); Tue, 3 Jan 2017 06:03:57 -0500 Received: by mail-lf0-f68.google.com with SMTP id x140so27822697lfa.2; Tue, 03 Jan 2017 03:03:56 -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=cOdaRJiHO1N8wssMM5f+UO8PcBicQYQ9nbHMXTOmO50=; b=B2xhJCOHyjgO6a9l9bfjyNFoUhlKLa1zwIwP78KE+Z1/AD58GyaL8I0Bc2pgfhtHIZ RZQOQr7k24C9GrttxTlVS97iMIElpzB+5xPy9SET9GiIFJONCFWZmThfICyGtn5hG6G+ cROXa35nGaiwik3ufZueB2uxS90x4K5nQ2vx4HZq1j3E/Xsbccz7H8w1w5XKDZ5YElYj VsoJf4Lh5Hkx3mWVGqXqSN80PhLCueu088yVVSWANwY+1R/GvOb3Se/jrDu8/dhllYN0 Pz12ISpn5nDfvcfLavATV/fKk7Vkvju46fJN1GKoCQvtIm519W8K1WzzAs4XLhT7qPKw 2XBA== 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=cOdaRJiHO1N8wssMM5f+UO8PcBicQYQ9nbHMXTOmO50=; b=AhvCx3h5q7a4oO6IaM+DoPP1URlLmVd3U+mJMsYPjrKl4VCGeaLm7+n8MgzD4yrsGd Sc8+H74usLyUWaWv39dpP0e3dbJ10wy0K0DRtsoVeZMQ3Vtj//ikWxESAd8uhnH3MIdY e21grEWqvDyYmpiTxcrFEhynpCANySWU9qQ/Il4P3QHP3BGrpKepXD0fxck9JGN+uzxQ aP+yzJVO/KEP6iCjgQmGeUfgsHEtnLOuQ+hBa6bVONMUuTSmaw47cNtYLtkoN++S6X6h kougmSxwTueaI8ojvT1BflJUfBAVUSyMndrExIT3UD4PFbMgNbU7HgDM0wAEcFCY0zjV C2oQ== X-Gm-Message-State: AIkVDXJ63cjgHK+qBXuQIRL5rHY+0t9H2HRp1QmXfrqJK3uxH515ZA9rn5yK350AjcOCzw== X-Received: by 10.25.213.7 with SMTP id m7mr14086779lfg.36.1483441435176; Tue, 03 Jan 2017 03:03:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 03:03:54 -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 2/2] cfg80211: support ieee80211-freq-limit DT property Date: Tue, 3 Jan 2017 12:03:39 +0100 Message-Id: <20170103110340.23249-2-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 This patch adds a helper for reading that new property and applying limitations or supported channels specified this way. It may be useful for specifying single band devices or devices that support only some part of the whole band. It's common that tri-band routers have separated radios for lower and higher part of 5 GHz band. Signed-off-by: Rafał Miłecki --- V2: Put main code in core.c as it isn't strictly part of regulatory - pointed by Arend. Update to support ieee80211-freq-limit (new property). V3: Introduce separated wiphy_read_of_freq_limits function. Add extra sanity checks for DT data. Move code back to reg.c as suggested by Johannes. V4: Move code to of.c Use one helper called at init time (no runtime hooks) Modify orig_flags --- include/net/cfg80211.h | 26 ++++++++++ net/wireless/Makefile | 1 + net/wireless/of.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ net/wireless/reg.c | 4 +- net/wireless/reg.h | 2 + 5 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 net/wireless/of.c diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index ca2ac1c..d7723a8 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -311,6 +311,32 @@ struct ieee80211_supported_band { struct ieee80211_sta_vht_cap vht_cap; }; +/** + * wiphy_read_of_freq_limits - read frequency limits from device tree + * + * @wiphy: the wireless device to get extra limits for + * + * Some devices may have extra limitations specified in DT. This may be useful + * for chipsets that normally support more bands but are limited due to board + * design (e.g. by antennas or extermal power amplifier). + * + * This function reads info from DT and uses it to *modify* channels (disable + * unavailable ones). It's usually a *bad* idea to use it in drivers with + * shared channel data as DT limitations are device specific. + * + * As this function access device node it has to be called after set_wiphy_dev. + * It also modifies channels so they have to be set first. + */ +#ifdef CONFIG_OF +int wiphy_read_of_freq_limits(struct wiphy *wiphy); +#else /* CONFIG_OF */ +static inline int wiphy_read_of_freq_limits(struct wiphy *wiphy) +{ + return 0; +} +#endif /* !CONFIG_OF */ + + /* * Wireless hardware/device configuration structures and methods */ diff --git a/net/wireless/Makefile b/net/wireless/Makefile index 4c9e39f..95b4c09 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_WEXT_PRIV) += wext-priv.o cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o +cfg80211-$(CONFIG_OF) += of.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_CFG80211_WEXT) += wext-compat.o wext-sme.o cfg80211-$(CONFIG_CFG80211_INTERNAL_REGDB) += regdb.o diff --git a/net/wireless/of.c b/net/wireless/of.c new file mode 100644 index 0000000..d5791c8 --- /dev/null +++ b/net/wireless/of.c @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2017 Rafał Miłecki + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include "reg.h" + +static bool wiphy_freq_limits_valid_chan(struct wiphy *wiphy, + struct ieee80211_freq_range *freq_limits, + unsigned int n_freq_limits, + struct ieee80211_channel *chan) +{ + u32 bw = MHZ_TO_KHZ(20); + int i; + + for (i = 0; i < n_freq_limits; i++) { + struct ieee80211_freq_range *limit = &freq_limits[i]; + + if (reg_does_bw_fit(limit, MHZ_TO_KHZ(chan->center_freq), bw)) + return true; + } + + return false; +} + +static void wiphy_freq_limits_apply(struct wiphy *wiphy, + struct ieee80211_freq_range *freq_limits, + unsigned int n_freq_limits) +{ + enum nl80211_band band; + int i; + + if (WARN_ON(!n_freq_limits)) + return; + + for (band = 0; band < NUM_NL80211_BANDS; band++) { + struct ieee80211_supported_band *sband = wiphy->bands[band]; + + if (!sband) + continue; + + for (i = 0; i < sband->n_channels; i++) { + struct ieee80211_channel *chan = &sband->channels[i]; + + if (chan->orig_flags & IEEE80211_CHAN_DISABLED) + continue; + + if (!wiphy_freq_limits_valid_chan(wiphy, freq_limits, + n_freq_limits, + chan)) { + pr_debug("Disabling freq %d MHz as it's out of OF limits\n", + chan->center_freq); + chan->orig_flags |= IEEE80211_CHAN_DISABLED; + } + } + } +} + +int wiphy_read_of_freq_limits(struct wiphy *wiphy) +{ + struct device *dev = wiphy_dev(wiphy); + struct device_node *np; + struct property *prop; + struct ieee80211_freq_range *freq_limits; + unsigned int n_freq_limits; + const __be32 *p; + int len, i, err; + + if (!dev) + return 0; + np = dev_of_node(dev); + if (!np) + return 0; + + prop = of_find_property(np, "ieee80211-freq-limit", &len); + if (!prop) + return 0; + + if (!len || len % sizeof(u32) || len / sizeof(u32) % 2) { + dev_err(dev, "ieee80211-freq-limit wrong format"); + return -EPROTO; + } + n_freq_limits = len / sizeof(u32) / 2; + + freq_limits = kcalloc(n_freq_limits, sizeof(*freq_limits), GFP_KERNEL); + if (!freq_limits) { + err = -ENOMEM; + goto out; + } + + p = NULL; + for (i = 0; i < n_freq_limits; i++) { + struct ieee80211_freq_range *limit = &freq_limits[i]; + + p = of_prop_next_u32(prop, p, &limit->start_freq_khz); + if (!p) { + err = -EINVAL; + goto out; + } + + p = of_prop_next_u32(prop, p, &limit->end_freq_khz); + if (!p) { + err = -EINVAL; + goto out; + } + + if (!limit->start_freq_khz || + !limit->end_freq_khz || + limit->start_freq_khz >= limit->end_freq_khz) { + err = -EINVAL; + goto out; + } + } + + wiphy_freq_limits_apply(wiphy, freq_limits, n_freq_limits); + + return 0; + +out: + dev_err(dev, "Failed to get limits: %d\n", err); + kfree(freq_limits); + return err; +} +EXPORT_SYMBOL(wiphy_read_of_freq_limits); diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5dbac37..bda0e9e 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -748,8 +748,8 @@ static bool is_valid_rd(const struct ieee80211_regdomain *rd) return true; } -static bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range, - u32 center_freq_khz, u32 bw_khz) +bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range, + u32 center_freq_khz, u32 bw_khz) { u32 start_freq_khz, end_freq_khz; diff --git a/net/wireless/reg.h b/net/wireless/reg.h index f6ced31..b8e44ef 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -54,6 +54,8 @@ void regulatory_exit(void); int set_regdom(const struct ieee80211_regdomain *rd, enum ieee80211_regd_source regd_src); +bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range, + u32 center_freq_khz, u32 bw_khz); unsigned int reg_get_max_bandwidth(const struct ieee80211_regdomain *rd, const struct ieee80211_reg_rule *rule);