Commit 0e273f9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB driver fixes fro 4.17-rc6.

  They resolve some reported bugs in the musb driver, the xhci driver,
  and a number of small fixes for the usbip driver.

  All of these have been in linux-next with no reported issues"

* tag 'usb-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usbip: usbip_host: fix bad unlock balance during stub_probe()
  usbip: usbip_host: fix NULL-ptr deref and use-after-free errors
  usbip: usbip_host: run rebind from exit when module is removed
  usbip: usbip_host: delete device from busid_table after rebind
  usbip: usbip_host: refine probe and disconnect debug msgs to be useful
  usb: musb: fix remote wakeup racing with suspend
  xhci: Fix USB3 NULL pointer dereference at logical disconnect.
parents 61c2ad9a c171654c

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, 


	slot_id = 0;

	for (i = 0; i < MAX_HC_SLOTS; i++) {

		if (!xhci->devs[i])

		if (!xhci->devs[i] || !xhci->devs[i]->udev)

			continue;

		speed = xhci->devs[i]->udev->speed;

		if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3))

drivers/usb/musb/musb_host.c

+4 −1
Original line number Diff line number Diff line
@@ -2524,8 +2524,11 @@ static int musb_bus_suspend(struct usb_hcd *hcd) 
{

	struct musb	*musb = hcd_to_musb(hcd);

	u8		devctl;

	int		ret;



	musb_port_suspend(musb, true);

	ret = musb_port_suspend(musb, true);

	if (ret)

		return ret;



	if (!is_host_active(musb))

		return 0;

drivers/usb/musb/musb_host.h

+5 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern void musb_host_rx(struct musb *, u8); 
extern void musb_root_disconnect(struct musb *musb);

extern void musb_host_resume_root_hub(struct musb *musb);

extern void musb_host_poke_root_hub(struct musb *musb);

extern void musb_port_suspend(struct musb *musb, bool do_suspend);

extern int musb_port_suspend(struct musb *musb, bool do_suspend);

extern void musb_port_reset(struct musb *musb, bool do_reset);

extern void musb_host_finish_resume(struct work_struct *work);

#else
@@ -99,7 +99,10 @@ static inline void musb_root_disconnect(struct musb *musb) {} 
static inline void musb_host_resume_root_hub(struct musb *musb)	{}

static inline void musb_host_poll_rh_status(struct musb *musb)	{}

static inline void musb_host_poke_root_hub(struct musb *musb)	{}

static inline void musb_port_suspend(struct musb *musb, bool do_suspend) {}

static inline int musb_port_suspend(struct musb *musb, bool do_suspend)

{

	return 0;

}

static inline void musb_port_reset(struct musb *musb, bool do_reset) {}

static inline void musb_host_finish_resume(struct work_struct *work) {}

#endif

drivers/usb/musb/musb_virthub.c

+15 −10
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ void musb_host_finish_resume(struct work_struct *work) 
	spin_unlock_irqrestore(&musb->lock, flags);

}



void musb_port_suspend(struct musb *musb, bool do_suspend)

int musb_port_suspend(struct musb *musb, bool do_suspend)

{

	struct usb_otg	*otg = musb->xceiv->otg;

	u8		power;

	void __iomem	*mbase = musb->mregs;



	if (!is_host_active(musb))

		return;

		return 0;



	/* NOTE:  this doesn't necessarily put PHY into low power mode,

	 * turning off its clock; that's a function of PHY integration and
@@ -66,7 +66,10 @@ void musb_port_suspend(struct musb *musb, bool do_suspend) 
	if (do_suspend) {

		int retries = 10000;



		power &= ~MUSB_POWER_RESUME;

		if (power & MUSB_POWER_RESUME)

			return -EBUSY;



		if (!(power & MUSB_POWER_SUSPENDM)) {

			power |= MUSB_POWER_SUSPENDM;

			musb_writeb(mbase, MUSB_POWER, power);
@@ -77,6 +80,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend) 
				if (retries-- < 1)

					break;

			}

		}



		musb_dbg(musb, "Root port suspended, power %02x", power);
@@ -111,6 +115,7 @@ void musb_port_suspend(struct musb *musb, bool do_suspend) 
		schedule_delayed_work(&musb->finish_resume_work,

				      msecs_to_jiffies(USB_RESUME_TIMEOUT));

	}

	return 0;

}



void musb_port_reset(struct musb *musb, bool do_reset)

drivers/usb/usbip/stub.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ struct bus_id_priv { 
	struct stub_device *sdev;

	struct usb_device *udev;

	char shutdown_busid;

	spinlock_t busid_lock;

};



/* stub_priv is allocated from stub_priv_cache */
@@ -83,6 +84,7 @@ extern struct usb_device_driver stub_driver; 


/* stub_main.c */

struct bus_id_priv *get_busid_priv(const char *busid);

void put_busid_priv(struct bus_id_priv *bid);

int del_match_busid(char *busid);

void stub_device_cleanup_urbs(struct stub_device *sdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE