Commit fc721f51 authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez Committed by Greg Kroah-Hartman
Browse files

wusb: make ep0_reinit available for modules 



We need to be able to call ep0_reinit() [renamed to usb_ep0_reinit()]
from the WUSB security code. The reason is that when we authenticate
the device, it's address changes (from having bit 7 set to having it
cleared). Thus, we need to signal the USB stack to reinitialize EP0,
so the status with the previous address kept at the HCD layer is
cleared and properly reinitialized.

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6c529cdc

drivers/usb/core/hub.c

+6 −5
Original line number Original line Diff line number Diff line
@@ -2211,12 +2211,13 @@ static int hub_port_debounce(struct usb_hub *hub, int port1) 
	return portstatus;

	return portstatus;

}

}





static void ep0_reinit(struct usb_device *udev)

void usb_ep0_reinit(struct usb_device *udev)

{

{

	usb_disable_endpoint(udev, 0 + USB_DIR_IN);

	usb_disable_endpoint(udev, 0 + USB_DIR_IN);

	usb_disable_endpoint(udev, 0 + USB_DIR_OUT);

	usb_disable_endpoint(udev, 0 + USB_DIR_OUT);

	usb_enable_endpoint(udev, &udev->ep0);

	usb_enable_endpoint(udev, &udev->ep0);

}

}

EXPORT_SYMBOL_GPL(usb_ep0_reinit);





#define usb_sndaddr0pipe()	(PIPE_CONTROL << 30)

#define usb_sndaddr0pipe()	(PIPE_CONTROL << 30)

#define usb_rcvaddr0pipe()	((PIPE_CONTROL << 30) | USB_DIR_IN)

#define usb_rcvaddr0pipe()	((PIPE_CONTROL << 30) | USB_DIR_IN)
@@ -2237,7 +2238,7 @@ static int hub_set_address(struct usb_device *udev, int devnum) 
	if (retval == 0) {

	if (retval == 0) {

		udev->devnum = devnum;	/* Device now using proper address */

		udev->devnum = devnum;	/* Device now using proper address */

		usb_set_device_state(udev, USB_STATE_ADDRESS);

		usb_set_device_state(udev, USB_STATE_ADDRESS);

		ep0_reinit(udev);

		usb_ep0_reinit(udev);

	}

	}

	return retval;

	return retval;

}

}
@@ -2473,7 +2474,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
		}

		}

		dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);

		dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i);

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i);

		ep0_reinit(udev);

		usb_ep0_reinit(udev);

	}

	}

  

  

	retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE);

	retval = usb_get_device_descriptor(udev, USB_DT_DEVICE_SIZE);
@@ -2729,7 +2730,7 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, 
loop_disable:

loop_disable:

		hub_port_disable(hub, port1, 1);

		hub_port_disable(hub, port1, 1);

loop:

loop:

		ep0_reinit(udev);

		usb_ep0_reinit(udev);

		release_address(udev);

		release_address(udev);

		usb_put_dev(udev);

		usb_put_dev(udev);

		if ((status == -ENOTCONN) || (status == -ENOTSUPP))

		if ((status == -ENOTCONN) || (status == -ENOTSUPP))
@@ -3164,7 +3165,7 @@ int usb_reset_device(struct usb_device *udev) 




		/* ep0 maxpacket size may change; let the HCD know about it.

		/* ep0 maxpacket size may change; let the HCD know about it.

		 * Other endpoints will be handled by re-enumeration. */

		 * Other endpoints will be handled by re-enumeration. */

		ep0_reinit(udev);

		usb_ep0_reinit(udev);

		ret = hub_port_init(parent_hub, udev, port1, i);

		ret = hub_port_init(parent_hub, udev, port1, i);

		if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV)

		if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV)

			break;

			break;

drivers/usb/core/hub.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -195,5 +195,6 @@ struct usb_tt_clear { 
};

};





extern void usb_hub_tt_clear_buffer(struct usb_device *dev, int pipe);

extern void usb_hub_tt_clear_buffer(struct usb_device *dev, int pipe);

extern void usb_ep0_reinit(struct usb_device *);





#endif /* __LINUX_HUB_H */
 
#endif /* __LINUX_HUB_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE