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

Commit 70dad499 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB/PHY fixes from Greg KH:
 "Here are some USB and PHY driver fixes for 4.8-rc5

  Nothing major, lots of little fixes for reported bugs, and a build fix
  for a missing .h file that the phy drivers needed.  All of these have
  been in linux-next for a while with no reported issues"

* tag 'usb-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (24 commits)
  usb: musb: Fix locking errors for host only mode
  usb: dwc3: gadget: always decrement by 1
  usb: dwc3: debug: fix ep name on trace output
  usb: gadget: udc: core: don't starve DMA resources
  USB: serial: option: add WeTelecom 0x6802 and 0x6803 products
  USB: avoid left shift by -1
  USB: fix typo in wMaxPacketSize validation
  usb: gadget: Add the gserial port checking in gs_start_tx()
  usb: dwc3: gadget: don't rely on jiffies while holding spinlock
  usb: gadget: fsl_qe_udc: signedness bug in qe_get_frame()
  usb: gadget: function: f_rndis: socket buffer may be NULL
  usb: gadget: function: f_eem: socket buffer may be NULL
  usb: renesas_usbhs: gadget: fix return value check in usbhs_mod_gadget_probe()
  usb: dwc2: Add reset control to dwc2
  usb: dwc3: core: allow device to runtime_suspend several times
  usb: dwc3: pci: runtime_resume child device
  USB: serial: option: add WeTelecom WM-D200
  usb: chipidea: udc: don't touch DP when controller is in host mode
  USB: serial: mos7840: fix non-atomic allocation in write path
  USB: serial: mos7720: fix non-atomic allocation in write path
  ...
parents 3e423945 2c557540

drivers/phy/phy-brcm-sata.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int brcm_sata_phy_init(struct phy *phy) 
		rc = -ENODEV;

	};



	return 0;

	return rc;

}



