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

Commit 3444b26a authored by David Vrabel's avatar David Vrabel Committed by Greg Kroah-Hartman
Browse files

USB: add reset endpoint operations 



Wireless USB endpoint state has a sequence number and a current
window and not just a single toggle bit.  So allow HCDs to provide a
endpoint_reset method and call this or clear the software toggles as
required (after a clear halt, set configuration etc.).

usb_settoggle() and friends are then HCD internal and are moved into
core/hcd.h and all device drivers call usb_reset_endpoint() instead.

If the device endpoint state has been reset (with a clear halt) but
the host endpoint state has not then subsequent data transfers will
not complete. The device will only work again after it is reset or
disconnected.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d45e230b

drivers/block/ub.c

+9 −11
Original line number Diff line number Diff line
@@ -1025,6 +1025,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
{

	struct urb *urb = &sc->work_urb;

	struct bulk_cs_wrap *bcs;

	int endp;

	int len;

	int rc;
@@ -1033,6 +1034,10 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		return;

	}



	endp = usb_pipeendpoint(sc->last_pipe);

	if (usb_pipein(sc->last_pipe))

		endp |= USB_DIR_IN;



	if (cmd->state == UB_CMDST_CLEAR) {

		if (urb->status == -EPIPE) {

			/*
@@ -1048,9 +1053,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_sense(sc, cmd);
@@ -1065,9 +1068,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_stat(sc, cmd);
@@ -1082,9 +1083,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) 
		 * We ignore the result for the halt clear.

		 */



		/* reset the endpoint toggle */

		usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),

			usb_pipeout(sc->last_pipe), 0);

		usb_reset_endpoint(sc->dev, endp);



		ub_state_stat_counted(sc, cmd);
@@ -2119,8 +2118,7 @@ static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe) 
	del_timer_sync(&timer);

	usb_kill_urb(&sc->work_urb);



	/* reset the endpoint toggle */

	usb_settoggle(sc->dev, endp, usb_pipeout(sc->last_pipe), 0);

	usb_reset_endpoint(sc->dev, endp);



	return 0;

}

drivers/isdn/hisax/st5481_usb.c

+1 −8
Original line number Diff line number Diff line
@@ -149,14 +149,7 @@ static void usb_ctrl_complete(struct urb *urb) 
	if (ctrl_msg->dr.bRequest == USB_REQ_CLEAR_FEATURE) {

	        /* Special case handling for pipe reset */

		le16_to_cpus(&ctrl_msg->dr.wIndex);



		/* toggle is reset on clear */

		usb_settoggle(adapter->usb_dev, 

			      ctrl_msg->dr.wIndex & ~USB_DIR_IN, 

			      (ctrl_msg->dr.wIndex & USB_DIR_IN) == 0,

			      0);





		usb_reset_endpoint(adapter->usb_dev, ctrl_msg->dr.wIndex);

	}

	

	if (ctrl_msg->complete)

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+0 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,6 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw) 
		return ret;

	}



	usb_settoggle(hdw->usb_dev, 0 & 0xf, !(0 & USB_DIR_IN), 0);

	usb_clear_halt(hdw->usb_dev, usb_sndbulkpipe(hdw->usb_dev, 0 & 0x7f));



	pipe = usb_sndctrlpipe(hdw->usb_dev, 0);

drivers/usb/core/devio.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static int proc_resetep(struct dev_state *ps, void __user *arg) 
	ret = checkintf(ps, ret);

	if (ret)

		return ret;

	usb_settoggle(ps->dev, ep & 0xf, !(ep & USB_DIR_IN), 0);

	usb_reset_endpoint(ps->dev, ep);

	return 0;

}

drivers/usb/core/hcd.c

+26 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,32 @@ void usb_hcd_disable_endpoint(struct usb_device *udev, 
		hcd->driver->endpoint_disable(hcd, ep);

}



/**

 * usb_hcd_reset_endpoint - reset host endpoint state

 * @udev: USB device.

 * @ep:   the endpoint to reset.

 *

 * Resets any host endpoint state such as the toggle bit, sequence

 * number and current window.

 */

void usb_hcd_reset_endpoint(struct usb_device *udev,

			    struct usb_host_endpoint *ep)

{

	struct usb_hcd *hcd = bus_to_hcd(udev->bus);



	if (hcd->driver->endpoint_reset)

		hcd->driver->endpoint_reset(hcd, ep);

	else {

		int epnum = usb_endpoint_num(&ep->desc);

		int is_out = usb_endpoint_dir_out(&ep->desc);

		int is_control = usb_endpoint_xfer_control(&ep->desc);



		usb_settoggle(udev, epnum, is_out, 0);

		if (is_control)

			usb_settoggle(udev, epnum, !is_out, 0);

	}

}



/* Protect against drivers that try to unlink URBs after the device

 * is gone, by waiting until all unlinks for @udev are finished.

 * Since we don't currently track URBs by device, simply wait until