* [PATCH 1/2] ath10k: Support 32 stations.
@ 2014-01-23 0:41 greearb
2014-01-23 0:41 ` [PATCH 2/2] ath10k: Support rx-software-crypt mode greearb
2014-01-23 6:30 ` [PATCH 1/2] ath10k: Support 32 stations Kalle Valo
0 siblings, 2 replies; 4+ messages in thread
From: greearb @ 2014-01-23 0:41 UTC (permalink / raw)
To: ath10k; +Cc: kvalo, Ben Greear
From: Ben Greear <greearb@candelatech.com>
Implement 64-bit vdev map to support larger numbers
of virtual devices. Support up to 32 stations
(actual limit will be determined when loading firmware,
as different firmwares have different limits)
Enable larger limits when using Candela Technologies
firmware.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/ath/ath10k/core.c | 8 +++-
drivers/net/wireless/ath/ath10k/core.h | 5 ++-
drivers/net/wireless/ath/ath10k/hw.h | 6 +++
drivers/net/wireless/ath/ath10k/mac.c | 68 +++++++++++++++++++++++++++-------
drivers/net/wireless/ath/ath10k/wmi.c | 23 +++++++++---
5 files changed, 90 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 56048b1..3f37bf8 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -833,7 +833,13 @@ int ath10k_core_start(struct ath10k *ar)
if (status)
goto err_disconnect_htc;
- ar->free_vdev_map = (1 << TARGET_NUM_VDEVS) - 1;
+ if (test_bit(ATH10K_FW_FEATURE_WMI_10X_CT, ar->fw_features))
+ ar->free_vdev_map = (1LL << TARGET_10X_NUM_VDEVS_CT) - 1;
+ else if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
+ ar->free_vdev_map = (1LL << TARGET_10X_NUM_VDEVS) - 1;
+ else
+ ar->free_vdev_map = (1LL << TARGET_NUM_VDEVS) - 1;
+
INIT_LIST_HEAD(&ar->arvifs);
if (!test_bit(ATH10K_FLAG_FIRST_BOOT_DONE, &ar->dev_flags))
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index ade1781..06a6b20 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -314,6 +314,9 @@ enum ath10k_fw_features {
/* Firmware does not support P2P */
ATH10K_FW_FEATURE_NO_P2P = 3,
+ /* Firmware from Candela Technologies, enables more VIFs, etc */
+ ATH10K_FW_FEATURE_WMI_10X_CT = 4,
+
/* keep last */
ATH10K_FW_FEATURE_COUNT,
};
@@ -412,7 +415,7 @@ struct ath10k {
/* valid during scan; needed for mgmt rx during scan */
struct ieee80211_channel *scan_channel;
- int free_vdev_map;
+ unsigned long long free_vdev_map;
int monitor_vdev_id;
bool monitor_enabled;
bool monitor_present;
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index f1505a2..7718c53 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -116,6 +116,12 @@ enum ath10k_mcast2ucast_mode {
#define TARGET_10X_AST_SKID_LIMIT 16
#define TARGET_10X_NUM_PEERS (128 + (TARGET_10X_NUM_VDEVS))
#define TARGET_10X_NUM_PEERS_MAX 128
+
+/* Over-rides for Candela Technologies firmware */
+#define TARGET_10X_NUM_VDEVS_CT 32
+#define TARGET_10X_NUM_PEERS_CT (32 + (TARGET_10X_NUM_VDEVS_CT))
+#define TARGET_10X_AST_SKID_LIMIT_CT (TARGET_10X_NUM_PEERS_CT * TARGET_10X_NUM_PEER_AST)
+
#define TARGET_10X_NUM_OFFLOAD_PEERS 0
#define TARGET_10X_NUM_OFFLOAD_REORDER_BUFS 0
#define TARGET_10X_NUM_PEER_KEYS 2
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 10bd18d..7b79ddd 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -627,14 +627,14 @@ static int ath10k_monitor_create(struct ath10k *ar)
return 0;
}
- bit = ffs(ar->free_vdev_map);
- if (bit == 0) {
+ bit = __ffs64(ar->free_vdev_map);
+ if (bit == 0 || !ar->free_vdev_map) {
ath10k_warn("No free VDEV slots\n");
return -ENOMEM;
}
ar->monitor_vdev_id = bit - 1;
- ar->free_vdev_map &= ~(1 << ar->monitor_vdev_id);
+ ar->free_vdev_map &= ~(1LL << ar->monitor_vdev_id);
ret = ath10k_wmi_vdev_create(ar, ar->monitor_vdev_id,
WMI_VDEV_TYPE_MONITOR,
@@ -654,7 +654,7 @@ vdev_fail:
/*
* Restore the ID to the global map.
*/
- ar->free_vdev_map |= 1 << (ar->monitor_vdev_id);
+ ar->free_vdev_map |= (1LL << ar->monitor_vdev_id);
return ret;
}
@@ -673,7 +673,7 @@ static int ath10k_monitor_destroy(struct ath10k *ar)
return ret;
}
- ar->free_vdev_map |= 1 << (ar->monitor_vdev_id);
+ ar->free_vdev_map |= (1LL << ar->monitor_vdev_id);
ar->monitor_present = false;
ath10k_dbg(ATH10K_DBG_MAC, "mac monitor vdev %d deleted\n",
@@ -2234,13 +2234,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
goto err;
}
- bit = ffs(ar->free_vdev_map);
- if (bit == 0) {
+ bit = __ffs64(ar->free_vdev_map);
+ if (!ar->free_vdev_map) {
+ ath10k_warn("Free vdev map is empty, no more interfaces allowed: %llu, bit: %i\n",
+ ar->free_vdev_map, bit);
ret = -EBUSY;
goto err;
}
+ ath10k_warn("Creating vdev id: %i map: %llu\n",
+ bit, ar->free_vdev_map);
- arvif->vdev_id = bit - 1;
+ arvif->vdev_id = bit;
arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE;
if (ar->p2p)
@@ -2280,7 +2284,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,
goto err;
}
- ar->free_vdev_map &= ~BIT(arvif->vdev_id);
+ ar->free_vdev_map &= ~(1LL << arvif->vdev_id);
list_add(&arvif->list, &ar->arvifs);
vdev_param = ar->wmi.vdev_param->def_keyid;
@@ -2370,7 +2374,7 @@ err_peer_delete:
err_vdev_delete:
ath10k_wmi_vdev_delete(ar, arvif->vdev_id);
- ar->free_vdev_map &= ~BIT(arvif->vdev_id);
+ ar->free_vdev_map &= ~(1LL << arvif->vdev_id);
list_del(&arvif->list);
err:
@@ -2397,7 +2401,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw,
}
spin_unlock_bh(&ar->data_lock);
- ar->free_vdev_map |= 1 << (arvif->vdev_id);
+ ar->free_vdev_map |= (1LL << arvif->vdev_id);
list_del(&arvif->list);
if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
@@ -2869,7 +2873,9 @@ static int ath10k_sta_state(struct ieee80211_hw *hw,
/*
* New station addition.
*/
- if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
+ if (test_bit(ATH10K_FW_FEATURE_WMI_10X_CT, ar->fw_features))
+ max_num_peers = TARGET_10X_NUM_PEERS_CT - 1;
+ else if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features))
max_num_peers = TARGET_10X_NUM_PEERS_MAX - 1;
else
max_num_peers = TARGET_NUM_PEERS;
@@ -3803,6 +3809,22 @@ static const struct ieee80211_iface_limit ath10k_10x_if_limits[] = {
},
};
+static const struct ieee80211_iface_limit ath10k_10x_ct_if_limits[] = {
+ {
+ .max = TARGET_10X_NUM_VDEVS_CT,
+ .types = BIT(NL80211_IFTYPE_STATION)
+ | BIT(NL80211_IFTYPE_P2P_CLIENT)
+ },
+ {
+ .max = 3,
+ .types = BIT(NL80211_IFTYPE_P2P_GO)
+ },
+ {
+ .max = 7,
+ .types = BIT(NL80211_IFTYPE_AP)
+ },
+};
+
static const struct ieee80211_iface_combination ath10k_if_comb[] = {
{
.limits = ath10k_if_limits,
@@ -3829,6 +3851,22 @@ static const struct ieee80211_iface_combination ath10k_10x_if_comb[] = {
},
};
+static const struct ieee80211_iface_combination ath10k_10x_ct_if_comb[] = {
+ {
+ .limits = ath10k_10x_ct_if_limits,
+ .n_limits = ARRAY_SIZE(ath10k_10x_ct_if_limits),
+ .max_interfaces = TARGET_10X_NUM_VDEVS_CT,
+ .num_different_channels = 1,
+ .beacon_int_infra_match = true,
+#ifdef CONFIG_ATH10K_DFS_CERTIFIED
+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
+ BIT(NL80211_CHAN_WIDTH_20) |
+ BIT(NL80211_CHAN_WIDTH_40) |
+ BIT(NL80211_CHAN_WIDTH_80),
+#endif
+ },
+};
+
static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)
{
struct ieee80211_sta_vht_cap vht_cap = {0};
@@ -4052,7 +4090,11 @@ int ath10k_mac_register(struct ath10k *ar)
*/
ar->hw->queues = 4;
- if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
+ if (test_bit(ATH10K_FW_FEATURE_WMI_10X_CT, ar->fw_features)) {
+ ar->hw->wiphy->iface_combinations = ath10k_10x_ct_if_comb;
+ ar->hw->wiphy->n_iface_combinations =
+ ARRAY_SIZE(ath10k_10x_ct_if_comb);
+ } else if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
ar->hw->wiphy->n_iface_combinations =
ARRAY_SIZE(ath10k_10x_if_comb);
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 2a89ccd..3adc4a8 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1928,6 +1928,13 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar,
u32 num_units, req_id, unit_size, num_mem_reqs, num_unit_info, i;
int ret;
struct wmi_service_ready_event_10x *ev = (void *)skb->data;
+ int my_num_peers = TARGET_10X_NUM_PEERS;
+ int my_num_vdevs = TARGET_10X_NUM_VDEVS;
+
+ if (test_bit(ATH10K_FW_FEATURE_WMI_10X_CT, ar->fw_features)) {
+ my_num_peers = TARGET_10X_NUM_PEERS_CT;
+ my_num_vdevs = TARGET_10X_NUM_VDEVS_CT;
+ }
if (skb->len < sizeof(*ev)) {
ath10k_warn("Service ready event was %d B but expected %zu B. Wrong firmware version?\n",
@@ -1990,9 +1997,9 @@ static void ath10k_wmi_10x_service_ready_event_rx(struct ath10k *ar,
* peers, 1 extra for self peer on target */
/* this needs to be tied, host and target
* can get out of sync */
- num_units = TARGET_10X_NUM_PEERS + 1;
+ num_units = my_num_peers + 1;
else if (num_unit_info & NUM_UNITS_IS_NUM_VDEVS)
- num_units = TARGET_10X_NUM_VDEVS + 1;
+ num_units = my_num_vdevs + 1;
ath10k_dbg(ATH10K_DBG_WMI,
"wmi mem_req_id %d num_units %d num_unit_info %d unit size %d actual units %d\n",
@@ -2562,11 +2569,17 @@ static int ath10k_wmi_10x_cmd_init(struct ath10k *ar)
u32 len, val;
int i;
- config.num_vdevs = __cpu_to_le32(TARGET_10X_NUM_VDEVS);
- config.num_peers = __cpu_to_le32(TARGET_10X_NUM_PEERS);
+ if (test_bit(ATH10K_FW_FEATURE_WMI_10X_CT, ar->fw_features)) {
+ config.num_vdevs = __cpu_to_le32(TARGET_10X_NUM_VDEVS_CT);
+ config.num_peers = __cpu_to_le32(TARGET_10X_NUM_PEERS_CT);
+ config.ast_skid_limit = __cpu_to_le32(TARGET_10X_AST_SKID_LIMIT_CT);
+ } else {
+ config.num_vdevs = __cpu_to_le32(TARGET_10X_NUM_VDEVS);
+ config.num_peers = __cpu_to_le32(TARGET_10X_NUM_PEERS);
+ config.ast_skid_limit = __cpu_to_le32(TARGET_10X_AST_SKID_LIMIT);
+ }
config.num_peer_keys = __cpu_to_le32(TARGET_10X_NUM_PEER_KEYS);
config.num_tids = __cpu_to_le32(TARGET_10X_NUM_TIDS);
- config.ast_skid_limit = __cpu_to_le32(TARGET_10X_AST_SKID_LIMIT);
config.tx_chain_mask = __cpu_to_le32(TARGET_10X_TX_CHAIN_MASK);
config.rx_chain_mask = __cpu_to_le32(TARGET_10X_RX_CHAIN_MASK);
config.rx_timeout_pri_vo = __cpu_to_le32(TARGET_10X_RX_TIMEOUT_LO_PRI);
--
1.7.11.7
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ath10k: Support rx-software-crypt mode.
2014-01-23 0:41 [PATCH 1/2] ath10k: Support 32 stations greearb
@ 2014-01-23 0:41 ` greearb
2014-01-23 1:40 ` Ben Greear
2014-01-23 6:30 ` [PATCH 1/2] ath10k: Support 32 stations Kalle Valo
1 sibling, 1 reply; 4+ messages in thread
From: greearb @ 2014-01-23 0:41 UTC (permalink / raw)
To: ath10k; +Cc: kvalo, Ben Greear
From: Ben Greear <greearb@candelatech.com>
With appropriate firmware (probably only CT firmware at this time)
this allows enabling rx-software-crypt mode. This tells the
firmware to not decrypt any packets received, but do encrypt
(as needed) any packets on transmit. This is implemented to get
around hardware issues that preclude using two stations to
connect to the same AP while using encryption.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 39 ++++++++++++++++++++++++++++----
drivers/net/wireless/ath/ath10k/mac.c | 12 ++++++++++
drivers/net/wireless/ath/ath10k/mac.h | 2 ++
drivers/net/wireless/ath/ath10k/txrx.c | 13 +++++++----
drivers/net/wireless/ath/ath10k/wmi.c | 9 +++++++-
drivers/net/wireless/ath/ath10k/wmi.h | 15 ++++++++++++
6 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 7b0b51f..96542ad 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -21,6 +21,7 @@
#include "txrx.h"
#include "debug.h"
#include "trace.h"
+#include "mac.h"
#include <linux/log2.h>
@@ -954,12 +955,42 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
if (status != HTT_RX_IND_MPDU_STATUS_OK &&
status != HTT_RX_IND_MPDU_STATUS_TKIP_MIC_ERR &&
!htt->ar->monitor_enabled) {
- ath10k_dbg(ATH10K_DBG_HTT,
- "htt rx ignoring frame w/ status %d\n",
- status);
+ if (status == HTT_RX_IND_MPDU_STATUS_ERR_DUP) {
+ /* Saw this during some attempts at
+ * having multiple stations connected
+ * to same AP. The CT firmware should
+ * fix this.
+ */
+ ath10k_dbg(ATH10K_DBG_HTT,
+ "htt rx: status DUP\n");
+ } else if (status == HTT_RX_IND_MPDU_STATUS_ERR_INV_PEER) {
+ /* This often happens when in nohwcrypt mode,
+ * ignore.
+ */
+ if (ath10k_modparam_nohwcrypt)
+ goto continue_on;
+ ath10k_dbg(ATH10K_DBG_HTT,
+ "htt rx: status INVALID_PEER\n");
+ } else if (status == HTT_RX_IND_MPDU_STATUS_ERR_FCS) {
+ /* This is seen when using sw-rx-crypt
+ * (CT firmware only, other firmware
+ * will not do sw-rx-crypt at all))
+ * Ignore this if we are in rx-sw-crypt
+ * mode.
+ */
+ if (ath10k_modparam_nohwcrypt)
+ goto continue_on;
+ ath10k_dbg(ATH10K_DBG_HTT,
+ "htt rx: status ERR_FCS\n");
+ } else {
+ ath10k_dbg(ATH10K_DBG_HTT,
+ "htt rx ignoring frame w/ status %d\n",
+ status);
+ }
ath10k_htt_rx_free_msdu_chain(msdu_head);
continue;
}
+continue_on:
if (test_bit(ATH10K_CAC_RUNNING, &htt->ar->dev_flags)) {
ath10k_warn("htt rx: CAC running\n");
@@ -979,7 +1010,7 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
info.fcs_err = ath10k_htt_rx_has_fcs_err(msdu_head);
info.mic_err = ath10k_htt_rx_has_mic_err(msdu_head);
- if (info.fcs_err)
+ if (info.fcs_err && !ath10k_modparam_nohwcrypt)
ath10k_warn("htt rx has FCS err\n");
if (info.mic_err)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 7b79ddd..89a52ca 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -19,6 +19,7 @@
#include <net/mac80211.h>
#include <linux/etherdevice.h>
+#include <linux/module.h>
#include "hif.h"
#include "core.h"
@@ -27,6 +28,13 @@
#include "htt.h"
#include "txrx.h"
+/* 0: Full hardware crypt
+ * 1: Tx hardware crypt, but expect rx software crypt (use native wifi tx type)
+ */
+int ath10k_modparam_nohwcrypt;
+module_param_named(nohwcrypt, ath10k_modparam_nohwcrypt, int, 0444);
+MODULE_PARM_DESC(nohwcrypt, "Disable hardware rx decrypt feature");
+
/**********/
/* Crypto */
/**********/
@@ -77,6 +85,8 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
if (cmd == DISABLE_KEY) {
arg.key_cipher = WMI_CIPHER_NONE;
arg.key_data = NULL;
+ } else if (ath10k_modparam_nohwcrypt) {
+ key->flags |= IEEE80211_KEY_FLAG_SW_RX_CRYPT;
}
return ath10k_wmi_vdev_install_key(arvif->ar, &arg);
@@ -2792,6 +2802,8 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
mutex_lock(&ar->conf_mutex);
+ key->flags &= ~IEEE80211_KEY_FLAG_SW_RX_CRYPT;
+
if (sta)
peer_addr = sta->addr;
else if (arvif->vdev_type == WMI_VDEV_TYPE_STA)
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index ba10219..66dc604 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -21,6 +21,8 @@
#include <net/mac80211.h>
#include "core.h"
+extern int ath10k_modparam_nohwcrypt;
+
struct ath10k_generic_iter {
struct ath10k *ar;
int ret;
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c
index fc3a651..4c0bace 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -224,11 +224,14 @@ void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info)
memset(status, 0, sizeof(*status));
if (info->encrypt_type != HTT_RX_MPDU_ENCRYPT_NONE) {
- status->flag |= RX_FLAG_DECRYPTED | RX_FLAG_IV_STRIPPED |
- RX_FLAG_MMIC_STRIPPED;
- hdr->frame_control = __cpu_to_le16(
- __le16_to_cpu(hdr->frame_control) &
- ~IEEE80211_FCTL_PROTECTED);
+ if (!ath10k_modparam_nohwcrypt) {
+ status->flag |= (RX_FLAG_DECRYPTED |
+ RX_FLAG_IV_STRIPPED |
+ RX_FLAG_MMIC_STRIPPED);
+ hdr->frame_control = __cpu_to_le16(
+ __le16_to_cpu(hdr->frame_control) &
+ ~IEEE80211_FCTL_PROTECTED);
+ }
}
if (info->mic_err)
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 3adc4a8..4b8f643 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2586,7 +2586,14 @@ static int ath10k_wmi_10x_cmd_init(struct ath10k *ar)
config.rx_timeout_pri_vi = __cpu_to_le32(TARGET_10X_RX_TIMEOUT_LO_PRI);
config.rx_timeout_pri_be = __cpu_to_le32(TARGET_10X_RX_TIMEOUT_LO_PRI);
config.rx_timeout_pri_bk = __cpu_to_le32(TARGET_10X_RX_TIMEOUT_HI_PRI);
- config.rx_decap_mode = __cpu_to_le32(TARGET_10X_RX_DECAP_MODE);
+ if (ath10k_modparam_nohwcrypt)
+ /* This will disable rx decryption in hardware, enable raw
+ * rx mode, and native-wifi tx mode. Requires 'CT' firmware.
+ */
+ config.rx_decap_mode = __cpu_to_le32(ATH10K_HW_TXRX_RAW |
+ ATH10k_USE_SW_RX_CRYPT);
+ else
+ config.rx_decap_mode = __cpu_to_le32(TARGET_10X_RX_DECAP_MODE);
config.scan_max_pending_reqs =
__cpu_to_le32(TARGET_10X_SCAN_MAX_PENDING_REQS);
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index 4b5e7d3..0f856d0 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -1447,7 +1447,22 @@ struct wmi_resource_config_10x {
* MAC can decap to RAW (no decap), native wifi or Ethernet types
* THis setting also determines the default TX behavior, however TX
* behavior can be modified on a per VAP basis during VAP init
+ *
+ * NOTE: Stealing some of this field for flags, only usable when
+ * running "CT" firmware.
+ * first byte: rx_decap_mode
+ * second byte: reserved
+ */
+ #define ATH10K_RX_DECAP_MODE_MASK 0xff
+ /* Use software rx crypt. This disables rx checksumming
+ * and may turn off some firmware/hardware optimizations for
+ * normal use case. BUT, it does allow us to run multiple
+ * stations connected to the same AP. This flag causes
+ * rx encapsulation to be 'raw', and tx mode to be native-wifi.
+ * You should probably not enable this unless you need to
+ * connect multiple stations to same AP.
*/
+ #define ATH10k_USE_SW_RX_CRYPT 0x10000
__le32 rx_decap_mode;
/* what is the maximum scan requests than can be queued */
--
1.7.11.7
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ath10k: Support rx-software-crypt mode.
2014-01-23 0:41 ` [PATCH 2/2] ath10k: Support rx-software-crypt mode greearb
@ 2014-01-23 1:40 ` Ben Greear
0 siblings, 0 replies; 4+ messages in thread
From: Ben Greear @ 2014-01-23 1:40 UTC (permalink / raw)
To: ath10k; +Cc: kvalo
On 01/22/2014 04:41 PM, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> With appropriate firmware (probably only CT firmware at this time)
> this allows enabling rx-software-crypt mode. This tells the
> firmware to not decrypt any packets received, but do encrypt
> (as needed) any packets on transmit. This is implemented to get
> around hardware issues that preclude using two stations to
> connect to the same AP while using encryption.
>
I should mention: This depends on a mac80211 patch I sent to
the linux-wireless mailing list. It defines and uses the key flag
used below...
Thanks,
Ben
> /**********/
> /* Crypto */
> /**********/
> @@ -77,6 +85,8 @@ static int ath10k_send_key(struct ath10k_vif *arvif,
> if (cmd == DISABLE_KEY) {
> arg.key_cipher = WMI_CIPHER_NONE;
> arg.key_data = NULL;
> + } else if (ath10k_modparam_nohwcrypt) {
> + key->flags |= IEEE80211_KEY_FLAG_SW_RX_CRYPT;
> }
>
> return ath10k_wmi_vdev_install_key(arvif->ar, &arg);
> @@ -2792,6 +2802,8 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
>
> mutex_lock(&ar->conf_mutex);
>
> + key->flags &= ~IEEE80211_KEY_FLAG_SW_RX_CRYPT;
> +
> if (sta)
> peer_addr = sta->addr;
> else if (arvif->vdev_type == WMI_VDEV_TYPE_STA)
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ath10k: Support 32 stations.
2014-01-23 0:41 [PATCH 1/2] ath10k: Support 32 stations greearb
2014-01-23 0:41 ` [PATCH 2/2] ath10k: Support rx-software-crypt mode greearb
@ 2014-01-23 6:30 ` Kalle Valo
1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2014-01-23 6:30 UTC (permalink / raw)
To: greearb; +Cc: ath10k
greearb@candelatech.com writes:
> From: Ben Greear <greearb@candelatech.com>
>
> Implement 64-bit vdev map to support larger numbers
> of virtual devices. Support up to 32 stations
> (actual limit will be determined when loading firmware,
> as different firmwares have different limits)
>
> Enable larger limits when using Candela Technologies
> firmware.
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
We are currently maintaining two different firmware branches which adds
extra effort to the developers. To be honest I'm not exactly thrilled to
start supporting a third one. Can't you maintain these out-of-tree, at
least for the time being?
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-23 6:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-23 0:41 [PATCH 1/2] ath10k: Support 32 stations greearb
2014-01-23 0:41 ` [PATCH 2/2] ath10k: Support rx-software-crypt mode greearb
2014-01-23 1:40 ` Ben Greear
2014-01-23 6:30 ` [PATCH 1/2] ath10k: Support 32 stations Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.