Hi,
This series refines error history functions and introduces a new event_notify vop to allow vendor to get notification of important events.
Changes since v4:
- Seperate patch sets according to Avri's suggestion
Changes since v3:
- Fix build warning in patch [8/8]
Changes since v2:
- Add patches for vop cleanups
- Introduce phy_initialization helper and replace direct invoking in ufs-cdns and ufs-dwc by the helper
- Introduce event_notify vop implemntation in ufs-mediatek
Changes since v1:
- Change notify_event() to event_notify() to follow vop naming covention
Stanley Chu (4):
scsi: ufs: Add error history for abort event in UFS Device W-LUN
scsi: ufs: Refine error history functions
scsi: ufs: Introduce event_notify variant function
scsi: ufs-mediatek: Introduce event_notify implementation
drivers/scsi/ufs/ufs-mediatek-trace.h | 37 ++++++++
drivers/scsi/ufs/ufs-mediatek.c | 12 +++
drivers/scsi/ufs/ufshcd.c | 122 +++++++++++++++-----------
drivers/scsi/ufs/ufshcd.h | 82 ++++++++---------
4 files changed, 161 insertions(+), 92 deletions(-)
create mode 100644 drivers/scsi/ufs/ufs-mediatek-trace.h
--
2.18.0
Introduce event_notify implementation on MediaTek UFS platform.
A vendor-specific tracepoint is added that could be used
for debugging purpose.
Reviewed-by: Avri Altman <[email protected]>
Signed-off-by: Stanley Chu <[email protected]>
---
drivers/scsi/ufs/ufs-mediatek-trace.h | 37 +++++++++++++++++++++++++++
drivers/scsi/ufs/ufs-mediatek.c | 12 +++++++++
2 files changed, 49 insertions(+)
create mode 100644 drivers/scsi/ufs/ufs-mediatek-trace.h
diff --git a/drivers/scsi/ufs/ufs-mediatek-trace.h b/drivers/scsi/ufs/ufs-mediatek-trace.h
new file mode 100644
index 000000000000..8c47f54f3e6b
--- /dev/null
+++ b/drivers/scsi/ufs/ufs-mediatek-trace.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2020 MediaTek Inc.
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM ufs_mtk
+
+#if !defined(_TRACE_EVENT_UFS_MEDIATEK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_EVENT_UFS_MEDIATEK_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(ufs_mtk_event,
+ TP_PROTO(unsigned int type, unsigned int data),
+ TP_ARGS(type, data),
+
+ TP_STRUCT__entry(
+ __field(unsigned int, type)
+ __field(unsigned int, data)
+ ),
+
+ TP_fast_assign(
+ __entry->type = type;
+ __entry->data = data;
+ ),
+
+ TP_printk("ufs:event=%u data=%u",
+ __entry->type, __entry->data)
+ );
+#endif
+
+#undef TRACE_INCLUDE_PATH
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE ufs-mediatek-trace
+#include <trace/define_trace.h>
+
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c
index 1d3c5cd4592e..3522458db3bb 100644
--- a/drivers/scsi/ufs/ufs-mediatek.c
+++ b/drivers/scsi/ufs/ufs-mediatek.c
@@ -24,6 +24,9 @@
#include "unipro.h"
#include "ufs-mediatek.h"
+#define CREATE_TRACE_POINTS
+#include "ufs-mediatek-trace.h"
+
#define ufs_mtk_smc(cmd, val, res) \
arm_smccc_smc(MTK_SIP_UFS_CONTROL, \
cmd, val, 0, 0, 0, 0, 0, &(res))
@@ -1002,6 +1005,14 @@ static void ufs_mtk_fixup_dev_quirks(struct ufs_hba *hba)
ufshcd_fixup_dev_quirks(hba, ufs_mtk_dev_fixups);
}
+static void ufs_mtk_event_notify(struct ufs_hba *hba,
+ enum ufs_event_type evt, void *data)
+{
+ unsigned int val = *(u32 *)data;
+
+ trace_ufs_mtk_event(evt, val);
+}
+
/*
* struct ufs_hba_mtk_vops - UFS MTK specific variant operations
*
@@ -1021,6 +1032,7 @@ static const struct ufs_hba_variant_ops ufs_hba_mtk_vops = {
.resume = ufs_mtk_resume,
.dbg_register_dump = ufs_mtk_dbg_register_dump,
.device_reset = ufs_mtk_device_reset,
+ .event_notify = ufs_mtk_event_notify,
};
/**
--
2.18.0
Stanley,
> This series refines error history functions and introduces a new
> event_notify vop to allow vendor to get notification of important
> events.
Applied to 5.11/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
On Sat, 5 Dec 2020 19:58:57 +0800, Stanley Chu wrote:
> This series refines error history functions and introduces a new event_notify vop to allow vendor to get notification of important events.
>
> Changes since v4:
> - Seperate patch sets according to Avri's suggestion
>
> Changes since v3:
> - Fix build warning in patch [8/8]
>
> [...]
Applied to 5.11/scsi-queue, thanks!
[1/4] scsi: ufs: Add error history for abort event in UFS Device W-LUN
https://git.kernel.org/mkp/scsi/c/eb3d2611df2e
[2/4] scsi: ufs: Refine error history functions
https://git.kernel.org/mkp/scsi/c/e965e5e00b23
[3/4] scsi: ufs: Introduce event_notify variant function
https://git.kernel.org/mkp/scsi/c/172614a9d0e8
[4/4] scsi: ufs-mediatek: Introduce event_notify implementation
https://git.kernel.org/mkp/scsi/c/ca1bb061d644
--
Martin K. Petersen Oracle Linux Engineering