net: ieee802154: at86rf230: Forward Tx trac errors

Commit 493bc90a9683 ("at86rf230: add debugfs support") brought trac
support as part of a debugfs feature, in order to add some testing
capabilities involving ack handling.

As we want to collect trac errors but do not need the debugfs feature
anymore, let's partially revert this commit, keeping the Tx trac
handling part which still makes sense. This allows to always return the
trac error directly to the core with the recently introduced
ieee802154_xmit_error() helper.

Suggested-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20220407100903.1695973-8-miquel.raynal@bootlin.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>

diff --git a/drivers/net/ieee802154/Kconfig b/drivers/net/ieee802154/Kconfig
index 0f7c6dc..95da876 100644 (file)
--- a/drivers/net/ieee802154/Kconfig
+++ b/drivers/net/ieee802154/Kconfig
@@ -33,13 +33,6 @@ config IEEE802154_AT86RF230
          This driver can also be built as a module. To do so, say M here.
          the module will be called 'at86rf230'.
 
-config IEEE802154_AT86RF230_DEBUGFS
-       depends on IEEE802154_AT86RF230
-       bool "AT86RF230 debugfs interface"
-       depends on DEBUG_FS
-       help
-         This option compiles debugfs code for the at86rf230 driver.
-
 config IEEE802154_MRF24J40
        tristate "Microchip MRF24J40 transceiver driver"
        depends on IEEE802154_DRIVERS && MAC802154

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 0536ccd..1c681c1 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -23,7 +23,6 @@
 #include <linux/skbuff.h>
 #include <linux/of_gpio.h>
 #include <linux/ieee802154.h>
-#include <linux/debugfs.h>
 
 #include <net/mac802154.h>
 #include <net/cfg802154.h>
@@ -72,19 +71,11 @@ struct at86rf230_state_change {
        void (*complete)(void *context);
        u8 from_state;
        u8 to_state;
+       int trac;
 
        bool free;
 };
 
-struct at86rf230_trac {
-       u64 success;
-       u64 success_data_pending;
-       u64 success_wait_for_ack;
-       u64 channel_access_failure;
-       u64 no_ack;
-       u64 invalid;
-};
-
 struct at86rf230_local {
        struct spi_device *spi;
 
@@ -104,8 +95,6 @@ struct at86rf230_local {
        u8 tx_retry;
        struct sk_buff *tx_skb;
        struct at86rf230_state_change tx;
-
-       struct at86rf230_trac trac;
 };
 
 #define AT86RF2XX_NUMREGS 0x3F
@@ -652,7 +641,11 @@ at86rf230_tx_complete(void *context)
        struct at86rf230_state_change *ctx = context;
        struct at86rf230_local *lp = ctx->lp;
 
-       ieee802154_xmit_complete(lp->hw, lp->tx_skb, false);
+       if (ctx->trac == IEEE802154_SUCCESS)
+               ieee802154_xmit_complete(lp->hw, lp->tx_skb, false);
+       else
+               ieee802154_xmit_error(lp->hw, lp->tx_skb, ctx->trac);
+
        kfree(ctx);
 }
 
