leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wfx: keys are kept during whole firmware life

Browse Source 
Keys sent to the firmware are never reset. So, it is not necessary to
re-upload them after hif_reset(). Thus, it is no more necessary to keep
a copy of the keys in struct wfx_dev.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200420160311.57323-12-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2020-04-20 18:03:06 +02:00 committed by Greg Kroah-Hartman
parent 7a44644c93
commit 9da38fd5a9
4 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/staging/wfx/key.c
View File

@ -21,14 +21,12 @@ static int wfx_alloc_key(struct wfx_dev *wdev)
return -1; return -1;
wdev->key_map |= BIT(idx); wdev->key_map |= BIT(idx);
wdev->keys[idx].entry_index = idx;
return idx; return idx;
} }
static void wfx_free_key(struct wfx_dev *wdev, int idx) static void wfx_free_key(struct wfx_dev *wdev, int idx)
{ {
WARN(!(wdev->key_map & BIT(idx)), "inconsistent key allocation"); WARN(!(wdev->key_map & BIT(idx)), "inconsistent key allocation");
memset(&wdev->keys[idx], 0, sizeof(wdev->keys[idx]));
wdev->key_map &= ~BIT(idx); wdev->key_map &= ~BIT(idx);
} }
@ -160,7 +158,7 @@ static int wfx_add_key(struct wfx_vif *wvif, struct ieee80211_sta *sta,
struct ieee80211_key_conf *key) struct ieee80211_key_conf *key)
{ {
int ret; int ret;
struct hif_req_add_key *k; struct hif_req_add_key k = { };
struct ieee80211_key_seq seq; struct ieee80211_key_seq seq;
struct wfx_dev *wdev = wvif->wdev; struct wfx_dev *wdev = wvif->wdev;
int idx = wfx_alloc_key(wvif->wdev); int idx = wfx_alloc_key(wvif->wdev);
@ -170,44 +168,44 @@ static int wfx_add_key(struct wfx_vif *wvif, struct ieee80211_sta *sta,
ieee80211_get_key_rx_seq(key, 0, &seq); ieee80211_get_key_rx_seq(key, 0, &seq);
if (idx < 0) if (idx < 0)
return -EINVAL; return -EINVAL;
k = &wdev->keys[idx]; k.int_id = wvif->id;
k->int_id = wvif->id; k.entry_index = idx;
if (key->cipher == WLAN_CIPHER_SUITE_WEP40 || if (key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
key->cipher == WLAN_CIPHER_SUITE_WEP104) { key->cipher == WLAN_CIPHER_SUITE_WEP104) {
if (pairwise) if (pairwise)
k->type = fill_wep_pair(&k->key.wep_pairwise_key, key, k.type = fill_wep_pair(&k.key.wep_pairwise_key, key,
sta->addr); sta->addr);
else else
k->type = fill_wep_group(&k->key.wep_group_key, key); k.type = fill_wep_group(&k.key.wep_group_key, key);
} else if (key->cipher == WLAN_CIPHER_SUITE_TKIP) { } else if (key->cipher == WLAN_CIPHER_SUITE_TKIP) {
if (pairwise) if (pairwise)
k->type = fill_tkip_pair(&k->key.tkip_pairwise_key, key, k.type = fill_tkip_pair(&k.key.tkip_pairwise_key, key,
sta->addr); sta->addr);
else else
k->type = fill_tkip_group(&k->key.tkip_group_key, key, k.type = fill_tkip_group(&k.key.tkip_group_key, key,
&seq, wvif->vif->type); &seq, wvif->vif->type);
} else if (key->cipher == WLAN_CIPHER_SUITE_CCMP) { } else if (key->cipher == WLAN_CIPHER_SUITE_CCMP) {
if (pairwise) if (pairwise)
k->type = fill_ccmp_pair(&k->key.aes_pairwise_key, key, k.type = fill_ccmp_pair(&k.key.aes_pairwise_key, key,
sta->addr); sta->addr);
else else
k->type = fill_ccmp_group(&k->key.aes_group_key, key, k.type = fill_ccmp_group(&k.key.aes_group_key, key,
&seq); &seq);
} else if (key->cipher == WLAN_CIPHER_SUITE_SMS4) { } else if (key->cipher == WLAN_CIPHER_SUITE_SMS4) {
if (pairwise) if (pairwise)
k->type = fill_sms4_pair(&k->key.wapi_pairwise_key, key, k.type = fill_sms4_pair(&k.key.wapi_pairwise_key, key,
sta->addr); sta->addr);
else else
k->type = fill_sms4_group(&k->key.wapi_group_key, key); k.type = fill_sms4_group(&k.key.wapi_group_key, key);
} else if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC) { } else if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC) {
k->type = fill_aes_cmac_group(&k->key.igtk_group_key, key, k.type = fill_aes_cmac_group(&k.key.igtk_group_key, key,
&seq); &seq);
} else { } else {
dev_warn(wdev->dev, "unsupported key type %d\n", key->cipher); dev_warn(wdev->dev, "unsupported key type %d\n", key->cipher);
wfx_free_key(wdev, idx); wfx_free_key(wdev, idx);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
ret = hif_add_key(wdev, k); ret = hif_add_key(wdev, &k);
if (ret) { if (ret) {
wfx_free_key(wdev, idx); wfx_free_key(wdev, idx);
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -241,19 +239,3 @@ int wfx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
return ret; return ret;
} }
int wfx_upload_keys(struct wfx_vif *wvif)
{
int i;
struct hif_req_add_key *key;
struct wfx_dev *wdev = wvif->wdev;
for (i = 0; i < ARRAY_SIZE(wdev->keys); i++) {
if (wdev->key_map & BIT(i)) {
key = &wdev->keys[i];
if (key->int_id == wvif->id)
hif_add_key(wdev, key);
}
}
return 0;
}

1
drivers/staging/wfx/key.h
View File

@ -16,6 +16,5 @@ struct wfx_vif;
int wfx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, int wfx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct ieee80211_vif *vif, struct ieee80211_sta *sta,
struct ieee80211_key_conf *key); struct ieee80211_key_conf *key);
int wfx_upload_keys(struct wfx_vif *wvif);
#endif /* WFX_STA_H */ #endif /* WFX_STA_H */

4
drivers/staging/wfx/sta.c
View File

@ -378,9 +378,6 @@ static void wfx_do_join(struct wfx_vif *wvif)
else else
wvif->state = WFX_STATE_PRE_STA; wvif->state = WFX_STATE_PRE_STA;
/* Upload keys */
wfx_upload_keys(wvif);
/* Due to beacon filtering it is possible that the /* Due to beacon filtering it is possible that the
* AP's beacon is not known for the mac80211 stack. * AP's beacon is not known for the mac80211 stack.
* Disable filtering temporary to make sure the stack * Disable filtering temporary to make sure the stack
@ -457,7 +454,6 @@ int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{ {
struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv; struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv;
wfx_upload_keys(wvif);
wvif->state = WFX_STATE_AP; wvif->state = WFX_STATE_AP;
wfx_upload_ap_templates(wvif); wfx_upload_ap_templates(wvif);
hif_start(wvif, &vif->bss_conf, wvif->channel); hif_start(wvif, &vif->bss_conf, wvif->channel);

1
drivers/staging/wfx/wfx.h
View File

@ -56,7 +56,6 @@ struct wfx_dev {
atomic_t packet_id; atomic_t packet_id;
u32 key_map; u32 key_map;
struct hif_req_add_key keys[MAX_KEY_ENTRIES];
struct hif_rx_stats rx_stats; struct hif_rx_stats rx_stats;
struct mutex rx_stats_lock; struct mutex rx_stats_lock;