فهرست منبع

disp: msm: dp: add marker to dp aux error logs

Some rate limited logs in dp aux and dp ctrl are using
pr_err_ratelimited function to print the logs instead of
the standard DP log macros. So this change adds a new
ratelimited DP log macro and make the logging consistent.

Change-Id: I75d7306d94c7c360783f39259c509c32fe59cdf5
Signed-off-by: Rajkumar Subbiah <[email protected]>
Rajkumar Subbiah 2 سال پیش
والد
کامیت
23955331e6
3فایلهای تغییر یافته به همراه16 افزوده شده و 5 حذف شده
  1. 10 3
      msm/dp/dp_aux.c
  2. 1 1
      msm/dp/dp_ctrl.c
  3. 5 1
      msm/dp/dp_debug.h

+ 10 - 3
msm/dp/dp_aux.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2021-2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
  */
 
@@ -43,6 +43,14 @@
 		DP_ERR_V(fmt, ##__VA_ARGS__); \
 	} while (0)
 
+#define DP_AUX_ERR_RATELIMITED(dp_aux, fmt, ...) \
+	do { \
+		if (dp_aux) \
+			ipc_log_string(dp_aux->ipc_log_context, "[e][%-4d]"fmt,\
+					current->pid, ##__VA_ARGS__); \
+		DP_ERR_RATELIMITED_V(fmt, ##__VA_ARGS__); \
+	} while (0)
+
 enum {
 	DP_AUX_DATA_INDEX_WRITE = BIT(31),
 };
@@ -220,9 +228,8 @@ static int dp_aux_cmd_fifo_tx(struct dp_aux_private *aux,
 	if (aux->aux_error_num == DP_AUX_ERR_NONE) {
 		ret = len;
 	} else {
-		pr_err_ratelimited("aux err: %s\n",
+		DP_AUX_ERR_RATELIMITED(dp_aux, "aux err: %s\n",
 			dp_aux_get_error(aux->aux_error_num));
-
 		ret = -EINVAL;
 	}
 

+ 1 - 1
msm/dp/dp_ctrl.c

@@ -391,7 +391,7 @@ static int dp_ctrl_link_training_1(struct dp_ctrl_private *ctrl)
 			break;
 
 		if (ctrl->link->phy_params.v_level == ctrl->link->phy_params.max_v_level) {
-			pr_err_ratelimited("max v_level reached\n");
+			DP_ERR_RATELIMITED_V("max v_level reached\n");
 			break;
 		}
 

+ 5 - 1
msm/dp/dp_debug.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
  */
 
@@ -73,6 +73,10 @@
 		pr_err("[drm:%s][msm-dp-err][%-4d]"fmt, __func__,   \
 				current->pid, ##__VA_ARGS__)
 
+#define DP_ERR_RATELIMITED_V(fmt, ...)                                    \
+		pr_err_ratelimited("[drm:%s][msm-dp-err][%-4d]"fmt, __func__, \
+				current->pid, ##__VA_ARGS__)
+
 #define DEFAULT_DISCONNECT_DELAY_MS 0
 #define MAX_DISCONNECT_DELAY_MS 10000
 #define DEFAULT_CONNECT_NOTIFICATION_DELAY_MS 150