On 01/10/2012 04:36 PM, Alex,Shi wrote: > On Tue, 2012-01-10 at 16:23 +0800, Andiry Xu wrote: >> On 01/10/2012 03:34 PM, Alex Shi wrote: >>> Adding Intel USB3 xhci host controller ID in pci_ids.h, and a MSI_FST >>> 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 */ >> >> I believe Sarah already submitted patch to fix this. > > Sorry, which tree takes Sarah's fix? See Greg's USB merge for 3.3. >> >>> 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 */ > > Just add it handy, since our machine has this HCD too. Does it has some > potential issue? If so, It is regret and will be removed. > I don't see any potential issue, it's just irrelevant to this patchset. Thanks, Andiry -- 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