Skip to content

FROMLIST: usb: typec: ucsi: ucsi_glink: Prevent suspend during UCSI notification handling #819

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
raryan-qcom wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+11 −0
Open

FROMLIST: usb: typec: ucsi: ucsi_glink: Prevent suspend during UCSI notification handling #819

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
11 changes: 11 additions & 0 deletions drivers/usb/typec/ucsi/ucsi_glink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of_device.h>
#include <linux/pm_wakeup.h>
#include <linux/property.h>
#include <linux/soc/qcom/pdr.h>
#include <linux/usb/typec_mux.h>
Expand All @@ -26,6 +27,12 @@
#define UC_UCSI_WRITE_BUF_REQ 0x12
#define UC_UCSI_USBC_NOTIFY_IND 0x13

/*
* Wakeup timeout to allow USB event notification processing to
* complete before device suspends.
*/
#define UCSI_GLINK_WAKEUP_TIMEOUT_MS 50

struct ucsi_read_buf_req_msg {
struct pmic_glink_hdr hdr;
};
Expand Down Expand Up @@ -342,6 +349,8 @@ static void pmic_glink_ucsi_callback(const void *data, size_t len, void *priv)
pmic_glink_ucsi_write_ack(ucsi, data, len);
break;
case UC_UCSI_USBC_NOTIFY_IND:
pm_wakeup_ws_event(ucsi->dev->power.wakeup,
UCSI_GLINK_WAKEUP_TIMEOUT_MS, true);
schedule_work(&ucsi->notify_work);
break;
}
Expand Down Expand Up @@ -397,6 +406,8 @@ static int pmic_glink_ucsi_probe(struct auxiliary_device *adev,
ucsi->dev = dev;
dev_set_drvdata(dev, ucsi);

device_init_wakeup(dev, true);

INIT_WORK(&ucsi->notify_work, pmic_glink_ucsi_notify);
INIT_WORK(&ucsi->register_work, pmic_glink_ucsi_register);
init_completion(&ucsi->read_ack);
Expand Down