add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/drivers/usb/host/xhci-pci.c
..
..
@@ -12,9 +12,11 @@
12
12
 #include <linux/slab.h>
13
13
 #include <linux/module.h>
14
14
 #include <linux/acpi.h>
15
+#include <linux/reset.h>
15
16
 
16
17
 #include "xhci.h"
17
18
 #include "xhci-trace.h"
19
+#include "xhci-pci.h"
18
20
 
19
21
 #define SSIC_PORT_NUM		2
20
22
 #define SSIC_PORT_CFG2		0x880c
..
..
@@ -44,12 +46,26 @@
44
46
 #define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI		0x1aa8
45
47
 #define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8
46
48
 #define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0
49
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5
50
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI	0x15b6
51
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_XHCI	0x15c1
52
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI	0x15db
53
+#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI	0x15d4
54
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI		0x15e9
55
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI		0x15ec
56
+#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI		0x15f0
57
+#define PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI		0x8a13
47
58
 #define PCI_DEVICE_ID_INTEL_CML_XHCI			0xa3af
59
+#define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI		0x9a13
60
+#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
61
+#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI		0x51ed
62
+#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI	0x54ed
48
63
 
49
64
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9
50
65
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba
51
66
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb
52
67
 #define PCI_DEVICE_ID_AMD_PROMONTORYA_1			0x43bc
68
+
53
69
 #define PCI_DEVICE_ID_ASMEDIA_1042_XHCI			0x1042
54
70
 #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142
55
71
 #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI			0x1242
..
..
@@ -85,7 +101,16 @@
85
101
 
86
102
 static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
87
103
 {
88
-	struct pci_dev		*pdev = to_pci_dev(dev);
104
+	struct pci_dev                  *pdev = to_pci_dev(dev);
105
+	struct xhci_driver_data         *driver_data;
106
+	const struct pci_device_id      *id;
107
+
108
+	id = pci_match_id(pdev->driver->id_table, pdev);
109
+
110
+	if (id && id->driver_data) {
111
+		driver_data = (struct xhci_driver_data *)id->driver_data;
112
+		xhci->quirks |= driver_data->quirks;
113
+	}
89
114
 
90
115
 	/* Look for vendor-specific quirks */
91
116
 	if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
..
..
@@ -135,7 +160,7 @@
135
160
 		xhci->quirks |= XHCI_AMD_0x96_HOST;
136
161
 
137
162
 	/* AMD PLL quirk */
138
-	if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
163
+	if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_quirk_pll_check())
139
164
 		xhci->quirks |= XHCI_AMD_PLL_FIX;
140
165
 
141
166
 	if (pdev->vendor == PCI_VENDOR_ID_AMD &&
..
..
@@ -217,6 +242,25 @@
217
242
 	     pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))
218
243
 		xhci->quirks |= XHCI_MISSING_CAS;
219
244
 
245
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
246
+	    (pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI ||
247
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI))
248
+		xhci->quirks |= XHCI_RESET_TO_DEFAULT;
249
+
250
+	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
251
+	    (pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||
252
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||
253
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_XHCI ||
254
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI ||
255
+	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI ||
256
+	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI ||
257
+	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI ||
258
+	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI ||
259
+	     pdev->device == PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI ||
260
+	     pdev->device == PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI ||
261
+	     pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI))
262
+		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
263
+
220
264
 	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
221
265
 			pdev->device == PCI_DEVICE_ID_EJ168) {
222
266
 		xhci->quirks |= XHCI_RESET_ON_RESUME;
..
..
@@ -241,9 +285,20 @@
241
285
 			pdev->device == 0x3432)
242
286
 		xhci->quirks |= XHCI_BROKEN_STREAMS;
243
287
 
288
+	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
289
+		xhci->quirks |= XHCI_LPM_SUPPORT;
290
+		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
291
+	}
292
+
244
293
 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
245
-		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)
294
+		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) {
295
+		/*
296
+		 * try to tame the ASMedia 1042 controller which reports 0.96
297
+		 * but appears to behave more like 1.0
298
+		 */
299
+		xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
246
300
 		xhci->quirks |= XHCI_BROKEN_STREAMS;
301
+	}
247
302
 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
248
303
 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) {
249
304
 		xhci->quirks |= XHCI_TRUST_TX_LENGTH;
..
..
@@ -266,6 +321,15 @@
266
321
 	     pdev->vendor == PCI_VENDOR_ID_CAVIUM) &&
267
322
 	     pdev->device == 0x9026)
268
323
 		xhci->quirks |= XHCI_RESET_PLL_ON_DISCONNECT;
324
+
325
+	if (pdev->vendor == PCI_VENDOR_ID_AMD &&
326
+	    (pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_2 ||
327
+	     pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4))
328
+		xhci->quirks |= XHCI_NO_SOFT_RETRY;
329
+
330
+	/* xHC spec requires PCI devices to support D3hot and D3cold */
331
+	if (xhci->hci_version >= 0x120)
332
+		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
269
333
 
270
334
 	if (xhci->quirks & XHCI_RESET_ON_RESUME)
271
335
 		xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
