samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Initialize channel_map at time of regulatory init

Browse Source 
A component can register callback with regulatory component before channel
list is available.Therefore initialize channel map at time of regulatory
init. Also, call callback when pdev current channel list
is computed, at time of nol channel update.

Change-Id: I551e0ea3391710538f694c50fa7dc6f795f3196c
CRs-Fixed: 2555403
This commit is contained in:
Amar Singhal
2019-10-29 12:35:42 -07:00
committed by nshrivas
parent 7345e2dd03
commit ddcd9fbf2e
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
umac/regulatory/core/src/reg_services_common.c
View File

@@ -169,7 +169,7 @@ static const enum phy_ch_width get_next_lower_bw[] = {
[CH_WIDTH_5MHZ] = CH_WIDTH_INVALID [CH_WIDTH_5MHZ] = CH_WIDTH_INVALID
}; };
static const struct chan_map channel_map_us[NUM_CHANNELS] = { const struct chan_map channel_map_us[NUM_CHANNELS] = {
[CHAN_ENUM_2412] = {2412, 1, 20, 40}, [CHAN_ENUM_2412] = {2412, 1, 20, 40},
[CHAN_ENUM_2417] = {2417, 2, 20, 40}, [CHAN_ENUM_2417] = {2417, 2, 20, 40},
[CHAN_ENUM_2422] = {2422, 3, 20, 40}, [CHAN_ENUM_2422] = {2422, 3, 20, 40},
@@ -332,7 +332,7 @@ static const struct chan_map channel_map_us[NUM_CHANNELS] = {
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
}; };
static const struct chan_map channel_map_eu[NUM_CHANNELS] = { const struct chan_map channel_map_eu[NUM_CHANNELS] = {
[CHAN_ENUM_2412] = {2412, 1, 20, 40}, [CHAN_ENUM_2412] = {2412, 1, 20, 40},
[CHAN_ENUM_2417] = {2417, 2, 20, 40}, [CHAN_ENUM_2417] = {2417, 2, 20, 40},
[CHAN_ENUM_2422] = {2422, 3, 20, 40}, [CHAN_ENUM_2422] = {2422, 3, 20, 40},
@@ -495,7 +495,7 @@ static const struct chan_map channel_map_eu[NUM_CHANNELS] = {
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
}; };
static const struct chan_map channel_map_jp[NUM_CHANNELS] = { const struct chan_map channel_map_jp[NUM_CHANNELS] = {
[CHAN_ENUM_2412] = {2412, 1, 20, 40}, [CHAN_ENUM_2412] = {2412, 1, 20, 40},
[CHAN_ENUM_2417] = {2417, 2, 20, 40}, [CHAN_ENUM_2417] = {2417, 2, 20, 40},
[CHAN_ENUM_2422] = {2422, 3, 20, 40}, [CHAN_ENUM_2422] = {2422, 3, 20, 40},
@@ -658,7 +658,7 @@ static const struct chan_map channel_map_jp[NUM_CHANNELS] = {
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
}; };
static const struct chan_map channel_map_global[NUM_CHANNELS] = { const struct chan_map channel_map_global[NUM_CHANNELS] = {
[CHAN_ENUM_2412] = {2412, 1, 20, 40}, [CHAN_ENUM_2412] = {2412, 1, 20, 40},
[CHAN_ENUM_2417] = {2417, 2, 20, 40}, [CHAN_ENUM_2417] = {2417, 2, 20, 40},
[CHAN_ENUM_2422] = {2422, 3, 20, 40}, [CHAN_ENUM_2422] = {2422, 3, 20, 40},
@@ -821,7 +821,7 @@ static const struct chan_map channel_map_global[NUM_CHANNELS] = {
#endif /* CONFIG_BAND_6GHZ */ #endif /* CONFIG_BAND_6GHZ */
}; };
static const struct chan_map channel_map_china[NUM_CHANNELS] = { const struct chan_map channel_map_china[NUM_CHANNELS] = {
[CHAN_ENUM_2412] = {2412, 1, 20, 40}, [CHAN_ENUM_2412] = {2412, 1, 20, 40},
[CHAN_ENUM_2417] = {2417, 2, 20, 40}, [CHAN_ENUM_2417] = {2417, 2, 20, 40},
[CHAN_ENUM_2422] = {2422, 3, 20, 40}, [CHAN_ENUM_2422] = {2422, 3, 20, 40},
@@ -3288,6 +3288,7 @@ void reg_update_nol_ch_for_freq(struct wlan_objmgr_pdev *pdev,
enum channel_enum chan_enum; enum channel_enum chan_enum;
struct regulatory_channel *mas_chan_list; struct regulatory_channel *mas_chan_list;
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj; struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;
struct wlan_objmgr_psoc *psoc;
uint16_t i; uint16_t i;
if (!num_chan || !chan_freq_list) { if (!num_chan || !chan_freq_list) {
@@ -3295,9 +3296,11 @@ void reg_update_nol_ch_for_freq(struct wlan_objmgr_pdev *pdev,
return; return;
} }
psoc = wlan_pdev_get_psoc(pdev);
pdev_priv_obj = reg_get_pdev_obj(pdev); pdev_priv_obj = reg_get_pdev_obj(pdev);
if (!pdev_priv_obj) { if (!pdev_priv_obj) {
reg_err("reg psoc private obj is NULL"); reg_err("reg pdev private obj is NULL");
return; return;
} }
@@ -3313,6 +3316,8 @@ void reg_update_nol_ch_for_freq(struct wlan_objmgr_pdev *pdev,
} }
reg_compute_pdev_current_chan_list(pdev_priv_obj); reg_compute_pdev_current_chan_list(pdev_priv_obj);
reg_send_scheduler_msg_sb(psoc, pdev);
} }
void reg_update_nol_history_ch_for_freq(struct wlan_objmgr_pdev *pdev, void reg_update_nol_history_ch_for_freq(struct wlan_objmgr_pdev *pdev,

5
umac/regulatory/core/src/reg_services_common.h
View File

@@ -104,6 +104,11 @@
#define COUNTRY_ERD_FLAG 0x8000 #define COUNTRY_ERD_FLAG 0x8000
extern const struct chan_map *channel_map; extern const struct chan_map *channel_map;
extern const struct chan_map channel_map_us[];
extern const struct chan_map channel_map_eu[];
extern const struct chan_map channel_map_jp[];
extern const struct chan_map channel_map_china[];
extern const struct chan_map channel_map_global[];
#ifdef CONFIG_CHAN_NUM_API #ifdef CONFIG_CHAN_NUM_API
/** /**

2
umac/regulatory/dispatcher/src/wlan_reg_services_api.c
View File

@@ -344,6 +344,8 @@ QDF_STATUS wlan_regulatory_init(void)
reg_debug("regulatory handlers registered with obj mgr"); reg_debug("regulatory handlers registered with obj mgr");
channel_map = channel_map_global;
return status; return status;
unreg_pdev_create: unreg_pdev_create: