mt76: move dev_irq tracepoint in mt76 module

Move dev_irq tracepoint in common code in order to be reused by mt7603
and mt7615 drivers

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/core.c b/drivers/net/wireless/mediatek/mt76/mt7603/core.c
index 693a91be070a3fcaa6be8c965e3c2069fb7531e8..60a996b63c0c059166d971d902e141cc4cd417fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/core.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: ISC
 
 #include "mt7603.h"
+#include "../trace.h"
 
 void mt7603_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {
@@ -20,6 +21,8 @@ irqreturn_t mt7603_irq_handler(int irq, void *dev_instance)
        if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))
                return IRQ_NONE;
 
+       trace_dev_irq(&dev->mt76, intr, dev->mt76.mmio.irqmask);
+
        intr &= dev->mt76.mmio.irqmask;
 
        if (intr & MT_INT_MAC_IRQ3) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c
index 7e3556c3b6eb659ce18aedd489a170cb5bec9316..828f11087b081a617529f274e069231183734866 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c
@@ -11,6 +11,7 @@
 
 #include "mt7615.h"
 #include "mac.h"
+#include "../trace.h"
 
 static const struct pci_device_id mt7615_pci_device_table[] = {
        { PCI_DEVICE(0x14c3, 0x7615) },
@@ -46,6 +47,8 @@ static irqreturn_t mt7615_irq_handler(int irq, void *dev_instance)
        if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))
                return IRQ_NONE;
 
+       trace_dev_irq(&dev->mt76, intr, dev->mt76.mmio.irqmask);
+
        intr &= dev->mt76.mmio.irqmask;
 
        if (intr & MT_INT_TX_DONE_ALL) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 094a4228b591f9ddbbaf1ebf30f7ba73075a5c64..93d56d7ce5db48304679914af493ff247f72194f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -9,7 +9,7 @@
 
 #include "mt76x02.h"
 #include "mt76x02_mcu.h"
-#include "mt76x02_trace.h"
+#include "trace.h"
 
 static void mt76x02_pre_tbtt_tasklet(unsigned long arg)
 {
@@ -271,7 +271,7 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)
        if (!test_bit(MT76_STATE_INITIALIZED, &dev->mphy.state))
                return IRQ_NONE;
 
-       trace_dev_irq(dev, intr, dev->mt76.mmio.irqmask);
+       trace_dev_irq(&dev->mt76, intr, dev->mt76.mmio.irqmask);
 
        intr &= dev->mt76.mmio.irqmask;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
index 61ecaf0fe0653576613e7fee48e4a0a556363c37..eea9afe154df7ab45a0a87e3a6fdc66154c77adf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
@@ -100,29 +100,6 @@ TRACE_EVENT(mac_txstat_fetch,
        )
 );
 
-TRACE_EVENT(dev_irq,
-       TP_PROTO(struct mt76x02_dev *dev, u32 val, u32 mask),
-
-       TP_ARGS(dev, val, mask),
-
-       TP_STRUCT__entry(
-               DEV_ENTRY
-               __field(u32, val)
-               __field(u32, mask)
-       ),
-
-       TP_fast_assign(
-               DEV_ASSIGN;
-               __entry->val = val;
-               __entry->mask = mask;
-       ),
-
-       TP_printk(
-               DEV_PR_FMT " %08x & %08x",
-               DEV_PR_ARG, __entry->val, __entry->mask
-       )
-);
-
 #endif
 
 #undef TRACE_INCLUDE_PATH

diff --git a/drivers/net/wireless/mediatek/mt76/trace.c b/drivers/net/wireless/mediatek/mt76/trace.c
index ed3df3c8b4b312af384f0ce1be7b2775b6916950..3c63f3b8a499a8ba8844ea4d329a51a2a169c8e1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/trace.c
+++ b/drivers/net/wireless/mediatek/mt76/trace.c
@@ -9,4 +9,6 @@
 #define CREATE_TRACE_POINTS
 #include "trace.h"
 
+EXPORT_TRACEPOINT_SYMBOL_GPL(dev_irq);
+
 #endif

diff --git a/drivers/net/wireless/mediatek/mt76/trace.h b/drivers/net/wireless/mediatek/mt76/trace.h
index 0b3e635da868d21c8eba2bb2fa5ba17fe9685e5d..41706a874afa7834b06e682499e2459e393af7b8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/trace.h
+++ b/drivers/net/wireless/mediatek/mt76/trace.h
@@ -51,6 +51,29 @@ DEFINE_EVENT(dev_reg_evt, reg_wr,
        TP_ARGS(dev, reg, val)
 );
 
+TRACE_EVENT(dev_irq,
+       TP_PROTO(struct mt76_dev *dev, u32 val, u32 mask),
+
+       TP_ARGS(dev, val, mask),
+
+       TP_STRUCT__entry(
+               DEV_ENTRY
+               __field(u32, val)
+               __field(u32, mask)
+       ),
+
+       TP_fast_assign(
+               DEV_ASSIGN;
+               __entry->val = val;
+               __entry->mask = mask;
+       ),
+
+       TP_printk(
+               DEV_PR_FMT " %08x & %08x",
+               DEV_PR_ARG, __entry->val, __entry->mask
+       )
+);
+
 #endif
 
 #undef TRACE_INCLUDE_PATH