Commit 083ba4c4 authored by Niklas Neronin's avatar Niklas Neronin Committed by Greg Kroah-Hartman
Browse files

usb: xhci: move link TRB quirk to xhci_gen_setup() 



This quirk is old and seldom seen, as a result the trace is changed
to debug message and only printed when the quirk is set.

Move it into xhci_gen_setup() where the majority of quirks are set.

Signed-off-by: default avatarNiklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20241106101459.775897-25-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci.c

+6 −8
Original line number Diff line number Diff line
@@ -473,14 +473,7 @@ static int xhci_init(struct usb_hcd *hcd) 


	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "xhci_init");

	spin_lock_init(&xhci->lock);

	if (xhci->hci_version == 0x95 && link_quirk) {

		xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,

				"QUIRK: Not clearing Link TRB chain bits.");

		xhci->quirks |= XHCI_LINK_TRB_QUIRK;

	} else {

		xhci_dbg_trace(xhci, trace_xhci_dbg_init,

				"xHCI doesn't need link TRB QUIRK");

	}



	retval = xhci_mem_init(xhci, GFP_KERNEL);

	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_init");
@@ -5311,6 +5304,11 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) 
	if (xhci->hci_version > 0x96)

		xhci->quirks |= XHCI_SPURIOUS_SUCCESS;



	if (xhci->hci_version == 0x95 && link_quirk) {

		xhci_dbg(xhci, "QUIRK: Not clearing Link TRB chain bits");

		xhci->quirks |= XHCI_LINK_TRB_QUIRK;

	}



	/* Make sure the HC is halted. */

	retval = xhci_halt(xhci);

	if (retval)