Commit 0882dda3 authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo

brcmfmac: correct interface combination info

The interface combination provided by brcmfmac did not truly reflect
the combinations supported by driver and/or firmware.
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarPontus Fuchs <pontusf@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 50f32e2d
...@@ -5695,63 +5695,132 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = { ...@@ -5695,63 +5695,132 @@ brcmf_txrx_stypes[NUM_NL80211_IFTYPES] = {
} }
}; };
/**
* brcmf_setup_ifmodes() - determine interface modes and combinations.
*
* @wiphy: wiphy object.
* @ifp: interface object needed for feat module api.
*
* The interface modes and combinations are determined dynamically here
* based on firmware functionality.
*
* no p2p and no mbss:
*
* #STA <= 1, #AP <= 1, channels = 1, 2 total
*
* no p2p and mbss:
*
* #STA <= 1, #AP <= 1, channels = 1, 2 total
* #AP <= 4, matching BI, channels = 1, 4 total
*
* p2p, no mchan, and mbss:
*
* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 1, 3 total
* #STA <= 1, #P2P-DEV <= 1, #AP <= 1, #P2P-CL <= 1, channels = 1, 4 total
* #AP <= 4, matching BI, channels = 1, 4 total
*
* p2p, mchan, and mbss:
*
* #STA <= 1, #P2P-DEV <= 1, #{P2P-CL, P2P-GO} <= 1, channels = 2, 3 total
* #STA <= 1, #P2P-DEV <= 1, #AP <= 1, #P2P-CL <= 1, channels = 1, 4 total
* #AP <= 4, matching BI, channels = 1, 4 total
*/
static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp) static int brcmf_setup_ifmodes(struct wiphy *wiphy, struct brcmf_if *ifp)
{ {
struct ieee80211_iface_combination *combo = NULL; struct ieee80211_iface_combination *combo = NULL;
struct ieee80211_iface_limit *limits = NULL; struct ieee80211_iface_limit *c0_limits = NULL;
int i = 0, max_iface_cnt; struct ieee80211_iface_limit *p2p_limits = NULL;
struct ieee80211_iface_limit *mbss_limits = NULL;
bool mbss, p2p;
int i, c, n_combos;
mbss = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS);
p2p = brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P);
combo = kzalloc(sizeof(*combo), GFP_KERNEL); n_combos = 1 + !!p2p + !!mbss;
combo = kcalloc(n_combos, sizeof(*combo), GFP_KERNEL);
if (!combo) if (!combo)
goto err; goto err;
limits = kzalloc(sizeof(*limits) * 4, GFP_KERNEL); c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
if (!limits) if (!c0_limits)
goto err; goto err;
if (p2p) {
p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
if (!p2p_limits)
goto err;
}
if (mbss) {
mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
if (!mbss_limits)
goto err;
}
wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_AP); BIT(NL80211_IFTYPE_AP);
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN)) c = 0;
combo->num_different_channels = 2; i = 0;
else combo[c].num_different_channels = 1;
combo->num_different_channels = 1; c0_limits[i].max = 1;
c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) { if (p2p) {
limits[i].max = 1; if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MCHAN))
limits[i++].types = BIT(NL80211_IFTYPE_STATION); combo[c].num_different_channels = 2;
limits[i].max = 4;
limits[i++].types = BIT(NL80211_IFTYPE_AP);
max_iface_cnt = 5;
} else {
limits[i].max = 2;
limits[i++].types = BIT(NL80211_IFTYPE_STATION) |
BIT(NL80211_IFTYPE_AP);
max_iface_cnt = 2;
}
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_P2P)) {
wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) | wiphy->interface_modes |= BIT(NL80211_IFTYPE_P2P_CLIENT) |
BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_P2P_GO) |
BIT(NL80211_IFTYPE_P2P_DEVICE); BIT(NL80211_IFTYPE_P2P_DEVICE);
limits[i].max = 1; c0_limits[i].max = 1;
limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) | c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
BIT(NL80211_IFTYPE_P2P_GO); c0_limits[i].max = 1;
limits[i].max = 1; c0_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE); BIT(NL80211_IFTYPE_P2P_GO);
max_iface_cnt += 2; } else {
} c0_limits[i].max = 1;
combo->max_interfaces = max_iface_cnt; c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
combo->limits = limits; }
combo->n_limits = i; combo[c].max_interfaces = i;
combo[c].n_limits = i;
combo[c].limits = c0_limits;
if (p2p) {
c++;
i = 0;
combo[c].num_different_channels = 1;
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_AP);
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
p2p_limits[i].max = 1;
p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
combo[c].max_interfaces = i;
combo[c].n_limits = i;
combo[c].limits = p2p_limits;
}
if (mbss) {
c++;
combo[c].beacon_int_infra_match = true;
combo[c].num_different_channels = 1;
mbss_limits[0].max = 4;
mbss_limits[0].types = BIT(NL80211_IFTYPE_AP);
combo[c].max_interfaces = 4;
combo[c].n_limits = 1;
combo[c].limits = mbss_limits;
}
wiphy->n_iface_combinations = n_combos;
wiphy->iface_combinations = combo; wiphy->iface_combinations = combo;
wiphy->n_iface_combinations = 1;
return 0; return 0;
err: err:
kfree(limits); kfree(c0_limits);
kfree(p2p_limits);
kfree(mbss_limits);
kfree(combo); kfree(combo);
return -ENOMEM; return -ENOMEM;
} }
...@@ -6080,11 +6149,15 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy, ...@@ -6080,11 +6149,15 @@ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
static void brcmf_free_wiphy(struct wiphy *wiphy) static void brcmf_free_wiphy(struct wiphy *wiphy)
{ {
int i;
if (!wiphy) if (!wiphy)
return; return;
if (wiphy->iface_combinations) if (wiphy->iface_combinations) {
kfree(wiphy->iface_combinations->limits); for (i = 0; i < wiphy->n_iface_combinations; i++)
kfree(wiphy->iface_combinations[i].limits);
}
kfree(wiphy->iface_combinations); kfree(wiphy->iface_combinations);
if (wiphy->bands[IEEE80211_BAND_2GHZ]) { if (wiphy->bands[IEEE80211_BAND_2GHZ]) {
kfree(wiphy->bands[IEEE80211_BAND_2GHZ]->channels); kfree(wiphy->bands[IEEE80211_BAND_2GHZ]->channels);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment