Skip to content

Commit

Permalink
rsi: fix rate mask set leading to P2P failure
Browse files Browse the repository at this point in the history 
commit b515d09 upstream.

P2P client mode was only working the first time.
On subsequent connection attempts the group was successfully created but
no data was sent (no transmitted data packets were seen with a sniffer).

The reason for this was that the hardware was being configured in fixed
rate mode with rate RSI_RATE_1 (1Mbps) which is not valid in the 5GHz band.

In P2P mode wpa_supplicant uses NL80211_CMD_SET_TX_BITRATE_MASK to disallow
the 11b rates in the 2.4GHz band which updated common->fixedrate_mask.

rsi_set_min_rate() then used the fixedrate_mask to calculate the minimum
allowed rate, or 0xffff = auto if none was found.
However that calculation did not account for the different rate sets
allowed in the different bands leading to the error.

Fixing set_min_rate() would result in 6Mb/s being used all the time
which is not what we want either.

The reason the problem did not occur on the first connection is that
rsi_mac80211_set_rate_mask() only updated the fixedrate_mask for
the *current* band. When it was called that was still 2.4GHz as the
switch is done later. So the when set_min_rate() was subsequently
called after the switch to 5GHz it still had a mask of zero, leading
to defaulting to auto mode.

Fix this by differentiating the case of a single rate being
requested, in which case the hardware will be used in fixed rate
mode with just that rate, and multiple rates being requested,
in which case we remain in auto mode but the firmware rate selection
algorithm is configured with a restricted set of rates.

Fixes: dad0d04 ("rsi: Add RS9113 wireless driver")
Signed-off-by: Martin Fuzzey <martin.fuzzey@flowbird.group>
CC: stable@vger.kernel.org
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1630337206-12410-4-git-send-email-martin.fuzzey@flowbird.group
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@gregkh
Martin Fuzzey authored and gregkh committed Nov 18, 2021
1 parent 41d97e0 commit d69ffec
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 65 deletions.
8 changes: 5 additions & 3 deletions drivers/net/wireless/rsi/rsi_91x_hal.c
View file
Expand Up @@ -214,15 +214,17 @@ int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb)
RSI_WIFI_DATA_Q);
data_desc->header_len = ieee80211_size;

