Merge "mhi: dev: netdev: inherit IPC log level from controller" (135e83ea) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/bus/mhi/devices/mhi_netdev.c

+16 −21

Original line number	Diff line number	Diff line
		@@ -24,17 +24,10 @@

		#ifdef CONFIG_MHI_DEBUG

		#define IPC_LOG_LVL (MHI_MSG_LVL_VERBOSE)

		#define MHI_ASSERT(cond, msg) do { \
		if (cond) \
		panic(msg); \
		} while (0)

		#define MSG_VERB(fmt, ...) do { \
		if (mhi_netdev->msg_lvl <= MHI_MSG_LVL_VERBOSE) \
		pr_err("[D][%s] " fmt, __func__, ##__VA_ARGS__);\
		if (mhi_netdev->ipc_log && (mhi_netdev->ipc_log_lvl <= \
		if (mhi_netdev->ipc_log && (*mhi_netdev->ipc_log_lvl <= \
		MHI_MSG_LVL_VERBOSE)) \
		ipc_log_string(mhi_netdev->ipc_log, "[D][%s] " fmt, \
		__func__, ##__VA_ARGS__); \
		@@ -42,23 +35,19 @@

		#else

		#define IPC_LOG_LVL (MHI_MSG_LVL_ERROR)

		#define MHI_ASSERT(cond, msg) do { \
		if (cond) { \
		MSG_ERR(msg); \
		WARN_ON(cond); \
		} \
		#define MSG_VERB(fmt, ...) do { \
		if (mhi_netdev->ipc_log && (*mhi_netdev->ipc_log_lvl <= \
		MHI_MSG_LVL_VERBOSE)) \
		ipc_log_string(mhi_netdev->ipc_log, "[D][%s] " fmt, \
		__func__, ##__VA_ARGS__); \
		} while (0)

		#define MSG_VERB(fmt, ...)

		#endif

		#define MSG_LOG(fmt, ...) do { \
		if (mhi_netdev->msg_lvl <= MHI_MSG_LVL_INFO) \
		pr_err("[I][%s] " fmt, __func__, ##__VA_ARGS__);\
		if (mhi_netdev->ipc_log && (mhi_netdev->ipc_log_lvl <= \
		if (mhi_netdev->ipc_log && (*mhi_netdev->ipc_log_lvl <= \
		MHI_MSG_LVL_INFO)) \
		ipc_log_string(mhi_netdev->ipc_log, "[I][%s] " fmt, \
		__func__, ##__VA_ARGS__); \
		@@ -67,12 +56,17 @@
		#define MSG_ERR(fmt, ...) do { \
		if (mhi_netdev->msg_lvl <= MHI_MSG_LVL_ERROR) \
		pr_err("[E][%s] " fmt, __func__, ##__VA_ARGS__); \
		if (mhi_netdev->ipc_log && (mhi_netdev->ipc_log_lvl <= \
		if (mhi_netdev->ipc_log && (*mhi_netdev->ipc_log_lvl <= \
		MHI_MSG_LVL_ERROR)) \
		ipc_log_string(mhi_netdev->ipc_log, "[E][%s] " fmt, \
		__func__, ##__VA_ARGS__); \
		} while (0)

		#define MHI_ASSERT(cond, msg) do { \
		if (cond) \
		panic(msg); \
		} while (0)

		struct mhi_net_chain {
		struct sk_buff head, tail; /* chained skb */
		};
		@@ -106,7 +100,7 @@ struct mhi_netdev {

		struct dentry *dentry;
		enum MHI_DEBUG_LEVEL msg_lvl;
		enum MHI_DEBUG_LEVEL ipc_log_lvl;
		enum MHI_DEBUG_LEVEL *ipc_log_lvl;
		void *ipc_log;

		/* debug stats */
		@@ -984,6 +978,7 @@ static int mhi_netdev_probe(struct mhi_device *mhi_dev,
		int ret;
		struct mhi_netdev mhi_netdev, p_netdev = NULL;
		struct device_node *of_node = mhi_dev->dev.of_node;
		struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;
		int nr_tre;
		char node_name[32];
		struct device_node *phandle;
		@@ -1091,7 +1086,7 @@ static int mhi_netdev_probe(struct mhi_device *mhi_dev,
		mhi_netdev->alias);
		mhi_netdev->ipc_log = ipc_log_context_create(IPC_LOG_PAGES,
		node_name, 0);
		mhi_netdev->ipc_log_lvl = IPC_LOG_LVL;
		mhi_netdev->ipc_log_lvl = &mhi_cntrl->log_lvl;

		mhi_netdev_create_debugfs(mhi_netdev);
		}