Skip to content

Commit c2ef60f

Browse files
Marc Zyngiergregkh
authored andcommitted
Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue"
This reverts commit 8466489. Now that we can properly reset the uPD72020x without a hard PCI reset, let's get rid of the existing quirks. Tested-by: Domenico Andreoli <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Tested-by: Faiz Abbas <[email protected]> Tested-by: Domenico Andreoli <[email protected]> Acked-by: Mathias Nyman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 12de0a3 commit c2ef60f

File tree

3 files changed

+0
-28
lines changed

3 files changed

+0
-28
lines changed

drivers/usb/host/pci-quirks.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,23 +1268,3 @@ static void quirk_usb_early_handoff(struct pci_dev *pdev)
12681268
}
12691269
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
12701270
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
1271-
1272-
bool usb_xhci_needs_pci_reset(struct pci_dev *pdev)
1273-
{
1274-
/*
1275-
* Our dear uPD72020{1,2} friend only partially resets when
1276-
* asked to via the XHCI interface, and may end up doing DMA
1277-
* at the wrong addresses, as it keeps the top 32bit of some
1278-
* addresses from its previous programming under obscure
1279-
* circumstances.
1280-
* Give it a good wack at probe time. Unfortunately, this
1281-
* needs to happen before we've had a chance to discover any
1282-
* quirk, or the system will be in a rather bad state.
1283-
*/
1284-
if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
1285-
(pdev->device == 0x0014 || pdev->device == 0x0015))
1286-
return true;
1287-
1288-
return false;
1289-
}
1290-
EXPORT_SYMBOL_GPL(usb_xhci_needs_pci_reset);

drivers/usb/host/pci-quirks.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ void usb_asmedia_modifyflowcontrol(struct pci_dev *pdev);
1616
void usb_enable_intel_xhci_ports(struct pci_dev *xhci_pdev);
1717
void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
1818
void sb800_prefetch(struct device *dev, int on);
19-
bool usb_xhci_needs_pci_reset(struct pci_dev *pdev);
2019
bool usb_amd_pt_check_port(struct device *device, int port);
2120
#else
2221
struct pci_dev;

drivers/usb/host/xhci-pci.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,6 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
288288

289289
driver = (struct hc_driver *)id->driver_data;
290290

291-
/* For some HW implementation, a XHCI reset is just not enough... */
292-
if (usb_xhci_needs_pci_reset(dev)) {
293-
dev_info(&dev->dev, "Resetting\n");
294-
if (pci_reset_function_locked(dev))
295-
dev_warn(&dev->dev, "Reset failed");
296-
}
297-
298291
/* Prevent runtime suspending between USB-2 and USB-3 initialization */
299292
pm_runtime_get_noresume(&dev->dev);
300293

0 commit comments

Comments
 (0)