Attachment 867594 Details for Bug 1212365

[patch] Revert the obvious suspect

0001-Revert-xhci-add-quirk-for-host-controllers-that-don-.patch (text/plain), 2.70 KB, created by Oliver Neukum on 2023-06-15 10:23:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Neukum

Created: 2023-06-15 10:23:09 UTC

Size: 2.70 KB

patch

obsolete

>From 838fb724a7d6b5d7dfd5bc32da0ce87a4aeeb7b4 Mon Sep 17 00:00:00 2001
>From: Oliver Neukum <oneukum@suse.com>
>Date: Thu, 15 Jun 2023 11:22:28 +0200
>Subject: [PATCH] Revert "xhci: add quirk for host controllers that don't
> update endpoint DCS"
>
>This reverts commit 5255660b208aebfdb71d574f3952cf48392f4306.
>---
> drivers/usb/host/xhci-pci.c  |  4 +---
> drivers/usb/host/xhci-ring.c | 25 +------------------------
> 2 files changed, 2 insertions(+), 27 deletions(-)
>
>diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
>index 79b3691f373f..9a788b6c30a5 100644
>--- a/drivers/usb/host/xhci-pci.c
>+++ b/drivers/usb/host/xhci-pci.c
>@@ -486,10 +486,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
> 			pdev->device == 0x3432)
> 		xhci->quirks |= XHCI_BROKEN_STREAMS;
> 
>-	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
>+	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483)
> 		xhci->quirks |= XHCI_LPM_SUPPORT;
>-		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
>-	}
> 
> 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
> 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) {
>diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
>index 2bc82b3a2f98..ad70f6359309 100644
>--- a/drivers/usb/host/xhci-ring.c
>+++ b/drivers/usb/host/xhci-ring.c
>@@ -592,11 +592,8 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
> 	struct xhci_ring *ep_ring;
> 	struct xhci_command *cmd;
> 	struct xhci_segment *new_seg;
>-	struct xhci_segment *halted_seg = NULL;
> 	union xhci_trb *new_deq;
> 	int new_cycle;
>-	union xhci_trb *halted_trb;
>-	int index = 0;
> 	dma_addr_t addr;
> 	u64 hw_dequeue;
> 	bool cycle_found = false;
>@@ -634,27 +631,7 @@ static int xhci_move_dequeue_past_td(struct xhci_hcd *xhci,
> 	hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id);
> 	new_seg = ep_ring->deq_seg;
> 	new_deq = ep_ring->dequeue;
>-
>-	/*
>-	 * Quirk: xHC write-back of the DCS field in the hardware dequeue
>-	 * pointer is wrong - use the cycle state of the TRB pointed to by
>-	 * the dequeue pointer.
>-	 */
>-	if (xhci->quirks & XHCI_EP_CTX_BROKEN_DCS &&
>-	    !(ep->ep_state & EP_HAS_STREAMS))
>-		halted_seg = trb_in_td(xhci, td->start_seg,
>-				       td->first_trb, td->last_trb,
>-				       hw_dequeue & ~0xf, false);
>-	if (halted_seg) {
>-		index = ((dma_addr_t)(hw_dequeue & ~0xf) - halted_seg->dma) /
>-			 sizeof(*halted_trb);
>-		halted_trb = &halted_seg->trbs[index];
>-		new_cycle = halted_trb->generic.field[3] & 0x1;
>-		xhci_dbg(xhci, "Endpoint DCS = %d TRB index = %d cycle = %d\n",
>-			 (u8)(hw_dequeue & 0x1), index, new_cycle);
>-	} else {
>-		new_cycle = hw_dequeue & 0x1;
>-	}
>+	new_cycle = hw_dequeue & 0x1;
> 
> 	/*
> 	 * We want to find the pointer, segment and cycle state of the new trb
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 1212365: 867574 | 867575 | 867594