Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03cc3a28 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi_dev: Add session id to the MHI IPC logs"

parents 0c8937f6 4e388214

drivers/platform/msm/mhi_dev/mhi.c

+5 −5
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#define TR_RING_ELEMENT_SZ	sizeof(struct mhi_dev_transfer_ring_element)

#define RING_ELEMENT_TYPE_SZ	sizeof(union mhi_dev_ring_element_type)



uint32_t bhi_imgtxdb;

enum mhi_msg_level mhi_msg_lvl = MHI_MSG_ERROR;

enum mhi_msg_level mhi_ipc_msg_lvl = MHI_MSG_VERBOSE;

void *mhi_ipc_log;
@@ -1499,7 +1500,6 @@ static void mhi_dev_scheduler(struct work_struct *work) 
	enum mhi_dev_state state;

	enum mhi_dev_event event = 0;

	u32 mhi_reset;

	uint32_t bhi_imgtxdb = 0;



	mutex_lock(&mhi_ctx->mhi_lock);

	/* Check for interrupts */
@@ -1508,6 +1508,10 @@ static void mhi_dev_scheduler(struct work_struct *work) 
	if (int_value & MHI_MMIO_CTRL_INT_STATUS_A7_MSK) {

		mhi_log(MHI_MSG_VERBOSE,

			"processing ctrl interrupt with %d\n", int_value);



		rc = mhi_dev_mmio_read(mhi, BHI_IMGTXDB, &bhi_imgtxdb);

		mhi_log(MHI_MSG_DBG, "BHI_IMGTXDB = 0x%x\n", bhi_imgtxdb);



		rc = mhi_dev_mmio_get_mhi_state(mhi, &state, &mhi_reset);

		if (rc) {

			pr_err("%s: get mhi state failed\n", __func__);
@@ -1537,10 +1541,6 @@ static void mhi_dev_scheduler(struct work_struct *work) 
			pr_err("error sending SM event\n");

			goto fail;

		}



		rc = mhi_dev_mmio_read(mhi, BHI_IMGTXDB, &bhi_imgtxdb);

		mhi_log(MHI_MSG_VERBOSE,

			"BHI_IMGTXDB = 0x%x\n", bhi_imgtxdb);

	}



	if (int_value & MHI_MMIO_CTRL_CRDB_STATUS_MSK) {

drivers/platform/msm/mhi_dev/mhi.h

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -590,6 +590,7 @@ enum mhi_msg_level { 
	MHI_MSG_reserved = 0x80000000

};



extern uint32_t bhi_imgtxdb;

extern enum mhi_msg_level mhi_msg_lvl;

extern enum mhi_msg_level mhi_ipc_msg_lvl;

extern void *mhi_ipc_log;
@@ -600,7 +601,7 @@ extern void *mhi_ipc_log; 
	} \

	if (mhi_ipc_log && (_msg_lvl >= mhi_ipc_msg_lvl)) { \

		ipc_log_string(mhi_ipc_log,                     \

			"[%s] " _msg, __func__, ##__VA_ARGS__);     \

		"[0x%x %s] " _msg, bhi_imgtxdb, __func__, ##__VA_ARGS__);     \

	} \

} while (0)