Message ID | 20180216104751.8371-8-hdegoede@redhat.com (mailing list archive) |
---|---|
State | Changes Requested, archived |
Delegated to: | Andy Shevchenko |
Headers | show |
On Fri, Feb 16, 2018 at 11:47:46AM +0100, Hans de Goede wrote: > From: Mathias Nyman <mathias.nyman@linux.intel.com> > > Modify xhci_find_next_ext_cap(base, offset, id) to return the next > capability offset if 0 is passed for id. Otherwise it will behave as > previously and return the offset of the next capability with matching id > > capability id 0 is not used by xhci (reserved) > > This is useful when we want to loop through all capabilities. > > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> FWIW: Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Br,
diff --git a/drivers/usb/host/xhci-ext-caps.h b/drivers/usb/host/xhci-ext-caps.h index bf7316e130d3..631e7cc62604 100644 --- a/drivers/usb/host/xhci-ext-caps.h +++ b/drivers/usb/host/xhci-ext-caps.h @@ -84,7 +84,8 @@ * @base PCI MMIO registers base address. * @start address at which to start looking, (0 or HCC_PARAMS to start at * beginning of list) - * @id Extended capability ID to search for. + * @id Extended capability ID to search for, or 0 for the next + * capability * * Returns the offset of the next matching extended capability structure. * Some capabilities can occur several times, e.g., the XHCI_EXT_CAPS_PROTOCOL, @@ -110,7 +111,7 @@ static inline int xhci_find_next_ext_cap(void __iomem *base, u32 start, int id) val = readl(base + offset); if (val == ~0) return 0; - if (XHCI_EXT_CAPS_ID(val) == id && offset != start) + if (offset != start && (id == 0 || XHCI_EXT_CAPS_ID(val) == id)) return offset; next = XHCI_EXT_CAPS_NEXT(val);