From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuHAfS+4azWO43WQ9UmPTvq+dTm/iN4HFRurZmXQl+JQomWVZOW08SZwTcUwpcG7MUdHEn0 ARC-Seal: i=1; a=rsa-sha256; t=1521550662; cv=none; d=google.com; s=arc-20160816; b=cJGbGd6kmpUEFHQnpQJsw3N/BTizavKKUrjLEBynFK7nJkboUyVRAcNJUzcrXEnC54 W8ZHmP8+IbEfLcO2dN6/looiGgQTaJRxNawrSTk0WW/7OxLp2VfFyHrlcaPoOqvxsOrc dVJ7oVlDMpL39MzCRb7kU5fdCb2e5WdQZ/UGYKXeLJfQGofWAb7AkiMNn0elk7sG9znc 7OTrDEaSq4Twaed9HkDcquEk9YO1rRBEJhTOAHPWxcI2m9bR9x1Sx85jy8OjRPfmV+v+ vLYyV518CajvfeJFFXeK7VmTYaoX/CraYQOifQrne47pcoBbHp0AyFcjkp+NCJILX60X m3Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=PyI8vAxpnnlKC0yu5aIxWpjeuz3Q+CDu8S+ZmsP4qko=; b=PxtyRK+4ntAMHLZYyZkpHXEZu0l/lGgnstmiNVMCEeyeehsgn7ufhxl9clWWQ9b+ey wO5Iv2gsFUGeZQaT/YIVwJRQnKPA+UeNFr+1dIzUP3oGPoq8clSA21tJbmeLnR8QssIv NSnhek9vW1+121Vb2prAEZscFnfeyxYc0AtSTcJVPFcK9o348jzute3LdNKzJLGaMpu/ K0hTZtx+dUX1HBriMKKWTTUV/lOyIDLtsq3FUlKocrRjL8v4Gazw9IGtr2qtOO6FBJ74 SyxAt1W4FxN0Y1rWTX3EA9bBhvIFJRAUGvgAiz2zd/g7TXf0nsHVExAbDKcLFBuWHHPX bkUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of heikki.krogerus@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=heikki.krogerus@linux.intel.com Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of heikki.krogerus@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=heikki.krogerus@linux.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,335,1517904000"; d="scan'208";a="39592561" From: Heikki Krogerus To: Greg Kroah-Hartman , Hans de Goede Cc: Darren Hart , Andy Shevchenko , MyungJoo Ham , Chanwoo Choi , Mathias Nyman , Guenter Roeck , Jun Li , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v9 07/12] xhci: Add option to get next extended capability in list by passing id = 0 Date: Tue, 20 Mar 2018 15:57:08 +0300 Message-Id: <20180320125713.85465-8-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180320125713.85465-1-heikki.krogerus@linux.intel.com> References: <20180320125713.85465-1-heikki.krogerus@linux.intel.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595461507272547974?= X-GMAIL-MSGID: =?utf-8?q?1595461507272547974?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Mathias Nyman 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 Reviewed-by: Andy Shevchenko Signed-off-by: Heikki Krogerus --- Changes in v4: -Add Andy's Reviewed-by Changes in v2: -Added Heikki's Reviewed-by --- drivers/usb/host/xhci-ext-caps.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); -- 2.16.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v9,07/12] xhci: Add option to get next extended capability in list by passing id = 0 From: Heikki Krogerus Message-Id: <20180320125713.85465-8-heikki.krogerus@linux.intel.com> Date: Tue, 20 Mar 2018 15:57:08 +0300 To: Greg Kroah-Hartman , Hans de Goede Cc: Darren Hart , Andy Shevchenko , MyungJoo Ham , Chanwoo Choi , Mathias Nyman , Guenter Roeck , Jun Li , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org List-ID: RnJvbTogTWF0aGlhcyBOeW1hbiA8bWF0aGlhcy5ueW1hbkBsaW51eC5pbnRlbC5jb20+CgpNb2Rp ZnkgeGhjaV9maW5kX25leHRfZXh0X2NhcChiYXNlLCBvZmZzZXQsIGlkKSB0byByZXR1cm4gdGhl IG5leHQKY2FwYWJpbGl0eSBvZmZzZXQgaWYgMCBpcyBwYXNzZWQgZm9yIGlkLiBPdGhlcndpc2Ug aXQgd2lsbCBiZWhhdmUgYXMKcHJldmlvdXNseSBhbmQgcmV0dXJuIHRoZSBvZmZzZXQgb2YgdGhl IG5leHQgY2FwYWJpbGl0eSB3aXRoIG1hdGNoaW5nIGlkCgpjYXBhYmlsaXR5IGlkIDAgaXMgbm90 IHVzZWQgYnkgeEhDSSAocmVzZXJ2ZWQpCgpUaGlzIGlzIHVzZWZ1bCB3aGVuIHdlIHdhbnQgdG8g bG9vcCB0aHJvdWdoIGFsbCBjYXBhYmlsaXRpZXMuCgpTaWduZWQtb2ZmLWJ5OiBNYXRoaWFzIE55 bWFuIDxtYXRoaWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEFuZHkgU2hl dmNoZW5rbyA8YW5keS5zaGV2Y2hlbmtvQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogSGVpa2tp IEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgotLS0KQ2hhbmdlcyBp biB2NDoKLUFkZCBBbmR5J3MgUmV2aWV3ZWQtYnkKCkNoYW5nZXMgaW4gdjI6Ci1BZGRlZCBIZWlr a2kncyBSZXZpZXdlZC1ieQotLS0KIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1leHQtY2Fwcy5oIHwg NSArKystLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaCBiL2RyaXZlcnMv dXNiL2hvc3QveGhjaS1leHQtY2Fwcy5oCmluZGV4IGJmNzMxNmUxMzBkMy4uNjMxZTdjYzYyNjA0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaAorKysgYi9kcml2 ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaApAQCAtODQsNyArODQsOCBAQAogICogQGJhc2UJ UENJIE1NSU8gcmVnaXN0ZXJzIGJhc2UgYWRkcmVzcy4KICAqIEBzdGFydAlhZGRyZXNzIGF0IHdo aWNoIHRvIHN0YXJ0IGxvb2tpbmcsICgwIG9yIEhDQ19QQVJBTVMgdG8gc3RhcnQgYXQKICAqCQli ZWdpbm5pbmcgb2YgbGlzdCkKLSAqIEBpZAkJRXh0ZW5kZWQgY2FwYWJpbGl0eSBJRCB0byBzZWFy Y2ggZm9yLgorICogQGlkCQlFeHRlbmRlZCBjYXBhYmlsaXR5IElEIHRvIHNlYXJjaCBmb3IsIG9y IDAgZm9yIHRoZSBuZXh0CisgKgkJY2FwYWJpbGl0eQogICoKICAqIFJldHVybnMgdGhlIG9mZnNl dCBvZiB0aGUgbmV4dCBtYXRjaGluZyBleHRlbmRlZCBjYXBhYmlsaXR5IHN0cnVjdHVyZS4KICAq IFNvbWUgY2FwYWJpbGl0aWVzIGNhbiBvY2N1ciBzZXZlcmFsIHRpbWVzLCBlLmcuLCB0aGUgWEhD SV9FWFRfQ0FQU19QUk9UT0NPTCwKQEAgLTExMCw3ICsxMTEsNyBAQCBzdGF0aWMgaW5saW5lIGlu dCB4aGNpX2ZpbmRfbmV4dF9leHRfY2FwKHZvaWQgX19pb21lbSAqYmFzZSwgdTMyIHN0YXJ0LCBp bnQgaWQpCiAJCXZhbCA9IHJlYWRsKGJhc2UgKyBvZmZzZXQpOwogCQlpZiAodmFsID09IH4wKQog CQkJcmV0dXJuIDA7Ci0JCWlmIChYSENJX0VYVF9DQVBTX0lEKHZhbCkgPT0gaWQgJiYgb2Zmc2V0 ICE9IHN0YXJ0KQorCQlpZiAob2Zmc2V0ICE9IHN0YXJ0ICYmIChpZCA9PSAwIHx8IFhIQ0lfRVhU X0NBUFNfSUQodmFsKSA9PSBpZCkpCiAJCQlyZXR1cm4gb2Zmc2V0OwogCiAJCW5leHQgPSBYSENJ X0VYVF9DQVBTX05FWFQodmFsKTsK