From: "Rafał Miłecki" <zajec5@gmail.com> To: Kalle Valo <kvalo@codeaurora.org>, linux-wireless@vger.kernel.org Cc: "Martin Blumenstingl" <martin.blumenstingl@googlemail.com>, "Felix Fietkau" <nbd@nbd.name>, "Arnd Bergmann" <arnd@arndb.de>, devicetree@vger.kernel.org, "Rafał Miłecki" <rafal@milecki.pl> Subject: [PATCH 2/2] cfg80211: reg: support ieee80211-(min|max)-center-freq DT properties Date: Wed, 28 Dec 2016 16:59:55 +0100 [thread overview] Message-ID: <20161228155955.25518-2-zajec5@gmail.com> (raw) In-Reply-To: <20161228155955.25518-1-zajec5@gmail.com> From: Rafał Miłecki <rafal@milecki.pl> They allow specifying hardware limitations of supported channels. This may be useful for specifying single band devices or devices that support only some part of the whole band. E.g. some tri-band routers have separated radios for lower and higher part of 5 GHz band. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- net/wireless/reg.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5dbac37..35ba5c7 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1123,6 +1123,26 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator) } EXPORT_SYMBOL(reg_initiator_name); +static bool reg_center_freq_of_valid(struct wiphy *wiphy, + struct ieee80211_channel *chan) +{ + struct device_node *np = wiphy_dev(wiphy)->of_node; + u32 val; + + if (!np) + return true; + + if (!of_property_read_u32(np, "ieee80211-min-center-freq", &val) && + chan->center_freq < KHZ_TO_MHZ(val)) + return false; + + if (!of_property_read_u32(np, "ieee80211-max-center-freq", &val) && + chan->center_freq > KHZ_TO_MHZ(val)) + return false; + + return true; +} + static uint32_t reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd, const struct ieee80211_reg_rule *reg_rule, const struct ieee80211_channel *chan) @@ -1209,6 +1229,13 @@ static void handle_channel(struct wiphy *wiphy, return; } + if (!reg_center_freq_of_valid(wiphy, chan)) { + pr_debug("Disabling freq %d MHz as it's out of OF limits\n", + chan->center_freq); + chan->flags |= IEEE80211_CHAN_DISABLED; + return; + } + regd = reg_get_regdomain(wiphy); power_rule = ®_rule->power_rule; @@ -1741,6 +1768,13 @@ static void handle_channel_custom(struct wiphy *wiphy, return; } + if (!reg_center_freq_of_valid(wiphy, chan)) { + pr_debug("Disabling freq %d MHz as it's out of OF limits\n", + chan->center_freq); + chan->flags |= IEEE80211_CHAN_DISABLED; + return; + } + power_rule = ®_rule->power_rule; bw_flags = reg_rule_to_chan_bw_flags(regd, reg_rule, chan); -- 2.10.1
WARNING: multiple messages have this Message-ID (diff)
From: "Rafał Miłecki" <zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Kalle Valo <kvalo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: "Martin Blumenstingl" <martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>, "Felix Fietkau" <nbd-Vt+b4OUoWG0@public.gmane.org>, "Arnd Bergmann" <arnd-r2nGTMty4D4@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Rafał Miłecki" <rafal-g1n6cQUeyibVItvQsEIGlw@public.gmane.org> Subject: [PATCH 2/2] cfg80211: reg: support ieee80211-(min|max)-center-freq DT properties Date: Wed, 28 Dec 2016 16:59:55 +0100 [thread overview] Message-ID: <20161228155955.25518-2-zajec5@gmail.com> (raw) In-Reply-To: <20161228155955.25518-1-zajec5-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> From: Rafał Miłecki <rafal-g1n6cQUeyibVItvQsEIGlw@public.gmane.org> They allow specifying hardware limitations of supported channels. This may be useful for specifying single band devices or devices that support only some part of the whole band. E.g. some tri-band routers have separated radios for lower and higher part of 5 GHz band. Signed-off-by: Rafał Miłecki <rafal-g1n6cQUeyibVItvQsEIGlw@public.gmane.org> --- net/wireless/reg.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5dbac37..35ba5c7 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1123,6 +1123,26 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator) } EXPORT_SYMBOL(reg_initiator_name); +static bool reg_center_freq_of_valid(struct wiphy *wiphy, + struct ieee80211_channel *chan) +{ + struct device_node *np = wiphy_dev(wiphy)->of_node; + u32 val; + + if (!np) + return true; + + if (!of_property_read_u32(np, "ieee80211-min-center-freq", &val) && + chan->center_freq < KHZ_TO_MHZ(val)) + return false; + + if (!of_property_read_u32(np, "ieee80211-max-center-freq", &val) && + chan->center_freq > KHZ_TO_MHZ(val)) + return false; + + return true; +} + static uint32_t reg_rule_to_chan_bw_flags(const struct ieee80211_regdomain *regd, const struct ieee80211_reg_rule *reg_rule, const struct ieee80211_channel *chan) @@ -1209,6 +1229,13 @@ static void handle_channel(struct wiphy *wiphy, return; } + if (!reg_center_freq_of_valid(wiphy, chan)) { + pr_debug("Disabling freq %d MHz as it's out of OF limits\n", + chan->center_freq); + chan->flags |= IEEE80211_CHAN_DISABLED; + return; + } + regd = reg_get_regdomain(wiphy); power_rule = ®_rule->power_rule; @@ -1741,6 +1768,13 @@ static void handle_channel_custom(struct wiphy *wiphy, return; } + if (!reg_center_freq_of_valid(wiphy, chan)) { + pr_debug("Disabling freq %d MHz as it's out of OF limits\n", + chan->center_freq); + chan->flags |= IEEE80211_CHAN_DISABLED; + return; + } + power_rule = ®_rule->power_rule; bw_flags = reg_rule_to_chan_bw_flags(regd, reg_rule, chan); -- 2.10.1
next prev parent reply other threads:[~2016-12-28 16:00 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-28 15:59 [PATCH 1/2] dt-bindings: document common IEEE 802.11 frequency properties Rafał Miłecki 2016-12-28 15:59 ` Rafał Miłecki 2016-12-28 15:59 ` Rafał Miłecki [this message] 2016-12-28 15:59 ` [PATCH 2/2] cfg80211: reg: support ieee80211-(min|max)-center-freq DT properties Rafał Miłecki 2016-12-28 21:07 ` Arend van Spriel 2016-12-28 21:07 ` Arend van Spriel 2016-12-28 21:28 ` Rafał Miłecki 2016-12-28 21:28 ` Rafał Miłecki 2016-12-28 21:30 ` Rafał Miłecki 2016-12-28 21:30 ` Rafał Miłecki 2016-12-29 8:57 ` Arend van Spriel 2016-12-29 8:57 ` Arend van Spriel 2016-12-29 9:43 ` Rafał Miłecki 2016-12-29 9:43 ` Rafał Miłecki 2016-12-30 20:20 ` Arend van Spriel 2016-12-30 20:20 ` Arend van Spriel 2016-12-30 21:37 ` Rafał Miłecki 2016-12-30 21:37 ` Rafał Miłecki 2016-12-28 20:05 ` [PATCH 1/2] dt-bindings: document common IEEE 802.11 frequency properties Arend van Spriel 2016-12-28 20:05 ` Arend van Spriel 2016-12-28 20:32 ` Rafał Miłecki 2016-12-28 20:32 ` Rafał Miłecki 2016-12-28 20:39 ` Martin Blumenstingl 2016-12-28 20:39 ` Martin Blumenstingl 2016-12-28 20:43 ` Rafał Miłecki 2016-12-28 20:43 ` Rafał Miłecki 2016-12-28 21:35 ` Felix Fietkau 2016-12-28 21:35 ` Felix Fietkau 2016-12-28 22:22 ` Rafał Miłecki 2016-12-28 22:22 ` Rafał Miłecki 2017-01-03 19:55 ` Rob Herring 2017-01-03 19:55 ` Rob Herring 2017-01-03 20:20 ` Rafał Miłecki 2017-01-03 20:20 ` Rafał Miłecki 2017-01-04 14:32 ` Kalle Valo 2017-01-04 14:32 ` Kalle Valo 2017-01-04 14:53 ` Rafał Miłecki 2017-01-04 14:53 ` Rafał Miłecki 2017-01-04 19:53 ` Arend Van Spriel 2017-01-04 19:53 ` Arend Van Spriel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161228155955.25518-2-zajec5@gmail.com \ --to=zajec5@gmail.com \ --cc=arnd@arndb.de \ --cc=devicetree@vger.kernel.org \ --cc=kvalo@codeaurora.org \ --cc=linux-wireless@vger.kernel.org \ --cc=martin.blumenstingl@googlemail.com \ --cc=nbd@nbd.name \ --cc=rafal@milecki.pl \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.