|
58 | 58 | #define PCI_DEVICE_ID_INTEL_CML_XHCI 0xa3af
|
59 | 59 | #define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI 0x9a13
|
60 | 60 | #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI 0x1138
|
61 |
| -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI 0x461e |
62 |
| -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI 0x464e |
63 |
| -#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed |
64 |
| -#define PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI 0xa71e |
65 |
| -#define PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI 0x7ec0 |
| 61 | +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed |
66 | 62 |
|
67 | 63 | #define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639
|
68 | 64 | #define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
|
69 | 65 | #define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
|
70 | 66 | #define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb
|
71 | 67 | #define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc
|
72 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 0x161a |
73 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 0x161b |
74 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 0x161d |
75 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 0x161e |
76 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 0x15d6 |
77 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 0x15d7 |
78 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_7 0x161c |
79 |
| -#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_8 0x161f |
80 | 68 |
|
81 | 69 | #define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042
|
82 | 70 | #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142
|
@@ -272,12 +260,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
272 | 260 | pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI ||
|
273 | 261 | pdev->device == PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI ||
|
274 | 262 | pdev->device == PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI ||
|
275 |
| - pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI || |
276 |
| - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI || |
277 |
| - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_XHCI || |
278 |
| - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI || |
279 |
| - pdev->device == PCI_DEVICE_ID_INTEL_RAPTOR_LAKE_XHCI || |
280 |
| - pdev->device == PCI_DEVICE_ID_INTEL_METEOR_LAKE_XHCI)) |
| 263 | + pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI)) |
281 | 264 | xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
|
282 | 265 |
|
283 | 266 | if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
|
@@ -346,15 +329,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
346 | 329 | pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4))
|
347 | 330 | xhci->quirks |= XHCI_NO_SOFT_RETRY;
|
348 | 331 |
|
349 |
| - if (pdev->vendor == PCI_VENDOR_ID_AMD && |
350 |
| - (pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 || |
351 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 || |
352 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 || |
353 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 || |
354 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 || |
355 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 || |
356 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_7 || |
357 |
| - pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_8)) |
| 332 | + /* xHC spec requires PCI devices to support D3hot and D3cold */ |
| 333 | + if (xhci->hci_version >= 0x120) |
358 | 334 | xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
|
359 | 335 |
|
360 | 336 | if (xhci->quirks & XHCI_RESET_ON_RESUME)
|
|
0 commit comments