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

Commit 4f63e0c9 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

Revert "xhci: turn off port power in shutdown" 



[ Upstream commit 8531aa1659f7278d4f2ec7408cc000eaa8d85217 ]

This reverts commit 83810f84ecf11dfc5a9414a8b762c3501b328185.

Turning off port power in shutdown did cause issues such as a laptop not
proprly powering off, and some specific usb devies failing to enumerate the
subsequent boot after a warm reset.

So revert this.

Fixes: 83810f84ecf1 ("xhci: turn off port power in shutdown")
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20220825150840.132216-4-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 155ab65c

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd) 
 * It will release and re-aquire the lock while calling ACPI

 * method.

 */

void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,

static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,

				u16 index, bool on, unsigned long *flags)

{

	struct xhci_hub *rhub;

drivers/usb/host/xhci.c

+2 −13
Original line number Diff line number Diff line
@@ -774,8 +774,6 @@ static void xhci_stop(struct usb_hcd *hcd) 
void xhci_shutdown(struct usb_hcd *hcd)

{

	struct xhci_hcd *xhci = hcd_to_xhci(hcd);

	unsigned long flags;

	int i;



	if (xhci->quirks & XHCI_SPURIOUS_REBOOT)

		usb_disable_xhci_ports(to_pci_dev(hcd->self.sysdev));
@@ -791,21 +789,12 @@ void xhci_shutdown(struct usb_hcd *hcd) 
		del_timer_sync(&xhci->shared_hcd->rh_timer);

	}



	spin_lock_irqsave(&xhci->lock, flags);

	spin_lock_irq(&xhci->lock);

	xhci_halt(xhci);



	/* Power off USB2 ports*/

	for (i = 0; i < xhci->usb2_rhub.num_ports; i++)

		xhci_set_port_power(xhci, xhci->main_hcd, i, false, &flags);



	/* Power off USB3 ports*/

	for (i = 0; i < xhci->usb3_rhub.num_ports; i++)

		xhci_set_port_power(xhci, xhci->shared_hcd, i, false, &flags);



	/* Workaround for spurious wakeups at shutdown with HSW */

	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)

		xhci_reset(xhci, XHCI_RESET_SHORT_USEC);

	spin_unlock_irqrestore(&xhci->lock, flags);

	spin_unlock_irq(&xhci->lock);



	xhci_cleanup_msix(xhci);

drivers/usb/host/xhci.h

+0 −2
Original line number Diff line number Diff line
@@ -2145,8 +2145,6 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, 
int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);

int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1);

struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd);

void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd, u16 index,

			 bool on, unsigned long *flags);



void xhci_hc_died(struct xhci_hcd *xhci);