Commit 13841db4 authored by JiangShui Yang's avatar JiangShui Yang Committed by JiangShui
Browse files

Revert "xhci:fix USB xhci controller issue" 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7ZPUX


CVE: NA

----------------------------------------------------------------------

This reverts commit 1a869403.

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJiangShui Yang <yangjiangshui@h-partners.com>
Signed-off-by: default avatarLongfang Liu <liulongfang@huawei.com>
parent e80d0dac

drivers/usb/host/xhci-pci.c

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/usb/host/xhci-ring.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -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)