Commit 669bc5a1 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: Add bus number to some debug messages 



As we register two usb buses for each xHC, and systems with several
hosts are more and more common it is getting hard to follow the
flow of debug messages without knowing which bus they belong to

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210820123503.2605901-7-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d9b9f53

drivers/usb/host/xhci-hub.c

+4 −2
Original line number Diff line number Diff line
@@ -1667,7 +1667,8 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf) 
			status = 1;

	}

	if (!status && !reset_change) {

		xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);

		xhci_dbg(xhci, "%s: stopping usb%d port polling\n",

			 __func__, hcd->self.busnum);

		clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	}

	spin_unlock_irqrestore(&xhci->lock, flags);
@@ -1699,7 +1700,8 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
		if (bus_state->resuming_ports ||	/* USB2 */

		    bus_state->port_remote_wakeup) {	/* USB3 */

			spin_unlock_irqrestore(&xhci->lock, flags);

			xhci_dbg(xhci, "suspend failed because a port is resuming\n");

			xhci_dbg(xhci, "usb%d bus suspend to fail because a port is resuming\n",

				 hcd->self.busnum);

			return -EBUSY;

		}

	}

drivers/usb/host/xhci-ring.c

+2 −1
Original line number Diff line number Diff line
@@ -2031,7 +2031,8 @@ static void handle_port_status(struct xhci_hcd *xhci, 
	 * bits are still set.  When an event occurs, switch over to

	 * polling to avoid losing status changes.

	 */

	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);

	xhci_dbg(xhci, "%s: starting usb%d port polling.\n",

		 __func__, hcd->self.busnum);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	spin_unlock(&xhci->lock);

	/* Pass this up to the core */

drivers/usb/host/xhci.c

+4 −2
Original line number Diff line number Diff line
@@ -993,7 +993,8 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	xhci_dbc_suspend(xhci);



	/* Don't poll the roothubs on bus suspend. */

	xhci_dbg(xhci, "%s: stopping port polling.\n", __func__);

	xhci_dbg(xhci, "%s: stopping usb%d port polling.\n",

		 __func__, hcd->self.busnum);

	clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	del_timer_sync(&hcd->rh_timer);

	clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
@@ -1257,7 +1258,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
		usb_asmedia_modifyflowcontrol(to_pci_dev(hcd->self.controller));



	/* Re-enable port polling. */

	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);

	xhci_dbg(xhci, "%s: starting usb%d port polling.\n",

		 __func__, hcd->self.busnum);

	set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	usb_hcd_poll_rh_status(xhci->shared_hcd);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);