Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758302Ab3DAVJq (ORCPT ); Mon, 1 Apr 2013 17:09:46 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:48167 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757873Ab3DAVJo (ORCPT ); Mon, 1 Apr 2013 17:09:44 -0400 MIME-Version: 1.0 In-Reply-To: References: <1364444885-19751-1-git-send-email-yinghai@kernel.org> From: Bjorn Helgaas Date: Mon, 1 Apr 2013 15:09:23 -0600 Message-ID: Subject: Re: [PATCH 0/2] eisa: fix eisa with PCI To: Yinghai Lu Cc: Linus Torvalds , Andrew Morton , Matthew Whitehead , "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" Content-Type: multipart/mixed; boundary=e89a8fb200bc345f3804d9530a97 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 16977 Lines: 244 --e89a8fb200bc345f3804d9530a97 Content-Type: text/plain; charset=ISO-8859-1 On Fri, Mar 29, 2013 at 9:16 AM, Bjorn Helgaas wrote: > [+cc linux-pci] > > On Wed, Mar 27, 2013 at 10:28 PM, Yinghai Lu wrote: >> Looks like pci eisa bridge support is broken for a while. >> >> one is root io resource reference, and other one is pnp related. >> >> Please check if we can put them in v3.9. >> eisa, PCI: Fix bus res reference >> eisa, PCI: init eisa early before pnp step in > > Both of these patches are to drivers/eisa/pci_eisa.c. I don't see an > EISA-specific maintainer, and I caused at least one of these problems, > so I'll push these through my PCI tree unless somebody objects. Hi Matthew, Can you test either the attached patch (against v3.9-rc4) or the git tree at http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/log/?h=pci/yinghai-eisa and send me the complete dmesg log? If all goes well, I'll ask Linus to pull these before v3.9. Thanks! Bjorn --e89a8fb200bc345f3804d9530a97 Content-Type: application/octet-stream; name="eisa.patch" Content-Disposition: attachment; filename="eisa.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hf04r7vg0 Y29tbWl0IDJjZmRhNjM3ZTI5Y2U5ZTNkZjMxYjU5ZjY0NTE2YjJlNTcxY2M5ODUKQXV0aG9yOiBZ aW5naGFpIEx1IDx5aW5naGFpQGtlcm5lbC5vcmc+CkRhdGU6ICAgTW9uIEFwciAxIDExOjQ4OjU5 IDIwMTMgLTA2MDAKCiAgICBFSVNBL1BDSTogRml4IGJ1cyByZXMgcmVmZXJlbmNlCiAgICAKICAg IE1hdHRoZXcgZm91bmQgdGhhdCAzLjguMyBpcyBoYXZpbmcgcHJvYmxlbXMgd2l0aCBhbiBvbGQg KGFuY2llbnQpCiAgICBQQ0ktdG8tRUlTQSBicmlkZ2UsIHRoZSBJbnRlbCA4MjM3NS4gSXQgd29y a2VkIHdpdGggdGhlIDMuMiBrZXJuZWwuCiAgICBIZSBpZGVudGlmaWVkIHRoZSA4MjM3NSwgYnV0 IGRvZXNuJ3QgYXNzaWduIHRoZSBzdHJ1Y3QgcmVzb3VyY2UgKnJlcwogICAgcG9pbnRlciBpbnNp ZGUgdGhlIHN0cnVjdCBlaXNhX3Jvb3RfZGV2aWNlLCBhbmQgcGFuaWNzLgogICAgCiAgICBwY2lf ZWlzYV9pbml0KCkgd2FzIHVzaW5nIGJ1cy0+cmVzb3VyY2VbXSBkaXJlY3RseSBpbnN0ZWFkIG9m CiAgICBwY2lfYnVzX3Jlc291cmNlX24oKS4gIFRoZSBidXMtPnJlc291cmNlW10gYXJyYXkgaXMg YSBQQ0ktaW50ZXJuYWwKICAgIGltcGxlbWVudGF0aW9uIGRldGFpbCwgYW5kIGFmdGVyIGNvbW1p dCA0NWNhOWU5NyAoUENJOiBhZGQgaGVscGVycyBmb3IKICAgIGJ1aWxkaW5nIFBDSSBidXMgcmVz b3VyY2UgbGlzdHMpIGFuZCBjb21taXQgMGVmZDVhYWIgKFBDSTogYWRkIHN0cnVjdAogICAgcGNp X2hvc3RfYnJpZGdlX3dpbmRvdyB3aXRoIENQVS9idXMgYWRkcmVzcyBvZmZzZXQpLCBidXMtPnJl c291cmNlW10gaXMgbm90CiAgICB1c2VkIGZvciBQQ0kgcm9vdCBidXNlcyBhbnkgbW9yZS4KICAg IAogICAgVGhlIDgyMzc1IGlzIGEgc3VidHJhY3RpdmUtZGVjb2RlIFBDSSBkZXZpY2UsIHNvIGhh bmRsZSBpdCB0aGUgc2FtZQogICAgd2F5IHdlIGhhbmRsZSBQQ0ktUENJIGJyaWRnZXMgaW4gc3Vi dHJhY3RpdmUtZGVjb2RlIG1vZGUgaW4KICAgIHBjaV9yZWFkX2JyaWRnZV9iYXNlcygpLgogICAg CiAgICBbYmhlbGdhYXM6IGNoYW5nZWxvZ10KICAgIFJlcG9ydGVkLWJ5OiBNYXR0aGV3IFdoaXRl aGVhZCA8bXdoaXRlaGVAcmVkaGF0LmNvbT4KICAgIFRlc3RlZC1ieTogTWF0dGhldyBXaGl0ZWhl YWQgPG13aGl0ZWhlQHJlZGhhdC5jb20+CiAgICBTaWduZWQtb2ZmLWJ5OiBZaW5naGFpIEx1IDx5 aW5naGFpQGtlcm5lbC5vcmc+CiAgICBTaWduZWQtb2ZmLWJ5OiBCam9ybiBIZWxnYWFzIDxiaGVs Z2Fhc0Bnb29nbGUuY29tPgogICAgQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcJIyB2My4zKwoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWlzYS9wY2lfZWlzYS5jIGIvZHJpdmVycy9laXNhL3BjaV9l aXNhLmMKaW5kZXggY2RhZTIwNy4uZWY1YzNlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9laXNhL3Bj aV9laXNhLmMKKysrIGIvZHJpdmVycy9laXNhL3BjaV9laXNhLmMKQEAgLTIyLDcgKzIyLDggQEAg c3RhdGljIHN0cnVjdCBlaXNhX3Jvb3RfZGV2aWNlIHBjaV9laXNhX3Jvb3Q7CiBzdGF0aWMgaW50 IF9faW5pdCBwY2lfZWlzYV9pbml0KHN0cnVjdCBwY2lfZGV2ICpwZGV2LAogCQkJCWNvbnN0IHN0 cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiB7Ci0JaW50IHJjOworCWludCByYywgaTsKKwlzdHJ1 Y3QgcmVzb3VyY2UgKnJlcywgKmJ1c19yZXMgPSBOVUxMOwogCiAJaWYgKChyYyA9IHBjaV9lbmFi bGVfZGV2aWNlIChwZGV2KSkpIHsKIAkJcHJpbnRrIChLRVJOX0VSUiAicGNpX2Vpc2EgOiBDb3Vs ZCBub3QgZW5hYmxlIGRldmljZSAlc1xuIiwKQEAgLTMwLDkgKzMxLDMwIEBAIHN0YXRpYyBpbnQg X19pbml0IHBjaV9laXNhX2luaXQoc3RydWN0IHBjaV9kZXYgKnBkZXYsCiAJCXJldHVybiByYzsK IAl9CiAKKwkvKgorCSAqIFRoZSBJbnRlbCA4MjM3NSBQQ0ktRUlTQSBicmlkZ2UgaXMgYSBzdWJ0 cmFjdGl2ZS1kZWNvZGUgUENJCisJICogZGV2aWNlLCBzbyB0aGUgcmVzb3VyY2VzIGF2YWlsYWJs ZSBvbiBFSVNBIGFyZSB0aGUgc2FtZSBhcyB0aG9zZQorCSAqIGF2YWlsYWJsZSBvbiB0aGUgODIz NzUgYnVzLiAgVGhpcyB3b3JrcyB0aGUgc2FtZSBhcyBhIFBDSS1QQ0kKKwkgKiBicmlkZ2UgaW4g c3VidHJhY3RpdmUtZGVjb2RlIG1vZGUgKHNlZSBwY2lfcmVhZF9icmlkZ2VfYmFzZXMoKSkuCisJ ICogV2UgYXNzdW1lIG90aGVyIFBDSS1FSVNBIGJyaWRnZXMgYXJlIHNpbWlsYXIuCisJICoKKwkg KiBlaXNhX3Jvb3RfcmVnaXN0ZXIoKSBjYW4gb25seSBkZWFsIHdpdGggYSBzaW5nbGUgaW8gcG9y dCByZXNvdXJjZSwKKwkqICBzbyB3ZSB1c2UgdGhlIGZpcnN0IHZhbGlkIGlvIHBvcnQgcmVzb3Vy Y2UuCisJICovCisJcGNpX2J1c19mb3JfZWFjaF9yZXNvdXJjZShwZGV2LT5idXMsIHJlcywgaSkK KwkJaWYgKHJlcyAmJiAocmVzLT5mbGFncyAmIElPUkVTT1VSQ0VfSU8pKSB7CisJCQlidXNfcmVz ID0gcmVzOworCQkJYnJlYWs7CisJCX0KKworCWlmICghYnVzX3JlcykgeworCQlkZXZfZXJyKCZw ZGV2LT5kZXYsICJObyByZXNvdXJjZXMgYXZhaWxhYmxlXG4iKTsKKwkJcmV0dXJuIC0xOworCX0K KwogCXBjaV9laXNhX3Jvb3QuZGV2ICAgICAgICAgICAgICA9ICZwZGV2LT5kZXY7Ci0JcGNpX2Vp c2Ffcm9vdC5yZXMJICAgICAgID0gcGRldi0+YnVzLT5yZXNvdXJjZVswXTsKLQlwY2lfZWlzYV9y b290LmJ1c19iYXNlX2FkZHIgICAgPSBwZGV2LT5idXMtPnJlc291cmNlWzBdLT5zdGFydDsKKwlw Y2lfZWlzYV9yb290LnJlcwkgICAgICAgPSBidXNfcmVzOworCXBjaV9laXNhX3Jvb3QuYnVzX2Jh c2VfYWRkciAgICA9IGJ1c19yZXMtPnN0YXJ0OwogCXBjaV9laXNhX3Jvb3Quc2xvdHMJICAgICAg ID0gRUlTQV9NQVhfU0xPVFM7CiAJcGNpX2Vpc2Ffcm9vdC5kbWFfbWFzayAgICAgICAgID0gcGRl di0+ZG1hX21hc2s7CiAJZGV2X3NldF9kcnZkYXRhKHBjaV9laXNhX3Jvb3QuZGV2LCAmcGNpX2Vp c2Ffcm9vdCk7Cgpjb21taXQgYzVmYjMwMWFlODNiZWM2ODkyZTU0OTg0ZTZlYzc2NWM0N2RmOGUx MApBdXRob3I6IFlpbmdoYWkgTHUgPHlpbmdoYWlAa2VybmVsLm9yZz4KRGF0ZTogICBXZWQgTWFy IDI3IDIxOjI4OjA1IDIwMTMgLTA3MDAKCiAgICBFSVNBL1BDSTogSW5pdCBFSVNBIGVhcmx5LCBi ZWZvcmUgUE5QCiAgICAKICAgIE1hdHRoZXcgcmVwb3J0ZWQga2VybmVscyBmYWlsIHRoZSBwY2lf ZWlzYSBwcm9iZSBhbmQgYXJlIGxhdGVyIHN1Y2Nlc3NmdWwKICAgIHdpdGggdGhlIHZpcnR1YWxf ZWlzYV9yb290X2luaXQgZm9yY2UgcHJvYmUgd2l0aG91dCBzbG90MC4KICAgIAogICAgVGhlIHJl YXNvbiBmb3IgdGhhdCBpczogUE5QIHByb2JpbmcgaXMgYmVmb3JlIHBjaV9laXNhX2luaXQgZ2V0 cyBjYWxsZWQKICAgIGFzIHBjaV9laXNhX2luaXQgaXMgY2FsbGVkIHZpYSBwY2lfZHJpdmVyLgog ICAgCiAgICBwbnAgMDA6MGYgaGFzIDB4YzgwIC0gMHhjODQgcmVzZXJ2ZWQuCiAgICBbICAgIDku NzAwNDA5XSBwbnAgMDA6MGY6IFtpbyAgMHgwYzgwLTB4MGM4NF0KICAgIAogICAgc28gZWlzYV9w cm9iZSB3aWxsIGZhaWwgZnJvbSBwY2lfZWlzYV9pbml0CiAgICAJCQkJPT0+ZWlzYV9yb290X3Jl Z2lzdGVyCiAgICAJCQkJCT09PmVpc2FfcHJvYmUgcGF0aC4KICAgIGFzIGZvcmNlX3Byb2JlIGlz IG5vdCBzZXQgaW4gcGNpX2Vpc2Ffcm9vdCwgaXQgd2lsbCBiYWlsIGVhcmx5IHdoZW4KICAgIHNs b3QwIGlzIG5vdCBwcm9iZWQgYW5kIGluaXRpYWxpemVkLgogICAgCiAgICBUcnkgdG8gdXNlIHN1 YnN5c19pbml0Y2FsbF9zeW5jIGluc3RlYWQsIGFuZCB3aWxsIGtlZXAgZm9sbG93aW5nIHNlcXVl bmNlOgogICAgCXBjaV9zdWJzeXNfaW5pdAogICAgCXBjaV9laXNhX2luaXRfZWFybHkKICAgIAlw bnBhY3BpX2luaXQvaXNhcG5wX2luaXQKICAgIAogICAgQWZ0ZXIgdGhpcyBwYXRjaCBFSVNBIGNh biBiZSBpbml0aWFsaXplZCBwcm9wZXJseSwgYW5kIFBOUCBvdmVybGFwcGluZwogICAgcmVzb3Vy Y2Ugd2lsbCBub3QgYmUgcmVzZXJ2ZWQuCiAgICBbICAgMTAuMTA0NDM0XSBzeXN0ZW0gMDA6MGY6 IFtpbyAgMHgwYzgwLTB4MGM4NF0gY291bGQgbm90IGJlIHJlc2VydmVkCiAgICAKICAgIFJlcG9y dGVkLWJ5OiBNYXR0aGV3IFdoaXRlaGVhZCA8bXdoaXRlaGVAcmVkaGF0LmNvbT4KICAgIFRlc3Rl ZC1ieTogTWF0dGhldyBXaGl0ZWhlYWQgPG13aGl0ZWhlQHJlZGhhdC5jb20+CiAgICBTaWduZWQt b2ZmLWJ5OiBZaW5naGFpIEx1IDx5aW5naGFpQGtlcm5lbC5vcmc+CiAgICBTaWduZWQtb2ZmLWJ5 OiBCam9ybiBIZWxnYWFzIDxiaGVsZ2Fhc0Bnb29nbGUuY29tPgogICAgQ2M6IHN0YWJsZUB2Z2Vy Lmtlcm5lbC5vcmcKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Vpc2EvcGNpX2Vpc2EuYyBiL2RyaXZl cnMvZWlzYS9wY2lfZWlzYS5jCmluZGV4IGVmNWMzZWMuLjZjM2ZjYTkgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZWlzYS9wY2lfZWlzYS5jCisrKyBiL2RyaXZlcnMvZWlzYS9wY2lfZWlzYS5jCkBAIC0x OSw4ICsxOSw3IEBACiAvKiBUaGVyZSBpcyBvbmx5ICpvbmUqIHBjaV9laXNhIGRldmljZSBwZXIg bWFjaGluZSwgcmlnaHQgPyAqLwogc3RhdGljIHN0cnVjdCBlaXNhX3Jvb3RfZGV2aWNlIHBjaV9l aXNhX3Jvb3Q7CiAKLXN0YXRpYyBpbnQgX19pbml0IHBjaV9laXNhX2luaXQoc3RydWN0IHBjaV9k ZXYgKnBkZXYsCi0JCQkJY29uc3Qgc3RydWN0IHBjaV9kZXZpY2VfaWQgKmVudCkKK3N0YXRpYyBp bnQgX19pbml0IHBjaV9laXNhX2luaXQoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiB7CiAJaW50IHJj LCBpOwogCXN0cnVjdCByZXNvdXJjZSAqcmVzLCAqYnVzX3JlcyA9IE5VTEw7CkBAIC02NywyMiAr NjYsMjYgQEAgc3RhdGljIGludCBfX2luaXQgcGNpX2Vpc2FfaW5pdChzdHJ1Y3QgcGNpX2RldiAq cGRldiwKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHN0cnVjdCBwY2lfZGV2aWNlX2lkIHBjaV9l aXNhX3BjaV90YmxbXSA9IHsKLQl7IFBDSV9BTllfSUQsIFBDSV9BTllfSUQsIFBDSV9BTllfSUQs IFBDSV9BTllfSUQsCi0JICBQQ0lfQ0xBU1NfQlJJREdFX0VJU0EgPDwgOCwgMHhmZmZmMDAsIDAg fSwKLQl7IDAsIH0KLX07CisvKgorICogV2UgaGF2ZSB0byBjYWxsIHBjaV9laXNhX2luaXRfZWFy bHkoKSBiZWZvcmUgcG5wYWNwaV9pbml0KCkvaXNhcG5wX2luaXQoKS4KKyAqICAgT3RoZXJ3aXNl IHBucCByZXNvdXJjZSB3aWxsIGdldCBlbmFibGVkIGVhcmx5IGFuZCBjb3VsZCBwcmV2ZW50IGVp c2EKKyAqICAgdG8gYmUgaW5pdGlhbGl6ZWQuCisgKiBBbHNvIG5lZWQgdG8gbWFrZSBzdXJlIHBj aV9laXNhX2luaXRfZWFybHkoKSBpcyBjYWxsZWQgYWZ0ZXIKKyAqIHg4Ni9wY2lfc3Vic3lzX2lu aXQoKS4KKyAqIFNvIG5lZWQgdG8gdXNlIHN1YnN5c19pbml0Y2FsbF9zeW5jIHdpdGggaXQuCisg Ki8KK3N0YXRpYyBpbnQgX19pbml0IHBjaV9laXNhX2luaXRfZWFybHkodm9pZCkKK3sKKwlzdHJ1 Y3QgcGNpX2RldiAqZGV2ID0gTlVMTDsKKwlpbnQgcmV0OwogCi1zdGF0aWMgc3RydWN0IHBjaV9k cml2ZXIgX19yZWZkYXRhIHBjaV9laXNhX2RyaXZlciA9IHsKLQkubmFtZQkJPSAicGNpX2Vpc2Ei LAotCS5pZF90YWJsZQk9IHBjaV9laXNhX3BjaV90YmwsCi0JLnByb2JlCQk9IHBjaV9laXNhX2lu aXQsCi19OworCWZvcl9lYWNoX3BjaV9kZXYoZGV2KQorCQlpZiAoKGRldi0+Y2xhc3MgPj4gOCkg PT0gUENJX0NMQVNTX0JSSURHRV9FSVNBKSB7CisJCQlyZXQgPSBwY2lfZWlzYV9pbml0KGRldik7 CisJCQlpZiAocmV0KQorCQkJCXJldHVybiByZXQ7CisJCX0KIAotc3RhdGljIGludCBfX2luaXQg cGNpX2Vpc2FfaW5pdF9tb2R1bGUgKHZvaWQpCi17Ci0JcmV0dXJuIHBjaV9yZWdpc3Rlcl9kcml2 ZXIgKCZwY2lfZWlzYV9kcml2ZXIpOworCXJldHVybiAwOwogfQotCi1kZXZpY2VfaW5pdGNhbGwo cGNpX2Vpc2FfaW5pdF9tb2R1bGUpOwotTU9EVUxFX0RFVklDRV9UQUJMRShwY2ksIHBjaV9laXNh X3BjaV90YmwpOworc3Vic3lzX2luaXRjYWxsX3N5bmMocGNpX2Vpc2FfaW5pdF9lYXJseSk7Cgpj b21taXQgZDBlMzZkZjY5ODYzYmZhMDU0YTQ3MDM0MDZhNzM3YjA0NzZlNjhlOApBdXRob3I6IEJq b3JuIEhlbGdhYXMgPGJoZWxnYWFzQGdvb2dsZS5jb20+CkRhdGU6ICAgTW9uIEFwciAxIDE0OjE2 OjU2IDIwMTMgLTA2MDAKCiAgICBFSVNBOiBVc2UgZGV2X3ByaW50aygpIHdoZW4gcG9zc2libGUK ICAgIAogICAgVXNlIGRldl9wcmludGsoKSB3aGVuIHBvc3NpYmxlIHRvIG1ha2UgbWVzc2FnZXMg bW9yZSB1c2VmdWwuCiAgICAKICAgIFNpZ25lZC1vZmYtYnk6IEJqb3JuIEhlbGdhYXMgPGJoZWxn YWFzQGdvb2dsZS5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9laXNhL2Vpc2EtYnVzLmMgYi9k cml2ZXJzL2Vpc2EvZWlzYS1idXMuYwppbmRleCA4MDZjNzdiLi4wYjA2ZGY0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2Vpc2EvZWlzYS1idXMuYworKysgYi9kcml2ZXJzL2Vpc2EvZWlzYS1idXMuYwpA QCAtMzE0LDIyICszMTQsMjIgQEAgc3RhdGljIGludCBfX2luaXQgZWlzYV9wcm9iZShzdHJ1Y3Qg ZWlzYV9yb290X2RldmljZSAqcm9vdCkKIHsKICAgICAgICAgaW50IGksIGM7CiAJc3RydWN0IGVp c2FfZGV2aWNlICplZGV2OworCWNoYXIgKmVuYWJsZWRfc3RyOwogCi0JcHJpbnRrKEtFUk5fSU5G TyAiRUlTQTogUHJvYmluZyBidXMgJWQgYXQgJXNcbiIsCi0JICAgICAgIHJvb3QtPmJ1c19uciwg ZGV2X25hbWUocm9vdC0+ZGV2KSk7CisJZGV2X2luZm8ocm9vdC0+ZGV2LCAiUHJvYmluZyBFSVNB IGJ1cyAlZFxuIiwgcm9vdC0+YnVzX25yKTsKIAogCS8qIEZpcnN0IHRyeSB0byBnZXQgaG9sZCBv ZiBzbG90IDAuIElmIHRoZXJlIGlzIG5vIGRldmljZQogCSAqIGhlcmUsIHNpbXBseSBmYWlsLCB1 bmxlc3Mgcm9vdC0+Zm9yY2VfcHJvYmUgaXMgc2V0LiAqLwogCQogCWVkZXYgPSBremFsbG9jKHNp emVvZigqZWRldiksIEdGUF9LRVJORUwpOwogCWlmICghZWRldikgewotCQlwcmludGsoS0VSTl9F UlIgIkVJU0E6IENvdWxkbid0IGFsbG9jYXRlIG1haW5ib2FyZCBzbG90XG4iKTsKKwkJZGV2X2Vy cihyb290LT5kZXYsICJFSVNBOiBDb3VsZG4ndCBhbGxvY2F0ZSBtYWluYm9hcmQgc2xvdFxuIik7 CiAJCXJldHVybiAtRU5PTUVNOwogCX0KIAkJCiAJaWYgKGVpc2FfcmVxdWVzdF9yZXNvdXJjZXMo cm9vdCwgZWRldiwgMCkpIHsKLQkJcHJpbnRrKEtFUk5fV0FSTklORyBcCi0JCSAgICAgICAiRUlT QTogQ2Fubm90IGFsbG9jYXRlIHJlc291cmNlIGZvciBtYWluYm9hcmRcbiIpOworCQlkZXZfd2Fy bihyb290LT5kZXYsCisJCSAgICAgICAgICJFSVNBOiBDYW5ub3QgYWxsb2NhdGUgcmVzb3VyY2Ug Zm9yIG1haW5ib2FyZFxuIik7CiAJCWtmcmVlKGVkZXYpOwogCQlpZiAoIXJvb3QtPmZvcmNlX3By b2JlKQogCQkJcmV0dXJuIC1FQlVTWTsKQEAgLTM0NCwxMSArMzQ0LDExIEBAIHN0YXRpYyBpbnQg X19pbml0IGVpc2FfcHJvYmUoc3RydWN0IGVpc2Ffcm9vdF9kZXZpY2UgKnJvb3QpCiAJCWdvdG8g Zm9yY2VfcHJvYmU7CiAJfQogCi0JcHJpbnRrKEtFUk5fSU5GTyAiRUlTQTogTWFpbmJvYXJkICVz IGRldGVjdGVkLlxuIiwgZWRldi0+aWQuc2lnKTsKKwlkZXZfaW5mbygmZWRldi0+ZGV2LCAiRUlT QTogTWFpbmJvYXJkICVzIGRldGVjdGVkXG4iLCBlZGV2LT5pZC5zaWcpOwogCiAJaWYgKGVpc2Ff cmVnaXN0ZXJfZGV2aWNlKGVkZXYpKSB7Ci0JCXByaW50ayhLRVJOX0VSUiAiRUlTQTogRmFpbGVk IHRvIHJlZ2lzdGVyICVzXG4iLAotCQkgICAgICAgZWRldi0+aWQuc2lnKTsKKwkJZGV2X2Vycigm ZWRldi0+ZGV2LCAiRUlTQTogRmFpbGVkIHRvIHJlZ2lzdGVyICVzXG4iLAorCQkgICAgICAgIGVk ZXYtPmlkLnNpZyk7CiAJCWVpc2FfcmVsZWFzZV9yZXNvdXJjZXMoZWRldik7CiAJCWtmcmVlKGVk ZXYpOwogCX0KQEAgLTM1OCwxNCArMzU4LDE1IEBAIHN0YXRpYyBpbnQgX19pbml0IGVpc2FfcHJv YmUoc3RydWN0IGVpc2Ffcm9vdF9kZXZpY2UgKnJvb3QpCiAgICAgICAgIGZvciAoYyA9IDAsIGkg PSAxOyBpIDw9IHJvb3QtPnNsb3RzOyBpKyspIHsKIAkJZWRldiA9IGt6YWxsb2Moc2l6ZW9mKCpl ZGV2KSwgR0ZQX0tFUk5FTCk7CiAJCWlmICghZWRldikgewotCQkJcHJpbnRrKEtFUk5fRVJSICJF SVNBOiBPdXQgb2YgbWVtb3J5IGZvciBzbG90ICVkXG4iLCBpKTsKKwkJCWRldl9lcnIocm9vdC0+ ZGV2LCAiRUlTQTogT3V0IG9mIG1lbW9yeSBmb3Igc2xvdCAlZFxuIiwKKwkJCQlpKTsKIAkJCWNv bnRpbnVlOwogCQl9CiAKIAkJaWYgKGVpc2FfcmVxdWVzdF9yZXNvdXJjZXMocm9vdCwgZWRldiwg aSkpIHsKLQkJCXByaW50ayhLRVJOX1dBUk5JTkcgXAotCQkJICAgICAgICJDYW5ub3QgYWxsb2Nh dGUgcmVzb3VyY2UgZm9yIEVJU0Egc2xvdCAlZFxuIiwKLQkJCSAgICAgICBpKTsKKwkJCWRldl93 YXJuKHJvb3QtPmRldiwKKwkJCSAgICAgICAgICJDYW5ub3QgYWxsb2NhdGUgcmVzb3VyY2UgZm9y IEVJU0Egc2xvdCAlZFxuIiwKKwkJCSAgICAgICAgIGkpOwogCQkJa2ZyZWUoZWRldik7CiAJCQlj b250aW51ZTsKIAkJfQpAQCAtMzc1LDM4ICszNzYsMzAgQEAgc3RhdGljIGludCBfX2luaXQgZWlz YV9wcm9iZShzdHJ1Y3QgZWlzYV9yb290X2RldmljZSAqcm9vdCkKIAkJCWtmcmVlKGVkZXYpOwog CQkJY29udGludWU7CiAJCX0KLQkJCi0JCXByaW50ayhLRVJOX0lORk8gIkVJU0E6IHNsb3QgJWQg OiAlcyBkZXRlY3RlZCIsCi0JCSAgICAgICBpLCBlZGV2LT5pZC5zaWcpOwotCQkJCi0JCXN3aXRj aCAoZWRldi0+c3RhdGUpIHsKLQkJY2FzZSBFSVNBX0NPTkZJR19FTkFCTEVEIHwgRUlTQV9DT05G SUdfRk9SQ0VEOgotCQkJcHJpbnRrKCIgKGZvcmNlZCBlbmFibGVkKSIpOwotCQkJYnJlYWs7Ci0K LQkJY2FzZSBFSVNBX0NPTkZJR19GT1JDRUQ6Ci0JCQlwcmludGsoIiAoZm9yY2VkIGRpc2FibGVk KSIpOwotCQkJYnJlYWs7Ci0KLQkJY2FzZSAwOgotCQkJcHJpbnRrKCIgKGRpc2FibGVkKSIpOwot CQkJYnJlYWs7Ci0JCX0KLQkJCQotCQlwcmludGsgKCIuXG4iKTsKKworCQlpZiAoZWRldi0+c3Rh dGUgPT0gKEVJU0FfQ09ORklHX0VOQUJMRUQgfCBFSVNBX0NPTkZJR19GT1JDRUQpKQorCQkJZW5h YmxlZF9zdHIgPSAiIChmb3JjZWQgZW5hYmxlZCkiOworCQllbHNlIGlmIChlZGV2LT5zdGF0ZSA9 PSBFSVNBX0NPTkZJR19GT1JDRUQpCisJCQllbmFibGVkX3N0ciA9ICIgKGZvcmNlZCBkaXNhYmxl ZCkiOworCQllbHNlIGlmIChlZGV2LT5zdGF0ZSA9PSAwKQorCQkJZW5hYmxlZF9zdHIgPSAiIChk aXNhYmxlZCkiOworCQllbHNlCisJCQllbmFibGVkX3N0ciA9ICIiOworCisJCWRldl9pbmZvKCZl ZGV2LT5kZXYsICJFSVNBOiBzbG90ICVkOiAlcyBkZXRlY3RlZCVzXG4iLCBpLAorCQkJIGVkZXYt PmlkLnNpZywgZW5hYmxlZF9zdHIpOwogCiAJCWMrKzsKIAogCQlpZiAoZWlzYV9yZWdpc3Rlcl9k ZXZpY2UoZWRldikpIHsKLQkJCXByaW50ayhLRVJOX0VSUiAiRUlTQTogRmFpbGVkIHRvIHJlZ2lz dGVyICVzXG4iLAotCQkJICAgICAgIGVkZXYtPmlkLnNpZyk7CisJCQlkZXZfZXJyKCZlZGV2LT5k ZXYsICJFSVNBOiBGYWlsZWQgdG8gcmVnaXN0ZXIgJXNcbiIsCisJCQkgICAgICAgIGVkZXYtPmlk LnNpZyk7CiAJCQllaXNhX3JlbGVhc2VfcmVzb3VyY2VzKGVkZXYpOwogCQkJa2ZyZWUoZWRldik7 CiAJCX0KICAgICAgICAgfQogCi0JcHJpbnRrKEtFUk5fSU5GTyAiRUlTQTogRGV0ZWN0ZWQgJWQg Y2FyZCVzLlxuIiwgYywgYyA9PSAxID8gIiIgOiAicyIpOwotCisJZGV2X2luZm8ocm9vdC0+ZGV2 LCAiRUlTQTogRGV0ZWN0ZWQgJWQgY2FyZCVzXG4iLCBjLCBjID09IDEgPyAiIiA6ICJzIik7CiAJ cmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWlzYS9wY2lfZWlzYS5jIGIvZHJp dmVycy9laXNhL3BjaV9laXNhLmMKaW5kZXggNmMzZmNhOS4uYTMzM2JmMyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9laXNhL3BjaV9laXNhLmMKKysrIGIvZHJpdmVycy9laXNhL3BjaV9laXNhLmMKQEAg LTI1LDggKzI1LDcgQEAgc3RhdGljIGludCBfX2luaXQgcGNpX2Vpc2FfaW5pdChzdHJ1Y3QgcGNp X2RldiAqcGRldikKIAlzdHJ1Y3QgcmVzb3VyY2UgKnJlcywgKmJ1c19yZXMgPSBOVUxMOwogCiAJ aWYgKChyYyA9IHBjaV9lbmFibGVfZGV2aWNlIChwZGV2KSkpIHsKLQkJcHJpbnRrIChLRVJOX0VS UiAicGNpX2Vpc2EgOiBDb3VsZCBub3QgZW5hYmxlIGRldmljZSAlc1xuIiwKLQkJCXBjaV9uYW1l KHBkZXYpKTsKKwkJZGV2X2VycigmcGRldi0+ZGV2LCAiQ291bGQgbm90IGVuYWJsZSBkZXZpY2Vc biIpOwogCQlyZXR1cm4gcmM7CiAJfQogCkBAIC01OSw3ICs1OCw3IEBAIHN0YXRpYyBpbnQgX19p bml0IHBjaV9laXNhX2luaXQoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJZGV2X3NldF9kcnZkYXRh KHBjaV9laXNhX3Jvb3QuZGV2LCAmcGNpX2Vpc2Ffcm9vdCk7CiAKIAlpZiAoZWlzYV9yb290X3Jl Z2lzdGVyICgmcGNpX2Vpc2Ffcm9vdCkpIHsKLQkJcHJpbnRrIChLRVJOX0VSUiAicGNpX2Vpc2Eg OiBDb3VsZCBub3QgcmVnaXN0ZXIgRUlTQSByb290XG4iKTsKKwkJZGV2X2VycigmcGRldi0+ZGV2 LCAiQ291bGQgbm90IHJlZ2lzdGVyIEVJU0Egcm9vdFxuIik7CiAJCXJldHVybiAtMTsKIAl9CiAK CmNvbW1pdCAzYTk0ZWRiN2JhNTlkM2NhMzBhM2E1NGQ4ZGU2MjhmMWNjZjAwNGU0CkF1dGhvcjog Qmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNAZ29vZ2xlLmNvbT4KRGF0ZTogICBNb24gQXByIDEgMTQ6 NDA6MDUgMjAxMyAtMDYwMAoKICAgIEVJU0E6IExvZyBkZXZpY2UgcmVzb3VyY2VzIGluIGRtZXNn CiAgICAKICAgIE5vdGUgdGhlIHJlc291cmNlcyBjb25zdW1lZCBieSBFSVNBIGRldmljZXMgaW4g ZG1lc2csIHNpbWlsYXIgdG8gd2hhdAogICAgd2UgYWxyZWFkeSBkbyBmb3IgUENJIGFuZCBQTlAg ZGV2aWNlcy4KICAgIAogICAgU2lnbmVkLW9mZi1ieTogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNA Z29vZ2xlLmNvbT4KCmRpZmYgLS1naXQgYS9kcml2ZXJzL2Vpc2EvZWlzYS1idXMuYyBiL2RyaXZl cnMvZWlzYS9laXNhLWJ1cy5jCmluZGV4IDBiMDZkZjQuLmE2ZmJmOTggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZWlzYS9laXNhLWJ1cy5jCisrKyBiL2RyaXZlcnMvZWlzYS9laXNhLWJ1cy5jCkBAIC0y ODgsNiArMjg4LDcgQEAgc3RhdGljIGludCBfX2luaXQgZWlzYV9yZXF1ZXN0X3Jlc291cmNlcyhz dHJ1Y3QgZWlzYV9yb290X2RldmljZSAqcm9vdCwKIAkJCWVkZXYtPnJlc1tpXS5mbGFncyA9IElP UkVTT1VSQ0VfQlVTWTsKIAkJfQogCisJCWRldl9wcmludGsoS0VSTl9ERUJVRywgJmVkZXYtPmRl diwgIiVwUlxuIiwgJmVkZXYtPnJlc1tpXSk7CiAJCWlmIChyZXF1ZXN0X3Jlc291cmNlKHJvb3Qt PnJlcywgJmVkZXYtPnJlc1tpXSkpCiAJCQlnb3RvIGZhaWxlZDsKIAl9Cg== --e89a8fb200bc345f3804d9530a97-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/