The base was showing the virtual address of the FSI master, which was
not useful for most users of the tracepoint.
Reviewed-by: Eddie James <eajames at linux.ibm.com>
Tested-by: Eddie James <eajames at linux.ibm.com>
Acked-by: Andrew Jeffery <andrew at aj.id.au>
Signed-off-by: Joel Stanley <joel at jms.id.au>
---
drivers/fsi/fsi-master-aspeed.c | 5 ++---
include/trace/events/fsi_master_aspeed.h | 20 ++++++++------------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c
index 2048e38e7200..d796c4012875 100644
--- a/drivers/fsi/fsi-master-aspeed.c
+++ b/drivers/fsi/fsi-master-aspeed.c
@@ -194,8 +194,7 @@ static u32 opb_write(void __iomem *base, uint32_t addr, uint32_t val,
status = readl(base + OPB0_STATUS);
- trace_fsi_master_aspeed_opb_write(base, addr, val, size,
- status, reg);
+ trace_fsi_master_aspeed_opb_write(addr, val, size, status, reg);
/* Return error when poll timed out */
if (ret)
@@ -231,7 +230,7 @@ static int opb_read(void __iomem *base, uint32_t addr, size_t size, u32 *out)
result = readl(base + OPB0_FSI_DATA_R);
- trace_fsi_master_aspeed_opb_read(base, addr, size, result,
+ trace_fsi_master_aspeed_opb_read(addr, size, result,
readl(base + OPB0_STATUS),
reg);
diff --git a/include/trace/events/fsi_master_aspeed.h b/include/trace/events/fsi_master_aspeed.h
index 06ff6a14bf11..63b9ce7f0de6 100644
--- a/include/trace/events/fsi_master_aspeed.h
+++ b/include/trace/events/fsi_master_aspeed.h
@@ -9,10 +9,9 @@
#include <linux/tracepoint.h>
TRACE_EVENT(fsi_master_aspeed_opb_read,
- TP_PROTO(void __iomem *base, uint32_t addr, size_t size, uint32_t result, uint32_t status, uint32_t irq_status),
- TP_ARGS(base, addr, size, result, status, irq_status),
+ TP_PROTO(uint32_t addr, size_t size, uint32_t result, uint32_t status, uint32_t irq_status),
+ TP_ARGS(addr, size, result, status, irq_status),
TP_STRUCT__entry(
- __field(void *, base)
__field(uint32_t, addr)
__field(size_t, size)
__field(uint32_t, result)
@@ -20,24 +19,22 @@ TRACE_EVENT(fsi_master_aspeed_opb_read,
__field(uint32_t, irq_status)
),
TP_fast_assign(
- __entry->base = base;
__entry->addr = addr;
__entry->size = size;
__entry->result = result;
__entry->status = status;
__entry->irq_status = irq_status;
),
- TP_printk("fsi: opb read: base %p addr %08x size %zu: result %08x status: %08x irq_status: %08x",
- __entry->base, __entry->addr, __entry->size, __entry->result,
+ TP_printk("fsi: opb read: addr %08x size %zu: result %08x status: %08x irq_status: %08x",
+ __entry->addr, __entry->size, __entry->result,
__entry->status, __entry->irq_status
)
);
TRACE_EVENT(fsi_master_aspeed_opb_write,
- TP_PROTO(void __iomem *base, uint32_t addr, uint32_t val, size_t size, uint32_t status, uint32_t irq_status),
- TP_ARGS(base, addr, val, size, status, irq_status),
+ TP_PROTO(uint32_t addr, uint32_t val, size_t size, uint32_t status, uint32_t irq_status),
+ TP_ARGS(addr, val, size, status, irq_status),
TP_STRUCT__entry(
- __field(void *, base)
__field(uint32_t, addr)
__field(uint32_t, val)
__field(size_t, size)
@@ -45,15 +42,14 @@ TRACE_EVENT(fsi_master_aspeed_opb_write,
__field(uint32_t, irq_status)
),
TP_fast_assign(
- __entry->base = base;
__entry->addr = addr;
__entry->val = val;
__entry->size = size;
__entry->status = status;
__entry->irq_status = irq_status;
),
- TP_printk("fsi: opb write: base %p addr %08x val %08x size %zu status: %08x irq_status: %08x",
- __entry->base, __entry->addr, __entry->val, __entry->size,
+ TP_printk("fsi: opb write: addr %08x val %08x size %zu status: %08x irq_status: %08x",
+ __entry->addr, __entry->val, __entry->size,
__entry->status, __entry->irq_status
)
);
--
2.23.0