iwlwifi: drop packets with bad status in CD

We need to drop packets with errors (such as replay,
MIC, ICV, conversion, duplicate and so on).

Drop invalid packets, put the status bits in the metadata and
move the enum definition to the correct place (FW API header).

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
index 2f599353c8856b4c9604e4953722771c7fef4837..2ba1401e5c0d526c3336b9090d9c911b9b9b131d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
@@ -574,6 +574,69 @@ struct iwl_rx_mpdu_desc {
 
 #define IWL_RX_DESC_SIZE_V1 offsetofend(struct iwl_rx_mpdu_desc, v1)
 
+#define IWL_CD_STTS_OPTIMIZED_POS      0
+#define IWL_CD_STTS_OPTIMIZED_MSK      0x01
+#define IWL_CD_STTS_TRANSFER_STATUS_POS        1
+#define IWL_CD_STTS_TRANSFER_STATUS_MSK        0x0E
+#define IWL_CD_STTS_WIFI_STATUS_POS    4
+#define IWL_CD_STTS_WIFI_STATUS_MSK    0xF0
+
+/**
+ * enum iwl_completion_desc_transfer_status -  transfer status (bits 1-3)
+ * @IWL_CD_STTS_UNUSED: unused
+ * @IWL_CD_STTS_UNUSED_2: unused
+ * @IWL_CD_STTS_END_TRANSFER: successful transfer complete.
+ *     In sniffer mode, when split is used, set in last CD completion. (RX)
+ * @IWL_CD_STTS_OVERFLOW: In sniffer mode, when using split - used for
+ *     all CD completion. (RX)
+ * @IWL_CD_STTS_ABORTED: CR abort / close flow. (RX)
+ * @IWL_CD_STTS_ERROR: general error (RX)
+ */
+enum iwl_completion_desc_transfer_status {
+       IWL_CD_STTS_UNUSED,
+       IWL_CD_STTS_UNUSED_2,
+       IWL_CD_STTS_END_TRANSFER,
+       IWL_CD_STTS_OVERFLOW,
+       IWL_CD_STTS_ABORTED,
+       IWL_CD_STTS_ERROR,
+};
+
+/**
+ * enum iwl_completion_desc_wifi_status - wifi status (bits 4-7)
+ * @IWL_CD_STTS_VALID: the packet is valid (RX)
+ * @IWL_CD_STTS_FCS_ERR: frame check sequence error (RX)
+ * @IWL_CD_STTS_SEC_KEY_ERR: error handling the security key of rx (RX)
+ * @IWL_CD_STTS_DECRYPTION_ERR: error decrypting the frame (RX)
+ * @IWL_CD_STTS_DUP: duplicate packet (RX)
+ * @IWL_CD_STTS_ICV_MIC_ERR: MIC error (RX)
+ * @IWL_CD_STTS_INTERNAL_SNAP_ERR: problems removing the snap (RX)
+ * @IWL_CD_STTS_SEC_PORT_FAIL: security port fail (RX)
+ * @IWL_CD_STTS_BA_OLD_SN: block ack received old SN (RX)
+ * @IWL_CD_STTS_QOS_NULL: QoS null packet (RX)
+ * @IWL_CD_STTS_MAC_HDR_ERR: MAC header conversion error (RX)
+ * @IWL_CD_STTS_MAX_RETRANS: reached max number of retransmissions (TX)
+ * @IWL_CD_STTS_EX_LIFETIME: exceeded lifetime (TX)
+ * @IWL_CD_STTS_NOT_USED: completed but not used (RX)
+ * @IWL_CD_STTS_REPLAY_ERR: pn check failed, replay error (RX)
+ */
+enum iwl_completion_desc_wifi_status {
+       IWL_CD_STTS_VALID,
+       IWL_CD_STTS_FCS_ERR,
+       IWL_CD_STTS_SEC_KEY_ERR,
+       IWL_CD_STTS_DECRYPTION_ERR,
+       IWL_CD_STTS_DUP,
+       IWL_CD_STTS_ICV_MIC_ERR,
+       IWL_CD_STTS_INTERNAL_SNAP_ERR,
+       IWL_CD_STTS_SEC_PORT_FAIL,
+       IWL_CD_STTS_BA_OLD_SN,
+       IWL_CD_STTS_QOS_NULL,
+       IWL_CD_STTS_MAC_HDR_ERR,
+       IWL_CD_STTS_MAX_RETRANS,
+       IWL_CD_STTS_EX_LIFETIME,
+       IWL_CD_STTS_NOT_USED,
+       IWL_CD_STTS_REPLAY_ERR,
+};
+
 struct iwl_frame_release {
        u8 baid;
        u8 reserved;

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 279dd7b7a3fb921c615dcab4fe769f926f7e896d..0b8cf7f3af93304116152bf9a6b9a5273507226d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -269,6 +269,7 @@ struct iwl_rx_cmd_buffer {
        bool _page_stolen;
        u32 _rx_page_order;
        unsigned int truesize;
+       u8 status;
 };
 
 static inline void *rxb_addr(struct iwl_rx_cmd_buffer *r)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index b63d44b7cd7c7be1e6a0a3fe0081edc5ea4820b7..0127386de6c654f73392903333b896d9352ac717 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -102,66 +102,6 @@ struct isr_statistics {
        u32 unhandled;
 };
 
-#define IWL_CD_STTS_OPTIMIZED_POS      0
-#define IWL_CD_STTS_OPTIMIZED_MSK      0x01
-#define IWL_CD_STTS_TRANSFER_STATUS_POS        1
-#define IWL_CD_STTS_TRANSFER_STATUS_MSK        0x0E
-#define IWL_CD_STTS_WIFI_STATUS_POS    4
-#define IWL_CD_STTS_WIFI_STATUS_MSK    0xF0
-
-/**
- * enum iwl_completion_desc_transfer_status -  transfer status (bits 1-3)
- * @IWL_CD_STTS_END_TRANSFER: successful transfer complete.
- *     In sniffer mode, when split is used, set in last CD completion. (RX)
- * @IWL_CD_STTS_OVERFLOW: In sniffer mode, when using split - used for
- *     all CD completion. (RX)
- * @IWL_CD_STTS_ABORTED: CR abort / close flow. (RX)
- */
-enum iwl_completion_desc_transfer_status {
-       IWL_CD_STTS_UNUSED,
-       IWL_CD_STTS_UNUSED_2,
-       IWL_CD_STTS_END_TRANSFER,
-       IWL_CD_STTS_OVERFLOW,
-       IWL_CD_STTS_ABORTED,
-       IWL_CD_STTS_ERROR,
-};
-
-/**
- * enum iwl_completion_desc_wifi_status - wifi status (bits 4-7)
- * @IWL_CD_STTS_VALID: the packet is valid (RX)
- * @IWL_CD_STTS_FCS_ERR: frame check sequence error (RX)
- * @IWL_CD_STTS_SEC_KEY_ERR: error handling the security key of rx (RX)
- * @IWL_CD_STTS_DECRYPTION_ERR: error decrypting the frame (RX)
- * @IWL_CD_STTS_DUP: duplicate packet (RX)
- * @IWL_CD_STTS_ICV_MIC_ERR: MIC error (RX)
- * @IWL_CD_STTS_INTERNAL_SNAP_ERR: problems removing the snap (RX)
- * @IWL_CD_STTS_SEC_PORT_FAIL: security port fail (RX)
- * @IWL_CD_STTS_BA_OLD_SN: block ack received old SN (RX)
- * @IWL_CD_STTS_QOS_NULL: QoS null packet (RX)
- * @IWL_CD_STTS_MAC_HDR_ERR: MAC header conversion error (RX)
- * @IWL_CD_STTS_MAX_RETRANS: reached max number of retransmissions (TX)
- * @IWL_CD_STTS_EX_LIFETIME: exceeded lifetime (TX)
- * @IWL_CD_STTS_NOT_USED: completed but not used (RX)
- * @IWL_CD_STTS_REPLAY_ERR: pn check failed, replay error (RX)
- */
-enum iwl_completion_desc_wifi_status {
-       IWL_CD_STTS_VALID,
-       IWL_CD_STTS_FCS_ERR,
-       IWL_CD_STTS_SEC_KEY_ERR,
-       IWL_CD_STTS_DECRYPTION_ERR,
-       IWL_CD_STTS_DUP,
-       IWL_CD_STTS_ICV_MIC_ERR,
-       IWL_CD_STTS_INTERNAL_SNAP_ERR,
-       IWL_CD_STTS_SEC_PORT_FAIL,
-       IWL_CD_STTS_BA_OLD_SN,
-       IWL_CD_STTS_QOS_NULL,
-       IWL_CD_STTS_MAC_HDR_ERR,
-       IWL_CD_STTS_MAX_RETRANS,
-       IWL_CD_STTS_EX_LIFETIME,
-       IWL_CD_STTS_NOT_USED,
-       IWL_CD_STTS_REPLAY_ERR,
-};
-
 #define IWL_RX_TD_TYPE_MSK     0xff000000
 #define IWL_RX_TD_SIZE_MSK     0x00ffffff
 #define IWL_RX_TD_SIZE_2K      BIT(11)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
index d017aa2a0a8bd7bed6c75f5f20da83460cca1c7a..b82f7a0509ec1d9da401ce3525105ea86aaaf420 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
@@ -1187,7 +1187,8 @@ static void iwl_pcie_rx_reuse_rbd(struct iwl_trans *trans,
 static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
                                struct iwl_rxq *rxq,
                                struct iwl_rx_mem_buffer *rxb,
-                               bool emergency)
+                               bool emergency,
+                               int i)
 {
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        struct iwl_txq *txq = trans_pcie->txq[trans_pcie->cmd_queue];
@@ -1213,6 +1214,9 @@ static void iwl_pcie_rx_handle_rb(struct iwl_trans *trans,
                        .truesize = max_len,
                };
 
+               if (trans->cfg->device_family >= IWL_DEVICE_FAMILY_22560)
+                       rxcb.status = rxq->cd[i].status;
+
                pkt = rxb_addr(&rxcb);
 
                if (pkt->len_n_flags == cpu_to_le32(FH_RSCSR_FRAME_INVALID)) {
@@ -1406,7 +1410,7 @@ restart:
                        goto out;
 
                IWL_DEBUG_RX(trans, "Q %d: HW = %d, SW = %d\n", rxq->id, r, i);
-               iwl_pcie_rx_handle_rb(trans, rxq, rxb, emergency);
+               iwl_pcie_rx_handle_rb(trans, rxq, rxb, emergency, i);
 
                i = (i + 1) & (rxq->queue_size - 1);