[v2] scsi: ufs: Move UFS trace events to private header

Commit Message

Avri Altman Aug. 21, 2024, 5:54 a.m. UTC

ufs trace events are called exclusively from the ufs core drivers.  Make
those events private to the core driver.

The MAINTAINERS file does not need updating as the maintainership
remains the same and the relevant directory is already covered.

Reviewed-by: Bart Van Assche <[e-mail]>
Signed-off-by: Avri Altman <[e-mail]>
---

Changes in v2:
 - Fix a spelling mistake
---
 include/trace/events/ufs.h => drivers/ufs/core/ufs_trace.h | 6 ++++++
 drivers/ufs/core/ufshcd.c                                  | 2 +-
 include/ufs/ufs.h                                          | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename include/trace/events/ufs.h => drivers/ufs/core/ufs_trace.h (98%)

Comments

Bean Huo Aug. 21, 2024, 12:49 p.m. UTC | #1

On Wed, 2024-08-21 at 08:54 +0300, Avri Altman wrote:
> ufs trace events are called exclusively from the ufs core drivers. 
> Make
> those events private to the core driver.
> 
> The MAINTAINERS file does not need updating as the maintainership
> remains the same and the relevant directory is already covered.
> 
> Reviewed-by: Bart Van Assche <[e-mail]>
> Signed-off-by: Avri Altman <[e-mail]>
Acked-by: Bean Huo <[e-mail]>

Martin K. Petersen Aug. 23, 2024, 12:55 a.m. UTC | #2

Avri,

> ufs trace events are called exclusively from the ufs core drivers.
> Make those events private to the core driver.

Applied to 6.12/scsi-staging, thanks!

Martin K. Petersen Aug. 29, 2024, 2:50 a.m. UTC | #3

On Wed, 21 Aug 2024 08:54:11 +0300, Avri Altman wrote:

> ufs trace events are called exclusively from the ufs core drivers.  Make
> those events private to the core driver.
> 
> The MAINTAINERS file does not need updating as the maintainership
> remains the same and the relevant directory is already covered.
> 
> 
> [...]

Applied to 6.12/scsi-queue, thanks!

[1/1] scsi: ufs: Move UFS trace events to private header
      https://git.kernel.org/mkp/scsi/c/89835a58f5f5

Patch

diff --git a/include/trace/events/ufs.h b/drivers/ufs/core/ufs_trace.h
similarity index 98%
rename from include/trace/events/ufs.h
rename to drivers/ufs/core/ufs_trace.h
index c4e209fbdfbb..84deca2b841d 100644
--- a/include/trace/events/ufs.h
+++ b/drivers/ufs/core/ufs_trace.h
@@ -9,6 +9,7 @@ 
 #if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_UFS_H
 
+#include <ufs/ufs.h>
 #include <linux/tracepoint.h>
 
 #define str_opcode(opcode)						\
@@ -395,5 +396,10 @@  TRACE_EVENT(ufshcd_exception_event,
 
 #endif /* if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ) */
 
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ../../drivers/ufs/core
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE ufs_trace
+
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 0dd26059f5d7..db30d0c4d91e 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -39,7 +39,7 @@ 
 #include <asm/unaligned.h>
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/ufs.h>
+#include "ufs_trace.h"
 
 #define UFSHCD_ENABLE_INTRS	(UTP_TRANSFER_REQ_COMPL |\
 				 UTP_TASK_REQ_COMPL |\
diff --git a/include/ufs/ufs.h b/include/ufs/ufs.h
index 853e95957c31..e594abe5d05f 100644
--- a/include/ufs/ufs.h
+++ b/include/ufs/ufs.h
@@ -597,7 +597,7 @@  struct ufs_dev_info {
 };
 
 /*
- * This enum is used in string mapping in include/trace/events/ufs.h.
+ * This enum is used in string mapping in ufs_trace.h.
  */
 enum ufs_trace_str_t {
 	UFS_CMD_SEND, UFS_CMD_COMP, UFS_DEV_COMP,
@@ -607,7 +607,7 @@  enum ufs_trace_str_t {
 
 /*
  * Transaction Specific Fields (TSF) type in the UPIU package, this enum is
- * used in include/trace/events/ufs.h for UFS command trace.
+ * used in ufs_trace.h for UFS command trace.
  */
 enum ufs_trace_tsf_t {
 	UFS_TSF_CDB, UFS_TSF_OSF, UFS_TSF_TM_INPUT, UFS_TSF_TM_OUTPUT