Commit e1bddde9 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo

ath10k: add struct for high latency PN replay protection

Add the struct for PN replay protection and fragment packet
handler.

Also fix the bitmask of HTT_RX_DESC_HL_INFO_MCAST_BCAST to match what's currently
used by SDIO firmware. The defines are not used yet so it's safe to modify
them. Remove the conflicting HTT_RX_DESC_HL_INFO_FRAGMENT as
it's not either used in ath10k.

Tested on QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.
Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f91b63b0
...@@ -400,6 +400,14 @@ struct ath10k_peer { ...@@ -400,6 +400,14 @@ struct ath10k_peer {
/* protected by ar->data_lock */ /* protected by ar->data_lock */
struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];
union htt_rx_pn_t tids_last_pn[ATH10K_TXRX_NUM_EXT_TIDS];
bool tids_last_pn_valid[ATH10K_TXRX_NUM_EXT_TIDS];
union htt_rx_pn_t frag_tids_last_pn[ATH10K_TXRX_NUM_EXT_TIDS];
u32 frag_tids_seq[ATH10K_TXRX_NUM_EXT_TIDS];
struct {
enum htt_security_types sec_type;
int pn_len;
} rx_pn[ATH10K_HTT_TXRX_PEER_SECURITY_MAX];
}; };
struct ath10k_txq { struct ath10k_txq {
......
...@@ -733,6 +733,20 @@ struct htt_rx_indication_hl { ...@@ -733,6 +733,20 @@ struct htt_rx_indication_hl {
struct htt_rx_indication_mpdu_range mpdu_ranges[0]; struct htt_rx_indication_mpdu_range mpdu_ranges[0];
} __packed; } __packed;
struct htt_hl_rx_desc {
__le32 info;
__le32 pn_31_0;
union {
struct {
__le16 pn_47_32;
__le16 pn_63_48;
} pn16;
__le32 pn_63_32;
} u0;
__le32 pn_95_64;
__le32 pn_127_96;
} __packed;
static inline struct htt_rx_indication_mpdu_range * static inline struct htt_rx_indication_mpdu_range *
htt_rx_ind_get_mpdu_ranges(struct htt_rx_indication *rx_ind) htt_rx_ind_get_mpdu_ranges(struct htt_rx_indication *rx_ind)
{ {
...@@ -790,6 +804,21 @@ struct htt_rx_peer_unmap { ...@@ -790,6 +804,21 @@ struct htt_rx_peer_unmap {
__le16 peer_id; __le16 peer_id;
} __packed; } __packed;
enum htt_txrx_sec_cast_type {
HTT_TXRX_SEC_MCAST = 0,
HTT_TXRX_SEC_UCAST
};
enum htt_rx_pn_check_type {
HTT_RX_NON_PN_CHECK = 0,
HTT_RX_PN_CHECK
};
enum htt_rx_tkip_demic_type {
HTT_RX_NON_TKIP_MIC = 0,
HTT_RX_TKIP_MIC
};
enum htt_security_types { enum htt_security_types {
HTT_SECURITY_NONE, HTT_SECURITY_NONE,
HTT_SECURITY_WEP128, HTT_SECURITY_WEP128,
...@@ -803,6 +832,9 @@ enum htt_security_types { ...@@ -803,6 +832,9 @@ enum htt_security_types {
HTT_NUM_SECURITY_TYPES /* keep this last! */ HTT_NUM_SECURITY_TYPES /* keep this last! */
}; };
#define ATH10K_HTT_TXRX_PEER_SECURITY_MAX 2
#define ATH10K_TXRX_NUM_EXT_TIDS 19
enum htt_security_flags { enum htt_security_flags {
#define HTT_SECURITY_TYPE_MASK 0x7F #define HTT_SECURITY_TYPE_MASK 0x7F
#define HTT_SECURITY_TYPE_LSB 0 #define HTT_SECURITY_TYPE_LSB 0
...@@ -1010,6 +1042,11 @@ struct htt_rx_fragment_indication { ...@@ -1010,6 +1042,11 @@ struct htt_rx_fragment_indication {
u8 fw_msdu_rx_desc[0]; u8 fw_msdu_rx_desc[0];
} __packed; } __packed;
#define ATH10K_IEEE80211_EXTIV BIT(5)
#define ATH10K_IEEE80211_TKIP_MICLEN 8 /* trailing MIC */
#define HTT_RX_FRAG_IND_INFO0_HEADER_LEN 16
#define HTT_RX_FRAG_IND_INFO0_EXT_TID_MASK 0x1F #define HTT_RX_FRAG_IND_INFO0_EXT_TID_MASK 0x1F
#define HTT_RX_FRAG_IND_INFO0_EXT_TID_LSB 0 #define HTT_RX_FRAG_IND_INFO0_EXT_TID_LSB 0
#define HTT_RX_FRAG_IND_INFO0_FLUSH_VALID_MASK 0x20 #define HTT_RX_FRAG_IND_INFO0_FLUSH_VALID_MASK 0x20
...@@ -2128,10 +2165,8 @@ struct htt_rx_desc { ...@@ -2128,10 +2165,8 @@ struct htt_rx_desc {
#define HTT_RX_DESC_HL_INFO_ENCRYPTED_LSB 12 #define HTT_RX_DESC_HL_INFO_ENCRYPTED_LSB 12
#define HTT_RX_DESC_HL_INFO_CHAN_INFO_PRESENT_MASK 0x00002000 #define HTT_RX_DESC_HL_INFO_CHAN_INFO_PRESENT_MASK 0x00002000
#define HTT_RX_DESC_HL_INFO_CHAN_INFO_PRESENT_LSB 13 #define HTT_RX_DESC_HL_INFO_CHAN_INFO_PRESENT_LSB 13
#define HTT_RX_DESC_HL_INFO_MCAST_BCAST_MASK 0x00008000 #define HTT_RX_DESC_HL_INFO_MCAST_BCAST_MASK 0x00010000
#define HTT_RX_DESC_HL_INFO_MCAST_BCAST_LSB 15 #define HTT_RX_DESC_HL_INFO_MCAST_BCAST_LSB 16
#define HTT_RX_DESC_HL_INFO_FRAGMENT_MASK 0x00010000
#define HTT_RX_DESC_HL_INFO_FRAGMENT_LSB 16
#define HTT_RX_DESC_HL_INFO_KEY_ID_OCT_MASK 0x01fe0000 #define HTT_RX_DESC_HL_INFO_KEY_ID_OCT_MASK 0x01fe0000
#define HTT_RX_DESC_HL_INFO_KEY_ID_OCT_LSB 17 #define HTT_RX_DESC_HL_INFO_KEY_ID_OCT_LSB 17
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment