Skip to content

FROMLIST: serial: qcom-geni: add force suspend/resume to system sleep callbacks #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vdadhani wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
Open

FROMLIST: serial: qcom-geni: add force suspend/resume to system sleep callbacks #882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion drivers/tty/serial/qcom_geni_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,6 +1860,7 @@ static int qcom_geni_serial_suspend(struct device *dev)
struct qcom_geni_serial_port *port = dev_get_drvdata(dev);
struct uart_port *uport = &port->uport;
struct qcom_geni_private_data *private_data = uport->private_data;
int ret;

/*
* This is done so we can hit the lowest possible state in suspend
Expand All @@ -1869,7 +1870,19 @@ static int qcom_geni_serial_suspend(struct device *dev)
geni_icc_set_tag(&port->se, QCOM_ICC_TAG_ACTIVE_ONLY);
geni_icc_set_bw(&port->se);
}
return uart_suspend_port(private_data->drv, uport);

ret = uart_suspend_port(private_data->drv, uport);
if (ret)
return ret;

/*
* When no_console_suspend is set the console must remain active
* across system sleep, so skip the force suspend path.
*/
if (uart_console(uport) && !uport->suspended)
return 0;

return pm_runtime_force_suspend(dev);
}

static int qcom_geni_serial_resume(struct device *dev)
Expand All @@ -1879,6 +1892,10 @@ static int qcom_geni_serial_resume(struct device *dev)
struct uart_port *uport = &port->uport;
struct qcom_geni_private_data *private_data = uport->private_data;

ret = pm_runtime_force_resume(dev);
if (ret)
return ret;

ret = uart_resume_port(private_data->drv, uport);
if (uart_console(uport)) {
geni_icc_set_tag(&port->se, QCOM_ICC_TAG_ALWAYS);
Expand Down
Loading