From: Arik Nemtsov <arik@wizery.com>
To: <linux-wireless@vger.kernel.org>
Cc: Luciano Coelho <coelho@ti.com>, Arik Nemtsov <arik@wizery.com>
Subject: [PATCH 28/78] wlcore: support peer MIMO rates
Date: Thu, 10 May 2012 12:13:33 +0300 [thread overview]
Message-ID: <1336641263-5761-29-git-send-email-arik@wizery.com> (raw)
In-Reply-To: <1336641263-5761-1-git-send-email-arik@wizery.com>
Parse the peer ht_cap element containing MCS8-MCS15 rates and pass it
to the FW. Rates unsupported by the HW will be sanitized by mac80211
before reaching us.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
drivers/net/wireless/ti/wlcore/cmd.c | 4 +++-
drivers/net/wireless/ti/wlcore/main.c | 3 ++-
drivers/net/wireless/ti/wlcore/tx.c | 4 ++--
drivers/net/wireless/ti/wlcore/wl12xx.h | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 8450f0e..0dec465 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1371,7 +1371,9 @@ int wl12xx_cmd_add_peer(struct wl1271 *wl, struct wl12xx_vif *wlvif,
sta_rates = sta->supp_rates[wlvif->band];
if (sta->ht_cap.ht_supported)
- sta_rates |= sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET;
+ sta_rates |=
+ (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+ (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
cmd->supported_rates =
cpu_to_le32(wl1271_tx_enabled_rates_get(wl, sta_rates,
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 3cd2ddd..f64aeb9 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -3695,7 +3695,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
sta_rate_set = sta->supp_rates[wl->hw->conf.channel->band];
if (sta->ht_cap.ht_supported)
sta_rate_set |=
- (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET);
+ (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |
+ (sta->ht_cap.mcs.rx_mask[1] << HW_MIMO_RATES_OFFSET);
sta_ht_cap = sta->ht_cap;
sta_exists = true;
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 44e4e7b..200d091 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -428,10 +428,10 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set,
rate_set >>= 1;
}
- /* MCS rates indication are on bits 16 - 23 */
+ /* MCS rates indication are on bits 16 - 31 */
rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
- for (bit = 0; bit < 8; bit++) {
+ for (bit = 0; bit < 16; bit++) {
if (rate_set & 0x1)
enabled_rates |= (CONF_HW_BIT_RATE_MCS_0 << bit);
rate_set >>= 1;
diff --git a/drivers/net/wireless/ti/wlcore/wl12xx.h b/drivers/net/wireless/ti/wlcore/wl12xx.h
index 05e6f74..571a4ef 100644
--- a/drivers/net/wireless/ti/wlcore/wl12xx.h
+++ b/drivers/net/wireless/ti/wlcore/wl12xx.h
@@ -502,6 +502,7 @@ void wl1271_rx_filter_flatten_fields(struct wl12xx_rx_filter *filter,
/* Macros to handle wl1271.sta_rate_set */
#define HW_BG_RATES_MASK 0xffff
#define HW_HT_RATES_OFFSET 16
+#define HW_MIMO_RATES_OFFSET 24
#define WL12XX_HW_BLOCK_SIZE 256
--
1.7.9.5
next prev parent reply other threads:[~2012-05-10 9:15 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 9:13 [PATCH 00/78] 18xx chip support Arik Nemtsov
2012-05-10 9:13 ` [PATCH 01/78] wl18xx: add new module Arik Nemtsov
2012-05-10 9:13 ` [PATCH 02/78] wlcore_sdio/wl18xx: use SDIO revision number to identify wl18xx chips Arik Nemtsov
2012-05-10 9:13 ` [PATCH 03/78] wl18xx: add empty operations struct Arik Nemtsov
2012-05-10 9:13 ` [PATCH 04/78] wl18xx: add partition table Arik Nemtsov
2012-05-10 9:13 ` [PATCH 05/78] wl18xx: add register table Arik Nemtsov
2012-05-10 9:13 ` [PATCH 06/78] wl18xx: add identify chip operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 07/78] wl18xx: add some boot operations and hw-specific configurations Arik Nemtsov
2012-05-10 9:13 ` [PATCH 08/78] wl18xx: add trigger command and ack event operations Arik Nemtsov
2012-05-10 9:13 ` [PATCH 09/78] wl18xx: create per-chip-family private storage Arik Nemtsov
2012-05-10 9:13 ` [PATCH 10/78] wl18xx: set the number of Tx descriptors Arik Nemtsov
2012-05-10 9:13 ` [PATCH 11/78] wl18xx: set normal/GEM Tx spare block counts Arik Nemtsov
2012-05-10 9:13 ` [PATCH 12/78] wl18xx: implement hw op for calculating hw block count per packet Arik Nemtsov
2012-05-10 9:13 ` [PATCH 13/78] wl18xx: implement hw op for setting blocks in hw_tx_desc Arik Nemtsov
2012-05-10 9:13 ` [PATCH 14/78] wl18xx: implement hw op for setting frame length in tx_hw_desc Arik Nemtsov
2012-05-10 9:13 ` [PATCH 15/78] wl18xx: define HW-rate translation elements/tables Arik Nemtsov
2012-05-10 9:13 ` [PATCH 16/78] wl18xx: add fw_status private data Arik Nemtsov
2012-05-10 9:13 ` [PATCH 17/78] wl18xx: set Rx block-size alignment quirk Arik Nemtsov
2012-05-10 9:13 ` [PATCH 18/78] wl18xx: implement hw op for getting rx buffer data alignment Arik Nemtsov
2012-05-10 9:13 ` [PATCH 19/78] wl18xx: implement hw op for getting rx packet data length Arik Nemtsov
2012-05-10 9:13 ` [PATCH 20/78] wl18xx: implement immediate Tx completion Arik Nemtsov
2012-05-10 9:13 ` [PATCH 21/78] wl18xx: add hw_init operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 22/78] wlcore/wl18xx: add hw op for setting Tx HW checksum Arik Nemtsov
2012-05-10 9:13 ` [PATCH 23/78] wlcore/wl18xx: add hw op for Rx " Arik Nemtsov
2012-05-10 9:13 ` [PATCH 24/78] wl18xx: add runtime configuration parameters Arik Nemtsov
2012-05-10 9:13 ` [PATCH 25/78] wlcore: track current channel type per vif Arik Nemtsov
2012-05-10 9:13 ` [PATCH 26/78] wl18xx: send channel type to FW on role start Arik Nemtsov
2012-05-10 9:13 ` [PATCH 27/78] wl18xx: ipmlement ap_rate_mask hw op Arik Nemtsov
2012-05-10 9:13 ` Arik Nemtsov [this message]
2012-05-10 9:13 ` [PATCH 29/78] wlcore/wl18xx: enable MIMO/wide-chan rates in AP-mode rate config Arik Nemtsov
2012-05-10 9:13 ` [PATCH 30/78] wl18xx: set HT capabilities Arik Nemtsov
2012-05-10 9:13 ` [PATCH 31/78] wl18xx: add module param for overriding HT caps Arik Nemtsov
2012-05-10 9:13 ` [PATCH 32/78] wl18xx: add board type module argument Arik Nemtsov
2012-05-10 9:13 ` [PATCH 33/78] wl18xx: translate and write the board type to SCR_PAD2 Arik Nemtsov
2012-05-10 9:13 ` [PATCH 34/78] wl18xx: read FW pc on recovery Arik Nemtsov
2012-05-10 9:13 ` [PATCH 35/78] wl18xx: disable FW log functionality Arik Nemtsov
2012-05-10 9:13 ` [PATCH 36/78] wl18xx: read clock frequency and do top init accordingly Arik Nemtsov
2012-05-10 9:13 ` [PATCH 37/78] wlcore: rename wl12xx.h to wlcore_i.h Arik Nemtsov
2012-05-10 9:13 ` [PATCH 38/78] wlcore/wl12xx: move ref_clock and tcxo_clock elements to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 39/78] wl18xx: implement hw op to read PG version Arik Nemtsov
2012-05-10 9:13 ` [PATCH 40/78] wlcore/wl12xx: move rx_mem_pool_addr element to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 41/78] wl18xx: init Tx-released index to 0 on HW init Arik Nemtsov
2012-05-10 9:13 ` [PATCH 42/78] wl18xx: don't upload NVS to FW Arik Nemtsov
2012-05-10 9:13 ` [PATCH 43/78] wl18xx: change board type enum according to new FW Arik Nemtsov
2012-05-10 9:13 ` [PATCH 44/78] wlcore/wl12xx: add plt_init op and move the code to wl12xx Arik Nemtsov
2012-05-10 9:13 ` [PATCH 45/78] wl18xx: add plt_init operation Arik Nemtsov
2012-05-10 9:13 ` [PATCH 46/78] wl18xx: change the low_band_component_type for HDK boards Arik Nemtsov
2012-05-10 9:13 ` [PATCH 47/78] wl18xx: add number of antennas and dc2dc type as module params Arik Nemtsov
2012-05-10 9:13 ` [PATCH 48/78] wl18xx: add module parameter to disable TCP checksum Arik Nemtsov
2012-05-10 9:13 ` [PATCH 49/78] wlcore/wl12xx/18xx: split fw_status struct into two Arik Nemtsov
2012-05-10 9:13 ` [PATCH 50/78] wl18xx: derive the MAC address from the BD_ADDR in fuse ROM Arik Nemtsov
2012-05-10 9:13 ` [PATCH 51/78] wl18xx: add a module parameter to control 11a support Arik Nemtsov
2012-05-10 9:13 ` [PATCH 52/78] wlcore: add module parameter to dump SDIO reads and writes Arik Nemtsov
2012-05-10 9:13 ` [PATCH 53/78] wl18xx: copy the default configuration before checking the board_type Arik Nemtsov
2012-05-10 9:13 ` [PATCH 54/78] wl18xx: changed default board_type to HDK Arik Nemtsov
2012-05-10 9:14 ` [PATCH 55/78] wlcore: add space for private area when allocating fw_status Arik Nemtsov
2012-05-10 9:14 ` [PATCH 56/78] wl18xx: change low_band_component_type value for COM8 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 57/78] wlcore: reorder identify_chip and get_hw_info Arik Nemtsov
2012-05-10 9:14 ` [PATCH 58/78] wl18xx: disable MCS_13 for wl18xx PG 1.0 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 59/78] wlcore: update beacon and probe_resp templates when rates change Arik Nemtsov
2012-05-10 9:14 ` [PATCH 60/78] wlcore: use all AP basic rates as default Arik Nemtsov
2012-05-10 9:14 ` [PATCH 61/78] wlcore: abstract debugfs fw_stats to be handled by the lower drivers Arik Nemtsov
2012-05-10 9:14 ` [PATCH 62/78] wlcore: add debugfs macro to help print fw statistics arrays Arik Nemtsov
2012-05-10 9:14 ` [PATCH 63/78] wl12xx: implement fw status debugfs entries Arik Nemtsov
2012-05-10 9:14 ` [PATCH 64/78] wl18xx: " Arik Nemtsov
2012-05-10 9:14 ` [PATCH 65/78] wlcore: create private static_data area and add operation to parse it Arik Nemtsov
2012-05-10 9:14 ` [PATCH 66/78] wl18xx: print the PHY firmware version from the private static data Arik Nemtsov
2012-05-10 9:14 ` [PATCH 67/78] wlcore: print the interrupt status when recovery is triggered Arik Nemtsov
2012-05-10 9:14 ` [PATCH 68/78] wl18xx: don't use MIMO when ht_mode is set to wide Arik Nemtsov
2012-05-10 9:14 ` [PATCH 69/78] wlcore: use proper values for supported local rates Arik Nemtsov
2012-05-10 9:14 ` [PATCH 70/78] wl18xx: add module parameter to force SISO 20MHz Arik Nemtsov
2012-05-10 9:14 ` [PATCH 71/78] wl18xx: add power limit reference value to mac_and_phy settings Arik Nemtsov
2012-05-10 9:14 ` [PATCH 72/78] wl18xx: export low/high band component values as module params Arik Nemtsov
2012-05-10 9:14 ` [PATCH 73/78] wl18xx: export pwr_limit_reference_11_abg value as a module parameter Arik Nemtsov
2012-05-10 9:14 ` [PATCH 74/78] wlcore/wl12xx/wl18xx: move lower driver debugfs to a subdir Arik Nemtsov
2012-05-10 9:14 ` [PATCH 75/78] wlcore: increase aggregation buffer size by one page Arik Nemtsov
2012-05-10 9:14 ` [PATCH 76/78] wl18xx: increase tx_ba_win_size to 64 Arik Nemtsov
2012-05-10 9:14 ` [PATCH 77/78] wl18xx: use new fw stats structures Arik Nemtsov
2012-05-10 9:14 ` [PATCH 78/78] wl18xx: change default tcp_checksum to false Arik Nemtsov
2012-05-10 9:50 ` [PATCH 00/78] 18xx chip support Kalle Valo
2012-05-10 10:11 ` Arik Nemtsov
2012-05-10 10:15 ` Kalle Valo
2012-05-10 10:25 ` Arik Nemtsov
2012-05-11 5:57 ` Luciano Coelho
2012-05-11 9:03 ` Kalle Valo
2012-06-05 14:04 ` Luciano Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336641263-5761-29-git-send-email-arik@wizery.com \
--to=arik@wizery.com \
--cc=coelho@ti.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).