Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac9d9476 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-ci-v4.12-rc1' of... 

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
parents 593bc462 a932a804

Documentation/ABI/testing/sysfs-platform-chipidea-usb2

0 → 100644
+9 −0
Original line number Diff line number Diff line 
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.

drivers/usb/chipidea/ci.h

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct hw_bank { 
 * @td_pool: allocation pool for transfer descriptors

 * @gadget: device side representation for peripheral controller

 * @driver: gadget driver

 * @resume_state: save the state of gadget suspend from

 * @hw_ep_max: total number of endpoints supported by hardware

 * @ci_hw_ep: array of endpoints

 * @ep0_dir: ep0 direction
@@ -227,6 +228,7 @@ struct ci_hdrc { 


	struct usb_gadget		gadget;

	struct usb_gadget_driver	*driver;

	enum usb_device_state		resume_state;

	unsigned			hw_ep_max;

	struct ci_hw_ep			ci_hw_ep[ENDPT_MAX];

	u32				ep0_dir;

drivers/usb/chipidea/core.c

+61 −3
Original line number Diff line number Diff line
@@ -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)

{

	struct device	*dev = &pdev->dev;
@@ -1004,11 +1054,18 @@ static int ci_hdrc_probe(struct platform_device *pdev) 
		ci_hdrc_otg_fsm_start(ci);



	device_set_wakeup_capable(&pdev->dev, true);



	ret = dbg_create_files(ci);

	if (!ret)

	if (ret)

		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:

	ci_role_destroy(ci);

deinit_phy:
@@ -1030,6 +1087,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) 
	}



	dbg_remove_files(ci);

	sysfs_remove_group(&ci->dev->kobj, &ci_attr_group);

	ci_role_destroy(ci);

	ci_hdrc_enter_lpm(ci, true);

	ci_usb_phy_exit(ci);

drivers/usb/chipidea/udc.c

+15 −8
Original line number Diff line number Diff line
@@ -1847,27 +1847,32 @@ static irqreturn_t udc_irq(struct ci_hdrc *ci) 
		if (USBi_PCI & intr) {

			ci->gadget.speed = hw_port_is_high_speed(ci) ?

				USB_SPEED_HIGH : USB_SPEED_FULL;

			if (ci->suspended && ci->driver->resume) {

			if (ci->suspended) {

				if (ci->driver->resume) {

					spin_unlock(&ci->lock);

					ci->driver->resume(&ci->gadget);

					spin_lock(&ci->lock);

				}

				ci->suspended = 0;

				usb_gadget_set_state(&ci->gadget,

						ci->resume_state);

			}

		}



		if (USBi_UI  & intr)

			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 &&

			    ci->driver->suspend) {

				ci->suspended = 1;

				spin_unlock(&ci->lock);

				ci->driver->suspend(&ci->gadget);

				usb_gadget_set_state(&ci->gadget,

						USB_STATE_SUSPENDED);

				spin_lock(&ci->lock);

			}

			usb_gadget_set_state(&ci->gadget,

					USB_STATE_SUSPENDED);

		}

		retval = IRQ_HANDLED;

	} else {
@@ -1975,6 +1980,8 @@ static void udc_id_switch_for_host(struct ci_hdrc *ci) 
	 */

	if (ci->is_otg)

		hw_write_otgsc(ci, OTGSC_BSVIE | OTGSC_BSVIS, OTGSC_BSVIS);



	ci->vbus_active = 0;

}



/**