Commit 2a865a65 authored by Weitao Wang's avatar Weitao Wang Committed by Greg Kroah-Hartman
Browse files

xhci: Fix TRB prefetch issue of ZHAOXIN hosts 



On some ZHAOXIN hosts, xHCI will prefetch TRB for performance
improvement. However this TRB prefetch mechanism may cross page boundary,
which may access memory not allocated by xHCI driver. In order to fix
this issue, two pages was allocated for a segment and only the first
page will be used. And add a quirk XHCI_ZHAOXIN_TRB_FETCH for this issue.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarWeitao Wang <WeitaoWang-oc@zhaoxin.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Message-ID: <20230602144009.1225632-10-mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9277281

drivers/usb/host/xhci-mem.c

+6 −2
Original line number Diff line number Diff line
@@ -2345,6 +2345,10 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) 
	 * and our use of dma addresses in the trb_address_map radix tree needs

	 * TRB_SEGMENT_SIZE alignment, so we pick the greater alignment need.

	 */

	if (xhci->quirks & XHCI_ZHAOXIN_TRB_FETCH)

		xhci->segment_pool = dma_pool_create("xHCI ring segments", dev,

				TRB_SEGMENT_SIZE * 2, TRB_SEGMENT_SIZE * 2, xhci->page_size * 2);

	else

		xhci->segment_pool = dma_pool_create("xHCI ring segments", dev,

				TRB_SEGMENT_SIZE, TRB_SEGMENT_SIZE, xhci->page_size);

drivers/usb/host/xhci-pci.c

+6 −1
Original line number Diff line number Diff line
@@ -522,8 +522,13 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		xhci->quirks |= XHCI_NO_SOFT_RETRY;



	if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) {

		if (pdev->device == 0x9202)

		if (pdev->device == 0x9202) {

			xhci->quirks |= XHCI_RESET_ON_RESUME;

			xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;

		}



		if (pdev->device == 0x9203)

			xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;

	}



	/* xHC spec requires PCI devices to support D3hot and D3cold */

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1904,6 +1904,7 @@ struct xhci_hcd { 
#define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)

#define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)

#define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)

#define XHCI_ZHAOXIN_TRB_FETCH	BIT_ULL(45)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;