From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtgj7hlq+a03vE4Kx9HINi+f5DvX8l8w37kGR9cK+0ZuU4DvfBryG3QIdhvvUc0iqdLl+4z ARC-Seal: i=1; a=rsa-sha256; t=1520865300; cv=none; d=google.com; s=arc-20160816; b=V0VvwbL2I2MWjTIauF7igJc1p9pqm+MUsHWW+REr+M7LEXUTgdcLyhSD3rK/5sGNhZ 1jpW1jdi4kpyNnvL3mgWGGmNXzriVQ1km4bdL4QtctegLx5FGvwfTfAn7xdJJuzZirC4 ucGGb8Ts+e0AsGeO4Ln5T7bwcBCXuShpO9Yt/2Oz3Xk+DuDRfNKbdY22nkX4EXbrrELx PExVzVtsRMIKAEZCACXnpF1miilIrSs85xkby4vqv6D6PIGChSK7k/zUXp+P7NwxGNMW jqDteNPprc4yUtfttWZ9XZ/CO4kxMXQOl4mC9B/GkukJyYWFABQqSgOsikNLX7pUthQt cbpA== 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=BQXu4PO5OSZSChgfTGjodjx43dT8usLASxkUwoDGIR8=; b=c20P8BeDdHURMxneleOxeBJ5r/3ugwr2+AW9Ffaoanh0tCee0c2Eqcxcyl3+XrkZGs 2/tG0+l5mat43hudE/5He+96BI+SNaivRRRU5P0s+mvLddLKwL93Pm39gAyZPpLmnTsF g5OG86IezOF7zOYu5u2CqW4wKEgcP8a4DqtZXUXxtKi17Achv+pRXoKreUqp9ToObP+A K3h7V+LbI+D3Oo54fwoJyr3TR/HxDdidBv+r9BdcQe9C2ckRNspaI1rxbfIZWcnVTppk 6tOjky9IR9okqWGh5lrVjzOdNuxSeTR2Wibzkh2sRYd6wcH765Zh7XDfwedAi5yj1D5W 7Qjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of heikki.krogerus@linux.intel.com designates 192.55.52.88 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 192.55.52.88 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.47,461,1515484800"; d="scan'208";a="37470897" 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 v7 07/12] xhci: Add option to get next extended capability in list by passing id = 0 Date: Mon, 12 Mar 2018 17:34:26 +0300 Message-Id: <20180312143431.82396-8-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180312143431.82396-1-heikki.krogerus@linux.intel.com> References: <20180312143431.82396-1-heikki.krogerus@linux.intel.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594742853185184818?= X-GMAIL-MSGID: =?utf-8?q?1594742853185184818?= 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 Revieved-by: Heikki Krogerus 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.1 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: [v7,07/12] xhci: Add option to get next extended capability in list by passing id = 0 From: Heikki Krogerus Message-Id: <20180312143431.82396-8-heikki.krogerus@linux.intel.com> Date: Mon, 12 Mar 2018 17:34:26 +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 bWFuIDxtYXRoaWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4KUmV2aWV2ZWQtYnk6IEhlaWtraSBL cm9nZXJ1cyA8aGVpa2tpLmtyb2dlcnVzQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEFu ZHkgU2hldmNoZW5rbyA8YW5keS5zaGV2Y2hlbmtvQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTog SGVpa2tpIEtyb2dlcnVzIDxoZWlra2kua3JvZ2VydXNAbGludXguaW50ZWwuY29tPgotLS0KQ2hh bmdlcyBpbiB2NDoKLUFkZCBBbmR5J3MgUmV2aWV3ZWQtYnkKCkNoYW5nZXMgaW4gdjI6Ci1BZGRl ZCBIZWlra2kncyBSZXZpZXdlZC1ieQotLS0KIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1leHQtY2Fw cy5oIHwgNSArKystLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaCBiL2Ry aXZlcnMvdXNiL2hvc3QveGhjaS1leHQtY2Fwcy5oCmluZGV4IGJmNzMxNmUxMzBkMy4uNjMxZTdj YzYyNjA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaAorKysg Yi9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktZXh0LWNhcHMuaApAQCAtODQsNyArODQsOCBAQAogICog QGJhc2UJUENJIE1NSU8gcmVnaXN0ZXJzIGJhc2UgYWRkcmVzcy4KICAqIEBzdGFydAlhZGRyZXNz IGF0IHdoaWNoIHRvIHN0YXJ0IGxvb2tpbmcsICgwIG9yIEhDQ19QQVJBTVMgdG8gc3RhcnQgYXQK ICAqCQliZWdpbm5pbmcgb2YgbGlzdCkKLSAqIEBpZAkJRXh0ZW5kZWQgY2FwYWJpbGl0eSBJRCB0 byBzZWFyY2ggZm9yLgorICogQGlkCQlFeHRlbmRlZCBjYXBhYmlsaXR5IElEIHRvIHNlYXJjaCBm b3IsIG9yIDAgZm9yIHRoZSBuZXh0CisgKgkJY2FwYWJpbGl0eQogICoKICAqIFJldHVybnMgdGhl IG9mZnNldCBvZiB0aGUgbmV4dCBtYXRjaGluZyBleHRlbmRlZCBjYXBhYmlsaXR5IHN0cnVjdHVy ZS4KICAqIFNvbWUgY2FwYWJpbGl0aWVzIGNhbiBvY2N1ciBzZXZlcmFsIHRpbWVzLCBlLmcuLCB0 aGUgWEhDSV9FWFRfQ0FQU19QUk9UT0NPTCwKQEAgLTExMCw3ICsxMTEsNyBAQCBzdGF0aWMgaW5s aW5lIGludCB4aGNpX2ZpbmRfbmV4dF9leHRfY2FwKHZvaWQgX19pb21lbSAqYmFzZSwgdTMyIHN0 YXJ0LCBpbnQgaWQpCiAJCXZhbCA9IHJlYWRsKGJhc2UgKyBvZmZzZXQpOwogCQlpZiAodmFsID09 IH4wKQogCQkJcmV0dXJuIDA7Ci0JCWlmIChYSENJX0VYVF9DQVBTX0lEKHZhbCkgPT0gaWQgJiYg b2Zmc2V0ICE9IHN0YXJ0KQorCQlpZiAob2Zmc2V0ICE9IHN0YXJ0ICYmIChpZCA9PSAwIHx8IFhI Q0lfRVhUX0NBUFNfSUQodmFsKSA9PSBpZCkpCiAJCQlyZXR1cm4gb2Zmc2V0OwogCiAJCW5leHQg PSBYSENJX0VYVF9DQVBTX05FWFQodmFsKTsK