Skip to content

Commit 372ab3b

Browse files
committed
cxl/pci: Add some type-safety to the AER trace points
The first argument to the CXL AER trace points is the source device. Pass a 'const struct device *' rather than a 'const char *' for more type precision / safety. Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Steven Rostedt <rostedt@goodmis.org> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Link: https://lore.kernel.org/r/167030091477.4045167.15174636482098463885.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 7fe8980 commit 372ab3b

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/cxl/pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ static bool cxl_report_and_clear(struct cxl_dev_state *cxlds)
562562
}
563563

564564
header_log_copy(cxlds, hl);
565-
trace_cxl_aer_uncorrectable_error(dev_name(dev), status, fe, hl);
565+
trace_cxl_aer_uncorrectable_error(dev, status, fe, hl);
566566
writel(status & CXL_RAS_UNCORRECTABLE_STATUS_MASK, addr);
567567

568568
return true;
@@ -644,7 +644,7 @@ static void cxl_cor_error_detected(struct pci_dev *pdev)
644644
status = le32_to_cpu(readl(addr));
645645
if (status & CXL_RAS_CORRECTABLE_STATUS_MASK) {
646646
writel(status & CXL_RAS_CORRECTABLE_STATUS_MASK, addr);
647-
trace_cxl_aer_correctable_error(dev_name(dev), status);
647+
trace_cxl_aer_correctable_error(dev, status);
648648
}
649649
}
650650

include/trace/events/cxl.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
)
4646

4747
TRACE_EVENT(cxl_aer_uncorrectable_error,
48-
TP_PROTO(const char *dev_name, u32 status, u32 fe, u32 *hl),
49-
TP_ARGS(dev_name, status, fe, hl),
48+
TP_PROTO(const struct device *dev, u32 status, u32 fe, u32 *hl),
49+
TP_ARGS(dev, status, fe, hl),
5050
TP_STRUCT__entry(
51-
__string(dev_name, dev_name)
51+
__string(dev_name, dev_name(dev))
5252
__field(u32, status)
5353
__field(u32, first_error)
5454
__array(u32, header_log, CXL_HEADERLOG_SIZE_U32)
5555
),
5656
TP_fast_assign(
57-
__assign_str(dev_name, dev_name);
57+
__assign_str(dev_name, dev_name(dev));
5858
__entry->status = status;
5959
__entry->first_error = fe;
6060
/*
@@ -89,14 +89,14 @@ TRACE_EVENT(cxl_aer_uncorrectable_error,
8989
)
9090

9191
TRACE_EVENT(cxl_aer_correctable_error,
92-
TP_PROTO(const char *dev_name, u32 status),
93-
TP_ARGS(dev_name, status),
92+
TP_PROTO(const struct device *dev, u32 status),
93+
TP_ARGS(dev, status),
9494
TP_STRUCT__entry(
95-
__string(dev_name, dev_name)
95+
__string(dev_name, dev_name(dev))
9696
__field(u32, status)
9797
),
9898
TP_fast_assign(
99-
__assign_str(dev_name, dev_name);
99+
__assign_str(dev_name, dev_name(dev));
100100
__entry->status = status;
101101
),
102102
TP_printk("%s: status: '%s'",

0 commit comments

Comments
 (0)