| From e1171aa4bd128d019fc5d53431472abddeb5cca0 Mon Sep 17 00:00:00 2001 |
| From: dzou <dzou@company.com> |
| Date: Sun, 5 Jun 2022 23:20:30 +0800 |
| Subject: [PATCH 905/911] DFS: Configure background radar/CAC detection |
| |
| Introduce the capability to perform radar/CAC detection on an offchannel |
| radar chain available on some hardware (e.g., mt7915). This feature |
| allows to avoid CAC downtime switching on a different channel during CAC |
| detection on the selected radar channel. |
| |
| Tested-by: Owen Peng <owen.peng@mediatek.com> |
| Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> |
| --- |
| src/ap/ap_drv_ops.c | 9 ++- |
| src/ap/ap_drv_ops.h | 3 +- |
| src/ap/dfs.c | 181 ++++++++++++++++++++++++++++++++++++++++---- |
| src/ap/hostapd.h | 15 ++++ |
| 4 files changed, 189 insertions(+), 19 deletions(-) |
| |
| diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c |
| index 033ad097e..1fc538104 100644 |
| --- a/src/ap/ap_drv_ops.c |
| +++ b/src/ap/ap_drv_ops.c |
| @@ -810,7 +810,8 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface, |
| int channel, int ht_enabled, int vht_enabled, |
| int he_enabled, |
| int sec_channel_offset, int oper_chwidth, |
| - int center_segment0, int center_segment1) |
| + int center_segment0, int center_segment1, |
| + bool radar_background) |
| { |
| struct hostapd_data *hapd = iface->bss[0]; |
| struct hostapd_freq_params data; |
| @@ -836,10 +837,14 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface, |
| wpa_printf(MSG_ERROR, "Can't set freq params"); |
| return -1; |
| } |
| + data.radar_background = radar_background; |
| |
| res = hapd->driver->start_dfs_cac(hapd->drv_priv, &data); |
| if (!res) { |
| - iface->cac_started = 1; |
| + if (radar_background) |
| + iface->radar_background.cac_started = 1; |
| + else |
| + iface->cac_started = 1; |
| os_get_reltime(&iface->dfs_cac_start); |
| } |
| |
| diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h |
| index 61c8f64eb..b4d6395ae 100644 |
| --- a/src/ap/ap_drv_ops.h |
| +++ b/src/ap/ap_drv_ops.h |
| @@ -130,7 +130,8 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface, |
| int channel, int ht_enabled, int vht_enabled, |
| int he_enabled, |
| int sec_channel_offset, int oper_chwidth, |
| - int center_segment0, int center_segment1); |
| + int center_segment0, int center_segment1, |
| + bool radar_background); |
| int hostapd_drv_do_acs(struct hostapd_data *hapd); |
| int hostapd_drv_update_dh_ie(struct hostapd_data *hapd, const u8 *peer, |
| u16 reason_code, const u8 *ie, size_t ielen); |
| diff --git a/src/ap/dfs.c b/src/ap/dfs.c |
| index 05cb63ac4..5dc261589 100644 |
| --- a/src/ap/dfs.c |
| +++ b/src/ap/dfs.c |
| @@ -20,6 +20,25 @@ |
| #include "crypto/crypto.h" |
| |
| |
| +enum dfs_channel_type { |
| + DFS_ANY_CHANNEL, |
| + DFS_AVAILABLE, /* non-radar or radar-available */ |
| + DFS_NO_CAC_YET, /* radar-not-yet-available */ |
| +}; |
| + |
| +static struct hostapd_channel_data * |
| +dfs_downgrade_bandwidth(struct hostapd_iface *iface, int *secondary_channel, |
| + u8 *oper_centr_freq_seg0_idx, |
| + u8 *oper_centr_freq_seg1_idx, |
| + enum dfs_channel_type *channel_type); |
| + |
| + |
| +static bool dfs_use_radar_background(struct hostapd_iface *iface) |
| +{ |
| + return iface->drv_flags2 & WPA_DRIVER_RADAR_BACKGROUND; |
| +} |
| + |
| + |
| static int dfs_get_used_n_chans(struct hostapd_iface *iface, int *seg1) |
| { |
| int n_chans = 1; |
| @@ -52,12 +71,6 @@ static int dfs_get_used_n_chans(struct hostapd_iface *iface, int *seg1) |
| } |
| |
| |
| -enum dfs_channel_type { |
| - DFS_ANY_CHANNEL, |
| - DFS_AVAILABLE, /* non-radar or radar-available */ |
| - DFS_NO_CAC_YET, /* radar-not-yet-available */ |
| -}; |
| - |
| /* dfs_channel_available: select new channel according to type parameter */ |
| static int dfs_channel_available(struct hostapd_channel_data *chan, |
| enum dfs_channel_type type) |
| @@ -878,7 +891,8 @@ int hostapd_handle_dfs(struct hostapd_iface *iface) |
| |
| /* Finally start CAC */ |
| hostapd_set_state(iface, HAPD_IFACE_DFS); |
| - wpa_printf(MSG_DEBUG, "DFS start CAC on %d MHz", iface->freq); |
| + wpa_printf(MSG_DEBUG, "DFS start CAC on %d MHz%s", iface->freq, |
| + dfs_use_radar_background(iface) ? " (background)" : ""); |
| wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START |
| "freq=%d chan=%d sec_chan=%d, width=%d, seg0=%d, seg1=%d, cac_time=%ds", |
| iface->freq, |
| @@ -895,13 +909,37 @@ int hostapd_handle_dfs(struct hostapd_iface *iface) |
| iface->conf->secondary_channel, |
| hostapd_get_oper_chwidth(iface->conf), |
| hostapd_get_oper_centr_freq_seg0_idx(iface->conf), |
| - hostapd_get_oper_centr_freq_seg1_idx(iface->conf)); |
| + hostapd_get_oper_centr_freq_seg1_idx(iface->conf), |
| + dfs_use_radar_background(iface)); |
| |
| if (res) { |
| wpa_printf(MSG_ERROR, "DFS start_dfs_cac() failed, %d", res); |
| return -1; |
| } |
| |
| + if (dfs_use_radar_background(iface)) { |
| + /* Cache background radar parameters. */ |
| + iface->radar_background.channel = iface->conf->channel; |
| + iface->radar_background.secondary_channel = |
| + iface->conf->secondary_channel; |
| + iface->radar_background.freq = iface->freq; |
| + iface->radar_background.centr_freq_seg0_idx = |
| + hostapd_get_oper_centr_freq_seg0_idx(iface->conf); |
| + iface->radar_background.centr_freq_seg1_idx = |
| + hostapd_get_oper_centr_freq_seg1_idx(iface->conf); |
| + |
| + /* |
| + * Let's select a random channel according to the |
| + * regulations and perform CAC on dedicated radar chain. |
| + */ |
| + res = dfs_set_valid_channel(iface, 1); |
| + if (res < 0) |
| + return res; |
| + |
| + iface->radar_background.temp_ch = 1; |
| + return 1; |
| + } |
| + |
| return 0; |
| } |
| |
| @@ -923,6 +961,86 @@ int hostapd_is_dfs_chan_available(struct hostapd_iface *iface) |
| } |
| |
| |
| +static void hostpad_dfs_update_background_chain(struct hostapd_iface *iface) |
| +{ |
| + int sec = 0; |
| + enum dfs_channel_type channel_type = DFS_NO_CAC_YET; |
| + struct hostapd_channel_data *channel; |
| + u8 oper_centr_freq_seg0_idx = 0; |
| + u8 oper_centr_freq_seg1_idx = 0; |
| + |
| + /* |
| + * Allow selection of DFS channel in ETSI to comply with |
| + * uniform spreading. |
| + */ |
| + if (iface->dfs_domain == HOSTAPD_DFS_REGION_ETSI) |
| + channel_type = DFS_ANY_CHANNEL; |
| + |
| + channel = dfs_get_valid_channel(iface, &sec, &oper_centr_freq_seg0_idx, |
| + &oper_centr_freq_seg1_idx, |
| + channel_type); |
| + if (!channel || |
| + channel->chan == iface->conf->channel || |
| + channel->chan == iface->radar_background.channel) |
| + channel = dfs_downgrade_bandwidth(iface, &sec, |
| + &oper_centr_freq_seg0_idx, |
| + &oper_centr_freq_seg1_idx, |
| + &channel_type); |
| + if (!channel || |
| + hostapd_start_dfs_cac(iface, iface->conf->hw_mode, |
| + channel->freq, channel->chan, |
| + iface->conf->ieee80211n, |
| + iface->conf->ieee80211ac, |
| + iface->conf->ieee80211ax, |
| + sec, hostapd_get_oper_chwidth(iface->conf), |
| + oper_centr_freq_seg0_idx, |
| + oper_centr_freq_seg1_idx, true)) { |
| + wpa_printf(MSG_ERROR, "DFS failed to start CAC offchannel"); |
| + iface->radar_background.channel = -1; |
| + return; |
| + } |
| + |
| + iface->radar_background.channel = channel->chan; |
| + iface->radar_background.freq = channel->freq; |
| + iface->radar_background.secondary_channel = sec; |
| + iface->radar_background.centr_freq_seg0_idx = oper_centr_freq_seg0_idx; |
| + iface->radar_background.centr_freq_seg1_idx = oper_centr_freq_seg1_idx; |
| + |
| + wpa_printf(MSG_DEBUG, |
| + "%s: setting background chain to chan %d (%d MHz)", |
| + __func__, channel->chan, channel->freq); |
| +} |
| + |
| + |
| +static bool |
| +hostapd_dfs_is_background_event(struct hostapd_iface *iface, int freq) |
| +{ |
| + return dfs_use_radar_background(iface) && |
| + iface->radar_background.channel != -1 && |
| + iface->radar_background.freq == freq; |
| +} |
| + |
| + |
| +static int |
| +hostapd_dfs_start_channel_switch_background(struct hostapd_iface *iface) |
| +{ |
| + iface->conf->channel = iface->radar_background.channel; |
| + iface->freq = iface->radar_background.freq; |
| + iface->conf->secondary_channel = |
| + iface->radar_background.secondary_channel; |
| + hostapd_set_oper_centr_freq_seg0_idx( |
| + iface->conf, iface->radar_background.centr_freq_seg0_idx); |
| + hostapd_set_oper_centr_freq_seg1_idx( |
| + iface->conf, iface->radar_background.centr_freq_seg1_idx); |
| + |
| + hostpad_dfs_update_background_chain(iface); |
| + hostapd_disable_iface(iface); |
| + hostapd_enable_iface(iface); |
| + |
| + return 0; |
| +} |
| + |
| + |
| int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq, |
| int ht_enabled, int chan_offset, int chan_width, |
| int cf1, int cf2) |
| @@ -943,6 +1061,22 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq, |
| set_dfs_state(iface, freq, ht_enabled, chan_offset, |
| chan_width, cf1, cf2, |
| HOSTAPD_CHAN_DFS_AVAILABLE); |
| + |
| + /* |
| + * Radar event from background chain for the selected |
| + * channel. Perform CSA, move the main chain to the |
| + * selected channel and configure the background chain |
| + * to a new DFS channel. |
| + */ |
| + if (hostapd_dfs_is_background_event(iface, freq)) { |
| + iface->radar_background.cac_started = 0; |
| + if (!iface->radar_background.temp_ch) |
| + return 0; |
| + |
| + iface->radar_background.temp_ch = 0; |
| + return hostapd_dfs_start_channel_switch_background(iface); |
| + } |
| + |
| /* |
| * Just mark the channel available when CAC completion |
| * event is received in enabled state. CAC result could |
| @@ -959,6 +1093,9 @@ int hostapd_dfs_complete_cac(struct hostapd_iface *iface, int success, int freq, |
| iface->cac_started = 0; |
| } |
| } |
| + } else if (hostapd_dfs_is_background_event(iface, freq)) { |
| + iface->radar_background.cac_started = 0; |
| + hostpad_dfs_update_background_chain(iface); |
| } |
| |
| return 0; |
| @@ -1269,9 +1406,14 @@ int hostapd_dfs_nop_finished(struct hostapd_iface *iface, int freq, |
| set_dfs_state(iface, freq, ht_enabled, chan_offset, chan_width, |
| cf1, cf2, HOSTAPD_CHAN_DFS_USABLE); |
| |
| - /* Handle cases where all channels were initially unavailable */ |
| - if (iface->state == HAPD_IFACE_DFS && !iface->cac_started) |
| + if (iface->state == HAPD_IFACE_DFS && !iface->cac_started) { |
| + /* Handle cases where all channels were initially unavailable */ |
| hostapd_handle_dfs(iface); |
| + } else if (dfs_use_radar_background(iface) && |
| + iface->radar_background.channel == -1) { |
| + /* Reset radar background chain if disabled */ |
| + hostpad_dfs_update_background_chain(iface); |
| + } |
| |
| return 0; |
| } |
| @@ -1309,17 +1451,24 @@ int hostapd_dfs_start_cac(struct hostapd_iface *iface, int freq, |
| int ht_enabled, int chan_offset, int chan_width, |
| int cf1, int cf2) |
| { |
| - /* This is called when the driver indicates that an offloaded DFS has |
| - * started CAC. */ |
| - hostapd_set_state(iface, HAPD_IFACE_DFS); |
| + if (hostapd_dfs_is_background_event(iface, freq)) { |
| + iface->radar_background.cac_started = 1; |
| + } else { |
| + /* This is called when the driver indicates that an offloaded |
| + * DFS has started CAC. */ |
| + hostapd_set_state(iface, HAPD_IFACE_DFS); |
| + iface->cac_started = 1; |
| + } |
| /* TODO: How to check CAC time for ETSI weather channels? */ |
| iface->dfs_cac_ms = 60000; |
| wpa_msg(iface->bss[0]->msg_ctx, MSG_INFO, DFS_EVENT_CAC_START |
| "freq=%d chan=%d chan_offset=%d width=%d seg0=%d " |
| - "seg1=%d cac_time=%ds", |
| + "seg1=%d cac_time=%ds%s", |
| freq, (freq - 5000) / 5, chan_offset, chan_width, cf1, cf2, |
| - iface->dfs_cac_ms / 1000); |
| - iface->cac_started = 1; |
| + iface->dfs_cac_ms / 1000, |
| + hostapd_dfs_is_background_event(iface, freq) ? |
| + " (background)" : ""); |
| + |
| os_get_reltime(&iface->dfs_cac_start); |
| return 0; |
| } |
| diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h |
| index a4ea32517..095524e49 100644 |
| --- a/src/ap/hostapd.h |
| +++ b/src/ap/hostapd.h |
| @@ -541,6 +541,21 @@ struct hostapd_iface { |
| int *basic_rates; |
| int freq; |
| |
| + /* Background radar configuration */ |
| + struct { |
| + int channel; |
| + int secondary_channel; |
| + int freq; |
| + int centr_freq_seg0_idx; |
| + int centr_freq_seg1_idx; |
| + /* Main chain is on temporary channel during |
| + * CAC detection on radar offchain. |
| + */ |
| + unsigned int temp_ch:1; |
| + /* CAC started on radar offchain */ |
| + unsigned int cac_started:1; |
| + } radar_background; |
| + |
| u16 hw_flags; |
| |
| /* Number of associated Non-ERP stations (i.e., stations using 802.11b |
| -- |
| 2.29.2 |
| |