static const struct phy_ops phy_ops = {

drivers/phy/phy-sun4i-usb.c

+46 −22
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/power_supply.h>

#include <linux/regulator/consumer.h>

#include <linux/reset.h>

#include <linux/usb/of.h>

#include <linux/workqueue.h>



#define REG_ISCR			0x00
@@ -110,6 +111,7 @@ struct sun4i_usb_phy_cfg { 
struct sun4i_usb_phy_data {

	void __iomem *base;

	const struct sun4i_usb_phy_cfg *cfg;

	enum usb_dr_mode dr_mode;

	struct mutex mutex;

	struct sun4i_usb_phy {

		struct phy *phy;
@@ -120,6 +122,7 @@ struct sun4i_usb_phy_data { 
		bool regulator_on;

		int index;

	} phys[MAX_PHYS];

	int first_phy;

	/* phy0 / otg related variables */

	struct extcon_dev *extcon;

	bool phy0_init;
@@ -285,16 +288,10 @@ static int sun4i_usb_phy_init(struct phy *_phy) 
		sun4i_usb_phy0_update_iscr(_phy, 0, ISCR_DPDM_PULLUP_EN);

		sun4i_usb_phy0_update_iscr(_phy, 0, ISCR_ID_PULLUP_EN);



		if (data->id_det_gpio) {

			/* OTG mode, force ISCR and cable state updates */

		/* Force ISCR and cable state updates */

		data->id_det = -1;

		data->vbus_det = -1;

		queue_delayed_work(system_wq, &data->detect, 0);

		} else {

			/* Host only mode */

			sun4i_usb_phy0_set_id_detect(_phy, 0);

			sun4i_usb_phy0_set_vbus_detect(_phy, 1);

		}

	}



	return 0;
@@ -319,6 +316,19 @@ static int sun4i_usb_phy_exit(struct phy *_phy) 
	return 0;

}



static int sun4i_usb_phy0_get_id_det(struct sun4i_usb_phy_data *data)

{

	switch (data->dr_mode) {

	case USB_DR_MODE_OTG:

		return gpiod_get_value_cansleep(data->id_det_gpio);

	case USB_DR_MODE_HOST:

		return 0;

	case USB_DR_MODE_PERIPHERAL:

	default:

		return 1;

	}

}



static int sun4i_usb_phy0_get_vbus_det(struct sun4i_usb_phy_data *data)

{

	if (data->vbus_det_gpio)
@@ -432,7 +442,10 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work) 
	struct phy *phy0 = data->phys[0].phy;

	int id_det, vbus_det, id_notify = 0, vbus_notify = 0;



	id_det = gpiod_get_value_cansleep(data->id_det_gpio);

	if (phy0 == NULL)

		return;



	id_det = sun4i_usb_phy0_get_id_det(data);

	vbus_det = sun4i_usb_phy0_get_vbus_det(data);



	mutex_lock(&phy0->mutex);
@@ -448,7 +461,8 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work) 
		 * without vbus detection report vbus low for long enough for

		 * the musb-ip to end the current device session.

		 */

		if (!sun4i_usb_phy0_have_vbus_det(data) && id_det == 0) {

		if (data->dr_mode == USB_DR_MODE_OTG &&

		    !sun4i_usb_phy0_have_vbus_det(data) && id_det == 0) {

			sun4i_usb_phy0_set_vbus_detect(phy0, 0);

			msleep(200);

			sun4i_usb_phy0_set_vbus_detect(phy0, 1);
@@ -474,7 +488,8 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work) 
		 * without vbus detection report vbus low for long enough to

		 * the musb-ip to end the current host session.

		 */

		if (!sun4i_usb_phy0_have_vbus_det(data) && id_det == 1) {

		if (data->dr_mode == USB_DR_MODE_OTG &&

		    !sun4i_usb_phy0_have_vbus_det(data) && id_det == 1) {

			mutex_lock(&phy0->mutex);

			sun4i_usb_phy0_set_vbus_detect(phy0, 0);

			msleep(1000);
@@ -519,7 +534,8 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev, 
{

	struct sun4i_usb_phy_data *data = dev_get_drvdata(dev);



	if (args->args[0] >= data->cfg->num_phys)

	if (args->args[0] < data->first_phy ||

	    args->args[0] >= data->cfg->num_phys)

		return ERR_PTR(-ENODEV);



	return data->phys[args->args[0]].phy;
@@ -593,13 +609,17 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) 
			return -EPROBE_DEFER;

	}



	/* vbus_det without id_det makes no sense, and is not supported */

	if (sun4i_usb_phy0_have_vbus_det(data) && !data->id_det_gpio) {

	data->dr_mode = of_usb_get_dr_mode_by_phy(np, 0);

	switch (data->dr_mode) {

	case USB_DR_MODE_OTG:

		/* otg without id_det makes no sense, and is not supported */

		if (!data->id_det_gpio) {

			dev_err(dev, "usb0_id_det missing or invalid\n");

			return -ENODEV;

		}



	if (data->id_det_gpio) {

		/* fall through */

	case USB_DR_MODE_HOST:

	case USB_DR_MODE_PERIPHERAL:

		data->extcon = devm_extcon_dev_allocate(dev,

							sun4i_usb_phy0_cable);

		if (IS_ERR(data->extcon))
@@ -610,9 +630,13 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) 
			dev_err(dev, "failed to register extcon: %d\n", ret);

			return ret;

		}

		break;

	default:

		dev_info(dev, "dr_mode unknown, not registering usb phy0\n");

		data->first_phy = 1;

	}



	for (i = 0; i < data->cfg->num_phys; i++) {

	for (i = data->first_phy; i < data->cfg->num_phys; i++) {

		struct sun4i_usb_phy *phy = data->phys + i;

		char name[16];

drivers/phy/phy-sun9i-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ static int sun9i_usb_phy_probe(struct platform_device *pdev) 
		}



		phy->hsic_clk = devm_clk_get(dev, "hsic_12M");

		if (IS_ERR(phy->clk)) {

		if (IS_ERR(phy->hsic_clk)) {

			dev_err(dev, "failed to get hsic_12M clock\n");

			return PTR_ERR(phy->clk);

			return PTR_ERR(phy->hsic_clk);

		}



		phy->reset = devm_reset_control_get(dev, "hsic");

drivers/usb/chipidea/udc.c

+5 −2
Original line number Diff line number Diff line
@@ -1596,8 +1596,11 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on) 
{

	struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);



	/* Data+ pullup controlled by OTG state machine in OTG fsm mode */

	if (ci_otg_is_fsm_mode(ci))

	/*

	 * Data+ pullup controlled by OTG state machine in OTG fsm mode;

	 * and don't touch Data+ in host mode for dual role config.

	 */

	if (ci_otg_is_fsm_mode(ci) || ci->role == CI_ROLE_HOST)

		return 0;



	pm_runtime_get_sync(&ci->gadget.dev);

drivers/usb/core/config.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static const unsigned short high_speed_maxpacket_maxes[4] = { 
	[USB_ENDPOINT_XFER_CONTROL] = 64,

	[USB_ENDPOINT_XFER_ISOC] = 1024,

	[USB_ENDPOINT_XFER_BULK] = 512,

	[USB_ENDPOINT_XFER_INT] = 1023,

	[USB_ENDPOINT_XFER_INT] = 1024,

};

static const unsigned short super_speed_maxpacket_maxes[4] = {

	[USB_ENDPOINT_XFER_CONTROL] = 512,