net/phy: add trace events for mdio accesses

Make it possible to generate trace events for mdio read and write accesses.

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 09deef4bed097dd2a6231c9cfd4916df86fe1e99..653d076eafe5068672f177d565eec07798a782e3 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -38,6 +38,9 @@
 
 #include <asm/irq.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/mdio.h>
+
 int mdiobus_register_device(struct mdio_device *mdiodev)
 {
        if (mdiodev->bus->mdio_map[mdiodev->addr])
@@ -461,6 +464,8 @@ int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum)
        retval = bus->read(bus, addr, regnum);
        mutex_unlock(&bus->mdio_lock);
 
+       trace_mdio_access(bus, 1, addr, regnum, retval, retval);
+
        return retval;
 }
 EXPORT_SYMBOL(mdiobus_read_nested);
@@ -485,6 +490,8 @@ int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
        retval = bus->read(bus, addr, regnum);
        mutex_unlock(&bus->mdio_lock);
 
+       trace_mdio_access(bus, 1, addr, regnum, retval, retval);
+
        return retval;
 }
 EXPORT_SYMBOL(mdiobus_read);
@@ -513,6 +520,8 @@ int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val)
        err = bus->write(bus, addr, regnum, val);
        mutex_unlock(&bus->mdio_lock);
 
+       trace_mdio_access(bus, 0, addr, regnum, val, err);
+
        return err;
 }
 EXPORT_SYMBOL(mdiobus_write_nested);
@@ -538,6 +547,8 @@ int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val)
        err = bus->write(bus, addr, regnum, val);
        mutex_unlock(&bus->mdio_lock);
 
+       trace_mdio_access(bus, 0, addr, regnum, val, err);
+
        return err;
 }
 EXPORT_SYMBOL(mdiobus_write);

diff --git a/include/trace/events/mdio.h b/include/trace/events/mdio.h
new file mode 100644 (file)
index 0000000..00d85f5
--- /dev/null
+++ b/include/trace/events/mdio.h
@@ -0,0 +1,42 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mdio
+
+#if !defined(_TRACE_MDIO_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_MDIO_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT_CONDITION(mdio_access,
+
+       TP_PROTO(struct mii_bus *bus, char read,
+                u8 addr, unsigned regnum, u16 val, int err),
+
+       TP_ARGS(bus, read, addr, regnum, val, err),
+
+       TP_CONDITION(err >= 0),
+
+       TP_STRUCT__entry(
+               __array(char, busid, MII_BUS_ID_SIZE)
+               __field(char, read)
+               __field(u8, addr)
+               __field(u16, val)
+               __field(unsigned, regnum)
+       ),
+
+       TP_fast_assign(
+               strncpy(__entry->busid, bus->id, MII_BUS_ID_SIZE);
+               __entry->read = read;
+               __entry->addr = addr;
+               __entry->regnum = regnum;
+               __entry->val = val;
+       ),
+
+       TP_printk("%s %-5s phy:0x%02hhx reg:0x%02x val:0x%04hx",
+                 __entry->busid, __entry->read ? "read" : "write",
+                 __entry->addr, __entry->regnum, __entry->val)
+);
+
+#endif /* if !defined(_TRACE_MDIO_H) || defined(TRACE_HEADER_MULTI_READ) */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>