mt76: improve mcu error logging

Dump mcu command code in hex and related prefix to help debugging

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
index 96b6c89..6abfe6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
@@ -21,9 +21,8 @@ mt7603_mcu_parse_response(struct mt76_dev *mdev, int cmd,
        struct mt7603_mcu_rxd *rxd;
 
        if (!skb) {
-               dev_err(mdev->dev,
-                       "MCU message %d (seq %d) timed out\n",
-                       cmd, seq);
+               dev_err(mdev->dev, "MCU message %02x (seq %d) timed out\n",
+                       abs(cmd), seq);
                dev->mcu_hang = MT7603_WATCHDOG_TIMEOUT;
                return -ETIMEDOUT;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 2e113fd..be976fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -175,8 +175,8 @@ int mt7615_mcu_parse_response(struct mt76_dev *mdev, int cmd,
        int ret = 0;
 
        if (!skb) {
-               dev_err(mdev->dev, "Message %ld (seq %d) timeout\n",
-                       cmd & MCU_CMD_MASK, seq);
+               dev_err(mdev->dev, "Message %08x (seq %d) timeout\n",
+                       cmd, seq);
                return -ETIMEDOUT;
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
index 4aa5c36..7597882 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c
@@ -17,9 +17,8 @@ int mt76x02_mcu_parse_response(struct mt76_dev *mdev, int cmd,
        u32 *rxfce;
 
        if (!skb) {
-               dev_err(mdev->dev,
-                       "MCU message %d (seq %d) timed out\n", cmd,
-                       seq);
+               dev_err(mdev->dev, "MCU message %02x (seq %d) timed out\n",
+                       abs(cmd), seq);
                dev->mcu_timeout = 1;
                return -ETIMEDOUT;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index bcf6aed..1a7c36c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -217,7 +217,7 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,
        int ret = 0;
 
        if (!skb) {
-               dev_err(mdev->dev, "Message %d (seq %d) timeout\n",
+               dev_err(mdev->dev, "Message %08x (seq %d) timeout\n",
                        cmd, seq);
                return -ETIMEDOUT;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 1f23108..a360929 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -160,7 +160,7 @@ mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
        int ret = 0;
 
        if (!skb) {
-               dev_err(mdev->dev, "Message %d (seq %d) timeout\n",
+               dev_err(mdev->dev, "Message %08x (seq %d) timeout\n",
                        cmd, seq);
                return -ETIMEDOUT;
        }