github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: dwc3: dwc3-msm-core: Re-use usb_role callbacks for mode changes

Browse Source 
We have a legacy sysfs interface to change the USB operating mode. Since
usb_role callbacks are available for user space and UCSI, there is
really no need for mode sysfs interface. For the sake of not breaking
any existing use cases, keep the mode interface but re-use the usb_role
callbacks. The usb-role-switch is an optional property, so refactor
the role switch ops so that they can be called even when this property
is not available but mode sysfs interface can be made available. Note that
there is no visible change to the user space.

Change-Id: I3f8b03b420429375af8d29d7b2339b490980dee0
Signed-off-by: Pavankumar Kondeti <quic_pkondeti@quicinc.com>
This commit is contained in:
Pavankumar Kondeti 2022-01-05 09:18:57 +05:30 committed by Wesley Cheng
parent ca9fb9573e
commit e29db3c587
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
drivers/usb/dwc3/dwc3-msm-core.c
View File

@ -4752,9 +4752,8 @@ static bool dwc3_msm_role_allowed(struct dwc3_msm *mdwc, enum usb_role role)
return true;
}
static enum usb_role dwc3_msm_usb_get_role(struct usb_role_switch *sw)
static enum usb_role dwc3_msm_get_role(struct dwc3_msm *mdwc)
{
struct dwc3_msm *mdwc = usb_role_switch_get_drvdata(sw);
enum usb_role role;
if (mdwc->vbus_active)
@ -4764,20 +4763,29 @@ static enum usb_role dwc3_msm_usb_get_role(struct usb_role_switch *sw)
else
role = USB_ROLE_NONE;
dbg_log_string("get_role:%s\n", dwc3_msm_usb_role_string(role));
return role;
}
static int dwc3_msm_usb_set_role(struct usb_role_switch *sw, enum usb_role role)
static enum usb_role dwc3_msm_usb_role_switch_get_role(struct usb_role_switch *sw)
{
struct dwc3_msm *mdwc = usb_role_switch_get_drvdata(sw);
enum usb_role cur_role = USB_ROLE_NONE;
enum usb_role role;
role = dwc3_msm_get_role(mdwc);
dbg_log_string("get_role:%s\n", dwc3_msm_usb_role_string(role));
return role;
}
static int dwc3_msm_set_role(struct dwc3_msm *mdwc, enum usb_role role)
{
enum usb_role cur_role;
if (!dwc3_msm_role_allowed(mdwc, role))
return -EINVAL;
mutex_lock(&mdwc->role_switch_mutex);
cur_role = dwc3_msm_usb_get_role(sw);
cur_role = dwc3_msm_get_role(mdwc);
dbg_log_string("cur_role:%s new_role:%s\n", dwc3_msm_usb_role_string(cur_role),
dwc3_msm_usb_role_string(role));
@ -4815,6 +4823,13 @@ static int dwc3_msm_usb_set_role(struct usb_role_switch *sw, enum usb_role role)
return 0;
}
static int dwc3_msm_usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role)
{
struct dwc3_msm *mdwc = usb_role_switch_get_drvdata(sw);
return dwc3_msm_set_role(mdwc, role);
}
static ssize_t orientation_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@ -4849,10 +4864,12 @@ static ssize_t mode_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct dwc3_msm *mdwc = dev_get_drvdata(dev);
enum usb_role cur_role;
if (mdwc->vbus_active)
cur_role = dwc3_msm_get_role(mdwc);
if (cur_role == USB_ROLE_DEVICE)
return scnprintf(buf, PAGE_SIZE, "peripheral\n");
if (mdwc->id_state == DWC3_ID_GROUND)
if (cur_role == USB_ROLE_HOST)
return scnprintf(buf, PAGE_SIZE, "host\n");
return scnprintf(buf, PAGE_SIZE, "none\n");
@ -4862,23 +4879,18 @@ static ssize_t mode_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct dwc3_msm *mdwc = dev_get_drvdata(dev);
enum usb_role role = USB_ROLE_NONE;
int ret;
if (sysfs_streq(buf, "peripheral")) {
if (!dwc3_msm_role_allowed(mdwc, USB_ROLE_DEVICE))
return -EINVAL;
mdwc->vbus_active = true;
mdwc->id_state = DWC3_ID_FLOAT;
} else if (sysfs_streq(buf, "host")) {
if (!dwc3_msm_role_allowed(mdwc, USB_ROLE_HOST))
return -EINVAL;
mdwc->vbus_active = false;
mdwc->id_state = DWC3_ID_GROUND;
} else {
mdwc->vbus_active = false;
mdwc->id_state = DWC3_ID_FLOAT;
}
if (sysfs_streq(buf, "peripheral"))
role = USB_ROLE_DEVICE;
else if (sysfs_streq(buf, "host"))
role = USB_ROLE_HOST;
dwc3_ext_event_notify(mdwc);
dbg_log_string("mode_request:%s\n", dwc3_msm_usb_role_string(role));
ret = dwc3_msm_set_role(mdwc, role);
if (ret < 0)
return ret;
return count;
}
@ -5701,8 +5713,8 @@ static int dwc3_msm_probe(struct platform_device *pdev)
if (of_property_read_bool(node, "usb-role-switch")) {
struct usb_role_switch_desc role_desc = {
.set = dwc3_msm_usb_set_role,
.get = dwc3_msm_usb_get_role,
.set = dwc3_msm_usb_role_switch_set_role,
.get = dwc3_msm_usb_role_switch_get_role,
.driver_data = mdwc,
.allow_userspace_control = true,
};