mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
Two changes for this v4.12-rc1:
- Add sysfs entry for role switch - Update gadget state after gadget back from suspend -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJY9XecAAoJEEhZKYFQ1nG7PuQH+wR+qFiaswoJA3q+2sdqQDdD vN1FLT93o3ObgnmYwbZZDxdGeB6e+AJ/K8tQCOVqm8AnaNOzDwCYJoBTa5nPaS5k c+E4JlciG2NJG1s+eGVhZUPTQD3qS47vkgHymgtlTbQPDJDZy7k5nu7H1GSI7mvM 7AH4uavzMIqsZcQTAln6BvIr2FQHh996LnUHDvYSZ6Y+8cws9IPMbSIiao3s3SiZ fULYJbVfDOd0LuxHOn7AdKrmlDJ/Gi2vmR4xQLlwvXEYk5/NUcSc1Yo5lVZcDUBR MzX4bLvhLi4SNLXLJhfqYjXcPXddXxawL/TRGDmT0B/1N8CCtBWJkNpIgx9q6dk= =opDd -----END PGP SIGNATURE----- Merge tag 'usb-ci-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next Peter writes: Two changes for this v4.12-rc1: - Add sysfs entry for role switch - Update gadget state after gadget back from suspend
This commit is contained in:
commit
ac9d947683
4 changed files with 87 additions and 11 deletions
9
Documentation/ABI/testing/sysfs-platform-chipidea-usb2
Normal file
9
Documentation/ABI/testing/sysfs-platform-chipidea-usb2
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
What: /sys/bus/platform/devices/ci_hdrc.0/role
|
||||||
|
Date: Mar 2017
|
||||||
|
Contact: Peter Chen <peter.chen@nxp.com>
|
||||||
|
Description:
|
||||||
|
It returns string "gadget" or "host" when read it, it indicates
|
||||||
|
current controller role.
|
||||||
|
|
||||||
|
It will do role switch when write "gadget" or "host" to it.
|
||||||
|
Only controller at dual-role configuration supports writing.
|
|
@ -177,6 +177,7 @@ struct hw_bank {
|
||||||
* @td_pool: allocation pool for transfer descriptors
|
* @td_pool: allocation pool for transfer descriptors
|
||||||
* @gadget: device side representation for peripheral controller
|
* @gadget: device side representation for peripheral controller
|
||||||
* @driver: gadget driver
|
* @driver: gadget driver
|
||||||
|
* @resume_state: save the state of gadget suspend from
|
||||||
* @hw_ep_max: total number of endpoints supported by hardware
|
* @hw_ep_max: total number of endpoints supported by hardware
|
||||||
* @ci_hw_ep: array of endpoints
|
* @ci_hw_ep: array of endpoints
|
||||||
* @ep0_dir: ep0 direction
|
* @ep0_dir: ep0 direction
|
||||||
|
@ -227,6 +228,7 @@ struct ci_hdrc {
|
||||||
|
|
||||||
struct usb_gadget gadget;
|
struct usb_gadget gadget;
|
||||||
struct usb_gadget_driver *driver;
|
struct usb_gadget_driver *driver;
|
||||||
|
enum usb_device_state resume_state;
|
||||||
unsigned hw_ep_max;
|
unsigned hw_ep_max;
|
||||||
struct ci_hw_ep ci_hw_ep[ENDPT_MAX];
|
struct ci_hw_ep ci_hw_ep[ENDPT_MAX];
|
||||||
u32 ep0_dir;
|
u32 ep0_dir;
|
||||||
|
|
|
@ -838,6 +838,56 @@ static void ci_get_otg_capable(struct ci_hdrc *ci)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr,
|
||||||
|
char *buf)
|
||||||
|
{
|
||||||
|
struct ci_hdrc *ci = dev_get_drvdata(dev);
|
||||||
|
|
||||||
|
return sprintf(buf, "%s\n", ci_role(ci)->name);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ssize_t ci_role_store(struct device *dev,
|
||||||
|
struct device_attribute *attr, const char *buf, size_t n)
|
||||||
|
{
|
||||||
|
struct ci_hdrc *ci = dev_get_drvdata(dev);
|
||||||
|
enum ci_role role;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (!(ci->roles[CI_ROLE_HOST] && ci->roles[CI_ROLE_GADGET])) {
|
||||||
|
dev_warn(dev, "Current configuration is not dual-role, quit\n");
|
||||||
|
return -EPERM;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (role = CI_ROLE_HOST; role < CI_ROLE_END; role++)
|
||||||
|
if (!strncmp(buf, ci->roles[role]->name,
|
||||||
|
strlen(ci->roles[role]->name)))
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (role == CI_ROLE_END || role == ci->role)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
pm_runtime_get_sync(dev);
|
||||||
|
disable_irq(ci->irq);
|
||||||
|
ci_role_stop(ci);
|
||||||
|
ret = ci_role_start(ci, role);
|
||||||
|
if (!ret && ci->role == CI_ROLE_GADGET)
|
||||||
|
ci_handle_vbus_change(ci);
|
||||||
|
enable_irq(ci->irq);
|
||||||
|
pm_runtime_put_sync(dev);
|
||||||
|
|
||||||
|
return (ret == 0) ? n : ret;
|
||||||
|
}
|
||||||
|
static DEVICE_ATTR(role, 0644, ci_role_show, ci_role_store);
|
||||||
|
|
||||||
|
static struct attribute *ci_attrs[] = {
|
||||||
|
&dev_attr_role.attr,
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct attribute_group ci_attr_group = {
|
||||||
|
.attrs = ci_attrs,
|
||||||
|
};
|
||||||
|
|
||||||
static int ci_hdrc_probe(struct platform_device *pdev)
|
static int ci_hdrc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
|
@ -1004,11 +1054,18 @@ static int ci_hdrc_probe(struct platform_device *pdev)
|
||||||
ci_hdrc_otg_fsm_start(ci);
|
ci_hdrc_otg_fsm_start(ci);
|
||||||
|
|
||||||
device_set_wakeup_capable(&pdev->dev, true);
|
device_set_wakeup_capable(&pdev->dev, true);
|
||||||
|
|
||||||
ret = dbg_create_files(ci);
|
ret = dbg_create_files(ci);
|
||||||
if (!ret)
|
if (ret)
|
||||||
return 0;
|
goto stop;
|
||||||
|
|
||||||
|
ret = sysfs_create_group(&dev->kobj, &ci_attr_group);
|
||||||
|
if (ret)
|
||||||
|
goto remove_debug;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
remove_debug:
|
||||||
|
dbg_remove_files(ci);
|
||||||
stop:
|
stop:
|
||||||
ci_role_destroy(ci);
|
ci_role_destroy(ci);
|
||||||
deinit_phy:
|
deinit_phy:
|
||||||
|
@ -1030,6 +1087,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
dbg_remove_files(ci);
|
dbg_remove_files(ci);
|
||||||
|
sysfs_remove_group(&ci->dev->kobj, &ci_attr_group);
|
||||||
ci_role_destroy(ci);
|
ci_role_destroy(ci);
|
||||||
ci_hdrc_enter_lpm(ci, true);
|
ci_hdrc_enter_lpm(ci, true);
|
||||||
ci_usb_phy_exit(ci);
|
ci_usb_phy_exit(ci);
|
||||||
|
|
|
@ -1847,27 +1847,32 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci)
|
||||||
if (USBi_PCI & intr) {
|
if (USBi_PCI & intr) {
|
||||||
ci->gadget.speed = hw_port_is_high_speed(ci) ?
|
ci->gadget.speed = hw_port_is_high_speed(ci) ?
|
||||||
USB_SPEED_HIGH : USB_SPEED_FULL;
|
USB_SPEED_HIGH : USB_SPEED_FULL;
|
||||||
if (ci->suspended && ci->driver->resume) {
|
if (ci->suspended) {
|
||||||
spin_unlock(&ci->lock);
|
if (ci->driver->resume) {
|
||||||
ci->driver->resume(&ci->gadget);
|
spin_unlock(&ci->lock);
|
||||||
spin_lock(&ci->lock);
|
ci->driver->resume(&ci->gadget);
|
||||||
|
spin_lock(&ci->lock);
|
||||||
|
}
|
||||||
ci->suspended = 0;
|
ci->suspended = 0;
|
||||||
|
usb_gadget_set_state(&ci->gadget,
|
||||||
|
ci->resume_state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (USBi_UI & intr)
|
if (USBi_UI & intr)
|
||||||
isr_tr_complete_handler(ci);
|
isr_tr_complete_handler(ci);
|
||||||
|
|
||||||
if (USBi_SLI & intr) {
|
if ((USBi_SLI & intr) && !(ci->suspended)) {
|
||||||
|
ci->suspended = 1;
|
||||||
|
ci->resume_state = ci->gadget.state;
|
||||||
if (ci->gadget.speed != USB_SPEED_UNKNOWN &&
|
if (ci->gadget.speed != USB_SPEED_UNKNOWN &&
|
||||||
ci->driver->suspend) {
|
ci->driver->suspend) {
|
||||||
ci->suspended = 1;
|
|
||||||
spin_unlock(&ci->lock);
|
spin_unlock(&ci->lock);
|
||||||
ci->driver->suspend(&ci->gadget);
|
ci->driver->suspend(&ci->gadget);
|
||||||
usb_gadget_set_state(&ci->gadget,
|
|
||||||
USB_STATE_SUSPENDED);
|
|
||||||
spin_lock(&ci->lock);
|
spin_lock(&ci->lock);
|
||||||
}
|
}
|
||||||
|
usb_gadget_set_state(&ci->gadget,
|
||||||
|
USB_STATE_SUSPENDED);
|
||||||
}
|
}
|
||||||
retval = IRQ_HANDLED;
|
retval = IRQ_HANDLED;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1975,6 +1980,8 @@ static void udc_id_switch_for_host(struct ci_hdrc *ci)
|
||||||
*/
|
*/
|
||||||
if (ci->is_otg)
|
if (ci->is_otg)
|
||||||
hw_write_otgsc(ci, OTGSC_BSVIE | OTGSC_BSVIS, OTGSC_BSVIS);
|
hw_write_otgsc(ci, OTGSC_BSVIE | OTGSC_BSVIS, OTGSC_BSVIS);
|
||||||
|
|
||||||
|
ci->vbus_active = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue