From: JiangShui Yang yangjiangshui@h-partners.com
driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7ZPUX CVE: NA
----------------------------------------------------------------------
This reverts commit 1a86940388049d27b6cb387c041c7d18e25af830.
Signed-off-by: Jialin Zhang zhangjialin11@huawei.com Signed-off-by: JiangShui Yang yangjiangshui@h-partners.com Signed-off-by: Longfang Liu liulongfang@huawei.com
--- drivers/usb/host/xhci-pci.c | 4 ---- drivers/usb/host/xhci-ring.c | 6 +----- drivers/usb/host/xhci.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 67291945de62..0b32df19071c 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -357,10 +357,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) if (xhci->quirks & XHCI_RESET_ON_RESUME) xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, "QUIRK: Resetting on resume"); - - if (pdev->vendor == PCI_VENDOR_ID_HUAWEI && - (pdev->device == 0xa23c || pdev->device == 0xa23d)) - xhci->quirks |= XHCI_USB3_NOOP; }
#ifdef CONFIG_ACPI diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index e7e93b8b9679..b69b8c7e7966 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1590,9 +1590,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, * Check whether the completion event is for our internal kept * command. */ - if (!cmd_dequeue_dma || ((cmd_dma != (u64)cmd_dequeue_dma) && - !((xhci->quirks & XHCI_USB3_NOOP) && (cmd_comp_code == - COMP_COMMAND_RING_STOPPED)))) { + if (!cmd_dequeue_dma || cmd_dma != (u64)cmd_dequeue_dma) { xhci_warn(xhci, "ERROR mismatched command completion event\n"); return; @@ -1625,8 +1623,6 @@ static void handle_cmd_completion(struct xhci_hcd *xhci, if (cmd_comp_code == COMP_COMMAND_ABORTED) { xhci->cmd_ring_state = CMD_RING_STATE_STOPPED; if (cmd->status == COMP_COMMAND_ABORTED) { - if (xhci->quirks & XHCI_USB3_NOOP) - trb_to_noop(cmd->command_trb, TRB_CMD_NOOP); if (xhci->current_cmd == cmd) xhci->current_cmd = NULL; goto event_handled; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 03478edb1179..2bddc2f3d517 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1840,7 +1840,6 @@ struct xhci_hcd { #define XHCI_STATE_HALTED (1 << 1) #define XHCI_STATE_REMOVING (1 << 2) unsigned long long quirks; -#define XHCI_USB3_NOOP BIT_ULL(63) #define XHCI_LINK_TRB_QUIRK BIT_ULL(0) #define XHCI_RESET_EP_QUIRK BIT_ULL(1) #define XHCI_NEC_HOST BIT_ULL(2)