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

Commit 17294ab2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 

* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
  uwb: lock rc->rsvs_lock with spin_lock_bh()
  wusb: timeout when waiting for ASL/PZL updates in whci-hcd
  uwb: remove unused #include <version.h>'s
  wusb: return -ENOTCONN when resetting a port with no connected device
  uwb: safely remove all reservations
parents 86adf8ad 8f049155

drivers/usb/host/whci/asl.c

+7 −2
Original line number Diff line number Diff line
@@ -170,12 +170,17 @@ void asl_stop(struct whc *whc) 
void asl_update(struct whc *whc, uint32_t wusbcmd)

{

	struct wusbhc *wusbhc = &whc->wusbhc;

	long t;



	mutex_lock(&wusbhc->mutex);

	if (wusbhc->active) {

		whc_write_wusbcmd(whc, wusbcmd, wusbcmd);

		wait_event(whc->async_list_wq,

			   (le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0);

		t = wait_event_timeout(

			whc->async_list_wq,

			(le_readl(whc->base + WUSBCMD) & WUSBCMD_ASYNC_UPDATED) == 0,

			msecs_to_jiffies(1000));

		if (t == 0)

			whc_hw_error(whc, "ASL update timeout");

	}

	mutex_unlock(&wusbhc->mutex);

}

drivers/usb/host/whci/hw.c

+15 −0
Original line number Diff line number Diff line
@@ -87,3 +87,18 @@ int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len) 


	return ret;

}



/**

 * whc_hw_error - recover from a hardware error

 * @whc:    the WHCI HC that broke.

 * @reason: a description of the failure.

 *

 * Recover from broken hardware with a full reset.

 */

void whc_hw_error(struct whc *whc, const char *reason)

{

	struct wusbhc *wusbhc = &whc->wusbhc;



	dev_err(&whc->umc->dev, "hardware error: %s\n", reason);

	wusbhc_reset_all(wusbhc);

}

drivers/usb/host/whci/pzl.c

+7 −2
Original line number Diff line number Diff line
@@ -183,12 +183,17 @@ void pzl_stop(struct whc *whc) 
void pzl_update(struct whc *whc, uint32_t wusbcmd)

{

	struct wusbhc *wusbhc = &whc->wusbhc;

	long t;



	mutex_lock(&wusbhc->mutex);

	if (wusbhc->active) {

		whc_write_wusbcmd(whc, wusbcmd, wusbcmd);

		wait_event(whc->periodic_list_wq,

			   (le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0);

		t = wait_event_timeout(

			whc->periodic_list_wq,

			(le_readl(whc->base + WUSBCMD) & WUSBCMD_PERIODIC_UPDATED) == 0,

			msecs_to_jiffies(1000));

		if (t == 0)

			whc_hw_error(whc, "PZL update timeout");

	}

	mutex_unlock(&wusbhc->mutex);

}

drivers/usb/host/whci/whcd.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ void whc_clean_up(struct whc *whc); 
/* hw.c */

void whc_write_wusbcmd(struct whc *whc, u32 mask, u32 val);

int whc_do_gencmd(struct whc *whc, u32 cmd, u32 params, void *addr, size_t len);

void whc_hw_error(struct whc *whc, const char *reason);



/* wusb.c */

int whc_wusbhc_start(struct wusbhc *wusbhc);

drivers/usb/wusbcore/devconnect.c

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, 
			  | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED);

	port->change |= USB_PORT_STAT_C_CONNECTION | USB_PORT_STAT_C_ENABLE;

	if (wusb_dev) {

		dev_dbg(wusbhc->dev, "disconnecting device from port %d\n", wusb_dev->port_idx);

		if (!list_empty(&wusb_dev->cack_node))

			list_del_init(&wusb_dev->cack_node);

		/* For the one in cack_add() */