..
..
@@ -326,10 +390,21 @@
326
390
 {
327
391
 	int retval;
328
392
 	struct xhci_hcd *xhci;
329
-	struct hc_driver *driver;
330
393
 	struct usb_hcd *hcd;
394
+	struct xhci_driver_data *driver_data;
395
+	struct reset_control *reset;
331
396
 
332
-	driver = (struct hc_driver *)id->driver_data;
397
+	driver_data = (struct xhci_driver_data *)id->driver_data;
398
+	if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) {
399
+		retval = renesas_xhci_check_request_fw(dev, id);
400
+		if (retval)
401
+			return retval;
402
+	}
403
+
404
+	reset = devm_reset_control_get_optional_exclusive(&dev->dev, NULL);
405
+	if (IS_ERR(reset))
406
+		return PTR_ERR(reset);
407
+	reset_control_reset(reset);
333
408
 
334
409
 	/* Prevent runtime suspending between USB-2 and USB-3 initialization */
335
410
 	pm_runtime_get_noresume(&dev->dev);
..
..
@@ -340,7 +415,7 @@
340
415
 	 * to say USB 2.0, but I'm not sure what the implications would be in
341
416
 	 * the other parts of the HCD code.
342
417
 	 */
343
-	retval = usb_hcd_pci_probe(dev, id);
418
+	retval = usb_hcd_pci_probe(dev, id, &xhci_pci_hc_driver);
344
419
 
345
420
 	if (retval)
346
421
 		goto put_runtime_pm;
..
..
@@ -348,8 +423,9 @@
348
423
 	/* USB 2.0 roothub is stored in the PCI device now. */
349
424
 	hcd = dev_get_drvdata(&dev->dev);
350
425
 	xhci = hcd_to_xhci(hcd);
351
-	xhci->shared_hcd = usb_create_shared_hcd(driver, &dev->dev,
352
-				pci_name(dev), hcd);
426
+	xhci->reset = reset;
427
+	xhci->shared_hcd = usb_create_shared_hcd(&xhci_pci_hc_driver, &dev->dev,
428
+						 pci_name(dev), hcd);
353
429
 	if (!xhci->shared_hcd) {
354
430
 		retval = -ENOMEM;
355
431
 		goto dealloc_usb2_hcd;
..
..
@@ -372,6 +448,9 @@
372
448
 	/* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
373
449
 	pm_runtime_put_noidle(&dev->dev);
374
450
 
451
+	if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
452
+		pm_runtime_allow(&dev->dev);
453
+
375
454
 	return 0;
376
455
 
377
456
 put_usb3_hcd:
..
..
@@ -388,7 +467,14 @@
388
467
 	struct xhci_hcd *xhci;
389
468
 
390
469
 	xhci = hcd_to_xhci(pci_get_drvdata(dev));
470
+	if (xhci->quirks & XHCI_RENESAS_FW_QUIRK)
471
+		renesas_xhci_pci_exit(dev);
472
+
391
473
 	xhci->xhc_state |= XHCI_STATE_REMOVING;
474
+
475
+	if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
476
+		pm_runtime_forbid(&dev->dev);
477
+
392
478
 	if (xhci->shared_hcd) {
393
479
 		usb_remove_hcd(xhci->shared_hcd);
394
480
 		usb_put_hcd(xhci->shared_hcd);
..
..
@@ -501,6 +587,8 @@
501
587
 	struct pci_dev		*pdev = to_pci_dev(hcd->self.controller);
502
588
 	int			retval = 0;
503
589
 
590
+	reset_control_reset(xhci->reset);
591
+
504
592
 	/* The BIOS on systems with the Intel Panther Point chipset may or may
505
593
 	 * not support xHCI natively.  That means that during system resume, it
506
594
 	 * may switch the ports back to EHCI so that users can use their
..
..
@@ -547,19 +635,37 @@
547
635
 
548
636
 /*-------------------------------------------------------------------------*/
549
637
 
638
+static const struct xhci_driver_data reneses_data = {
639
+	.quirks  = XHCI_RENESAS_FW_QUIRK,
640
+	.firmware = "renesas_usb_fw.mem",
641
+};
642
+
550
643
 /* PCI driver selection metadata; PCI hotplugging uses this */
551
-static const struct pci_device_id pci_ids[] = { {
644
+static const struct pci_device_id pci_ids[] = {
645
+	{ PCI_DEVICE(0x1912, 0x0014),
646
+		.driver_data =  (unsigned long)&reneses_data,
647
+	},
648
+	{ PCI_DEVICE(0x1912, 0x0015),
649
+		.driver_data =  (unsigned long)&reneses_data,
650
+	},
552
651
 	/* handle any USB 3.0 xHCI controller */
553
-	PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0),
554
-	.driver_data =	(unsigned long) &xhci_pci_hc_driver,
652
+	{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0),
555
653
 	},
556
654
 	{ /* end: all zeroes */ }
557
655
 };
558
656
 MODULE_DEVICE_TABLE(pci, pci_ids);
559
657
 
658
+/*
659
+ * Without CONFIG_USB_XHCI_PCI_RENESAS renesas_xhci_check_request_fw() won't
660
+ * load firmware, so don't encumber the xhci-pci driver with it.
661
+ */
662
+#if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS)
663
+MODULE_FIRMWARE("renesas_usb_fw.mem");
664
+#endif
665
+
560
666
 /* pci driver glue; this is a "new style" PCI driver module */
561
667
 static struct pci_driver xhci_pci_driver = {
562
-	.name =		(char *) hcd_name,
668
+	.name =		hcd_name,
563
669
 	.id_table =	pci_ids,
564
670
 
565
671
 	.probe =	xhci_pci_probe,