From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-spi@vger.kernel.org, broonie@kernel.org,
andi.shyti@kernel.org, joel@jms.id.au, alistair@popple.id.au,
jk@ozlabs.org, andrew@codeconstruct.com.au,
linux-aspeed@lists.ozlabs.org, eajames@linux.ibm.com
Subject: [PATCH v3 17/40] fsi: aspeed: Refactor trace functions
Date: Thu, 16 May 2024 13:18:44 -0500 [thread overview]
Message-ID: <20240516181907.3468796-18-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240516181907.3468796-1-eajames@linux.ibm.com>
Remove the opb error trace, add a timeout trace, and combine the
read/write traces.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/fsi/fsi-master-aspeed.c | 29 +++------
include/trace/events/fsi_master_aspeed.h | 80 ++++++++----------------
2 files changed, 34 insertions(+), 75 deletions(-)
diff --git a/drivers/fsi/fsi-master-aspeed.c b/drivers/fsi/fsi-master-aspeed.c
index 29932037c9866..04aa5cb9b6fad 100644
--- a/drivers/fsi/fsi-master-aspeed.c
+++ b/drivers/fsi/fsi-master-aspeed.c
@@ -122,16 +122,17 @@ static int __opb_write(struct fsi_master_aspeed *aspeed, u32 addr,
status = readl(base + OPB0_STATUS);
- trace_fsi_master_aspeed_opb_write(addr, val, transfer_size, status, reg);
-
/* Return error when poll timed out */
- if (ret)
+ if (ret) {
+ trace_fsi_master_aspeed_timeout(reg, status, false);
return ret;
+ }
/* Command failed, master will reset */
if (status & STATUS_ERR_ACK)
return -EIO;
+ trace_fsi_master_aspeed_opb_xfer(addr, transfer_size + 1, val, false);
return 0;
}
@@ -175,13 +176,11 @@ static int __opb_read(struct fsi_master_aspeed *aspeed, uint32_t addr,
result = readl(base + OPB0_FSI_DATA_R);
- trace_fsi_master_aspeed_opb_read(addr, transfer_size, result,
- readl(base + OPB0_STATUS),
- reg);
-
/* Return error when poll timed out */
- if (ret)
+ if (ret) {
+ trace_fsi_master_aspeed_timeout(reg, status, true);
return ret;
+ }
/* Command failed, master will reset */
if (status & STATUS_ERR_ACK)
@@ -204,6 +203,7 @@ static int __opb_read(struct fsi_master_aspeed *aspeed, uint32_t addr,
}
+ trace_fsi_master_aspeed_opb_xfer(addr, transfer_size + 1, result, true);
return 0;
}
@@ -226,19 +226,6 @@ static int check_errors(struct fsi_master_aspeed *aspeed, int err)
{
int ret;
- if (trace_fsi_master_aspeed_opb_error_enabled()) {
- __be32 mresp0, mstap0, mesrb0;
-
- opb_readl(aspeed, ctrl_base + FSI_MRESP0, &mresp0);
- opb_readl(aspeed, ctrl_base + FSI_MSTAP0, &mstap0);
- opb_readl(aspeed, ctrl_base + FSI_MESRB0, &mesrb0);
-
- trace_fsi_master_aspeed_opb_error(
- be32_to_cpu(mresp0),
- be32_to_cpu(mstap0),
- be32_to_cpu(mesrb0));
- }
-
if (err == -EIO) {
/* Check MAEB (0x70) ? */
diff --git a/include/trace/events/fsi_master_aspeed.h b/include/trace/events/fsi_master_aspeed.h
index 0fff873775f19..7eeecbfec7f09 100644
--- a/include/trace/events/fsi_master_aspeed.h
+++ b/include/trace/events/fsi_master_aspeed.h
@@ -8,69 +8,41 @@
#include <linux/tracepoint.h>
-TRACE_EVENT(fsi_master_aspeed_opb_read,
- 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),
+TRACE_EVENT(fsi_master_aspeed_opb_xfer,
+ TP_PROTO(uint32_t addr, uint32_t size, uint32_t data, bool read),
+ TP_ARGS(addr, size, data, read),
TP_STRUCT__entry(
- __field(uint32_t, addr)
- __field(size_t, size)
- __field(uint32_t, result)
- __field(uint32_t, status)
- __field(uint32_t, irq_status)
- ),
+ __field(uint32_t, addr)
+ __field(uint32_t, size)
+ __field(uint32_t, data)
+ __field(bool, read)
+ ),
TP_fast_assign(
__entry->addr = addr;
__entry->size = size;
- __entry->result = result;
- __entry->status = status;
- __entry->irq_status = irq_status;
- ),
- TP_printk("addr %08x size %zu: result %08x sts: %08x irq_sts: %08x",
- __entry->addr, __entry->size, __entry->result,
- __entry->status, __entry->irq_status
- )
+ __entry->data = data;
+ __entry->read = read;
+ ),
+ TP_printk("%s addr %08x size %u data %08x", __entry->read ? "read" : "write",
+ __entry->addr, __entry->size, __entry->data)
);
-TRACE_EVENT(fsi_master_aspeed_opb_write,
- 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),
+TRACE_EVENT(fsi_master_aspeed_timeout,
+ TP_PROTO(uint32_t irq, uint32_t status, bool read),
+ TP_ARGS(irq, status, read),
TP_STRUCT__entry(
- __field(uint32_t, addr)
- __field(uint32_t, val)
- __field(size_t, size)
- __field(uint32_t, status)
- __field(uint32_t, irq_status)
- ),
+ __field(uint32_t, irq)
+ __field(uint32_t, status)
+ __field(bool, read)
+ ),
TP_fast_assign(
- __entry->addr = addr;
- __entry->val = val;
- __entry->size = size;
+ __entry->irq = irq;
__entry->status = status;
- __entry->irq_status = irq_status;
- ),
- TP_printk("addr %08x val %08x size %zu status: %08x irq_sts: %08x",
- __entry->addr, __entry->val, __entry->size,
- __entry->status, __entry->irq_status
- )
- );
-
-TRACE_EVENT(fsi_master_aspeed_opb_error,
- TP_PROTO(uint32_t mresp0, uint32_t mstap0, uint32_t mesrb0),
- TP_ARGS(mresp0, mstap0, mesrb0),
- TP_STRUCT__entry(
- __field(uint32_t, mresp0)
- __field(uint32_t, mstap0)
- __field(uint32_t, mesrb0)
- ),
- TP_fast_assign(
- __entry->mresp0 = mresp0;
- __entry->mstap0 = mstap0;
- __entry->mesrb0 = mesrb0;
- ),
- TP_printk("mresp0 %08x mstap0 %08x mesrb0 %08x",
- __entry->mresp0, __entry->mstap0, __entry->mesrb0
- )
- );
+ __entry->read = read;
+ ),
+ TP_printk("%s irq %08x status %08x", __entry->read ? "read" : "write", __entry->irq,
+ __entry->status)
+);
TRACE_EVENT(fsi_master_aspeed_cfam_reset,
TP_PROTO(bool start),
--
2.39.3
next prev parent reply other threads:[~2024-05-16 18:20 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-16 18:18 [PATCH v3 00/40] fsi: Add interrupt support Eddie James
2024-05-16 18:18 ` [PATCH v3 01/40] fsi: hub: Set master index to link number plus one Eddie James
2024-05-16 18:18 ` [PATCH v3 02/40] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-05-16 18:18 ` [PATCH v3 03/40] fsi: Fix slave addressing after break command Eddie James
2024-05-16 18:18 ` [PATCH v3 04/40] fsi: Use a defined value for default echo delay Eddie James
2024-05-16 18:18 ` [PATCH v3 05/40] fsi: Calculate local bus clock frequency Eddie James
2024-05-16 18:18 ` [PATCH v3 06/40] fsi: core: Improve master read/write/error traces Eddie James
2024-05-16 18:18 ` [PATCH v3 07/40] fsi: core: Add slave error trace Eddie James
2024-05-16 18:18 ` [PATCH v3 08/40] fsi: core: Reset errors instead of clearing interrupts Eddie James
2024-05-16 18:18 ` [PATCH v3 09/40] fsi: aspeed: Add AST2700 support Eddie James
2024-05-16 18:18 ` [PATCH v3 10/40] fsi: core: Add slave spinlock Eddie James
2024-05-16 18:18 ` [PATCH v3 11/40] fsi: core: Allow cfam device type aliases Eddie James
2024-05-16 18:18 ` [PATCH v3 12/40] fsi: core: Add common regmap master functions Eddie James
2024-05-16 18:18 ` [PATCH v3 13/40] fsi: core: Disable relative addressing during scan Eddie James
2024-05-16 18:18 ` [PATCH v3 14/40] fsi: hub: Use common initialization and link enable Eddie James
2024-05-16 18:18 ` [PATCH v3 15/40] fsi: aspeed: " Eddie James
2024-05-16 18:18 ` [PATCH v3 16/40] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-05-16 18:18 ` Eddie James [this message]
2024-05-16 18:18 ` [PATCH v3 18/40] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-05-16 18:18 ` [PATCH v3 19/40] fsi: aspeed: Only read result register for successful read Eddie James
2024-05-16 18:18 ` [PATCH v3 20/40] fsi: aspeed: Switch to spinlock Eddie James
2024-05-16 18:18 ` [PATCH v3 21/40] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-05-16 18:18 ` [PATCH v3 22/40] fsi: aspeed: Use common master error handler Eddie James
2024-05-16 18:18 ` [PATCH v3 23/40] fsi: core: Add interrupt support Eddie James
2024-05-17 20:41 ` kernel test robot
2024-05-16 18:18 ` [PATCH v3 24/40] fsi: aspeed: " Eddie James
2024-05-16 18:18 ` [PATCH v3 25/40] fsi: hub: " Eddie James
2024-05-16 18:18 ` [PATCH v3 26/40] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-05-16 18:18 ` [PATCH v3 27/40] i2c: fsi: Improve formatting Eddie James
2024-05-16 18:18 ` [PATCH v3 28/40] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer Eddie James
2024-05-16 18:18 ` [PATCH v3 29/40] i2c: fsi: Remove list structure of ports Eddie James
2024-05-16 18:18 ` [PATCH v3 30/40] i2c: fsi: Define a function to check status error bits Eddie James
2024-05-16 18:18 ` [PATCH v3 31/40] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-05-16 18:18 ` [PATCH v3 32/40] i2c: fsi: Add interrupt support Eddie James
2024-05-16 18:19 ` [PATCH v3 33/40] fsi: hub master: Reset hub master after errors Eddie James
2024-05-16 18:19 ` [PATCH v3 34/40] fsi: core: Add master register read-only sysfs Eddie James
2024-05-16 18:19 ` [PATCH v3 35/40] fsi: core: Add slave " Eddie James
2024-05-16 18:19 ` [PATCH v3 36/40] fsi: i2cr: Adjust virtual CFAM ID to match Odyssey chip Eddie James
2024-05-16 18:19 ` [PATCH v3 37/40] fsi: core: Add different types of CFAM Eddie James
2024-05-17 12:38 ` kernel test robot
2024-05-17 15:49 ` kernel test robot
2024-05-18 1:03 ` kernel test robot
2024-05-16 18:19 ` [PATCH v3 38/40] spi: fsi: Calculate clock divider from local bus frequency Eddie James
2024-05-16 18:24 ` Mark Brown
2024-05-16 18:19 ` [PATCH v3 39/40] ARM: dts: aspeed: P10 and tacoma: Set FSI clock frequency Eddie James
2024-05-16 18:19 ` [PATCH v3 40/40] ARM: dts: aspeed: P10: Bump SPI max frequencies Eddie James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240516181907.3468796-18-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andi.shyti@kernel.org \
--cc=andrew@codeconstruct.com.au \
--cc=broonie@kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).