@@ -671,30 +664,21 @@ at86rf230_tx_trac_check(void *context)
 {
        struct at86rf230_state_change *ctx = context;
        struct at86rf230_local *lp = ctx->lp;
+       u8 trac = TRAC_MASK(ctx->buf[1]);
 
-       if (IS_ENABLED(CONFIG_IEEE802154_AT86RF230_DEBUGFS)) {
-               u8 trac = TRAC_MASK(ctx->buf[1]);
-
-               switch (trac) {
-               case TRAC_SUCCESS:
-                       lp->trac.success++;
-                       break;
-               case TRAC_SUCCESS_DATA_PENDING:
-                       lp->trac.success_data_pending++;
-                       break;
-               case TRAC_CHANNEL_ACCESS_FAILURE:
-                       lp->trac.channel_access_failure++;
-                       break;
-               case TRAC_NO_ACK:
-                       lp->trac.no_ack++;
-                       break;
-               case TRAC_INVALID:
-                       lp->trac.invalid++;
-                       break;
-               default:
-                       WARN_ONCE(1, "received tx trac status %d\n", trac);
-                       break;
-               }
+       switch (trac) {
+       case TRAC_SUCCESS:
+       case TRAC_SUCCESS_DATA_PENDING:
+               ctx->trac = IEEE802154_SUCCESS;
+               break;
+       case TRAC_CHANNEL_ACCESS_FAILURE:
+               ctx->trac = IEEE802154_CHANNEL_ACCESS_FAILURE;
+               break;
+       case TRAC_NO_ACK:
+               ctx->trac = IEEE802154_NO_ACK;
+               break;
+       default:
+               ctx->trac = IEEE802154_SYSTEM_ERROR;
        }
 
        at86rf230_async_state_change(lp, ctx, STATE_TX_ON, at86rf230_tx_on);
@@ -736,25 +720,6 @@ at86rf230_rx_trac_check(void *context)
        u8 *buf = ctx->buf;
        int rc;
 
-       if (IS_ENABLED(CONFIG_IEEE802154_AT86RF230_DEBUGFS)) {
-               u8 trac = TRAC_MASK(buf[1]);
-
-               switch (trac) {
-               case TRAC_SUCCESS:
-                       lp->trac.success++;
-                       break;
-               case TRAC_SUCCESS_WAIT_FOR_ACK:
-                       lp->trac.success_wait_for_ack++;
-                       break;
-               case TRAC_INVALID:
-                       lp->trac.invalid++;
-                       break;
-               default:
-                       WARN_ONCE(1, "received rx trac status %d\n", trac);
-                       break;
-               }
-       }
-
        buf[0] = CMD_FB;
        ctx->trx.len = AT86RF2XX_MAX_BUF;
        ctx->msg.complete = at86rf230_rx_read_frame_complete;
@@ -950,10 +915,6 @@ at86rf230_start(struct ieee802154_hw *hw)
 {
        struct at86rf230_local *lp = hw->priv;
 
-       /* reset trac stats on start */
-       if (IS_ENABLED(CONFIG_IEEE802154_AT86RF230_DEBUGFS))
-               memset(&lp->trac, 0, sizeof(struct at86rf230_trac));
-
        at86rf230_awake(lp);
        enable_irq(lp->spi->irq);
 
@@ -1581,47 +1542,6 @@ not_supp:
        return rc;
 }
 
-#ifdef CONFIG_IEEE802154_AT86RF230_DEBUGFS
-static struct dentry *at86rf230_debugfs_root;
-
-static int at86rf230_stats_show(struct seq_file *file, void *offset)
-{
-       struct at86rf230_local *lp = file->private;
-
-       seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
-       seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
-                  lp->trac.success_data_pending);
-       seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-                  lp->trac.success_wait_for_ack);
-       seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
-                  lp->trac.channel_access_failure);
-       seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
-       seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
-       return 0;
-}
-DEFINE_SHOW_ATTRIBUTE(at86rf230_stats);
-
-static void at86rf230_debugfs_init(struct at86rf230_local *lp)
-{
-       char debugfs_dir_name[DNAME_INLINE_LEN + 1] = "at86rf230-";
-
-       strncat(debugfs_dir_name, dev_name(&lp->spi->dev), DNAME_INLINE_LEN);
-
-       at86rf230_debugfs_root = debugfs_create_dir(debugfs_dir_name, NULL);
-
-       debugfs_create_file("trac_stats", 0444, at86rf230_debugfs_root, lp,
-                           &at86rf230_stats_fops);
-}
-
-static void at86rf230_debugfs_remove(void)
-{
-       debugfs_remove_recursive(at86rf230_debugfs_root);
-}
-#else
-static void at86rf230_debugfs_init(struct at86rf230_local *lp) { }
-static void at86rf230_debugfs_remove(void) { }
-#endif
-
 static int at86rf230_probe(struct spi_device *spi)
 {
        struct ieee802154_hw *hw;
@@ -1718,16 +1638,12 @@ static int at86rf230_probe(struct spi_device *spi)
        /* going into sleep by default */
        at86rf230_sleep(lp);
 
-       at86rf230_debugfs_init(lp);
-
        rc = ieee802154_register_hw(lp->hw);
        if (rc)
-               goto free_debugfs;
+               goto free_dev;
 
        return rc;
 
-free_debugfs:
-       at86rf230_debugfs_remove();
 free_dev:
        ieee802154_free_hw(lp->hw);
 
@@ -1742,7 +1658,6 @@ static int at86rf230_remove(struct spi_device *spi)
        at86rf230_write_subreg(lp, SR_IRQ_MASK, 0);
        ieee802154_unregister_hw(lp->hw);
        ieee802154_free_hw(lp->hw);
-       at86rf230_debugfs_remove();
        dev_dbg(&spi->dev, "unregistered at86rf230\n");
 
        return 0;