From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: [PATCH v6 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Mon, 20 Mar 2023 15:16:31 +0200 Message-ID: <20230320131633.61680-3-andriy.shevchenko@linux.intel.com> References: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679318169; x=1710854169; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKBg2DWRtjN/3o0GQ+Gz1Jmqpx4HtRyfpegHo4oOuDE=; b=IevzGpzGRGvW6GHvpuGTsY/dEcTF4i+gKzGLKMxz9JkrMv4+oNpy0zO4 0WHVKpWOELHGsdINiwE7WeZkwW0EjFz+KVEiUNmME1rCsw3T0eSEf8hiX GeL0Se5Zj4g90Kqsi1TQbql+lA0XbQ8eUCuPGAc3qhkwcEzXy4uByNex5 qYRF93wmVEcKPRsI0AUd4fJWbCWmdtUdAkkefFAN4SZ/El/2Xxtl6di/y 500+a/Ci/ySo7dQawdXEZVO0IOmHRD3ki5ziCw1AOnbEOvpW0EcbliCNn mgV9jD1sqor+3xpU75mvuKGmSumoZofFYjxnOc3fDI+yGszd5WSy4N9QA A==; In-Reply-To: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> List-ID: Content-Type: text/plain; charset="macroman" To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini UmVmYWN0b3IgcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZSgpIGluIHRoZSBzYW1lIHdheSBhcyBp dCdzIGRvbmUgaW4KcGNpX2Rldl9mb3JfZWFjaF9yZXNvdXJjZSgpIGNhc2UuIFRoaXMgd2lsbCBh bGxvdyB0byBoaWRlIGl0ZXJhdG9yCmluc2lkZSB0aGUgbG9vcCwgd2hlcmUgaXQncyBub3QgdXNl ZCBvdGhlcndpc2UuCgpObyBmdW5jdGlvbmFsIGNoYW5nZXMgaW50ZW5kZWQuCgpTaWduZWQtb2Zm LWJ5OiBBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5zaGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IEtyenlzenRvZiBXaWxjennFhHNraSA8a3dAbGludXguY29tPgotLS0KIC5j bGFuZy1mb3JtYXQgICAgICAgICAgICAgICAgICAgICAgfCAgMSArCiBkcml2ZXJzL3BjaS9idXMu YyAgICAgICAgICAgICAgICAgIHwgIDcgKysrLS0tLQogZHJpdmVycy9wY2kvaG90cGx1Zy9zaHBj aHBfc3lzZnMuYyB8ICA4ICsrKystLS0tCiBkcml2ZXJzL3BjaS9wY2kuYyAgICAgICAgICAgICAg ICAgIHwgIDUgKystLS0KIGRyaXZlcnMvcGNpL3Byb2JlLmMgICAgICAgICAgICAgICAgfCAgMiAr LQogZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMgICAgICAgICAgICB8IDEwICsrKystLS0tLS0KIGlu Y2x1ZGUvbGludXgvcGNpLmggICAgICAgICAgICAgICAgfCAxNCArKysrKysrKysrLS0tLQogNyBm aWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS8uY2xhbmctZm9ybWF0IGIvLmNsYW5nLWZvcm1hdAppbmRleCAyNjZhYmI4NDM2NTQuLjgx YzlmMDU1MDg2ZiAxMDA2NDQKLS0tIGEvLmNsYW5nLWZvcm1hdAorKysgYi8uY2xhbmctZm9ybWF0 CkBAIC01MjAsNiArNTIwLDcgQEAgRm9yRWFjaE1hY3JvczoKICAgLSAnb2ZfcHJvcGVydHlfZm9y X2VhY2hfc3RyaW5nJwogICAtICdvZl9wcm9wZXJ0eV9mb3JfZWFjaF91MzInCiAgIC0gJ3BjaV9i dXNfZm9yX2VhY2hfcmVzb3VyY2UnCisgIC0gJ3BjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcCcK ICAgLSAncGNpX2Rldl9mb3JfZWFjaF9yZXNvdXJjZScKICAgLSAncGNpX2Rldl9mb3JfZWFjaF9y ZXNvdXJjZV9wJwogICAtICdwY2lfZG9lX2Zvcl9lYWNoX29mZicKZGlmZiAtLWdpdCBhL2RyaXZl cnMvcGNpL2J1cy5jIGIvZHJpdmVycy9wY2kvYnVzLmMKaW5kZXggNTQ5YzRiZDVjYWVjLi5iMDc4 OWQzMzJkMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2J1cy5jCisrKyBiL2RyaXZlcnMvcGNp L2J1cy5jCkBAIC0xODIsMTMgKzE4MiwxMyBAQCBzdGF0aWMgaW50IHBjaV9idXNfYWxsb2NfZnJv bV9yZWdpb24oc3RydWN0IHBjaV9idXMgKmJ1cywgc3RydWN0IHJlc291cmNlICpyZXMsCiAJCXZv aWQgKmFsaWduZl9kYXRhLAogCQlzdHJ1Y3QgcGNpX2J1c19yZWdpb24gKnJlZ2lvbikKIHsKLQlp bnQgaSwgcmV0OwogCXN0cnVjdCByZXNvdXJjZSAqciwgYXZhaWw7CiAJcmVzb3VyY2Vfc2l6ZV90 IG1heDsKKwlpbnQgcmV0OwogCiAJdHlwZV9tYXNrIHw9IElPUkVTT1VSQ0VfVFlQRV9CSVRTOwog Ci0JcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShidXMsIHIsIGkpIHsKKwlwY2lfYnVzX2Zvcl9l YWNoX3Jlc291cmNlX3AoYnVzLCByKSB7CiAJCXJlc291cmNlX3NpemVfdCBtaW5fdXNlZCA9IG1p bjsKIAogCQlpZiAoIXIpCkBAIC0yODksOSArMjg5LDggQEAgYm9vbCBwY2lfYnVzX2NsaXBfcmVz b3VyY2Uoc3RydWN0IHBjaV9kZXYgKmRldiwgaW50IGlkeCkKIAlzdHJ1Y3QgcmVzb3VyY2UgKnJl cyA9ICZkZXYtPnJlc291cmNlW2lkeF07CiAJc3RydWN0IHJlc291cmNlIG9yaWdfcmVzID0gKnJl czsKIAlzdHJ1Y3QgcmVzb3VyY2UgKnI7Ci0JaW50IGk7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jl c291cmNlKGJ1cywgciwgaSkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHIp IHsKIAkJcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0LCBlbmQ7CiAKIAkJaWYgKCFyKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9wY2kvaG90cGx1Zy9zaHBjaHBfc3lzZnMuYyBiL2RyaXZlcnMvcGNpL2hvdHBs dWcvc2hwY2hwX3N5c2ZzLmMKaW5kZXggNjRiZWVkN2EyNmJlLi5mZjA0ZjBjNWU3YzMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvcGNpL2hvdHBsdWcvc2hwY2hwX3N5c2ZzLmMKKysrIGIvZHJpdmVycy9w Y2kvaG90cGx1Zy9zaHBjaHBfc3lzZnMuYwpAQCAtMjQsMTYgKzI0LDE2IEBACiBzdGF0aWMgc3Np emVfdCBzaG93X2N0cmwoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0 ZSAqYXR0ciwgY2hhciAqYnVmKQogewogCXN0cnVjdCBwY2lfZGV2ICpwZGV2OwotCWludCBpbmRl eCwgYnVzbnI7CiAJc3RydWN0IHJlc291cmNlICpyZXM7CiAJc3RydWN0IHBjaV9idXMgKmJ1czsK IAlzaXplX3QgbGVuID0gMDsKKwlpbnQgYnVzbnI7CiAKIAlwZGV2ID0gdG9fcGNpX2RldihkZXYp OwogCWJ1cyA9IHBkZXYtPnN1Ym9yZGluYXRlOwogCiAJbGVuICs9IHN5c2ZzX2VtaXRfYXQoYnVm LCBsZW4sICJGcmVlIHJlc291cmNlczogbWVtb3J5XG4iKTsKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jl c291cmNlKGJ1cywgcmVzLCBpbmRleCkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChi dXMsIHJlcykgewogCQlpZiAocmVzICYmIChyZXMtPmZsYWdzICYgSU9SRVNPVVJDRV9NRU0pICYm CiAJCQkJIShyZXMtPmZsYWdzICYgSU9SRVNPVVJDRV9QUkVGRVRDSCkpIHsKIAkJCWxlbiArPSBz eXNmc19lbWl0X2F0KGJ1ZiwgbGVuLApAQCAtNDMsNyArNDMsNyBAQCBzdGF0aWMgc3NpemVfdCBz aG93X2N0cmwoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0 ciwgY2hhcgogCQl9CiAJfQogCWxlbiArPSBzeXNmc19lbWl0X2F0KGJ1ZiwgbGVuLCAiRnJlZSBy ZXNvdXJjZXM6IHByZWZldGNoYWJsZSBtZW1vcnlcbiIpOwotCXBjaV9idXNfZm9yX2VhY2hfcmVz b3VyY2UoYnVzLCByZXMsIGluZGV4KSB7CisJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGJ1 cywgcmVzKSB7CiAJCWlmIChyZXMgJiYgKHJlcy0+ZmxhZ3MgJiBJT1JFU09VUkNFX01FTSkgJiYK IAkJCSAgICAgICAocmVzLT5mbGFncyAmIElPUkVTT1VSQ0VfUFJFRkVUQ0gpKSB7CiAJCQlsZW4g Kz0gc3lzZnNfZW1pdF9hdChidWYsIGxlbiwKQEAgLTUzLDcgKzUzLDcgQEAgc3RhdGljIHNzaXpl X3Qgc2hvd19jdHJsKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUg KmF0dHIsIGNoYXIKIAkJfQogCX0KIAlsZW4gKz0gc3lzZnNfZW1pdF9hdChidWYsIGxlbiwgIkZy ZWUgcmVzb3VyY2VzOiBJT1xuIik7Ci0JcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShidXMsIHJl cywgaW5kZXgpIHsKKwlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlX3AoYnVzLCByZXMpIHsKIAkJ aWYgKHJlcyAmJiAocmVzLT5mbGFncyAmIElPUkVTT1VSQ0VfSU8pKSB7CiAJCQlsZW4gKz0gc3lz ZnNfZW1pdF9hdChidWYsIGxlbiwKIAkJCQkJICAgICAic3RhcnQgPSAlOC44bGx4LCBsZW5ndGgg PSAlOC44bGx4XG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcGNpLmMgYi9kcml2ZXJzL3Bj aS9wY2kuYwppbmRleCA3YTY3NjExZGM1ZjQuLjJmODkxNWFiNDFlZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9wY2kvcGNpLmMKKysrIGIvZHJpdmVycy9wY2kvcGNpLmMKQEAgLTc3OSw5ICs3NzksOCBA QCBzdHJ1Y3QgcmVzb3VyY2UgKnBjaV9maW5kX3BhcmVudF9yZXNvdXJjZShjb25zdCBzdHJ1Y3Qg cGNpX2RldiAqZGV2LAogewogCWNvbnN0IHN0cnVjdCBwY2lfYnVzICpidXMgPSBkZXYtPmJ1czsK IAlzdHJ1Y3QgcmVzb3VyY2UgKnI7Ci0JaW50IGk7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291 cmNlKGJ1cywgciwgaSkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHIpIHsK IAkJaWYgKCFyKQogCQkJY29udGludWU7CiAJCWlmIChyZXNvdXJjZV9jb250YWlucyhyLCByZXMp KSB7CkBAIC03OTksNyArNzk4LDcgQEAgc3RydWN0IHJlc291cmNlICpwY2lfZmluZF9wYXJlbnRf cmVzb3VyY2UoY29uc3Qgc3RydWN0IHBjaV9kZXYgKmRldiwKIAkJCSAqIGJlIGJvdGggYSBwb3Np dGl2ZWx5LWRlY29kZWQgYXBlcnR1cmUgYW5kIGEKIAkJCSAqIHN1YnRyYWN0aXZlbHktZGVjb2Rl ZCByZWdpb24gdGhhdCBjb250YWluIHRoZSBCQVIuCiAJCQkgKiBXZSB3YW50IHRoZSBwb3NpdGl2 ZWx5LWRlY29kZWQgb25lLCBzbyB0aGlzIGRlcGVuZHMKLQkJCSAqIG9uIHBjaV9idXNfZm9yX2Vh Y2hfcmVzb3VyY2UoKSBnaXZpbmcgdXMgdGhvc2UKKwkJCSAqIG9uIHBjaV9idXNfZm9yX2VhY2hf cmVzb3VyY2VfcCgpIGdpdmluZyB1cyB0aG9zZQogCQkJICogZmlyc3QuCiAJCQkgKi8KIAkJCXJl dHVybiByOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcHJvYmUuYyBiL2RyaXZlcnMvcGNpL3By b2JlLmMKaW5kZXggYTNmNjhiNmJhNmFjLi41YWRhNGMxNTVkM2MgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvcGNpL3Byb2JlLmMKKysrIGIvZHJpdmVycy9wY2kvcHJvYmUuYwpAQCAtNTMzLDcgKzUzMyw3 IEBAIHZvaWQgcGNpX3JlYWRfYnJpZGdlX2Jhc2VzKHN0cnVjdCBwY2lfYnVzICpjaGlsZCkKIAlw Y2lfcmVhZF9icmlkZ2VfbW1pb19wcmVmKGNoaWxkKTsKIAogCWlmIChkZXYtPnRyYW5zcGFyZW50 KSB7Ci0JCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2UoY2hpbGQtPnBhcmVudCwgcmVzLCBpKSB7 CisJCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChjaGlsZC0+cGFyZW50LCByZXMpIHsKIAkJ CWlmIChyZXMgJiYgcmVzLT5mbGFncykgewogCQkJCXBjaV9idXNfYWRkX3Jlc291cmNlKGNoaWxk LCByZXMsCiAJCQkJCQkgICAgIFBDSV9TVUJUUkFDVElWRV9ERUNPREUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMgYi9kcml2ZXJzL3BjaS9zZXR1cC1idXMuYwppbmRleCBk NGZjNzY2NWY3MGEuLmQ2ZWFkMDI3MjU1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvc2V0dXAt YnVzLmMKKysrIGIvZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMKQEAgLTc3MCw5ICs3NzAsOCBAQCBz dGF0aWMgc3RydWN0IHJlc291cmNlICpmaW5kX2J1c19yZXNvdXJjZV9vZl90eXBlKHN0cnVjdCBw Y2lfYnVzICpidXMsCiAJCQkJCQkgIHVuc2lnbmVkIGxvbmcgdHlwZSkKIHsKIAlzdHJ1Y3QgcmVz b3VyY2UgKnIsICpyX2Fzc2lnbmVkID0gTlVMTDsKLQlpbnQgaTsKIAotCXBjaV9idXNfZm9yX2Vh Y2hfcmVzb3VyY2UoYnVzLCByLCBpKSB7CisJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGJ1 cywgcikgewogCQlpZiAociA9PSAmaW9wb3J0X3Jlc291cmNlIHx8IHIgPT0gJmlvbWVtX3Jlc291 cmNlKQogCQkJY29udGludWU7CiAJCWlmIChyICYmIChyLT5mbGFncyAmIHR5cGVfbWFzaykgPT0g dHlwZSAmJiAhci0+cGFyZW50KQpAQCAtMTIwNCw3ICsxMjAzLDcgQEAgdm9pZCBfX3BjaV9idXNf c2l6ZV9icmlkZ2VzKHN0cnVjdCBwY2lfYnVzICpidXMsIHN0cnVjdCBsaXN0X2hlYWQgKnJlYWxs b2NfaGVhZCkKIAkJCWFkZGl0aW9uYWxfbW1pb19wcmVmX3NpemUgPSAwOwogCXN0cnVjdCByZXNv dXJjZSAqcHJlZjsKIAlzdHJ1Y3QgcGNpX2hvc3RfYnJpZGdlICpob3N0OwotCWludCBoZHJfdHlw ZSwgaSwgcmV0OworCWludCBoZHJfdHlwZSwgcmV0OwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShk ZXYsICZidXMtPmRldmljZXMsIGJ1c19saXN0KSB7CiAJCXN0cnVjdCBwY2lfYnVzICpiID0gZGV2 LT5zdWJvcmRpbmF0ZTsKQEAgLTEyMjgsNyArMTIyNyw3IEBAIHZvaWQgX19wY2lfYnVzX3NpemVf YnJpZGdlcyhzdHJ1Y3QgcGNpX2J1cyAqYnVzLCBzdHJ1Y3QgbGlzdF9oZWFkICpyZWFsbG9jX2hl YWQpCiAJCWhvc3QgPSB0b19wY2lfaG9zdF9icmlkZ2UoYnVzLT5icmlkZ2UpOwogCQlpZiAoIWhv c3QtPnNpemVfd2luZG93cykKIAkJCXJldHVybjsKLQkJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJj ZShidXMsIHByZWYsIGkpCisJCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHByZWYp CiAJCQlpZiAocHJlZiAmJiAocHJlZi0+ZmxhZ3MgJiBJT1JFU09VUkNFX1BSRUZFVENIKSkKIAkJ CQlicmVhazsKIAkJaGRyX3R5cGUgPSAtMTsJLyogSW50ZW50aW9uYWxseSBpbnZhbGlkIC0gbm90 IGEgUENJIGRldmljZS4gKi8KQEAgLTEzMzMsMTIgKzEzMzIsMTEgQEAgRVhQT1JUX1NZTUJPTChw Y2lfYnVzX3NpemVfYnJpZGdlcyk7CiAKIHN0YXRpYyB2b2lkIGFzc2lnbl9maXhlZF9yZXNvdXJj ZV9vbl9idXMoc3RydWN0IHBjaV9idXMgKmIsIHN0cnVjdCByZXNvdXJjZSAqcikKIHsKLQlpbnQg aTsKIAlzdHJ1Y3QgcmVzb3VyY2UgKnBhcmVudF9yOwogCXVuc2lnbmVkIGxvbmcgbWFzayA9IElP UkVTT1VSQ0VfSU8gfCBJT1JFU09VUkNFX01FTSB8CiAJCQkgICAgIElPUkVTT1VSQ0VfUFJFRkVU Q0g7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGIsIHBhcmVudF9yLCBpKSB7CisJcGNp X2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGIsIHBhcmVudF9yKSB7CiAJCWlmICghcGFyZW50X3Ip CiAJCQljb250aW51ZTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9wY2kuaCBiL2luY2x1 ZGUvbGludXgvcGNpLmgKaW5kZXggYTk3ZjAyNmFmYWVkLi5mMGJlOTYxZmNkN2UgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvbGludXgvcGNpLmgKKysrIGIvaW5jbHVkZS9saW51eC9wY2kuaApAQCAtMTQ0 NSwxMCArMTQ0NSwxNiBAQCBpbnQgZGV2bV9yZXF1ZXN0X3BjaV9idXNfcmVzb3VyY2VzKHN0cnVj dCBkZXZpY2UgKmRldiwKIC8qIFRlbXBvcmFyeSB1bnRpbCBuZXcgYW5kIHdvcmtpbmcgUENJIFNC UiBBUEkgaW4gcGxhY2UgKi8KIGludCBwY2lfYnJpZGdlX3NlY29uZGFyeV9idXNfcmVzZXQoc3Ry dWN0IHBjaV9kZXYgKmRldik7CiAKLSNkZWZpbmUgcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShi dXMsIHJlcywgaSkJCQkJXAotCWZvciAoaSA9IDA7CQkJCQkJCVwKLQkgICAgKHJlcyA9IHBjaV9i dXNfcmVzb3VyY2VfbihidXMsIGkpKSB8fCBpIDwgUENJX0JSSURHRV9SRVNPVVJDRV9OVU07IFwK LQkgICAgIGkrKykKKyNkZWZpbmUgX19wY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGJ1cywgcmVz LCBfX2ksIHZhcnR5cGUpCQkJXAorCWZvciAodmFydHlwZSBfX2kgPSAwOwkJCQkJCQlcCisJICAg ICByZXMgPSBwY2lfYnVzX3Jlc291cmNlX24oYnVzLCBfX2kpLCBfX2kgPCBQQ0lfQlJJREdFX1JF U09VUkNFX05VTTsJXAorCSAgICAgX19pKyspCisKKyNkZWZpbmUgcGNpX2J1c19mb3JfZWFjaF9y ZXNvdXJjZShidXMsIHJlcywgaSkJCQkJCVwKKwlfX3BjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2Uo YnVzLCByZXMsIGksICkKKworI2RlZmluZSBwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlX3AoYnVz LCByZXMpCQkJCQlcCisJX19wY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGJ1cywgcmVzLCBfX2ks IHVuc2lnbmVkIGludCkKIAogaW50IF9fbXVzdF9jaGVjayBwY2lfYnVzX2FsbG9jX3Jlc291cmNl KHN0cnVjdCBwY2lfYnVzICpidXMsCiAJCQlzdHJ1Y3QgcmVzb3VyY2UgKnJlcywgcmVzb3VyY2Vf c2l6ZV90IHNpemUsCi0tIAoyLjM5LjIKCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BC11C7618A for ; Mon, 20 Mar 2023 13:16:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231643AbjCTNQO (ORCPT ); Mon, 20 Mar 2023 09:16:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231596AbjCTNQN (ORCPT ); Mon, 20 Mar 2023 09:16:13 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FFC723840; Mon, 20 Mar 2023 06:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679318169; x=1710854169; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKBg2DWRtjN/3o0GQ+Gz1Jmqpx4HtRyfpegHo4oOuDE=; b=IevzGpzGRGvW6GHvpuGTsY/dEcTF4i+gKzGLKMxz9JkrMv4+oNpy0zO4 0WHVKpWOELHGsdINiwE7WeZkwW0EjFz+KVEiUNmME1rCsw3T0eSEf8hiX GeL0Se5Zj4g90Kqsi1TQbql+lA0XbQ8eUCuPGAc3qhkwcEzXy4uByNex5 qYRF93wmVEcKPRsI0AUd4fJWbCWmdtUdAkkefFAN4SZ/El/2Xxtl6di/y 500+a/Ci/ySo7dQawdXEZVO0IOmHRD3ki5ziCw1AOnbEOvpW0EcbliCNn mgV9jD1sqor+3xpU75mvuKGmSumoZofFYjxnOc3fDI+yGszd5WSy4N9QA A==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="341015291" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="341015291" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 06:16:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="824468996" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="824468996" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 20 Mar 2023 06:15:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0FA3050B; Mon, 20 Mar 2023 15:16:44 +0200 (EET) From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v6 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Mon, 20 Mar 2023 15:16:31 +0200 Message-Id: <20230320131633.61680-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> References: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Refactor pci_bus_for_each_resource() in the same way as it's done in pci_dev_for_each_resource() case. This will allow to hide iterator inside the loop, where it's not used otherwise. No functional changes intended. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczyński --- .clang-format | 1 + drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 5 ++--- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 14 ++++++++++---- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index 266abb843654..81c9f055086f 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_bus_for_each_resource_p' - 'pci_dev_for_each_resource' - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 549c4bd5caec..b0789d332d36 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -182,13 +182,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, void *alignf_data, struct pci_bus_region *region) { - int i, ret; struct resource *r, avail; resource_size_t max; + int ret; type_mask |= IORESOURCE_TYPE_BITS; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t min_used = min; if (!r) @@ -289,9 +289,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) struct resource *res = &dev->resource[idx]; struct resource orig_res = *res; struct resource *r; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t start, end; if (!r) diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c index 64beed7a26be..ff04f0c5e7c3 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c @@ -24,16 +24,16 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev; - int index, busnr; struct resource *res; struct pci_bus *bus; size_t len = 0; + int busnr; pdev = to_pci_dev(dev); bus = pdev->subordinate; len += sysfs_emit_at(buf, len, "Free resources: memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && !(res->flags & IORESOURCE_PREFETCH)) { len += sysfs_emit_at(buf, len, @@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len += sysfs_emit_at(buf, len, "Free resources: prefetchable memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PREFETCH)) { len += sysfs_emit_at(buf, len, @@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len += sysfs_emit_at(buf, len, "Free resources: IO\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_IO)) { len += sysfs_emit_at(buf, len, "start = %8.8llx, length = %8.8llx\n", diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a67611dc5f4..2f8915ab41ef 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, { const struct pci_bus *bus = dev->bus; struct resource *r; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (!r) continue; if (resource_contains(r, res)) { @@ -799,7 +798,7 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, * be both a positively-decoded aperture and a * subtractively-decoded region that contain the BAR. * We want the positively-decoded one, so this depends - * on pci_bus_for_each_resource() giving us those + * on pci_bus_for_each_resource_p() giving us those * first. */ return r; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a3f68b6ba6ac..5ada4c155d3c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child) pci_read_bridge_mmio_pref(child); if (dev->transparent) { - pci_bus_for_each_resource(child->parent, res, i) { + pci_bus_for_each_resource_p(child->parent, res) { if (res && res->flags) { pci_bus_add_resource(child, res, PCI_SUBTRACTIVE_DECODE); diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index d4fc7665f70a..d6ead027255f 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struct pci_bus *bus, unsigned long type) { struct resource *r, *r_assigned = NULL; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (r == &ioport_resource || r == &iomem_resource) continue; if (r && (r->flags & type_mask) == type && !r->parent) @@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) additional_mmio_pref_size = 0; struct resource *pref; struct pci_host_bridge *host; - int hdr_type, i, ret; + int hdr_type, ret; list_for_each_entry(dev, &bus->devices, bus_list) { struct pci_bus *b = dev->subordinate; @@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) host = to_pci_host_bridge(bus->bridge); if (!host->size_windows) return; - pci_bus_for_each_resource(bus, pref, i) + pci_bus_for_each_resource_p(bus, pref) if (pref && (pref->flags & IORESOURCE_PREFETCH)) break; hdr_type = -1; /* Intentionally invalid - not a PCI device. */ @@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges); static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r) { - int i; struct resource *parent_r; unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; - pci_bus_for_each_resource(b, parent_r, i) { + pci_bus_for_each_resource_p(b, parent_r) { if (!parent_r) continue; diff --git a/include/linux/pci.h b/include/linux/pci.h index a97f026afaed..f0be961fcd7e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1445,10 +1445,16 @@ int devm_request_pci_bus_resources(struct device *dev, /* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset(struct pci_dev *dev); -#define pci_bus_for_each_resource(bus, res, i) \ - for (i = 0; \ - (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ - i++) +#define __pci_bus_for_each_resource(bus, res, __i, vartype) \ + for (vartype __i = 0; \ + res = pci_bus_resource_n(bus, __i), __i < PCI_BRIDGE_RESOURCE_NUM; \ + __i++) + +#define pci_bus_for_each_resource(bus, res, i) \ + __pci_bus_for_each_resource(bus, res, i, ) + +#define pci_bus_for_each_resource_p(bus, res) \ + __pci_bus_for_each_resource(bus, res, __i, unsigned int) int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D8E9C7618A for ; Mon, 20 Mar 2023 13:17:10 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4PgFdJ4r6Nz3ch6 for ; Tue, 21 Mar 2023 00:17:08 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Uuyl5jz+; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=linux.intel.com (client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=andriy.shevchenko@linux.intel.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Uuyl5jz+; dkim-atps=neutral Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4PgFcD3G52z3cCc for ; Tue, 21 Mar 2023 00:16:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679318172; x=1710854172; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKBg2DWRtjN/3o0GQ+Gz1Jmqpx4HtRyfpegHo4oOuDE=; b=Uuyl5jz+MF+ts2snAKWXeseUieev2wwjV37cKGqwloBmdVd+hOxYlxrQ iKs2/oyTuz0mBs8Cm5clpQwQGuEvPEYsCvkjH2I97wU2KJgRd2eHUzY8+ rYhcRwpTe1MCGSGPZhRUJTyVJRAR+Sq7CZ6CivGvE6gDjlo/UllVlLNSD b/gTw58aIRa//2m4+783CbnjqtLYmiOjSSQZLXWbdCrhiWxuHrLuo13iG SyqlLuT+4uYRzb4cBZ3DcWQqrz4v1Yqf05vpRnWkr8BC8a0de3Ek/rX0I p8On5BeZYhLaUWrMb4vzlex3ZIwxX+kpAIifVwwLctH78o4woHTTH0wII w==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="341015306" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="341015306" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 06:16:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="824468996" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="824468996" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 20 Mar 2023 06:15:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0FA3050B; Mon, 20 Mar 2023 15:16:44 +0200 (EET) From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Subject: [PATCH v6 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Mon, 20 Mar 2023 15:16:31 +0200 Message-Id: <20230320131633.61680-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> References: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Thomas Bogendoerfer , Stefano Stabellini , Yoshinori Sato , Oleksandr Tyshchenko , Gregory Clement , Richard Henderson , Russell King , Nicholas Piggin , Bjorn Helgaas , Rich Felker , Ivan Kokshaysky , John Paul Adrian Glaubitz , Miguel Ojeda , Matt Turner , Anatolij Gustschin , "David S. Miller" , Sebastian Hesselbarth Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Refactor pci_bus_for_each_resource() in the same way as it's done in pci_dev_for_each_resource() case. This will allow to hide iterator inside the loop, where it's not used otherwise. No functional changes intended. Signed-off-by: Andy Shevchenko Reviewed-by: Krzysztof Wilczyński --- .clang-format | 1 + drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 5 ++--- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 14 ++++++++++---- 7 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index 266abb843654..81c9f055086f 100644 --- a/.clang-format +++ b/.clang-format @@ -520,6 +520,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_bus_for_each_resource_p' - 'pci_dev_for_each_resource' - 'pci_dev_for_each_resource_p' - 'pci_doe_for_each_off' diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 549c4bd5caec..b0789d332d36 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -182,13 +182,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res, void *alignf_data, struct pci_bus_region *region) { - int i, ret; struct resource *r, avail; resource_size_t max; + int ret; type_mask |= IORESOURCE_TYPE_BITS; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t min_used = min; if (!r) @@ -289,9 +289,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) struct resource *res = &dev->resource[idx]; struct resource orig_res = *res; struct resource *r; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { resource_size_t start, end; if (!r) diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c index 64beed7a26be..ff04f0c5e7c3 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c @@ -24,16 +24,16 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev; - int index, busnr; struct resource *res; struct pci_bus *bus; size_t len = 0; + int busnr; pdev = to_pci_dev(dev); bus = pdev->subordinate; len += sysfs_emit_at(buf, len, "Free resources: memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && !(res->flags & IORESOURCE_PREFETCH)) { len += sysfs_emit_at(buf, len, @@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len += sysfs_emit_at(buf, len, "Free resources: prefetchable memory\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PREFETCH)) { len += sysfs_emit_at(buf, len, @@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len += sysfs_emit_at(buf, len, "Free resources: IO\n"); - pci_bus_for_each_resource(bus, res, index) { + pci_bus_for_each_resource_p(bus, res) { if (res && (res->flags & IORESOURCE_IO)) { len += sysfs_emit_at(buf, len, "start = %8.8llx, length = %8.8llx\n", diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 7a67611dc5f4..2f8915ab41ef 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, { const struct pci_bus *bus = dev->bus; struct resource *r; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (!r) continue; if (resource_contains(r, res)) { @@ -799,7 +798,7 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, * be both a positively-decoded aperture and a * subtractively-decoded region that contain the BAR. * We want the positively-decoded one, so this depends - * on pci_bus_for_each_resource() giving us those + * on pci_bus_for_each_resource_p() giving us those * first. */ return r; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index a3f68b6ba6ac..5ada4c155d3c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child) pci_read_bridge_mmio_pref(child); if (dev->transparent) { - pci_bus_for_each_resource(child->parent, res, i) { + pci_bus_for_each_resource_p(child->parent, res) { if (res && res->flags) { pci_bus_add_resource(child, res, PCI_SUBTRACTIVE_DECODE); diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index d4fc7665f70a..d6ead027255f 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struct pci_bus *bus, unsigned long type) { struct resource *r, *r_assigned = NULL; - int i; - pci_bus_for_each_resource(bus, r, i) { + pci_bus_for_each_resource_p(bus, r) { if (r == &ioport_resource || r == &iomem_resource) continue; if (r && (r->flags & type_mask) == type && !r->parent) @@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) additional_mmio_pref_size = 0; struct resource *pref; struct pci_host_bridge *host; - int hdr_type, i, ret; + int hdr_type, ret; list_for_each_entry(dev, &bus->devices, bus_list) { struct pci_bus *b = dev->subordinate; @@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) host = to_pci_host_bridge(bus->bridge); if (!host->size_windows) return; - pci_bus_for_each_resource(bus, pref, i) + pci_bus_for_each_resource_p(bus, pref) if (pref && (pref->flags & IORESOURCE_PREFETCH)) break; hdr_type = -1; /* Intentionally invalid - not a PCI device. */ @@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges); static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r) { - int i; struct resource *parent_r; unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH; - pci_bus_for_each_resource(b, parent_r, i) { + pci_bus_for_each_resource_p(b, parent_r) { if (!parent_r) continue; diff --git a/include/linux/pci.h b/include/linux/pci.h index a97f026afaed..f0be961fcd7e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1445,10 +1445,16 @@ int devm_request_pci_bus_resources(struct device *dev, /* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset(struct pci_dev *dev); -#define pci_bus_for_each_resource(bus, res, i) \ - for (i = 0; \ - (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ - i++) +#define __pci_bus_for_each_resource(bus, res, __i, vartype) \ + for (vartype __i = 0; \ + res = pci_bus_resource_n(bus, __i), __i < PCI_BRIDGE_RESOURCE_NUM; \ + __i++) + +#define pci_bus_for_each_resource(bus, res, i) \ + __pci_bus_for_each_resource(bus, res, i, ) + +#define pci_bus_for_each_resource_p(bus, res) \ + __pci_bus_for_each_resource(bus, res, __i, unsigned int) int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size, -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37CA2C76195 for ; Mon, 20 Mar 2023 13:17:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8nmf7ZfYJWQdDYTKQhWQl3p4l6wdHdU6cOW1upsVO6g=; b=mYo4y3VZUItsQo nyKDDBfwPXYXf5+6kXm7Ozukkd72sr8evX47rNTXZkjylAc8EMrm0ywtdfB/JN3iSqh0qgyE9SKbH VTZ1kjnk6IC8w3tTgVKNMQizP+S+h3obshtIJQmZD4EWYXEYX0gI9tN1w4XZIolbNf940r4Bi90+1 EOfmS9k1wL5rZUk8eghxbz2P1eKHYusFs8w/9aKH5oagiMmywDrn8+fb8Ek22qHq/XjxQDncjSKzR S7wVWWfOrdV4YdxBZMiskwG2oRIrjgiS/I9sy5+JwvWDSRLczhDLzCgzdY7Z2qCsl6rcFxoIF/FQX fW8ymiLMPd2Pvm6M01hQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1peFN1-0094rB-0I; Mon, 20 Mar 2023 13:16:15 +0000 Received: from mga03.intel.com ([134.134.136.65]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1peFMx-0094pn-2N for linux-arm-kernel@lists.infradead.org; Mon, 20 Mar 2023 13:16:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679318171; x=1710854171; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pKBg2DWRtjN/3o0GQ+Gz1Jmqpx4HtRyfpegHo4oOuDE=; b=klH+DgYPQPZx2ycy+5yn2zuj8aR9pJKVoJ2yQjAZnahZzZo2FwZgHaBA ac/bnUS63+Trd+/e2Dx2YkZ4PqMi1XYhSPFxlHmQKoBZWSID+Vic+qjSM 2+DJtOrSA1ESRFmETE9zFMKs1QmYvI1/eKlyGA+om1tgwMEihuE0iw9L6 qk2nnUTI6KMvRmCrByKIBPKSB6L0DLRuNvxeUxJEWeAZ5LYv7dsNPTaRb 7ht6eMWEAY17oXtWU9v30QGuXfpW+9JaXxVwWHYJv5u3nPHLIuTkh7yf0 nGe1tlwFOUpssYysB0qQkaAYGCLe0ymE+x7/YI1r4j+9N7n8wvHuaT5uH g==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="341015298" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="341015298" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 06:16:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="824468996" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="824468996" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 20 Mar 2023 06:15:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0FA3050B; Mon, 20 Mar 2023 15:16:44 +0200 (EET) From: Andy Shevchenko To: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andy Shevchenko , Mika Westerberg , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Michael Ellerman , Randy Dunlap , Arnd Bergmann , Niklas Schnelle , Bjorn Helgaas , "Rafael J. Wysocki" , =?UTF-8?q?Pali=20Roh=C3=A1r?= , "Maciej W. Rozycki" , Juergen Gross , Dominik Brodowski , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, linux-acpi@vger.kernel.org Cc: Miguel Ojeda , Richard Henderson , Ivan Kokshaysky , Matt Turner , Russell King , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Bogendoerfer , Nicholas Piggin , Christophe Leroy , Anatolij Gustschin , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , "David S. Miller" , Bjorn Helgaas , Stefano Stabellini , Oleksandr Tyshchenko Subject: [PATCH v6 2/4] PCI: Split pci_bus_for_each_resource_p() out of pci_bus_for_each_resource() Date: Mon, 20 Mar 2023 15:16:31 +0200 Message-Id: <20230320131633.61680-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> References: <20230320131633.61680-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230320_061611_835659_BCA81237 X-CRM114-Status: GOOD ( 21.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org UmVmYWN0b3IgcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZSgpIGluIHRoZSBzYW1lIHdheSBhcyBp dCdzIGRvbmUgaW4KcGNpX2Rldl9mb3JfZWFjaF9yZXNvdXJjZSgpIGNhc2UuIFRoaXMgd2lsbCBh bGxvdyB0byBoaWRlIGl0ZXJhdG9yCmluc2lkZSB0aGUgbG9vcCwgd2hlcmUgaXQncyBub3QgdXNl ZCBvdGhlcndpc2UuCgpObyBmdW5jdGlvbmFsIGNoYW5nZXMgaW50ZW5kZWQuCgpTaWduZWQtb2Zm LWJ5OiBBbmR5IFNoZXZjaGVua28gPGFuZHJpeS5zaGV2Y2hlbmtvQGxpbnV4LmludGVsLmNvbT4K UmV2aWV3ZWQtYnk6IEtyenlzenRvZiBXaWxjennFhHNraSA8a3dAbGludXguY29tPgotLS0KIC5j bGFuZy1mb3JtYXQgICAgICAgICAgICAgICAgICAgICAgfCAgMSArCiBkcml2ZXJzL3BjaS9idXMu YyAgICAgICAgICAgICAgICAgIHwgIDcgKysrLS0tLQogZHJpdmVycy9wY2kvaG90cGx1Zy9zaHBj aHBfc3lzZnMuYyB8ICA4ICsrKystLS0tCiBkcml2ZXJzL3BjaS9wY2kuYyAgICAgICAgICAgICAg ICAgIHwgIDUgKystLS0KIGRyaXZlcnMvcGNpL3Byb2JlLmMgICAgICAgICAgICAgICAgfCAgMiAr LQogZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMgICAgICAgICAgICB8IDEwICsrKystLS0tLS0KIGlu Y2x1ZGUvbGludXgvcGNpLmggICAgICAgICAgICAgICAgfCAxNCArKysrKysrKysrLS0tLQogNyBm aWxlcyBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS8uY2xhbmctZm9ybWF0IGIvLmNsYW5nLWZvcm1hdAppbmRleCAyNjZhYmI4NDM2NTQuLjgx YzlmMDU1MDg2ZiAxMDA2NDQKLS0tIGEvLmNsYW5nLWZvcm1hdAorKysgYi8uY2xhbmctZm9ybWF0 CkBAIC01MjAsNiArNTIwLDcgQEAgRm9yRWFjaE1hY3JvczoKICAgLSAnb2ZfcHJvcGVydHlfZm9y X2VhY2hfc3RyaW5nJwogICAtICdvZl9wcm9wZXJ0eV9mb3JfZWFjaF91MzInCiAgIC0gJ3BjaV9i dXNfZm9yX2VhY2hfcmVzb3VyY2UnCisgIC0gJ3BjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcCcK ICAgLSAncGNpX2Rldl9mb3JfZWFjaF9yZXNvdXJjZScKICAgLSAncGNpX2Rldl9mb3JfZWFjaF9y ZXNvdXJjZV9wJwogICAtICdwY2lfZG9lX2Zvcl9lYWNoX29mZicKZGlmZiAtLWdpdCBhL2RyaXZl cnMvcGNpL2J1cy5jIGIvZHJpdmVycy9wY2kvYnVzLmMKaW5kZXggNTQ5YzRiZDVjYWVjLi5iMDc4 OWQzMzJkMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvcGNpL2J1cy5jCisrKyBiL2RyaXZlcnMvcGNp L2J1cy5jCkBAIC0xODIsMTMgKzE4MiwxMyBAQCBzdGF0aWMgaW50IHBjaV9idXNfYWxsb2NfZnJv bV9yZWdpb24oc3RydWN0IHBjaV9idXMgKmJ1cywgc3RydWN0IHJlc291cmNlICpyZXMsCiAJCXZv aWQgKmFsaWduZl9kYXRhLAogCQlzdHJ1Y3QgcGNpX2J1c19yZWdpb24gKnJlZ2lvbikKIHsKLQlp bnQgaSwgcmV0OwogCXN0cnVjdCByZXNvdXJjZSAqciwgYXZhaWw7CiAJcmVzb3VyY2Vfc2l6ZV90 IG1heDsKKwlpbnQgcmV0OwogCiAJdHlwZV9tYXNrIHw9IElPUkVTT1VSQ0VfVFlQRV9CSVRTOwog Ci0JcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShidXMsIHIsIGkpIHsKKwlwY2lfYnVzX2Zvcl9l YWNoX3Jlc291cmNlX3AoYnVzLCByKSB7CiAJCXJlc291cmNlX3NpemVfdCBtaW5fdXNlZCA9IG1p bjsKIAogCQlpZiAoIXIpCkBAIC0yODksOSArMjg5LDggQEAgYm9vbCBwY2lfYnVzX2NsaXBfcmVz b3VyY2Uoc3RydWN0IHBjaV9kZXYgKmRldiwgaW50IGlkeCkKIAlzdHJ1Y3QgcmVzb3VyY2UgKnJl cyA9ICZkZXYtPnJlc291cmNlW2lkeF07CiAJc3RydWN0IHJlc291cmNlIG9yaWdfcmVzID0gKnJl czsKIAlzdHJ1Y3QgcmVzb3VyY2UgKnI7Ci0JaW50IGk7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jl c291cmNlKGJ1cywgciwgaSkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHIp IHsKIAkJcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0LCBlbmQ7CiAKIAkJaWYgKCFyKQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9wY2kvaG90cGx1Zy9zaHBjaHBfc3lzZnMuYyBiL2RyaXZlcnMvcGNpL2hvdHBs dWcvc2hwY2hwX3N5c2ZzLmMKaW5kZXggNjRiZWVkN2EyNmJlLi5mZjA0ZjBjNWU3YzMgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvcGNpL2hvdHBsdWcvc2hwY2hwX3N5c2ZzLmMKKysrIGIvZHJpdmVycy9w Y2kvaG90cGx1Zy9zaHBjaHBfc3lzZnMuYwpAQCAtMjQsMTYgKzI0LDE2IEBACiBzdGF0aWMgc3Np emVfdCBzaG93X2N0cmwoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0 ZSAqYXR0ciwgY2hhciAqYnVmKQogewogCXN0cnVjdCBwY2lfZGV2ICpwZGV2OwotCWludCBpbmRl eCwgYnVzbnI7CiAJc3RydWN0IHJlc291cmNlICpyZXM7CiAJc3RydWN0IHBjaV9idXMgKmJ1czsK IAlzaXplX3QgbGVuID0gMDsKKwlpbnQgYnVzbnI7CiAKIAlwZGV2ID0gdG9fcGNpX2RldihkZXYp OwogCWJ1cyA9IHBkZXYtPnN1Ym9yZGluYXRlOwogCiAJbGVuICs9IHN5c2ZzX2VtaXRfYXQoYnVm LCBsZW4sICJGcmVlIHJlc291cmNlczogbWVtb3J5XG4iKTsKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jl c291cmNlKGJ1cywgcmVzLCBpbmRleCkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChi dXMsIHJlcykgewogCQlpZiAocmVzICYmIChyZXMtPmZsYWdzICYgSU9SRVNPVVJDRV9NRU0pICYm CiAJCQkJIShyZXMtPmZsYWdzICYgSU9SRVNPVVJDRV9QUkVGRVRDSCkpIHsKIAkJCWxlbiArPSBz eXNmc19lbWl0X2F0KGJ1ZiwgbGVuLApAQCAtNDMsNyArNDMsNyBAQCBzdGF0aWMgc3NpemVfdCBz aG93X2N0cmwoc3RydWN0IGRldmljZSAqZGV2LCBzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0 ciwgY2hhcgogCQl9CiAJfQogCWxlbiArPSBzeXNmc19lbWl0X2F0KGJ1ZiwgbGVuLCAiRnJlZSBy ZXNvdXJjZXM6IHByZWZldGNoYWJsZSBtZW1vcnlcbiIpOwotCXBjaV9idXNfZm9yX2VhY2hfcmVz b3VyY2UoYnVzLCByZXMsIGluZGV4KSB7CisJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGJ1 cywgcmVzKSB7CiAJCWlmIChyZXMgJiYgKHJlcy0+ZmxhZ3MgJiBJT1JFU09VUkNFX01FTSkgJiYK IAkJCSAgICAgICAocmVzLT5mbGFncyAmIElPUkVTT1VSQ0VfUFJFRkVUQ0gpKSB7CiAJCQlsZW4g Kz0gc3lzZnNfZW1pdF9hdChidWYsIGxlbiwKQEAgLTUzLDcgKzUzLDcgQEAgc3RhdGljIHNzaXpl X3Qgc2hvd19jdHJsKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZV9hdHRyaWJ1dGUg KmF0dHIsIGNoYXIKIAkJfQogCX0KIAlsZW4gKz0gc3lzZnNfZW1pdF9hdChidWYsIGxlbiwgIkZy ZWUgcmVzb3VyY2VzOiBJT1xuIik7Ci0JcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShidXMsIHJl cywgaW5kZXgpIHsKKwlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlX3AoYnVzLCByZXMpIHsKIAkJ aWYgKHJlcyAmJiAocmVzLT5mbGFncyAmIElPUkVTT1VSQ0VfSU8pKSB7CiAJCQlsZW4gKz0gc3lz ZnNfZW1pdF9hdChidWYsIGxlbiwKIAkJCQkJICAgICAic3RhcnQgPSAlOC44bGx4LCBsZW5ndGgg PSAlOC44bGx4XG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcGNpLmMgYi9kcml2ZXJzL3Bj aS9wY2kuYwppbmRleCA3YTY3NjExZGM1ZjQuLjJmODkxNWFiNDFlZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9wY2kvcGNpLmMKKysrIGIvZHJpdmVycy9wY2kvcGNpLmMKQEAgLTc3OSw5ICs3NzksOCBA QCBzdHJ1Y3QgcmVzb3VyY2UgKnBjaV9maW5kX3BhcmVudF9yZXNvdXJjZShjb25zdCBzdHJ1Y3Qg cGNpX2RldiAqZGV2LAogewogCWNvbnN0IHN0cnVjdCBwY2lfYnVzICpidXMgPSBkZXYtPmJ1czsK IAlzdHJ1Y3QgcmVzb3VyY2UgKnI7Ci0JaW50IGk7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291 cmNlKGJ1cywgciwgaSkgeworCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHIpIHsK IAkJaWYgKCFyKQogCQkJY29udGludWU7CiAJCWlmIChyZXNvdXJjZV9jb250YWlucyhyLCByZXMp KSB7CkBAIC03OTksNyArNzk4LDcgQEAgc3RydWN0IHJlc291cmNlICpwY2lfZmluZF9wYXJlbnRf cmVzb3VyY2UoY29uc3Qgc3RydWN0IHBjaV9kZXYgKmRldiwKIAkJCSAqIGJlIGJvdGggYSBwb3Np dGl2ZWx5LWRlY29kZWQgYXBlcnR1cmUgYW5kIGEKIAkJCSAqIHN1YnRyYWN0aXZlbHktZGVjb2Rl ZCByZWdpb24gdGhhdCBjb250YWluIHRoZSBCQVIuCiAJCQkgKiBXZSB3YW50IHRoZSBwb3NpdGl2 ZWx5LWRlY29kZWQgb25lLCBzbyB0aGlzIGRlcGVuZHMKLQkJCSAqIG9uIHBjaV9idXNfZm9yX2Vh Y2hfcmVzb3VyY2UoKSBnaXZpbmcgdXMgdGhvc2UKKwkJCSAqIG9uIHBjaV9idXNfZm9yX2VhY2hf cmVzb3VyY2VfcCgpIGdpdmluZyB1cyB0aG9zZQogCQkJICogZmlyc3QuCiAJCQkgKi8KIAkJCXJl dHVybiByOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wY2kvcHJvYmUuYyBiL2RyaXZlcnMvcGNpL3By b2JlLmMKaW5kZXggYTNmNjhiNmJhNmFjLi41YWRhNGMxNTVkM2MgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvcGNpL3Byb2JlLmMKKysrIGIvZHJpdmVycy9wY2kvcHJvYmUuYwpAQCAtNTMzLDcgKzUzMyw3 IEBAIHZvaWQgcGNpX3JlYWRfYnJpZGdlX2Jhc2VzKHN0cnVjdCBwY2lfYnVzICpjaGlsZCkKIAlw Y2lfcmVhZF9icmlkZ2VfbW1pb19wcmVmKGNoaWxkKTsKIAogCWlmIChkZXYtPnRyYW5zcGFyZW50 KSB7Ci0JCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2UoY2hpbGQtPnBhcmVudCwgcmVzLCBpKSB7 CisJCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChjaGlsZC0+cGFyZW50LCByZXMpIHsKIAkJ CWlmIChyZXMgJiYgcmVzLT5mbGFncykgewogCQkJCXBjaV9idXNfYWRkX3Jlc291cmNlKGNoaWxk LCByZXMsCiAJCQkJCQkgICAgIFBDSV9TVUJUUkFDVElWRV9ERUNPREUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMgYi9kcml2ZXJzL3BjaS9zZXR1cC1idXMuYwppbmRleCBk NGZjNzY2NWY3MGEuLmQ2ZWFkMDI3MjU1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wY2kvc2V0dXAt YnVzLmMKKysrIGIvZHJpdmVycy9wY2kvc2V0dXAtYnVzLmMKQEAgLTc3MCw5ICs3NzAsOCBAQCBz dGF0aWMgc3RydWN0IHJlc291cmNlICpmaW5kX2J1c19yZXNvdXJjZV9vZl90eXBlKHN0cnVjdCBw Y2lfYnVzICpidXMsCiAJCQkJCQkgIHVuc2lnbmVkIGxvbmcgdHlwZSkKIHsKIAlzdHJ1Y3QgcmVz b3VyY2UgKnIsICpyX2Fzc2lnbmVkID0gTlVMTDsKLQlpbnQgaTsKIAotCXBjaV9idXNfZm9yX2Vh Y2hfcmVzb3VyY2UoYnVzLCByLCBpKSB7CisJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGJ1 cywgcikgewogCQlpZiAociA9PSAmaW9wb3J0X3Jlc291cmNlIHx8IHIgPT0gJmlvbWVtX3Jlc291 cmNlKQogCQkJY29udGludWU7CiAJCWlmIChyICYmIChyLT5mbGFncyAmIHR5cGVfbWFzaykgPT0g dHlwZSAmJiAhci0+cGFyZW50KQpAQCAtMTIwNCw3ICsxMjAzLDcgQEAgdm9pZCBfX3BjaV9idXNf c2l6ZV9icmlkZ2VzKHN0cnVjdCBwY2lfYnVzICpidXMsIHN0cnVjdCBsaXN0X2hlYWQgKnJlYWxs b2NfaGVhZCkKIAkJCWFkZGl0aW9uYWxfbW1pb19wcmVmX3NpemUgPSAwOwogCXN0cnVjdCByZXNv dXJjZSAqcHJlZjsKIAlzdHJ1Y3QgcGNpX2hvc3RfYnJpZGdlICpob3N0OwotCWludCBoZHJfdHlw ZSwgaSwgcmV0OworCWludCBoZHJfdHlwZSwgcmV0OwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShk ZXYsICZidXMtPmRldmljZXMsIGJ1c19saXN0KSB7CiAJCXN0cnVjdCBwY2lfYnVzICpiID0gZGV2 LT5zdWJvcmRpbmF0ZTsKQEAgLTEyMjgsNyArMTIyNyw3IEBAIHZvaWQgX19wY2lfYnVzX3NpemVf YnJpZGdlcyhzdHJ1Y3QgcGNpX2J1cyAqYnVzLCBzdHJ1Y3QgbGlzdF9oZWFkICpyZWFsbG9jX2hl YWQpCiAJCWhvc3QgPSB0b19wY2lfaG9zdF9icmlkZ2UoYnVzLT5icmlkZ2UpOwogCQlpZiAoIWhv c3QtPnNpemVfd2luZG93cykKIAkJCXJldHVybjsKLQkJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJj ZShidXMsIHByZWYsIGkpCisJCXBjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2VfcChidXMsIHByZWYp CiAJCQlpZiAocHJlZiAmJiAocHJlZi0+ZmxhZ3MgJiBJT1JFU09VUkNFX1BSRUZFVENIKSkKIAkJ CQlicmVhazsKIAkJaGRyX3R5cGUgPSAtMTsJLyogSW50ZW50aW9uYWxseSBpbnZhbGlkIC0gbm90 IGEgUENJIGRldmljZS4gKi8KQEAgLTEzMzMsMTIgKzEzMzIsMTEgQEAgRVhQT1JUX1NZTUJPTChw Y2lfYnVzX3NpemVfYnJpZGdlcyk7CiAKIHN0YXRpYyB2b2lkIGFzc2lnbl9maXhlZF9yZXNvdXJj ZV9vbl9idXMoc3RydWN0IHBjaV9idXMgKmIsIHN0cnVjdCByZXNvdXJjZSAqcikKIHsKLQlpbnQg aTsKIAlzdHJ1Y3QgcmVzb3VyY2UgKnBhcmVudF9yOwogCXVuc2lnbmVkIGxvbmcgbWFzayA9IElP UkVTT1VSQ0VfSU8gfCBJT1JFU09VUkNFX01FTSB8CiAJCQkgICAgIElPUkVTT1VSQ0VfUFJFRkVU Q0g7CiAKLQlwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGIsIHBhcmVudF9yLCBpKSB7CisJcGNp X2J1c19mb3JfZWFjaF9yZXNvdXJjZV9wKGIsIHBhcmVudF9yKSB7CiAJCWlmICghcGFyZW50X3Ip CiAJCQljb250aW51ZTsKIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9wY2kuaCBiL2luY2x1 ZGUvbGludXgvcGNpLmgKaW5kZXggYTk3ZjAyNmFmYWVkLi5mMGJlOTYxZmNkN2UgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvbGludXgvcGNpLmgKKysrIGIvaW5jbHVkZS9saW51eC9wY2kuaApAQCAtMTQ0 NSwxMCArMTQ0NSwxNiBAQCBpbnQgZGV2bV9yZXF1ZXN0X3BjaV9idXNfcmVzb3VyY2VzKHN0cnVj dCBkZXZpY2UgKmRldiwKIC8qIFRlbXBvcmFyeSB1bnRpbCBuZXcgYW5kIHdvcmtpbmcgUENJIFNC UiBBUEkgaW4gcGxhY2UgKi8KIGludCBwY2lfYnJpZGdlX3NlY29uZGFyeV9idXNfcmVzZXQoc3Ry dWN0IHBjaV9kZXYgKmRldik7CiAKLSNkZWZpbmUgcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShi dXMsIHJlcywgaSkJCQkJXAotCWZvciAoaSA9IDA7CQkJCQkJCVwKLQkgICAgKHJlcyA9IHBjaV9i dXNfcmVzb3VyY2VfbihidXMsIGkpKSB8fCBpIDwgUENJX0JSSURHRV9SRVNPVVJDRV9OVU07IFwK LQkgICAgIGkrKykKKyNkZWZpbmUgX19wY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGJ1cywgcmVz LCBfX2ksIHZhcnR5cGUpCQkJXAorCWZvciAodmFydHlwZSBfX2kgPSAwOwkJCQkJCQlcCisJICAg ICByZXMgPSBwY2lfYnVzX3Jlc291cmNlX24oYnVzLCBfX2kpLCBfX2kgPCBQQ0lfQlJJREdFX1JF U09VUkNFX05VTTsJXAorCSAgICAgX19pKyspCisKKyNkZWZpbmUgcGNpX2J1c19mb3JfZWFjaF9y ZXNvdXJjZShidXMsIHJlcywgaSkJCQkJCVwKKwlfX3BjaV9idXNfZm9yX2VhY2hfcmVzb3VyY2Uo YnVzLCByZXMsIGksICkKKworI2RlZmluZSBwY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlX3AoYnVz LCByZXMpCQkJCQlcCisJX19wY2lfYnVzX2Zvcl9lYWNoX3Jlc291cmNlKGJ1cywgcmVzLCBfX2ks IHVuc2lnbmVkIGludCkKIAogaW50IF9fbXVzdF9jaGVjayBwY2lfYnVzX2FsbG9jX3Jlc291cmNl KHN0cnVjdCBwY2lfYnVzICpidXMsCiAJCQlzdHJ1Y3QgcmVzb3VyY2UgKnJlcywgcmVzb3VyY2Vf c2l6ZV90IHNpemUsCi0tIAoyLjM5LjIKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==