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

Commit 5db3df73 authored by Girish Mahadevan's avatar Girish Mahadevan
Browse files

serial: msm_geni_serial: Vote resources even if power framework is disabled 



Currently the driver's resource voting is tied into the runtime framework.
But if the runtime framework isn't available, which can happen around
certain portions of the system resume path, then the driver can't
vote resources on and can't do transactions.
To get past this, vote the resources on even if the runtime framework
isn't available.

Change-Id: I645245010dbe6f00c9227b1ea0f767badf01278e
Signed-off-by: default avatarGirish Mahadevan <girishm@codeaurora.org>
parent 8e96f4f7

drivers/tty/serial/msm_geni_serial.c

+35 −13
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ static void msm_geni_serial_power_off(struct uart_port *uport); 
static int msm_geni_serial_poll_bit(struct uart_port *uport,

				int offset, int bit_field, bool set);

static void msm_geni_serial_stop_rx(struct uart_port *uport);

static int msm_geni_serial_runtime_resume(struct device *dev);

static int msm_geni_serial_runtime_suspend(struct device *dev);



static atomic_t uart_line_id = ATOMIC_INIT(0);
@@ -246,7 +248,7 @@ static bool device_pending_suspend(struct uart_port *uport) 
{

	int usage_count = atomic_read(&uport->dev->power.usage_count);



	return (pm_runtime_suspended(uport->dev) || !usage_count);

	return (pm_runtime_status_suspended(uport->dev) || !usage_count);

}



static bool check_transfers_inflight(struct uart_port *uport)
@@ -313,10 +315,6 @@ static int vote_clock_on(struct uart_port *uport) 
	struct msm_geni_serial_port *port = GET_DEV_PORT(uport);

	int ret = 0;



	if (!pm_runtime_enabled(uport->dev)) {

		dev_err(uport->dev, "RPM not available.Can't enable clocks\n");

		return -EPERM;

	}

	ret = msm_geni_serial_power_on(uport);

	if (ret) {

		dev_err(uport->dev, "Failed to vote clock on\n");
@@ -472,6 +470,29 @@ static int msm_geni_serial_power_on(struct uart_port *uport) 
	int ret = 0;

	struct msm_geni_serial_port *port = GET_DEV_PORT(uport);



	if (!pm_runtime_enabled(uport->dev)) {

		if (pm_runtime_status_suspended(uport->dev)) {

			struct uart_state *state = uport->state;

			struct tty_port *tport = &state->port;

			int lock = mutex_trylock(&tport->mutex);



			IPC_LOG_MSG(port->ipc_log_pwr,

					"%s:Manual resume\n", __func__);

			pm_runtime_disable(uport->dev);

			ret = msm_geni_serial_runtime_resume(uport->dev);

			if (ret) {

				IPC_LOG_MSG(port->ipc_log_pwr,

					"%s:Manual RPM CB failed %d\n",

								__func__, ret);

			} else {

				pm_runtime_get_noresume(uport->dev);

				pm_runtime_set_active(uport->dev);

			}

			pm_runtime_enable(uport->dev);

			if (lock)

				mutex_unlock(&tport->mutex);

		}

	} else {

		ret = pm_runtime_get_sync(uport->dev);

		if (ret < 0) {

			IPC_LOG_MSG(port->ipc_log_pwr, "%s Err\n", __func__);
@@ -480,6 +501,7 @@ static int msm_geni_serial_power_on(struct uart_port *uport) 
			pm_runtime_set_suspended(uport->dev);

			return ret;

		}

	}

	return 0;

}
@@ -1315,7 +1337,7 @@ static irqreturn_t msm_geni_serial_isr(int isr, void *dev) 
	spin_lock_irqsave(&uport->lock, flags);

	if (uart_console(uport) && uport->suspended)

		goto exit_geni_serial_isr;

	if (!uart_console(uport) && pm_runtime_suspended(uport->dev)) {

	if (!uart_console(uport) && pm_runtime_status_suspended(uport->dev)) {

		dev_err(uport->dev, "%s.Device is suspended.\n", __func__);

		IPC_LOG_MSG(msm_port->ipc_log_misc,

				"%s.Device is suspended.\n", __func__);