Hello.
On 10-01-2012 11:34, Alex Shi wrote:
Adding Intel USB3 xhci host controller ID in pci_ids.h,
This is generally frowned upon these days.
flags in pci hcd driver. That HCD may just works under MSI, so need to
skip line irq checking in pci hcd core probe. That is a preparation for
next fixing patch.
This patch also fix a little comments error in code.
Signed-off-by: Alex Shi<alex.shi@xxxxxxxxx>
---
drivers/usb/host/xhci.h | 2 +-
include/linux/pci_ids.h | 2 ++
include/linux/usb/hcd.h | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 3c8fbd2..ecd2ad5 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1356,7 +1356,7 @@ static inline unsigned int hcd_index(struct usb_hcd *hcd)
return 1;
}
-/* There is one ehci_hci structure per controller */
+/* There is one xhci_hcd structure per controller */
Unrelataed change?
struct xhci_hcd {
struct usb_hcd *main_hcd;
struct usb_hcd *shared_hcd;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2aaee0c..0a7c1f5 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -641,6 +641,7 @@
#define PCI_DEVICE_ID_NEC_STARALPHA2 0x002c /* STAR ALPHA2 */
#define PCI_DEVICE_ID_NEC_CBUS_2 0x002d /* PCI-Cbus Bridge */
#define PCI_DEVICE_ID_NEC_USB 0x0035 /* PCI-USB Host */
+#define PCI_DEVICE_ID_NEC_USB3 0x0194 /* PCI-USB3 Host */
#define PCI_DEVICE_ID_NEC_CBUS_3 0x003b
#define PCI_DEVICE_ID_NEC_NAPCCARD 0x003e
#define PCI_DEVICE_ID_NEC_PCX2 0x0046 /* PowerVR */
@@ -2779,6 +2780,7 @@
#define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500
#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004
#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152
+#define PCI_DEVICE_ID_INTEL_USB_XHCI 0x1e31
#define PCI_VENDOR_ID_SCALEMP 0x8686
#define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 03354d5..4f67a41 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -199,9 +199,8 @@ struct hcd_timeout { /* timeouts we allocate */
/*-------------------------------------------------------------------------*/
-
struct hc_driver {
- const char *description; /* "ehci-hcd" etc */
+ const char *description; /* "ehci_hcd", "xhci_hcd" etc */
const char *product_desc; /* product/vendor string */
size_t hcd_priv_size; /* size of private data */
@@ -212,6 +211,7 @@ struct hc_driver {
#define HCD_MEMORY 0x0001 /* HC regs use memory (else I/O) */
#define HCD_LOCAL_MEM 0x0002 /* HC needs local memory */
#define HCD_SHARED 0x0004 /* Two (or more) usb_hcds share HW */
+#define HCD_MSI_FST 0x0008 /* Try to get MSI first, PCI only */
#define HCD_USB11 0x0010 /* USB 1.1 */
#define HCD_USB2 0x0020 /* USB 2.0 */
#define HCD_USB3 0x0040 /* USB 3.0 */
Your patch does many unrelated things, maybe it's better to split it?
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
