| Message ID | 1433383018-47335-1-git-send-email-cfliu.tw@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
Kalle et al. Please ignore this patch and review the new email with subject line changed with [PATCH V2] highlighted. Looks like only by doing so would it start a new thread in the ML. That patch is exactly the same as the last one in this thread. I updated the commit message with more testing details. On Wed, Jun 3, 2015 at 6:56 PM, David Liu <cfliu.tw@gmail.com> wrote: > This change supports bypassing HW crypto engine by enabling raw Rx/Tx mode. > This will enable use cases such as sw crypto and raw tx injection. > This change introduces a new module param 'cryptmode'. > > cryptmode: > > 0 Use HW crypto engine. Use native WiFi mode Tx/Rx encap > > 1 Use SW crypto engine. Use raw mode Tx/Rx encap > > 2 Supports both SW & HW crypto engine. Use raw mode Tx/Rx encap. > > Testing: used QCA988x hw 2.0 with 10.2.4.13-2 firmware with backports-20150424 > > ath10k > cryptmode > param Testing Status > ------- --------------------------------- > 0 HW CCMP tested ok. > Note: HW crypto bypass not supported by ath10k hw in native WiFi > mode. > > 1 - mac80211 SW crypto tested ok. > - raw Tx frame injection tested ok. > > 2 HW CCMP tested ok. > SW CCMP tested ok. > Tested raw Tx encrypted frame injection ok. > > Signed-off-by: David Liu <cfliu.tw@gmail.com> > --- > drivers/net/wireless/ath/ath10k/core.c | 29 +++++++++++++++++ > drivers/net/wireless/ath/ath10k/core.h | 29 +++++++++++++++-- > drivers/net/wireless/ath/ath10k/htt_rx.c | 5 ++- > drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +++++- > drivers/net/wireless/ath/ath10k/mac.c | 53 +++++++++++++++++++++++++++----- > drivers/net/wireless/ath/ath10k/wmi.c | 4 ++- > 6 files changed, 114 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > index 59496a9..a81c7a7 100644 > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -31,16 +31,19 @@ > #include "wmi-ops.h" > > unsigned int ath10k_debug_mask; > +unsigned int ath10k_cryptmode_param; > static bool uart_print; > static bool skip_otp; > > module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); > +module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); > module_param(uart_print, bool, 0644); > module_param(skip_otp, bool, 0644); > > MODULE_PARM_DESC(debug_mask, "Debugging mask"); > MODULE_PARM_DESC(uart_print, "Uart target debugging"); > MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode"); > +MODULE_PARM_DESC(cryptmode, "Crypto mode - 0: HW only, 1: SW only, 2:Both"); > > static const struct ath10k_hw_params ath10k_hw_params_list[] = { > { > @@ -991,6 +994,32 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) > return -EINVAL; > } > > + switch (ath10k_cryptmode_param) { > + case ATH10K_CRYPT_MODE_HW: > + clear_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); > + clear_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); > + break; > + case ATH10K_CRYPT_MODE_SW: > + case ATH10K_CRYPT_MODE_HW_SW: > + if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT, > + ar->fw_features)) { > + ath10k_err(ar, "cryptmode > 0 requires raw mode support from firmware"); > + return -EINVAL; > + } > + > + set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); > + > + if (ath10k_cryptmode_param == ATH10K_CRYPT_MODE_SW) { > + set_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); > + } > + break; > + default: > + ath10k_info(ar, "invalid cryptmode: %d\n", > + ath10k_cryptmode_param); > + return -EINVAL; > + } > + ath10k_info(ar, "cryptmode: %d\n", ath10k_cryptmode_param); > + > /* Backwards compatibility for firmwares without > * ATH10K_FW_IE_WMI_OP_VERSION. > */ > diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h > index 45f9603..38606e7 100644 > --- a/drivers/net/wireless/ath/ath10k/core.h > +++ b/drivers/net/wireless/ath/ath10k/core.h > @@ -91,6 +91,7 @@ struct ath10k_skb_cb { > u8 tid; > u16 freq; > bool is_offchan; > + bool nohwcrypt; > struct ath10k_htt_txbuf *txbuf; > u32 txbuf_paddr; > } __packed htt; > @@ -349,6 +350,7 @@ struct ath10k_vif { > } u; > > bool use_cts_prot; > + bool nohwcrypt; > int num_legacy_stations; > int txpower; > struct wmi_wmm_params_all_arg wmm_params; > @@ -461,16 +463,21 @@ enum ath10k_fw_features { > ATH10K_FW_FEATURE_WOWLAN_SUPPORT = 6, > > /* Don't trust error code from otp.bin */ > - ATH10K_FW_FEATURE_IGNORE_OTP_RESULT, > + ATH10K_FW_FEATURE_IGNORE_OTP_RESULT = 7, > > /* Some firmware revisions pad 4th hw address to 4 byte boundary making > * it 8 bytes long in Native Wifi Rx decap. > */ > - ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING, > + ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING = 8, > > /* Firmware supports bypassing PLL setting on init. */ > ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT = 9, > > + /* Raw mode support. If supported, FW supports receiving and trasmitting > + * frames in raw mode > + */ > + ATH10K_FW_FEATURE_RAW_MODE_SUPPORT = 10, > + > /* keep last */ > ATH10K_FW_FEATURE_COUNT, > }; > @@ -484,6 +491,15 @@ enum ath10k_dev_flags { > * waiters should immediately cancel instead of waiting for a time out. > */ > ATH10K_FLAG_CRASH_FLUSH, > + > + /* Use Raw mode instead of native WiFi Tx/Rx encap mode. > + * Raw mode supports both HW and SW crypto. Native WiFi only > + * supports HW crypto. > + */ > + ATH10K_FLAG_RAW_MODE, > + > + /* Disable HW crypto engine */ > + ATH10K_FLAG_HW_CRYPTO_DISABLED, > }; > > enum ath10k_cal_mode { > @@ -492,6 +508,15 @@ enum ath10k_cal_mode { > ATH10K_CAL_MODE_DT, > }; > > +enum ath10k_crypt_mode { > + /* Use HW crypto engine only */ > + ATH10K_CRYPT_MODE_HW, > + /* HW SW crypto engine only (ie. HW crypto engine disabled) */ > + ATH10K_CRYPT_MODE_SW, > + /* Both SW & HW crypto engine supported */ > + ATH10K_CRYPT_MODE_HW_SW, > +}; > + > static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) > { > switch (mode) { > diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c > index 89eb16b..7e738da 100644 > --- a/drivers/net/wireless/ath/ath10k/htt_rx.c > +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c > @@ -1017,9 +1017,8 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar, > skb_trim(msdu, msdu->len - FCS_LEN); > > /* In most cases this will be true for sniffed frames. It makes sense > - * to deliver them as-is without stripping the crypto param. This would > - * also make sense for software based decryption (which is not > - * implemented in ath10k). > + * to deliver them as-is without stripping the crypto param. This is > + * neccessary for software based decryption. > * > * If there's no error then the frame is decrypted. At least that is > * the case for frames that come in via fragmented rx indication. > diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c > index a60ef7d..7099e91 100644 > --- a/drivers/net/wireless/ath/ath10k/htt_tx.c > +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c > @@ -450,8 +450,12 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) > if ((ieee80211_is_action(hdr->frame_control) || > ieee80211_is_deauth(hdr->frame_control) || > ieee80211_is_disassoc(hdr->frame_control)) && > - ieee80211_has_protected(hdr->frame_control)) > + ieee80211_has_protected(hdr->frame_control)) { > skb_put(msdu, IEEE80211_CCMP_MIC_LEN); > + } else if (!skb_cb->htt.nohwcrypt && > + skb_cb->txmode == ATH10K_HW_TXRX_RAW) { > + skb_put(msdu, IEEE80211_CCMP_MIC_LEN); > + } > > skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, > DMA_TO_DEVICE); > @@ -508,6 +512,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) > prefetch_len); > skb_cb->htt.txbuf->htc_hdr.flags = 0; > > + if (skb_cb->htt.nohwcrypt) > + flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; > + > if (!skb_cb->is_protected) > flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; > > diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c > index f4de717..6a3a361 100644 > --- a/drivers/net/wireless/ath/ath10k/mac.c > +++ b/drivers/net/wireless/ath/ath10k/mac.c > @@ -172,6 +172,7 @@ static int ath10k_send_key(struct ath10k_vif *arvif, > .key_flags = flags, > .macaddr = macaddr, > }; > + int ret; > > lockdep_assert_held(&arvif->ar->conf_mutex); > > @@ -197,12 +198,23 @@ static int ath10k_send_key(struct ath10k_vif *arvif, > return -EOPNOTSUPP; > } > > + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { > + key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; > + } > + > + if (arvif->nohwcrypt) > + cmd = DISABLE_KEY; > + > if (cmd == DISABLE_KEY) { > arg.key_cipher = WMI_CIPHER_NONE; > arg.key_data = NULL; > } > > - return ath10k_wmi_vdev_install_key(arvif->ar, &arg); > + ret = ath10k_wmi_vdev_install_key(arvif->ar, &arg); > + > + if (arvif->nohwcrypt && !ret) > + return -EOPNOTSUPP; > + return ret; > } > > static int ath10k_install_key(struct ath10k_vif *arvif, > @@ -3172,9 +3184,24 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, > if (ieee80211_is_data_present(fc) && sta && sta->tdls) > return ATH10K_HW_TXRX_ETHERNET; > > + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) > + return ATH10K_HW_TXRX_RAW; > + > return ATH10K_HW_TXRX_NATIVE_WIFI; > } > > +static bool ath10k_tx_h_use_hwcrypto(struct ieee80211_vif *vif, > + struct sk_buff *skb) { > + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); > + const u32 mask = IEEE80211_TX_INTFL_DONT_ENCRYPT | > + IEEE80211_TX_CTL_INJECTED; > + if ((info->flags & mask) == mask) > + return false; > + if (vif) > + return !ath10k_vif_to_arvif(vif)->nohwcrypt; > + return true; > +} > + > /* HTT Tx uses Native Wifi tx mode which expects 802.11 frames without QoS > * Control in the header. > */ > @@ -3620,6 +3647,7 @@ static void ath10k_tx(struct ieee80211_hw *hw, > ATH10K_SKB_CB(skb)->htt.is_offchan = false; > ATH10K_SKB_CB(skb)->htt.freq = 0; > ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr); > + ATH10K_SKB_CB(skb)->htt.nohwcrypt = !ath10k_tx_h_use_hwcrypto(vif, skb); > ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif); > ATH10K_SKB_CB(skb)->txmode = ath10k_tx_h_get_txmode(ar, vif, sta, skb); > ATH10K_SKB_CB(skb)->is_protected = ieee80211_has_protected(fc); > @@ -3635,12 +3663,11 @@ static void ath10k_tx(struct ieee80211_hw *hw, > ath10k_tx_h_8023(skb); > break; > case ATH10K_HW_TXRX_RAW: > - /* FIXME: Packet injection isn't implemented. It should be > - * doable with firmware 10.2 on qca988x. > - */ > - WARN_ON_ONCE(1); > - ieee80211_free_txskb(hw, skb); > - return; > + if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { > + WARN_ON_ONCE(1); > + ieee80211_free_txskb(hw, skb); > + return; > + } > } > > if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) { > @@ -4236,6 +4263,14 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, > goto err; > } > } > + if (test_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags)) > + arvif->nohwcrypt = true; > + > + if (arvif->nohwcrypt && > + !test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { > + ath10k_warn(ar, "cryptmode module param needed for sw crypto\n"); > + goto err; > + } > > ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vdev create %d (add interface) type %d subtype %d bcnmode %s\n", > arvif->vdev_id, arvif->vdev_type, arvif->vdev_subtype, > @@ -6890,7 +6925,6 @@ int ath10k_mac_register(struct ath10k *ar) > IEEE80211_HW_HAS_RATE_CONTROL | > IEEE80211_HW_AP_LINK_PS | > IEEE80211_HW_SPECTRUM_MGMT | > - IEEE80211_HW_SW_CRYPTO_CONTROL | > IEEE80211_HW_CONNECTION_MONITOR | > IEEE80211_HW_SUPPORTS_PER_STA_GTK | > IEEE80211_HW_WANT_MONITOR_VIF | > @@ -6898,6 +6932,9 @@ int ath10k_mac_register(struct ath10k *ar) > IEEE80211_HW_QUEUE_CONTROL | > IEEE80211_HW_SUPPORT_FAST_XMIT; > > + if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) > + ar->hw->flags |= IEEE80211_HW_SW_CRYPTO_CONTROL; > + > ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; > ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; > > diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c > index 77220b0..64b31f1 100644 > --- a/drivers/net/wireless/ath/ath10k/wmi.c > +++ b/drivers/net/wireless/ath/ath10k/wmi.c > @@ -3894,7 +3894,9 @@ static struct sk_buff *ath10k_wmi_10_2_op_gen_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); > + config.rx_decap_mode = __cpu_to_le32(ATH10K_HW_TXRX_NATIVE_WIFI); > + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) > + config.rx_decap_mode = __cpu_to_le32(ATH10K_HW_TXRX_RAW); > > config.scan_max_pending_reqs = > __cpu_to_le32(TARGET_10X_SCAN_MAX_PENDING_REQS); > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
"Liu CF/TW" <cfliu.tw@gmail.com> writes: > Kalle et al. Please ignore this patch and review the new email with > subject line changed with [PATCH V2] highlighted. Looks like only by > doing so would it start a new thread in the ML. > That patch is exactly the same as the last one in this thread. I > updated the commit message with more testing details. If you send a new version of the patch, please increase the version number so that it's easy to find the latest patch. "v2" vs "V2" is just confusing, so just mark the new patch as v3. It's not like we are running out of version numbers or anything like that.
On Fri, Jun 5, 2015 at 10:43 AM, Kalle Valo <kvalo@qca.qualcomm.com> wrote: > "Liu CF/TW" <cfliu.tw@gmail.com> writes: > >> Kalle et al. Please ignore this patch and review the new email with >> subject line changed with [PATCH V2] highlighted. Looks like only by >> doing so would it start a new thread in the ML. >> That patch is exactly the same as the last one in this thread. I >> updated the commit message with more testing details. > > If you send a new version of the patch, please increase the version > number so that it's easy to find the latest patch. "v2" vs "V2" is just > confusing, so just mark the new patch as v3. It's not like we are > running out of version numbers or anything like that. > > -- > Kalle Valo Kalle, Sure. Will do, with 'v3' next time. Do you have other comments so I can address them together with Michal's in v3? Thanks David -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 59496a9..a81c7a7 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -31,16 +31,19 @@ #include "wmi-ops.h" unsigned int ath10k_debug_mask; +unsigned int ath10k_cryptmode_param; static bool uart_print; static bool skip_otp; module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); +module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); module_param(uart_print, bool, 0644); module_param(skip_otp, bool, 0644); MODULE_PARM_DESC(debug_mask, "Debugging mask"); MODULE_PARM_DESC(uart_print, "Uart target debugging"); MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode"); +MODULE_PARM_DESC(cryptmode, "Crypto mode - 0: HW only, 1: SW only, 2:Both"); static const struct ath10k_hw_params ath10k_hw_params_list[] = { { @@ -991,6 +994,32 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) return -EINVAL; } + switch (ath10k_cryptmode_param) { + case ATH10K_CRYPT_MODE_HW: + clear_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); + clear_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); + break; + case ATH10K_CRYPT_MODE_SW: + case ATH10K_CRYPT_MODE_HW_SW: + if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT, + ar->fw_features)) { + ath10k_err(ar, "cryptmode > 0 requires raw mode support from firmware"); + return -EINVAL; + } + + set_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags); + + if (ath10k_cryptmode_param == ATH10K_CRYPT_MODE_SW) { + set_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags); + } + break; + default: + ath10k_info(ar, "invalid cryptmode: %d\n", + ath10k_cryptmode_param); + return -EINVAL; + } + ath10k_info(ar, "cryptmode: %d\n", ath10k_cryptmode_param); + /* Backwards compatibility for firmwares without * ATH10K_FW_IE_WMI_OP_VERSION. */ diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 45f9603..38606e7 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -91,6 +91,7 @@ struct ath10k_skb_cb { u8 tid; u16 freq; bool is_offchan; + bool nohwcrypt; struct ath10k_htt_txbuf *txbuf; u32 txbuf_paddr; } __packed htt; @@ -349,6 +350,7 @@ struct ath10k_vif { } u; bool use_cts_prot; + bool nohwcrypt; int num_legacy_stations; int txpower; struct wmi_wmm_params_all_arg wmm_params; @@ -461,16 +463,21 @@ enum ath10k_fw_features { ATH10K_FW_FEATURE_WOWLAN_SUPPORT = 6, /* Don't trust error code from otp.bin */ - ATH10K_FW_FEATURE_IGNORE_OTP_RESULT, + ATH10K_FW_FEATURE_IGNORE_OTP_RESULT = 7, /* Some firmware revisions pad 4th hw address to 4 byte boundary making * it 8 bytes long in Native Wifi Rx decap. */ - ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING, + ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDING = 8, /* Firmware supports bypassing PLL setting on init. */ ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT = 9, + /* Raw mode support. If supported, FW supports receiving and trasmitting + * frames in raw mode + */ + ATH10K_FW_FEATURE_RAW_MODE_SUPPORT = 10, + /* keep last */ ATH10K_FW_FEATURE_COUNT, }; @@ -484,6 +491,15 @@ enum ath10k_dev_flags { * waiters should immediately cancel instead of waiting for a time out. */ ATH10K_FLAG_CRASH_FLUSH, + + /* Use Raw mode instead of native WiFi Tx/Rx encap mode. + * Raw mode supports both HW and SW crypto. Native WiFi only + * supports HW crypto. + */ + ATH10K_FLAG_RAW_MODE, + + /* Disable HW crypto engine */ + ATH10K_FLAG_HW_CRYPTO_DISABLED, }; enum ath10k_cal_mode { @@ -492,6 +508,15 @@ enum ath10k_cal_mode { ATH10K_CAL_MODE_DT, }; +enum ath10k_crypt_mode { + /* Use HW crypto engine only */ + ATH10K_CRYPT_MODE_HW, + /* HW SW crypto engine only (ie. HW crypto engine disabled) */ + ATH10K_CRYPT_MODE_SW, + /* Both SW & HW crypto engine supported */ + ATH10K_CRYPT_MODE_HW_SW, +}; + static inline const char *ath10k_cal_mode_str(enum ath10k_cal_mode mode) { switch (mode) { diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 89eb16b..7e738da 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -1017,9 +1017,8 @@ static void ath10k_htt_rx_h_undecap_raw(struct ath10k *ar, skb_trim(msdu, msdu->len - FCS_LEN); /* In most cases this will be true for sniffed frames. It makes sense - * to deliver them as-is without stripping the crypto param. This would - * also make sense for software based decryption (which is not - * implemented in ath10k). + * to deliver them as-is without stripping the crypto param. This is + * neccessary for software based decryption. * * If there's no error then the frame is decrypted. At least that is * the case for frames that come in via fragmented rx indication. diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c index a60ef7d..7099e91 100644 --- a/drivers/net/wireless/ath/ath10k/htt_tx.c +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c @@ -450,8 +450,12 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) if ((ieee80211_is_action(hdr->frame_control) || ieee80211_is_deauth(hdr->frame_control) || ieee80211_is_disassoc(hdr->frame_control)) && - ieee80211_has_protected(hdr->frame_control)) + ieee80211_has_protected(hdr->frame_control)) { skb_put(msdu, IEEE80211_CCMP_MIC_LEN); + } else if (!skb_cb->htt.nohwcrypt && + skb_cb->txmode == ATH10K_HW_TXRX_RAW) { + skb_put(msdu, IEEE80211_CCMP_MIC_LEN); + } skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, DMA_TO_DEVICE); @@ -508,6 +512,9 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) prefetch_len); skb_cb->htt.txbuf->htc_hdr.flags = 0; + if (skb_cb->htt.nohwcrypt) + flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; + if (!skb_cb->is_protected) flags0 |= HTT_DATA_TX_DESC_FLAGS0_NO_ENCRYPT; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index f4de717..6a3a361 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -172,6 +172,7 @@ static int ath10k_send_key(struct ath10k_vif *arvif, .key_flags = flags, .macaddr = macaddr, }; + int ret; lockdep_assert_held(&arvif->ar->conf_mutex); @@ -197,12 +198,23 @@ static int ath10k_send_key(struct ath10k_vif *arvif, return -EOPNOTSUPP; } + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { + key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; + } + + if (arvif->nohwcrypt) + cmd = DISABLE_KEY; + if (cmd == DISABLE_KEY) { arg.key_cipher = WMI_CIPHER_NONE; arg.key_data = NULL; } - return ath10k_wmi_vdev_install_key(arvif->ar, &arg); + ret = ath10k_wmi_vdev_install_key(arvif->ar, &arg); + + if (arvif->nohwcrypt && !ret) + return -EOPNOTSUPP; + return ret; } static int ath10k_install_key(struct ath10k_vif *arvif, @@ -3172,9 +3184,24 @@ ath10k_tx_h_get_txmode(struct ath10k *ar, struct ieee80211_vif *vif, if (ieee80211_is_data_present(fc) && sta && sta->tdls) return ATH10K_HW_TXRX_ETHERNET; + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) + return ATH10K_HW_TXRX_RAW; + return ATH10K_HW_TXRX_NATIVE_WIFI; } +static bool ath10k_tx_h_use_hwcrypto(struct ieee80211_vif *vif, + struct sk_buff *skb) { + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + const u32 mask = IEEE80211_TX_INTFL_DONT_ENCRYPT | + IEEE80211_TX_CTL_INJECTED; + if ((info->flags & mask) == mask) + return false; + if (vif) + return !ath10k_vif_to_arvif(vif)->nohwcrypt; + return true; +} + /* HTT Tx uses Native Wifi tx mode which expects 802.11 frames without QoS * Control in the header. */ @@ -3620,6 +3647,7 @@ static void ath10k_tx(struct ieee80211_hw *hw, ATH10K_SKB_CB(skb)->htt.is_offchan = false; ATH10K_SKB_CB(skb)->htt.freq = 0; ATH10K_SKB_CB(skb)->htt.tid = ath10k_tx_h_get_tid(hdr); + ATH10K_SKB_CB(skb)->htt.nohwcrypt = !ath10k_tx_h_use_hwcrypto(vif, skb); ATH10K_SKB_CB(skb)->vdev_id = ath10k_tx_h_get_vdev_id(ar, vif); ATH10K_SKB_CB(skb)->txmode = ath10k_tx_h_get_txmode(ar, vif, sta, skb); ATH10K_SKB_CB(skb)->is_protected = ieee80211_has_protected(fc); @@ -3635,12 +3663,11 @@ static void ath10k_tx(struct ieee80211_hw *hw, ath10k_tx_h_8023(skb); break; case ATH10K_HW_TXRX_RAW: - /* FIXME: Packet injection isn't implemented. It should be - * doable with firmware 10.2 on qca988x. - */ - WARN_ON_ONCE(1); - ieee80211_free_txskb(hw, skb); - return; + if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { + WARN_ON_ONCE(1); + ieee80211_free_txskb(hw, skb); + return; + } } if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) { @@ -4236,6 +4263,14 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err; } } + if (test_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags)) + arvif->nohwcrypt = true; + + if (arvif->nohwcrypt && + !test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) { + ath10k_warn(ar, "cryptmode module param needed for sw crypto\n"); + goto err; + } ath10k_dbg(ar, ATH10K_DBG_MAC, "mac vdev create %d (add interface) type %d subtype %d bcnmode %s\n", arvif->vdev_id, arvif->vdev_type, arvif->vdev_subtype, @@ -6890,7 +6925,6 @@ int ath10k_mac_register(struct ath10k *ar) IEEE80211_HW_HAS_RATE_CONTROL | IEEE80211_HW_AP_LINK_PS | IEEE80211_HW_SPECTRUM_MGMT | - IEEE80211_HW_SW_CRYPTO_CONTROL | IEEE80211_HW_CONNECTION_MONITOR | IEEE80211_HW_SUPPORTS_PER_STA_GTK | IEEE80211_HW_WANT_MONITOR_VIF | @@ -6898,6 +6932,9 @@ int ath10k_mac_register(struct ath10k *ar) IEEE80211_HW_QUEUE_CONTROL | IEEE80211_HW_SUPPORT_FAST_XMIT; + if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) + ar->hw->flags |= IEEE80211_HW_SW_CRYPTO_CONTROL; + ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 77220b0..64b31f1 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -3894,7 +3894,9 @@ static struct sk_buff *ath10k_wmi_10_2_op_gen_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); + config.rx_decap_mode = __cpu_to_le32(ATH10K_HW_TXRX_NATIVE_WIFI); + if (test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) + config.rx_decap_mode = __cpu_to_le32(ATH10K_HW_TXRX_RAW); config.scan_max_pending_reqs = __cpu_to_le32(TARGET_10X_SCAN_MAX_PENDING_REQS);
This change supports bypassing HW crypto engine by enabling raw Rx/Tx mode. This will enable use cases such as sw crypto and raw tx injection. This change introduces a new module param 'cryptmode'. cryptmode: 0 Use HW crypto engine. Use native WiFi mode Tx/Rx encap 1 Use SW crypto engine. Use raw mode Tx/Rx encap 2 Supports both SW & HW crypto engine. Use raw mode Tx/Rx encap. Testing: used QCA988x hw 2.0 with 10.2.4.13-2 firmware with backports-20150424 ath10k cryptmode param Testing Status ------- --------------------------------- 0 HW CCMP tested ok. Note: HW crypto bypass not supported by ath10k hw in native WiFi mode. 1 - mac80211 SW crypto tested ok. - raw Tx frame injection tested ok. 2 HW CCMP tested ok. SW CCMP tested ok. Tested raw Tx encrypted frame injection ok. Signed-off-by: David Liu <cfliu.tw@gmail.com> --- drivers/net/wireless/ath/ath10k/core.c | 29 +++++++++++++++++ drivers/net/wireless/ath/ath10k/core.h | 29 +++++++++++++++-- drivers/net/wireless/ath/ath10k/htt_rx.c | 5 ++- drivers/net/wireless/ath/ath10k/htt_tx.c | 9 +++++- drivers/net/wireless/ath/ath10k/mac.c | 53 +++++++++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/wmi.c | 4 ++- 6 files changed, 114 insertions(+), 15 deletions(-)