if (common->min_rate != RSI_RATE_AUTO) {
if (common->rate_config[common->band].fixed_enabled) {
/* Send fixed rate */
u16 fixed_rate = common->rate_config[common->band].fixed_hw_rate;

data_desc->frame_info = cpu_to_le16(RATE_INFO_ENABLE);
data_desc->rate_info = cpu_to_le16(common->min_rate);
data_desc->rate_info = cpu_to_le16(fixed_rate);

if (conf_is_ht40(&common->priv->hw->conf))
data_desc->bbp_info = cpu_to_le16(FULL40M_ENABLE);

if ((common->vif_info[0].sgi) && (common->min_rate & 0x100)) {
if (common->vif_info[0].sgi && (fixed_rate & 0x100)) {
/* Only MCS rates */
data_desc->rate_info |=
cpu_to_le16(ENABLE_SHORTGI_RATE);
Expand Down
74 changes: 22 additions & 52 deletions drivers/net/wireless/rsi/rsi_91x_mac80211.c
View file
Expand Up @@ -510,7 +510,6 @@ static int rsi_mac80211_add_interface(struct ieee80211_hw *hw,
if ((vif->type == NL80211_IFTYPE_AP) ||
(vif->type == NL80211_IFTYPE_P2P_GO)) {
rsi_send_rx_filter_frame(common, DISALLOW_BEACONS);
common->min_rate = RSI_RATE_AUTO;
for (i = 0; i < common->max_stations; i++)
common->stations[i].sta = NULL;
}
Expand Down Expand Up @@ -1211,20 +1210,32 @@ static int rsi_mac80211_set_rate_mask(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
const struct cfg80211_bitrate_mask *mask)
{
const unsigned int mcs_offset = ARRAY_SIZE(rsi_rates);
struct rsi_hw *adapter = hw->priv;
struct rsi_common *common = adapter->priv;
enum nl80211_band band = hw->conf.chandef.chan->band;
int i;

mutex_lock(&common->mutex);
common->fixedrate_mask[band] = 0;

if (mask->control[band].legacy == 0xfff) {
common->fixedrate_mask[band] =
(mask->control[band].ht_mcs[0] << 12);
} else {
common->fixedrate_mask[band] =
mask->control[band].legacy;
for (i = 0; i < ARRAY_SIZE(common->rate_config); i++) {
struct rsi_rate_config *cfg = &common->rate_config[i];
u32 bm;

bm = mask->control[i].legacy | (mask->control[i].ht_mcs[0] << mcs_offset);
if (hweight32(bm) == 1) { /* single rate */
int rate_index = ffs(bm) - 1;

if (rate_index < mcs_offset)
cfg->fixed_hw_rate = rsi_rates[rate_index].hw_value;
else
cfg->fixed_hw_rate = rsi_mcsrates[rate_index - mcs_offset];
cfg->fixed_enabled = true;
} else {
cfg->configured_mask = bm;
cfg->fixed_enabled = false;
}
}

mutex_unlock(&common->mutex);

return 0;
Expand Down Expand Up @@ -1361,46 +1372,6 @@ void rsi_indicate_pkt_to_os(struct rsi_common *common,
ieee80211_rx_irqsafe(hw, skb);
}

static void rsi_set_min_rate(struct ieee80211_hw *hw,
struct ieee80211_sta *sta,
struct rsi_common *common)
{
u8 band = hw->conf.chandef.chan->band;
u8 ii;
u32 rate_bitmap;
bool matched = false;

common->bitrate_mask[band] = sta->supp_rates[band];

rate_bitmap = (common->fixedrate_mask[band] & sta->supp_rates[band]);

if (rate_bitmap & 0xfff) {
/* Find out the min rate */
for (ii = 0; ii < ARRAY_SIZE(rsi_rates); ii++) {
if (rate_bitmap & BIT(ii)) {
common->min_rate = rsi_rates[ii].hw_value;
matched = true;
break;
}
}
}

common->vif_info[0].is_ht = sta->ht_cap.ht_supported;

if ((common->vif_info[0].is_ht) && (rate_bitmap >> 12)) {
for (ii = 0; ii < ARRAY_SIZE(rsi_mcsrates); ii++) {
if ((rate_bitmap >> 12) & BIT(ii)) {
common->min_rate = rsi_mcsrates[ii];
matched = true;
break;
}
}
}

if (!matched)
common->min_rate = 0xffff;
}

/**
* rsi_mac80211_sta_add() - This function notifies driver about a peer getting
* connected.
Expand Down Expand Up @@ -1499,9 +1470,9 @@ static int rsi_mac80211_sta_add(struct ieee80211_hw *hw,

if ((vif->type == NL80211_IFTYPE_STATION) ||
(vif->type == NL80211_IFTYPE_P2P_CLIENT)) {
rsi_set_min_rate(hw, sta, common);
common->bitrate_mask[common->band] = sta->supp_rates[common->band];
common->vif_info[0].is_ht = sta->ht_cap.ht_supported;
if (sta->ht_cap.ht_supported) {
common->vif_info[0].is_ht = true;
common->bitrate_mask[NL80211_BAND_2GHZ] =
sta->supp_rates[NL80211_BAND_2GHZ];
if ((sta->ht_cap.cap & IEEE80211_HT_CAP_SGI_20) ||
Expand Down Expand Up @@ -1575,7 +1546,6 @@ static int rsi_mac80211_sta_remove(struct ieee80211_hw *hw,
bss->qos = sta->wme;
common->bitrate_mask[NL80211_BAND_2GHZ] = 0;
common->bitrate_mask[NL80211_BAND_5GHZ] = 0;
common->min_rate = 0xffff;
common->vif_info[0].is_ht = false;
common->vif_info[0].sgi = false;
common->vif_info[0].seq_start = 0;
Expand Down
21 changes: 14 additions & 7 deletions drivers/net/wireless/rsi/rsi_91x_mgmt.c
View file
Expand Up @@ -276,7 +276,7 @@ static void rsi_set_default_parameters(struct rsi_common *common)
common->channel_width = BW_20MHZ;
common->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
common->channel = 1;
common->min_rate = 0xffff;
memset(&common->rate_config, 0, sizeof(common->rate_config));
common->fsm_state = FSM_CARD_NOT_READY;
common->iface_down = true;
common->endpoint = EP_2GHZ_20MHZ;
Expand Down Expand Up @@ -1314,7 +1314,7 @@ static int rsi_send_auto_rate_request(struct rsi_common *common,
u8 band = hw->conf.chandef.chan->band;
u8 num_supported_rates = 0;
u8 rate_table_offset, rate_offset = 0;
u32 rate_bitmap;
u32 rate_bitmap, configured_rates;
u16 *selected_rates, min_rate;
bool is_ht = false, is_sgi = false;
u16 frame_len = sizeof(struct rsi_auto_rate);
Expand Down Expand Up @@ -1364,6 +1364,10 @@ static int rsi_send_auto_rate_request(struct rsi_common *common,
is_sgi = true;
}

/* Limit to any rates administratively configured by cfg80211 */
configured_rates = common->rate_config[band].configured_mask ?: 0xffffffff;
rate_bitmap &= configured_rates;

if (band == NL80211_BAND_2GHZ) {
if ((rate_bitmap == 0) && (is_ht))
min_rate = RSI_RATE_MCS0;
Expand All @@ -1389,10 +1393,13 @@ static int rsi_send_auto_rate_request(struct rsi_common *common,
num_supported_rates = jj;

if (is_ht) {
for (ii = 0; ii < ARRAY_SIZE(mcs); ii++)
selected_rates[jj++] = mcs[ii];
num_supported_rates += ARRAY_SIZE(mcs);
rate_offset += ARRAY_SIZE(mcs);
for (ii = 0; ii < ARRAY_SIZE(mcs); ii++) {
if (configured_rates & BIT(ii + ARRAY_SIZE(rsi_rates))) {
selected_rates[jj++] = mcs[ii];
num_supported_rates++;
rate_offset++;
}
}
}

sort(selected_rates, jj, sizeof(u16), &rsi_compare, NULL);
Expand Down Expand Up @@ -1482,7 +1489,7 @@ void rsi_inform_bss_status(struct rsi_common *common,
qos_enable,
aid, sta_id,
vif);
if (common->min_rate == 0xffff)
if (!common->rate_config[common->band].fixed_enabled)
rsi_send_auto_rate_request(common, sta, sta_id, vif);
if (opmode == RSI_OPMODE_STA &&
!(assoc_cap & WLAN_CAPABILITY_PRIVACY) &&
Expand Down
12 changes: 9 additions & 3 deletions drivers/net/wireless/rsi/rsi_main.h
View file
Expand Up @@ -61,6 +61,7 @@ enum RSI_FSM_STATES {
extern u32 rsi_zone_enabled;
extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...);

#define RSI_MAX_BANDS 2
#define RSI_MAX_VIFS 3
#define NUM_EDCA_QUEUES 4
#define IEEE80211_ADDR_LEN 6
Expand Down Expand Up @@ -230,6 +231,12 @@ struct rsi_9116_features {
u32 ps_options;
};

struct rsi_rate_config {
u32 configured_mask; /* configured by mac80211 bits 0-11=legacy 12+ mcs */
u16 fixed_hw_rate;
bool fixed_enabled;
};

struct rsi_common {
struct rsi_hw *priv;
struct vif_priv vif_info[RSI_MAX_VIFS];
Expand All @@ -255,8 +262,8 @@ struct rsi_common {
u8 channel_width;

u16 rts_threshold;
u16 bitrate_mask[2];
u32 fixedrate_mask[2];
u32 bitrate_mask[RSI_MAX_BANDS];
struct rsi_rate_config rate_config[RSI_MAX_BANDS];

u8 rf_reset;
struct transmit_q_stats tx_stats;
Expand All @@ -277,7 +284,6 @@ struct rsi_common {
u8 mac_id;
u8 radio_id;
u16 rate_pwr[20];
u16 min_rate;

/* WMM algo related */
u8 selected_qnum;
Expand Down

0 comments on commit d69ffec

Please sign in to comment.