hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: roles: intel_xhci: Enable runtime PM 

This fixes an issue where the mux does not get configured
when the parent device is suspended. The registers for this
mux are mapped to the parent device MMIO (usually xHCI PCI
device), so in order for the driver to be able to program
the registers, the parent device must be resumed.

Reported-by: Sathyanarayanan Kuppuswamy <sathyanarayanan.kuppuswamy@intel.com>
Fixes: f6fb9ec02b ("usb: roles: Add Intel xHCI USB role switch driver")
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2018-05-24 11:18:27 +03:00 committed by Greg Kroah-Hartman
parent c9359f4162
commit cb29684686
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/roles/intel-xhci-usb-role-switch.c
View File

@ -18,6 +18,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/usb/role.h> #include <linux/usb/role.h>
/* register definition */ /* register definition */
@ -56,6 +57,8 @@ static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
return -EIO; return -EIO;
} }
pm_runtime_get_sync(dev);
/* Set idpin value as requested */ /* Set idpin value as requested */
val = readl(data->base + DUAL_ROLE_CFG0); val = readl(data->base + DUAL_ROLE_CFG0);
switch (role) { switch (role) {
@ -84,13 +87,17 @@ static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
/* Polling on CFG1 register to confirm mode switch.*/ /* Polling on CFG1 register to confirm mode switch.*/
do { do {
val = readl(data->base + DUAL_ROLE_CFG1); val = readl(data->base + DUAL_ROLE_CFG1);
if (!!(val & HOST_MODE) == (role == USB_ROLE_HOST)) if (!!(val & HOST_MODE) == (role == USB_ROLE_HOST)) {
pm_runtime_put(dev);
return 0; return 0;
}
/* Interval for polling is set to about 5 - 10 ms */ /* Interval for polling is set to about 5 - 10 ms */
usleep_range(5000, 10000); usleep_range(5000, 10000);
} while (time_before(jiffies, timeout)); } while (time_before(jiffies, timeout));
pm_runtime_put(dev);
dev_warn(dev, "Timeout waiting for role-switch\n"); dev_warn(dev, "Timeout waiting for role-switch\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
@ -101,7 +108,9 @@ static enum usb_role intel_xhci_usb_get_role(struct device *dev)
enum usb_role role; enum usb_role role;
u32 val; u32 val;
pm_runtime_get_sync(dev);
val = readl(data->base + DUAL_ROLE_CFG0); val = readl(data->base + DUAL_ROLE_CFG0);
pm_runtime_put(dev);
if (!(val & SW_IDPIN)) if (!(val & SW_IDPIN))
role = USB_ROLE_HOST; role = USB_ROLE_HOST;
@ -142,6 +151,9 @@ static int intel_xhci_usb_probe(struct platform_device *pdev)
if (IS_ERR(data->role_sw)) if (IS_ERR(data->role_sw))
return PTR_ERR(data->role_sw); return PTR_ERR(data->role_sw);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
return 0; return 0;
} }