diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2010-01-08 00:06:11 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:02:06 -0500 |
commit | 1395d3f00a4164caae168b041855d48e0fa9ea4c (patch) | |
tree | ce900aebcb2abc20c612be47e6d68b49b8599773 | |
parent | cc9c378aa57817003a094e4bb9a953337ebf035a (diff) |
ath9k: Add debugfs file for RX errors
This file can be used to track frame reception errors.
PHY error counts are also added.
Location: ath9k/phy#/recv
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.c | 118 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/debug.h | 32 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.h | 34 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 2 |
4 files changed, 186 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 592f1b70f55a..9489b6b25b5f 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
@@ -580,6 +580,116 @@ static const struct file_operations fops_xmit = { | |||
580 | .owner = THIS_MODULE | 580 | .owner = THIS_MODULE |
581 | }; | 581 | }; |
582 | 582 | ||
583 | static ssize_t read_file_recv(struct file *file, char __user *user_buf, | ||
584 | size_t count, loff_t *ppos) | ||
585 | { | ||
586 | #define PHY_ERR(s, p) \ | ||
587 | len += snprintf(buf + len, size - len, "%18s : %10u\n", s, \ | ||
588 | sc->debug.stats.rxstats.phy_err_stats[p]); | ||
589 | |||
590 | struct ath_softc *sc = file->private_data; | ||
591 | char *buf; | ||
592 | unsigned int len = 0, size = 1152; | ||
593 | ssize_t retval = 0; | ||
594 | |||
595 | buf = kzalloc(size, GFP_KERNEL); | ||
596 | if (buf == NULL) | ||
597 | return 0; | ||
598 | |||
599 | len += snprintf(buf + len, size - len, | ||
600 | "%18s : %10u\n", "CRC ERR", | ||
601 | sc->debug.stats.rxstats.crc_err); | ||
602 | len += snprintf(buf + len, size - len, | ||
603 | "%18s : %10u\n", "DECRYPT CRC ERR", | ||
604 | sc->debug.stats.rxstats.decrypt_crc_err); | ||
605 | len += snprintf(buf + len, size - len, | ||
606 | "%18s : %10u\n", "PHY ERR", | ||
607 | sc->debug.stats.rxstats.phy_err); | ||
608 | len += snprintf(buf + len, size - len, | ||
609 | "%18s : %10u\n", "MIC ERR", | ||
610 | sc->debug.stats.rxstats.mic_err); | ||
611 | len += snprintf(buf + len, size - len, | ||
612 | "%18s : %10u\n", "PRE-DELIM CRC ERR", | ||
613 | sc->debug.stats.rxstats.pre_delim_crc_err); | ||
614 | len += snprintf(buf + len, size - len, | ||
615 | "%18s : %10u\n", "POST-DELIM CRC ERR", | ||
616 | sc->debug.stats.rxstats.post_delim_crc_err); | ||
617 | len += snprintf(buf + len, size - len, | ||
618 | "%18s : %10u\n", "DECRYPT BUSY ERR", | ||
619 | sc->debug.stats.rxstats.decrypt_busy_err); | ||
620 | |||
621 | PHY_ERR("UNDERRUN", ATH9K_PHYERR_UNDERRUN); | ||
622 | PHY_ERR("TIMING", ATH9K_PHYERR_TIMING); | ||
623 | PHY_ERR("PARITY", ATH9K_PHYERR_PARITY); | ||
624 | PHY_ERR("RATE", ATH9K_PHYERR_RATE); | ||
625 | PHY_ERR("LENGTH", ATH9K_PHYERR_LENGTH); | ||
626 | PHY_ERR("RADAR", ATH9K_PHYERR_RADAR); | ||
627 | PHY_ERR("SERVICE", ATH9K_PHYERR_SERVICE); | ||
628 | PHY_ERR("TOR", ATH9K_PHYERR_TOR); | ||
629 | PHY_ERR("OFDM-TIMING", ATH9K_PHYERR_OFDM_TIMING); | ||
630 | PHY_ERR("OFDM-SIGNAL-PARITY", ATH9K_PHYERR_OFDM_SIGNAL_PARITY); | ||
631 | PHY_ERR("OFDM-RATE", ATH9K_PHYERR_OFDM_RATE_ILLEGAL); | ||
632 | PHY_ERR("OFDM-LENGTH", ATH9K_PHYERR_OFDM_LENGTH_ILLEGAL); | ||
633 | PHY_ERR("OFDM-POWER-DROP", ATH9K_PHYERR_OFDM_POWER_DROP); | ||
634 | PHY_ERR("OFDM-SERVICE", ATH9K_PHYERR_OFDM_SERVICE); | ||
635 | PHY_ERR("OFDM-RESTART", ATH9K_PHYERR_OFDM_RESTART); | ||
636 | PHY_ERR("FALSE-RADAR-EXT", ATH9K_PHYERR_FALSE_RADAR_EXT); | ||
637 | PHY_ERR("CCK-TIMING", ATH9K_PHYERR_CCK_TIMING); | ||
638 | PHY_ERR("CCK-HEADER-CRC", ATH9K_PHYERR_CCK_HEADER_CRC); | ||
639 | PHY_ERR("CCK-RATE", ATH9K_PHYERR_CCK_RATE_ILLEGAL); | ||
640 | PHY_ERR("CCK-SERVICE", ATH9K_PHYERR_CCK_SERVICE); | ||
641 | PHY_ERR("CCK-RESTART", ATH9K_PHYERR_CCK_RESTART); | ||
642 | PHY_ERR("CCK-LENGTH", ATH9K_PHYERR_CCK_LENGTH_ILLEGAL); | ||
643 | PHY_ERR("CCK-POWER-DROP", ATH9K_PHYERR_CCK_POWER_DROP); | ||
644 | PHY_ERR("HT-CRC", ATH9K_PHYERR_HT_CRC_ERROR); | ||
645 | PHY_ERR("HT-LENGTH", ATH9K_PHYERR_HT_LENGTH_ILLEGAL); | ||
646 | PHY_ERR("HT-RATE", ATH9K_PHYERR_HT_RATE_ILLEGAL); | ||
647 | |||
648 | retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); | ||
649 | kfree(buf); | ||
650 | |||
651 | return retval; | ||
652 | |||
653 | #undef PHY_ERR | ||
654 | } | ||
655 | |||
656 | void ath_debug_stat_rx(struct ath_softc *sc, struct ath_buf *bf) | ||
657 | { | ||
658 | #define RX_STAT_INC(c) sc->debug.stats.rxstats.c++ | ||
659 | #define RX_PHY_ERR_INC(c) sc->debug.stats.rxstats.phy_err_stats[c]++ | ||
660 | |||
661 | struct ath_desc *ds = bf->bf_desc; | ||
662 | u32 phyerr; | ||
663 | |||
664 | if (ds->ds_rxstat.rs_status & ATH9K_RXERR_CRC) | ||
665 | RX_STAT_INC(crc_err); | ||
666 | if (ds->ds_rxstat.rs_status & ATH9K_RXERR_DECRYPT) | ||
667 | RX_STAT_INC(decrypt_crc_err); | ||
668 | if (ds->ds_rxstat.rs_status & ATH9K_RXERR_MIC) | ||
669 | RX_STAT_INC(mic_err); | ||
670 | if (ds->ds_rxstat.rs_status & ATH9K_RX_DELIM_CRC_PRE) | ||
671 | RX_STAT_INC(pre_delim_crc_err); | ||
672 | if (ds->ds_rxstat.rs_status & ATH9K_RX_DELIM_CRC_POST) | ||
673 | RX_STAT_INC(post_delim_crc_err); | ||
674 | if (ds->ds_rxstat.rs_status & ATH9K_RX_DECRYPT_BUSY) | ||
675 | RX_STAT_INC(decrypt_busy_err); | ||
676 | |||
677 | if (ds->ds_rxstat.rs_status & ATH9K_RXERR_PHY) { | ||
678 | RX_STAT_INC(phy_err); | ||
679 | phyerr = ds->ds_rxstat.rs_phyerr & 0x24; | ||
680 | RX_PHY_ERR_INC(phyerr); | ||
681 | } | ||
682 | |||
683 | #undef RX_STAT_INC | ||
684 | #undef RX_PHY_ERR_INC | ||
685 | } | ||
686 | |||
687 | static const struct file_operations fops_recv = { | ||
688 | .read = read_file_recv, | ||
689 | .open = ath9k_debugfs_open, | ||
690 | .owner = THIS_MODULE | ||
691 | }; | ||
692 | |||
583 | int ath9k_init_debug(struct ath_hw *ah) | 693 | int ath9k_init_debug(struct ath_hw *ah) |
584 | { | 694 | { |
585 | struct ath_common *common = ath9k_hw_common(ah); | 695 | struct ath_common *common = ath9k_hw_common(ah); |
@@ -632,6 +742,13 @@ int ath9k_init_debug(struct ath_hw *ah) | |||
632 | if (!sc->debug.debugfs_xmit) | 742 | if (!sc->debug.debugfs_xmit) |
633 | goto err; | 743 | goto err; |
634 | 744 | ||
745 | sc->debug.debugfs_recv = debugfs_create_file("recv", | ||
746 | S_IRUSR, | ||
747 | sc->debug.debugfs_phy, | ||
748 | sc, &fops_recv); | ||
749 | if (!sc->debug.debugfs_recv) | ||
750 | goto err; | ||
751 | |||
635 | return 0; | 752 | return 0; |
636 | err: | 753 | err: |
637 | ath9k_exit_debug(ah); | 754 | ath9k_exit_debug(ah); |
@@ -643,6 +760,7 @@ void ath9k_exit_debug(struct ath_hw *ah) | |||
643 | struct ath_common *common = ath9k_hw_common(ah); | 760 | struct ath_common *common = ath9k_hw_common(ah); |
644 | struct ath_softc *sc = (struct ath_softc *) common->priv; | 761 | struct ath_softc *sc = (struct ath_softc *) common->priv; |
645 | 762 | ||
763 | debugfs_remove(sc->debug.debugfs_recv); | ||
646 | debugfs_remove(sc->debug.debugfs_xmit); | 764 | debugfs_remove(sc->debug.debugfs_xmit); |
647 | debugfs_remove(sc->debug.debugfs_wiphy); | 765 | debugfs_remove(sc->debug.debugfs_wiphy); |
648 | debugfs_remove(sc->debug.debugfs_rcstat); | 766 | debugfs_remove(sc->debug.debugfs_rcstat); |
diff --git a/drivers/net/wireless/ath/ath9k/debug.h b/drivers/net/wireless/ath/ath9k/debug.h index 536663e3ee11..86780e68b31e 100644 --- a/drivers/net/wireless/ath/ath9k/debug.h +++ b/drivers/net/wireless/ath/ath9k/debug.h | |||
@@ -116,10 +116,35 @@ struct ath_tx_stats { | |||
116 | u32 delim_underrun; | 116 | u32 delim_underrun; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | /** | ||
120 | * struct ath_rx_stats - RX Statistics | ||
121 | * @crc_err: No. of frames with incorrect CRC value | ||
122 | * @decrypt_crc_err: No. of frames whose CRC check failed after | ||
123 | decryption process completed | ||
124 | * @phy_err: No. of frames whose reception failed because the PHY | ||
125 | encountered an error | ||
126 | * @mic_err: No. of frames with incorrect TKIP MIC verification failure | ||
127 | * @pre_delim_crc_err: Pre-Frame delimiter CRC error detections | ||
128 | * @post_delim_crc_err: Post-Frame delimiter CRC error detections | ||
129 | * @decrypt_busy_err: Decryption interruptions counter | ||
130 | * @phy_err_stats: Individual PHY error statistics | ||
131 | */ | ||
132 | struct ath_rx_stats { | ||
133 | u32 crc_err; | ||
134 | u32 decrypt_crc_err; | ||
135 | u32 phy_err; | ||
136 | u32 mic_err; | ||
137 | u32 pre_delim_crc_err; | ||
138 | u32 post_delim_crc_err; | ||
139 | u32 decrypt_busy_err; | ||
140 | u32 phy_err_stats[ATH9K_PHYERR_MAX]; | ||
141 | }; | ||
142 | |||
119 | struct ath_stats { | 143 | struct ath_stats { |
120 | struct ath_interrupt_stats istats; | 144 | struct ath_interrupt_stats istats; |
121 | struct ath_rc_stats rcstats[RATE_TABLE_SIZE]; | 145 | struct ath_rc_stats rcstats[RATE_TABLE_SIZE]; |
122 | struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES]; | 146 | struct ath_tx_stats txstats[ATH9K_NUM_TX_QUEUES]; |
147 | struct ath_rx_stats rxstats; | ||
123 | }; | 148 | }; |
124 | 149 | ||
125 | struct ath9k_debug { | 150 | struct ath9k_debug { |
@@ -130,6 +155,7 @@ struct ath9k_debug { | |||
130 | struct dentry *debugfs_rcstat; | 155 | struct dentry *debugfs_rcstat; |
131 | struct dentry *debugfs_wiphy; | 156 | struct dentry *debugfs_wiphy; |
132 | struct dentry *debugfs_xmit; | 157 | struct dentry *debugfs_xmit; |
158 | struct dentry *debugfs_recv; | ||
133 | struct ath_stats stats; | 159 | struct ath_stats stats; |
134 | }; | 160 | }; |
135 | 161 | ||
@@ -142,6 +168,7 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status); | |||
142 | void ath_debug_stat_rc(struct ath_softc *sc, int final_rate); | 168 | void ath_debug_stat_rc(struct ath_softc *sc, int final_rate); |
143 | void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq, | 169 | void ath_debug_stat_tx(struct ath_softc *sc, struct ath_txq *txq, |
144 | struct ath_buf *bf); | 170 | struct ath_buf *bf); |
171 | void ath_debug_stat_rx(struct ath_softc *sc, struct ath_buf *bf); | ||
145 | void ath_debug_stat_retries(struct ath_softc *sc, int rix, | 172 | void ath_debug_stat_retries(struct ath_softc *sc, int rix, |
146 | int xretries, int retries, u8 per); | 173 | int xretries, int retries, u8 per); |
147 | 174 | ||
@@ -181,6 +208,11 @@ static inline void ath_debug_stat_tx(struct ath_softc *sc, | |||
181 | { | 208 | { |
182 | } | 209 | } |
183 | 210 | ||
211 | static inline void ath_debug_stat_rx(struct ath_softc *sc, | ||
212 | struct ath_buf *bf) | ||
213 | { | ||
214 | } | ||
215 | |||
184 | static inline void ath_debug_stat_retries(struct ath_softc *sc, int rix, | 216 | static inline void ath_debug_stat_retries(struct ath_softc *sc, int rix, |
185 | int xretries, int retries, u8 per) | 217 | int xretries, int retries, u8 per) |
186 | { | 218 | { |
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h index e185479e295e..29851e6376a9 100644 --- a/drivers/net/wireless/ath/ath9k/mac.h +++ b/drivers/net/wireless/ath/ath9k/mac.h | |||
@@ -167,6 +167,40 @@ struct ath_rx_status { | |||
167 | #define ATH9K_RXKEYIX_INVALID ((u8)-1) | 167 | #define ATH9K_RXKEYIX_INVALID ((u8)-1) |
168 | #define ATH9K_TXKEYIX_INVALID ((u32)-1) | 168 | #define ATH9K_TXKEYIX_INVALID ((u32)-1) |
169 | 169 | ||
170 | enum ath9k_phyerr { | ||
171 | ATH9K_PHYERR_UNDERRUN = 0, /* Transmit underrun */ | ||
172 | ATH9K_PHYERR_TIMING = 1, /* Timing error */ | ||
173 | ATH9K_PHYERR_PARITY = 2, /* Illegal parity */ | ||
174 | ATH9K_PHYERR_RATE = 3, /* Illegal rate */ | ||
175 | ATH9K_PHYERR_LENGTH = 4, /* Illegal length */ | ||
176 | ATH9K_PHYERR_RADAR = 5, /* Radar detect */ | ||
177 | ATH9K_PHYERR_SERVICE = 6, /* Illegal service */ | ||
178 | ATH9K_PHYERR_TOR = 7, /* Transmit override receive */ | ||
179 | |||
180 | ATH9K_PHYERR_OFDM_TIMING = 17, | ||
181 | ATH9K_PHYERR_OFDM_SIGNAL_PARITY = 18, | ||
182 | ATH9K_PHYERR_OFDM_RATE_ILLEGAL = 19, | ||
183 | ATH9K_PHYERR_OFDM_LENGTH_ILLEGAL = 20, | ||
184 | ATH9K_PHYERR_OFDM_POWER_DROP = 21, | ||
185 | ATH9K_PHYERR_OFDM_SERVICE = 22, | ||
186 | ATH9K_PHYERR_OFDM_RESTART = 23, | ||
187 | ATH9K_PHYERR_FALSE_RADAR_EXT = 24, | ||
188 | |||
189 | ATH9K_PHYERR_CCK_TIMING = 25, | ||
190 | ATH9K_PHYERR_CCK_HEADER_CRC = 26, | ||
191 | ATH9K_PHYERR_CCK_RATE_ILLEGAL = 27, | ||
192 | ATH9K_PHYERR_CCK_SERVICE = 30, | ||
193 | ATH9K_PHYERR_CCK_RESTART = 31, | ||
194 | ATH9K_PHYERR_CCK_LENGTH_ILLEGAL = 32, | ||
195 | ATH9K_PHYERR_CCK_POWER_DROP = 33, | ||
196 | |||
197 | ATH9K_PHYERR_HT_CRC_ERROR = 34, | ||
198 | ATH9K_PHYERR_HT_LENGTH_ILLEGAL = 35, | ||
199 | ATH9K_PHYERR_HT_RATE_ILLEGAL = 36, | ||
200 | |||
201 | ATH9K_PHYERR_MAX = 37, | ||
202 | }; | ||
203 | |||
170 | struct ath_desc { | 204 | struct ath_desc { |
171 | u32 ds_link; | 205 | u32 ds_link; |
172 | u32 ds_data; | 206 | u32 ds_data; |
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 17b0a6dd8caf..40b5d05edcce 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -571,6 +571,8 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) | |||
571 | hw = ath_get_virt_hw(sc, hdr); | 571 | hw = ath_get_virt_hw(sc, hdr); |
572 | rx_stats = &ds->ds_rxstat; | 572 | rx_stats = &ds->ds_rxstat; |
573 | 573 | ||
574 | ath_debug_stat_rx(sc, bf); | ||
575 | |||
574 | /* | 576 | /* |
575 | * If we're asked to flush receive queue, directly | 577 | * If we're asked to flush receive queue, directly |
576 | * chain it back at the queue without processing it. | 578 | * chain it back at the queue without processing it. |