From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D6C47A04BA; Fri, 2 Oct 2020 07:45:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F0C5F1D5A9; Fri, 2 Oct 2020 07:44:58 +0200 (CEST) Received: from out0-148.mail.aliyun.com (out0-148.mail.aliyun.com [140.205.0.148]) by dpdk.org (Postfix) with ESMTP id D1E111D5A8 for ; Fri, 2 Oct 2020 07:44:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alibaba-inc.com; s=default; t=1601617492; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type; bh=pCuxUbRJSSMUWMXi8rvuqf/ker5BTi+jZV0btnV0Hgk=; b=SG+onXXg0w17XGdRdLU58ex2y4/R/wmFSbiaOeGQ4m4lSuQWeqGo+CgqbymaRm9Sm5JdipeXL6ko+g5x7NgoRv4Z9PYRxilpIp5CcwpS/aP7ZjwUCRLisExREM6hU62aHtlREYbx5sLaIJykzDrre2R8XdhqgqIO1POALqruv7E= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R121e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018047205; MF=huawei.xhw@alibaba-inc.com; NM=1; PH=DS; RN=9; SR=0; TI=SMTPD_---.IefdGOV_1601617490; Received: from 30.15.232.176(mailfrom:huawei.xhw@alibaba-inc.com fp:SMTPD_---.IefdGOV_1601617490) by smtp.aliyun-inc.com(127.0.0.1); Fri, 02 Oct 2020 13:44:51 +0800 To: "Burakov, Anatoly" , dev , "ferruh.yigit" Cc: "Maxime Coquelin" , "David Marchand" , "=?UTF-8?B?V2FuZywgWmhpaG9uZw==?=" , "=?UTF-8?B?WGlhLCBDaGVuYm8=?=" , "Gaetan Rivet" , "=?UTF-8?B?5p2o6IiqKOihjOWuqik=?=" References: <68ecd941-9c56-4de7-fae2-2ad15bdfd81a@alibaba-inc.com> <719c243a-2ff9-ba6e-e587-e638f8e16bfa@intel.com> From: "=?UTF-8?B?6LCi5Y2O5LyfKOatpOaXtuatpOWIu++8iQ==?=" Message-ID: <8c543fec-01e9-c6fe-f5b9-35b0dbb64173@alibaba-inc.com> Date: Fri, 02 Oct 2020 13:44:33 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <719c243a-2ff9-ba6e-e587-e638f8e16bfa@intel.com> Content-Type: multipart/mixed; boundary="------------E25B2EA9957C656A6D83007C" Content-Language: en-US Subject: Re: [dpdk-dev] [PATCH v2] pci: support both PIO and MMIO BAR for legacy virtio on x86 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This is a multi-part message in MIME format. --------------E25B2EA9957C656A6D83007C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 2020/10/1 18:22, Burakov, Anatoly wrote: > On 30-Sep-20 3:59 PM, 谢华伟(此时此刻） wrote: >>  From c13f981e287254cd0877cc7b98ee2dd7b80c3b69 Mon Sep 17 00:00:00 2001 >> From: "huawei.xhw" >> Date: Wed, 30 Sep 2020 22:37:03 +0800 >> Subject: [PATCH v2] pci:  support both PIO and MMIO BAR for legacy >> virtio on >>   x86 >> >> Legacy virtio-pci only supports PIO BAR resource. As we need to >> create lots of >> virtio devices and PIO resource on x86 is very limited, we expose >> MMIO BAR. >> >> Kernel supports both PIO  and MMIO BAR for legacy virtio-pci device. >> We handles >> different type of BAR in the similar way. >> >> In previous implementation, with igb_uio we get PIO address from igb_uio >> sysfs entry; with uio_pci_generic, we get PIO address from >> /proc/ioports. >> For PIO/MMIO RW, there is different path for different drivers and arch. >> For VFIO, PIO/MMIO RW is through syscall, which has big performance >> issue. >> On X86, it assumes only PIO is supported. >> >> All of the above is too much twisted. >> This patch unifies the way to get both PIO and MMIO address for >> different driver >> and arch, all from standard resource attr under pci sysfs. >> >> We distinguish PIO and MMIO by their address like how kernel does. It >> is ugly but works. >> >> Signed-off-by: huawei.xhw >> --- > > You patches are somehow malformed (at least according to my inline > diff viewer). Are you using git-send-email to send patches? > Very sorry for the format issue. I still failed configuring send-email to work, and Thunderbird had issues with plain text settings. Zhihong, Chenbo: I attach this patch. Could you help send this patch for me? Thanks! --------------E25B2EA9957C656A6D83007C Content-Type: text/plain; charset=UTF-8; name="v2.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2.patch" RnJvbSBjMTNmOTgxZTI4NzI1NGNkMDg3N2NjN2I5OGVlMmRkN2I4MGMzYjY5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogImh1YXdlaS54aHciIDxodWF3ZWkueGh3QGFsaWJh YmEtaW5jLmNvbT4NCkRhdGU6IFdlZCwgMzAgU2VwIDIwMjAgMjI6Mzc6MDMgKzA4MDANClN1 YmplY3Q6IFtQQVRDSCB2Ml0gcGNpOiAgc3VwcG9ydCBib3RoIFBJTyBhbmQgTU1JTyBCQVIg Zm9yIGxlZ2FjeSB2aXJ0aW8gb24geDg2DQoNCkxlZ2FjeSB2aXJ0aW8tcGNpIG9ubHkgc3Vw cG9ydHMgUElPIEJBUiByZXNvdXJjZS4gQXMgd2UgbmVlZCB0byBjcmVhdGUgbG90cyBvZg0K dmlydGlvIGRldmljZXMgYW5kIFBJTyByZXNvdXJjZSBvbiB4ODYgaXMgdmVyeSBsaW1pdGVk LCB3ZSBleHBvc2UgTU1JTyBCQVIuDQoNCktlcm5lbCBzdXBwb3J0cyBib3RoIFBJTyAgYW5k IE1NSU8gQkFSIGZvciBsZWdhY3kgdmlydGlvLXBjaSBkZXZpY2UuIFdlIGhhbmRsZXMNCmRp ZmZlcmVudCB0eXBlIG9mIEJBUiBpbiB0aGUgc2ltaWxhciB3YXkuDQoNCkluIHByZXZpb3Vz IGltcGxlbWVudGF0aW9uLCB3aXRoIGlnYl91aW8gd2UgZ2V0IFBJTyBhZGRyZXNzIGZyb20g aWdiX3Vpbw0Kc3lzZnMgZW50cnk7IHdpdGggdWlvX3BjaV9nZW5lcmljLCB3ZSBnZXQgUElP IGFkZHJlc3MgZnJvbQ0KL3Byb2MvaW9wb3J0cy4NCkZvciBQSU8vTU1JTyBSVywgdGhlcmUg aXMgZGlmZmVyZW50IHBhdGggZm9yIGRpZmZlcmVudCBkcml2ZXJzIGFuZCBhcmNoLg0KRm9y IFZGSU8sIFBJTy9NTUlPIFJXIGlzIHRocm91Z2ggc3lzY2FsbCwgd2hpY2ggaGFzIGJpZyBw ZXJmb3JtYW5jZQ0KaXNzdWUuDQpPbiBYODYsIGl0IGFzc3VtZXMgb25seSBQSU8gaXMgc3Vw cG9ydGVkLg0KDQpBbGwgb2YgdGhlIGFib3ZlIGlzIHRvbyBtdWNoIHR3aXN0ZWQuDQpUaGlz IHBhdGNoIHVuaWZpZXMgdGhlIHdheSB0byBnZXQgYm90aCBQSU8gYW5kIE1NSU8gYWRkcmVz cyBmb3IgZGlmZmVyZW50IGRyaXZlcg0KYW5kIGFyY2gsIGFsbCBmcm9tIHN0YW5kYXJkIHJl c291cmNlIGF0dHIgdW5kZXIgcGNpIHN5c2ZzLg0KDQpXZSBkaXN0aW5ndWlzaCBQSU8gYW5k IE1NSU8gYnkgdGhlaXIgYWRkcmVzcyBsaWtlIGhvdyBrZXJuZWwgZG9lcy4gSXQgaXMgdWds eSBidXQgd29ya3MuDQoNClNpZ25lZC1vZmYtYnk6IGh1YXdlaS54aHcgPGh1YXdlaS54aHdA YWxpYmFiYS1pbmMuY29tPg0KLS0tDQogZHJpdmVycy9idXMvcGNpL2xpbnV4L3BjaS5jICAg ICB8ICA4OSArLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiBkcml2ZXJzL2J1cy9wY2kvbGludXgv cGNpX3Vpby5jIHwgMTY2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0NCiAyIGZpbGVzIGNoYW5nZWQsIDExOCBpbnNlcnRpb25zKCspLCAxMzcgZGVsZXRpb25z KC0pDQoNCmRpZmYgLS1naXQgYS9kcml2ZXJzL2J1cy9wY2kvbGludXgvcGNpLmMgYi9kcml2 ZXJzL2J1cy9wY2kvbGludXgvcGNpLmMNCmluZGV4IGJmMjc1OTQuLjg4NWU1NGUgMTAwNjQ0 DQotLS0gYS9kcml2ZXJzL2J1cy9wY2kvbGludXgvcGNpLmMNCisrKyBiL2RyaXZlcnMvYnVz L3BjaS9saW51eC9wY2kuYw0KQEAgLTY4Nyw3MSArNjg3LDYgQEAgaW50IHJ0ZV9wY2lfd3Jp dGVfY29uZmlnKGNvbnN0IHN0cnVjdCBydGVfcGNpX2RldmljZSAqZGV2aWNlLA0KIAl9DQog fQ0KIA0KLSNpZiBkZWZpbmVkKFJURV9BUkNIX1g4NikNCi1zdGF0aWMgaW50DQotcGNpX2lv cG9ydF9tYXAoc3RydWN0IHJ0ZV9wY2lfZGV2aWNlICpkZXYsIGludCBiYXIgX19ydGVfdW51 c2VkLA0KLQkJc3RydWN0IHJ0ZV9wY2lfaW9wb3J0ICpwKQ0KLXsNCi0JdWludDE2X3Qgc3Rh cnQsIGVuZDsNCi0JRklMRSAqZnA7DQotCWNoYXIgKmxpbmUgPSBOVUxMOw0KLQljaGFyIHBj aV9pZFsxNl07DQotCWludCBmb3VuZCA9IDA7DQotCXNpemVfdCBsaW5lc3o7DQotDQotCWlm IChydGVfZWFsX2lvcGxfaW5pdCgpICE9IDApIHsNCi0JCVJURV9MT0coRVJSLCBFQUwsICIl cygpOiBpbnN1ZmZpY2llbnQgaW9wb3J0IHBlcm1pc3Npb25zIGZvciBQQ0kgZGV2aWNlICVz XG4iLA0KLQkJCV9fZnVuY19fLCBkZXYtPm5hbWUpOw0KLQkJcmV0dXJuIC0xOw0KLQl9DQot DQotCXNucHJpbnRmKHBjaV9pZCwgc2l6ZW9mKHBjaV9pZCksIFBDSV9QUklfRk1ULA0KLQkJ IGRldi0+YWRkci5kb21haW4sIGRldi0+YWRkci5idXMsDQotCQkgZGV2LT5hZGRyLmRldmlk LCBkZXYtPmFkZHIuZnVuY3Rpb24pOw0KLQ0KLQlmcCA9IGZvcGVuKCIvcHJvYy9pb3BvcnRz IiwgInIiKTsNCi0JaWYgKGZwID09IE5VTEwpIHsNCi0JCVJURV9MT0coRVJSLCBFQUwsICIl cygpOiBjYW4ndCBvcGVuIGlvcG9ydHNcbiIsIF9fZnVuY19fKTsNCi0JCXJldHVybiAtMTsN Ci0JfQ0KLQ0KLQl3aGlsZSAoZ2V0ZGVsaW0oJmxpbmUsICZsaW5lc3osICdcbicsIGZwKSA+ IDApIHsNCi0JCWNoYXIgKnB0ciA9IGxpbmU7DQotCQljaGFyICpsZWZ0Ow0KLQkJaW50IG47 DQotDQotCQluID0gc3RyY3NwbihwdHIsICI6Iik7DQotCQlwdHJbbl0gPSAwOw0KLQkJbGVm dCA9ICZwdHJbbiArIDFdOw0KLQ0KLQkJd2hpbGUgKCpsZWZ0ICYmIGlzc3BhY2UoKmxlZnQp KQ0KLQkJCWxlZnQrKzsNCi0NCi0JCWlmICghc3RybmNtcChsZWZ0LCBwY2lfaWQsIHN0cmxl bihwY2lfaWQpKSkgew0KLQkJCWZvdW5kID0gMTsNCi0NCi0JCQl3aGlsZSAoKnB0ciAmJiBp c3NwYWNlKCpwdHIpKQ0KLQkJCQlwdHIrKzsNCi0NCi0JCQlzc2NhbmYocHRyLCAiJTA0aHgt JTA0aHgiLCAmc3RhcnQsICZlbmQpOw0KLQ0KLQkJCWJyZWFrOw0KLQkJfQ0KLQl9DQotDQot CWZyZWUobGluZSk7DQotCWZjbG9zZShmcCk7DQotDQotCWlmICghZm91bmQpDQotCQlyZXR1 cm4gLTE7DQotDQotCXAtPmJhc2UgPSBzdGFydDsNCi0JUlRFX0xPRyhERUJVRywgRUFMLCAi UENJIFBvcnQgSU8gZm91bmQgc3RhcnQ9MHgleFxuIiwgc3RhcnQpOw0KLQ0KLQlyZXR1cm4g MDsNCi19DQotI2VuZGlmDQotDQogaW50DQogcnRlX3BjaV9pb3BvcnRfbWFwKHN0cnVjdCBy dGVfcGNpX2RldmljZSAqZGV2LCBpbnQgYmFyLA0KIAkJc3RydWN0IHJ0ZV9wY2lfaW9wb3J0 ICpwKQ0KQEAgLTc2MiwxOCArNjk3LDEyIEBAIGludCBydGVfcGNpX3dyaXRlX2NvbmZpZyhj b25zdCBzdHJ1Y3QgcnRlX3BjaV9kZXZpY2UgKmRldmljZSwNCiAjaWZkZWYgVkZJT19QUkVT RU5UDQogCWNhc2UgUlRFX1BDSV9LRFJWX1ZGSU86DQogCQlpZiAocGNpX3ZmaW9faXNfZW5h YmxlZCgpKQ0KLQkJCXJldCA9IHBjaV92ZmlvX2lvcG9ydF9tYXAoZGV2LCBiYXIsIHApOw0K KwkJCXJldCA9IHBjaV91aW9faW9wb3J0X21hcChkZXYsIGJhciwgcCk7DQogCQlicmVhazsN CiAjZW5kaWYNCiAJY2FzZSBSVEVfUENJX0tEUlZfSUdCX1VJTzoNCi0JCXJldCA9IHBjaV91 aW9faW9wb3J0X21hcChkZXYsIGJhciwgcCk7DQotCQlicmVhazsNCiAJY2FzZSBSVEVfUENJ X0tEUlZfVUlPX0dFTkVSSUM6DQotI2lmIGRlZmluZWQoUlRFX0FSQ0hfWDg2KQ0KLQkJcmV0 ID0gcGNpX2lvcG9ydF9tYXAoZGV2LCBiYXIsIHApOw0KLSNlbHNlDQogCQlyZXQgPSBwY2lf dWlvX2lvcG9ydF9tYXAoZGV2LCBiYXIsIHApOw0KLSNlbmRpZg0KIAkJYnJlYWs7DQogCWRl ZmF1bHQ6DQogCQlicmVhazsNCkBAIC03OTIsMTIgKzcyMSwxMCBAQCBpbnQgcnRlX3BjaV93 cml0ZV9jb25maWcoY29uc3Qgc3RydWN0IHJ0ZV9wY2lfZGV2aWNlICpkZXZpY2UsDQogCXN3 aXRjaCAocC0+ZGV2LT5rZHJ2KSB7DQogI2lmZGVmIFZGSU9fUFJFU0VOVA0KIAljYXNlIFJU RV9QQ0lfS0RSVl9WRklPOg0KLQkJcGNpX3ZmaW9faW9wb3J0X3JlYWQocCwgZGF0YSwgbGVu LCBvZmZzZXQpOw0KKwkJcGNpX3Vpb19pb3BvcnRfcmVhZChwLCBkYXRhLCBsZW4sIG9mZnNl dCk7DQogCQlicmVhazsNCiAjZW5kaWYNCiAJY2FzZSBSVEVfUENJX0tEUlZfSUdCX1VJTzoN Ci0JCXBjaV91aW9faW9wb3J0X3JlYWQocCwgZGF0YSwgbGVuLCBvZmZzZXQpOw0KLQkJYnJl YWs7DQogCWNhc2UgUlRFX1BDSV9LRFJWX1VJT19HRU5FUklDOg0KIAkJcGNpX3Vpb19pb3Bv cnRfcmVhZChwLCBkYXRhLCBsZW4sIG9mZnNldCk7DQogCQlicmVhazsNCkBAIC04MTMsMTIg Kzc0MCwxMCBAQCBpbnQgcnRlX3BjaV93cml0ZV9jb25maWcoY29uc3Qgc3RydWN0IHJ0ZV9w Y2lfZGV2aWNlICpkZXZpY2UsDQogCXN3aXRjaCAocC0+ZGV2LT5rZHJ2KSB7DQogI2lmZGVm IFZGSU9fUFJFU0VOVA0KIAljYXNlIFJURV9QQ0lfS0RSVl9WRklPOg0KLQkJcGNpX3ZmaW9f aW9wb3J0X3dyaXRlKHAsIGRhdGEsIGxlbiwgb2Zmc2V0KTsNCisJCXBjaV91aW9faW9wb3J0 X3dyaXRlKHAsIGRhdGEsIGxlbiwgb2Zmc2V0KTsNCiAJCWJyZWFrOw0KICNlbmRpZg0KIAlj YXNlIFJURV9QQ0lfS0RSVl9JR0JfVUlPOg0KLQkJcGNpX3Vpb19pb3BvcnRfd3JpdGUocCwg ZGF0YSwgbGVuLCBvZmZzZXQpOw0KLQkJYnJlYWs7DQogCWNhc2UgUlRFX1BDSV9LRFJWX1VJ T19HRU5FUklDOg0KIAkJcGNpX3Vpb19pb3BvcnRfd3JpdGUocCwgZGF0YSwgbGVuLCBvZmZz ZXQpOw0KIAkJYnJlYWs7DQpAQCAtODM2LDE4ICs3NjEsMTIgQEAgaW50IHJ0ZV9wY2lfd3Jp dGVfY29uZmlnKGNvbnN0IHN0cnVjdCBydGVfcGNpX2RldmljZSAqZGV2aWNlLA0KICNpZmRl ZiBWRklPX1BSRVNFTlQNCiAJY2FzZSBSVEVfUENJX0tEUlZfVkZJTzoNCiAJCWlmIChwY2lf dmZpb19pc19lbmFibGVkKCkpDQotCQkJcmV0ID0gcGNpX3ZmaW9faW9wb3J0X3VubWFwKHAp Ow0KKwkJCXJldCA9IHBjaV91aW9faW9wb3J0X3VubWFwKHApOw0KIAkJYnJlYWs7DQogI2Vu ZGlmDQogCWNhc2UgUlRFX1BDSV9LRFJWX0lHQl9VSU86DQotCQlyZXQgPSBwY2lfdWlvX2lv cG9ydF91bm1hcChwKTsNCi0JCWJyZWFrOw0KIAljYXNlIFJURV9QQ0lfS0RSVl9VSU9fR0VO RVJJQzoNCi0jaWYgZGVmaW5lZChSVEVfQVJDSF9YODYpDQotCQlyZXQgPSAwOw0KLSNlbHNl DQogCQlyZXQgPSBwY2lfdWlvX2lvcG9ydF91bm1hcChwKTsNCi0jZW5kaWYNCiAJCWJyZWFr Ow0KIAlkZWZhdWx0Og0KIAkJYnJlYWs7DQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9idXMvcGNp L2xpbnV4L3BjaV91aW8uYyBiL2RyaXZlcnMvYnVzL3BjaS9saW51eC9wY2lfdWlvLmMNCmlu ZGV4IGYzMzA1YTIuLmNmNDllOGYgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL2J1cy9wY2kvbGlu dXgvcGNpX3Vpby5jDQorKysgYi9kcml2ZXJzL2J1cy9wY2kvbGludXgvcGNpX3Vpby5jDQpA QCAtMzczLDUyICszNzMsODMgQEANCiBwY2lfdWlvX2lvcG9ydF9tYXAoc3RydWN0IHJ0ZV9w Y2lfZGV2aWNlICpkZXYsIGludCBiYXIsDQogCQkgICBzdHJ1Y3QgcnRlX3BjaV9pb3BvcnQg KnApDQogew0KKwlGSUxFICpmID0gTlVMTDsNCiAJY2hhciBkaXJuYW1lW1BBVEhfTUFYXTsN CiAJY2hhciBmaWxlbmFtZVtQQVRIX01BWF07DQorCWNoYXIgYnVmW0JVRlNJWl07DQorCXVp bnQ2NF90IHBoeXNfYWRkciwgZW5kX2FkZHIsIGZsYWdzOw0KIAlpbnQgdWlvX251bTsNCi0J dW5zaWduZWQgbG9uZyBzdGFydDsNCisJdW5zaWduZWQgbG9uZyBiYXNlOw0KKwlib29sIGlv YmFyOw0KKwlpbnQgaTsNCiANCi0JaWYgKHJ0ZV9lYWxfaW9wbF9pbml0KCkgIT0gMCkgew0K LQkJUlRFX0xPRyhFUlIsIEVBTCwgIiVzKCk6IGluc3VmZmljaWVudCBpb3BvcnQgcGVybWlz c2lvbnMgZm9yIFBDSSBkZXZpY2UgJXNcbiIsDQotCQkJX19mdW5jX18sIGRldi0+bmFtZSk7 DQorCS8qIG9wZW4gYW5kIHJlYWQgYWRkcmVzc2VzIG9mIHRoZSBjb3JyZXNwb25kaW5nIHJl c291cmNlIGluIHN5c2ZzICovDQorCXNucHJpbnRmKGZpbGVuYW1lLCBzaXplb2YoZmlsZW5h bWUpLCAiJXMvIiBQQ0lfUFJJX0ZNVCAiL3Jlc291cmNlIiwNCisJCXJ0ZV9wY2lfZ2V0X3N5 c2ZzX3BhdGgoKSwgZGV2LT5hZGRyLmRvbWFpbiwgZGV2LT5hZGRyLmJ1cywNCisJCWRldi0+ YWRkci5kZXZpZCwgZGV2LT5hZGRyLmZ1bmN0aW9uKTsNCisJZiA9IGZvcGVuKGZpbGVuYW1l LCAiciIpOw0KKwlpZiAoZiA9PSBOVUxMKSB7DQorCQlSVEVfTE9HKEVSUiwgRUFMLCAiQ2Fu bm90IG9wZW4gc3lzZnMgcmVzb3VyY2U6ICVzXG4iLA0KKwkJCXN0cmVycm9yKGVycm5vKSk7 DQogCQlyZXR1cm4gLTE7DQogCX0NCiANCi0JdWlvX251bSA9IHBjaV9nZXRfdWlvX2Rldihk ZXYsIGRpcm5hbWUsIHNpemVvZihkaXJuYW1lKSwgMCk7DQotCWlmICh1aW9fbnVtIDwgMCkN Ci0JCXJldHVybiAtMTsNCisJZm9yIChpID0gMDsgaSA8IGJhciArIDE7IGkrKykgew0KKwkJ aWYgKGZnZXRzKGJ1Ziwgc2l6ZW9mKGJ1ZiksIGYpID09IE5VTEwpIHsNCisJCQlSVEVfTE9H KEVSUiwgRUFMLCAiQ2Fubm90IHJlYWQgc3lzZnMgcmVzb3VyY2VcbiIpOw0KKwkJCWdvdG8g ZXJyb3I7DQorCQl9DQorCX0NCisJaWYgKHBjaV9wYXJzZV9vbmVfc3lzZnNfcmVzb3VyY2Uo YnVmLCBzaXplb2YoYnVmKSwgJnBoeXNfYWRkciwNCisJCSZlbmRfYWRkciwgJmZsYWdzKSA8 IDApDQorCQlnb3RvIGVycm9yOw0KIA0KLQkvKiBnZXQgcG9ydGlvIHN0YXJ0ICovDQotCXNu cHJpbnRmKGZpbGVuYW1lLCBzaXplb2YoZmlsZW5hbWUpLA0KLQkJICIlcy9wb3J0aW8vcG9y dCVkL3N0YXJ0IiwgZGlybmFtZSwgYmFyKTsNCi0JaWYgKGVhbF9wYXJzZV9zeXNmc192YWx1 ZShmaWxlbmFtZSwgJnN0YXJ0KSA8IDApIHsNCi0JCVJURV9MT0coRVJSLCBFQUwsICIlcygp OiBjYW5ub3QgcGFyc2UgcG9ydGlvIHN0YXJ0XG4iLA0KLQkJCV9fZnVuY19fKTsNCi0JCXJl dHVybiAtMTsNCisJaWYgKGZsYWdzICYgSU9SRVNPVVJDRV9JTykgew0KKwkJaW9iYXIgPSAx Ow0KKwkJYmFzZSA9ICh1bnNpZ25lZCBsb25nKXBoeXNfYWRkcjsNCisJCVJURV9MT0coSU5G TywgRUFMLCAiJXMoKTogUElPIEJBUiAlMDhseCBkZXRlY3RlZFxuIiwgX19mdW5jX18sIGJh c2UpOw0KKwl9IGVsc2UgaWYgKGZsYWdzICYgSU9SRVNPVVJDRV9NRU0pIHsNCisJCWlvYmFy ID0gMDsNCisJCWJhc2UgPSAodW5zaWduZWQgbG9uZylkZXYtPm1lbV9yZXNvdXJjZVtiYXJd LmFkZHI7DQorCQlSVEVfTE9HKElORk8sIEVBTCwgIiVzKCk6IE1NSU8gQkFSICUwOGx4IGRl dGVjdGVkXG4iLCBfX2Z1bmNfXywgYmFzZSk7DQorCX0gZWxzZSB7DQorCQlSVEVfTE9HKEVS UiwgRUFMLCAiJXMoKTogdW5rbm93biBCQVIgdHlwZVxuIiwgX19mdW5jX18pOw0KKwkJZ290 byBlcnJvcjsNCisJfQ0KKw0KKwlpZiAoaW9iYXIgJiYgcnRlX2VhbF9pb3BsX2luaXQoKSAh PSAwKSB7DQorCQlSVEVfTE9HKEVSUiwgRUFMLCAiJXMoKTogaW5zdWZmaWNpZW50IGlvcG9y dCBwZXJtaXNzaW9ucyBmb3IgUENJIGRldmljZSAlc1xuIiwNCisJCQlfX2Z1bmNfXywgZGV2 LT5uYW1lKTsNCisJCWdvdG8gZXJyb3I7DQogCX0NCi0JLyogZW5zdXJlIHdlIGRvbid0IGdl dCBhbnl0aGluZyBmdW5ueSBoZXJlLCByZWFkL3dyaXRlIHdpbGwgY2FzdCB0bw0KLQkgKiB1 aW4xNl90ICovDQotCWlmIChzdGFydCA+IFVJTlQxNl9NQVgpDQotCQlyZXR1cm4gLTE7DQog DQogCS8qIEZJWE1FIG9ubHkgZm9yIHByaW1hcnkgcHJvY2VzcyA/ICovDQotCWlmIChkZXYt PmludHJfaGFuZGxlLnR5cGUgPT0gUlRFX0lOVFJfSEFORExFX1VOS05PV04pIHsNCisJaWYg KGRldi0+aW50cl9oYW5kbGUudHlwZSA9PSBSVEVfSU5UUl9IQU5ETEVfVU5LTk9XTiAmJg0K KwkgICAgZGV2LT5rZHJ2ID09IFJURV9LRFJWX1VJT19HRU5FUklDKSB7DQorCQl1aW9fbnVt ID0gcGNpX2dldF91aW9fZGV2KGRldiwgZGlybmFtZSwgc2l6ZW9mKGRpcm5hbWUpLCAwKTsN CisJCWlmICh1aW9fbnVtIDwgMCkNCisJCQlnb3RvIGVycm9yOw0KIA0KIAkJc25wcmludGYo ZmlsZW5hbWUsIHNpemVvZihmaWxlbmFtZSksICIvZGV2L3VpbyV1IiwgdWlvX251bSk7DQog CQlkZXYtPmludHJfaGFuZGxlLmZkID0gb3BlbihmaWxlbmFtZSwgT19SRFdSKTsNCiAJCWlm IChkZXYtPmludHJfaGFuZGxlLmZkIDwgMCkgew0KIAkJCVJURV9MT0coRVJSLCBFQUwsICJD YW5ub3Qgb3BlbiAlczogJXNcbiIsDQogCQkJCWZpbGVuYW1lLCBzdHJlcnJvcihlcnJubykp Ow0KLQkJCXJldHVybiAtMTsNCisJCQlnb3RvIGVycm9yOw0KIAkJfQ0KIAkJZGV2LT5pbnRy X2hhbmRsZS50eXBlID0gUlRFX0lOVFJfSEFORExFX1VJTzsNCiAJfQ0KIA0KLQlSVEVfTE9H KERFQlVHLCBFQUwsICJQQ0kgUG9ydCBJTyBmb3VuZCBzdGFydD0weCVseFxuIiwgc3RhcnQp Ow0KKwlSVEVfTE9HKERFQlVHLCBFQUwsICJQQ0kgSU8gcG9ydCBmb3VuZCBzdGFydD0weCVs eFxuIiwgYmFzZSk7DQogDQotCXAtPmJhc2UgPSBzdGFydDsNCisJcC0+YmFzZSA9IGJhc2U7 DQogCXAtPmxlbiA9IDA7DQorCWZjbG9zZShmKTsNCiAJcmV0dXJuIDA7DQorZXJyb3I6DQor CWlmIChmKQ0KKwkJZmNsb3NlKGYpOw0KKwlyZXR1cm4gLTE7DQogfQ0KICNlbHNlDQogaW50 DQpAQCAtNDg5LDYgKzUyMCw2MSBAQA0KIH0NCiAjZW5kaWYNCiANCisjZGVmaW5lIFBJT19N QVggMHgxMDAwMA0KK3N0YXRpYyBpbmxpbmUgdWludDhfdCBpb3JlYWQ4KHZvaWQgKmFkZHIp DQorew0KKwl1aW50OF90IHZhbDsNCisNCisJdmFsID0gKHVpbnQ2NF90KSh1aW50cHRyX3Qp YWRkciA+PSBQSU9fTUFYID8NCisJCSoodm9sYXRpbGUgdWludDhfdCAqKWFkZHIgOg0KKwkJ aW5iKCh1bnNpZ25lZCBsb25nKWFkZHIpOw0KKw0KKwlyZXR1cm4gdmFsOw0KK30NCisNCitz dGF0aWMgaW5saW5lIHVpbnQxNl90IGlvcmVhZDE2KHZvaWQgKmFkZHIpDQorew0KKwl1aW50 MTZfdCB2YWw7DQorDQorCXZhbCA9ICh1aW50NjRfdCkodWludHB0cl90KWFkZHIgPj0gUElP X01BWCA/DQorCQkqKHZvbGF0aWxlIHVpbnQxNl90ICopYWRkciA6DQorCQlpbncoKHVuc2ln bmVkIGxvbmcpYWRkcik7DQorDQorCXJldHVybiB2YWw7DQorfQ0KKw0KK3N0YXRpYyBpbmxp bmUgdWludDMyX3QgaW9yZWFkMzIodm9pZCAqYWRkcikNCit7DQorCXVpbnQzMl90IHZhbDsN CisNCisJdmFsID0gKHVpbnQ2NF90KSh1aW50cHRyX3QpYWRkciA+PSBQSU9fTUFYID8NCisJ CSoodm9sYXRpbGUgdWludDMyX3QgKilhZGRyIDoNCisJaW5sKCh1bnNpZ25lZCBsb25nKWFk ZHIpOw0KKw0KKwlyZXR1cm4gdmFsOw0KK30NCisNCitzdGF0aWMgaW5saW5lIHZvaWQgaW93 cml0ZTgodWludDhfdCB2YWwsIHZvaWQgKmFkZHIpDQorew0KKwkodWludDY0X3QpKHVpbnRw dHJfdClhZGRyID49IFBJT19NQVggPw0KKwkJKih2b2xhdGlsZSB1aW50OF90ICopYWRkciA9 IHZhbCA6DQorCQlvdXRiKHZhbCwgKHVuc2lnbmVkIGxvbmcpYWRkcik7DQorfQ0KKw0KK3N0 YXRpYyBpbmxpbmUgdm9pZCBpb3dyaXRlMTYodWludDE2X3QgdmFsLCB2b2lkICphZGRyKQ0K K3sNCisJKHVpbnQ2NF90KSh1aW50cHRyX3QpYWRkciA+PSBQSU9fTUFYID8NCisJCSoodm9s YXRpbGUgdWludDE2X3QgKilhZGRyID0gdmFsIDoNCisJCW91dHcodmFsLCAodW5zaWduZWQg bG9uZylhZGRyKTsNCit9DQorDQorc3RhdGljIGlubGluZSB2b2lkIGlvd3JpdGUzMih1aW50 MzJfdCB2YWwsIHZvaWQgKmFkZHIpDQorew0KKwkodWludDY0X3QpKHVpbnRwdHJfdClhZGRy ID49IFBJT19NQVggPw0KKwkJKih2b2xhdGlsZSB1aW50MzJfdCAqKWFkZHIgPSB2YWwgOg0K KwkJb3V0bCh2YWwsICh1bnNpZ25lZCBsb25nKWFkZHIpOw0KK30NCisNCiB2b2lkDQogcGNp X3Vpb19pb3BvcnRfcmVhZChzdHJ1Y3QgcnRlX3BjaV9pb3BvcnQgKnAsDQogCQkgICAgdm9p ZCAqZGF0YSwgc2l6ZV90IGxlbiwgb2ZmX3Qgb2Zmc2V0KQ0KQEAgLTUwMCwyNSArNTg2LDEz IEBADQogCWZvciAoZCA9IGRhdGE7IGxlbiA+IDA7IGQgKz0gc2l6ZSwgcmVnICs9IHNpemUs IGxlbiAtPSBzaXplKSB7DQogCQlpZiAobGVuID49IDQpIHsNCiAJCQlzaXplID0gNDsNCi0j aWYgZGVmaW5lZChSVEVfQVJDSF9YODYpDQotCQkJKih1aW50MzJfdCAqKWQgPSBpbmwocmVn KTsNCi0jZWxzZQ0KLQkJCSoodWludDMyX3QgKilkID0gKih2b2xhdGlsZSB1aW50MzJfdCAq KXJlZzsNCi0jZW5kaWYNCisJCQkqKHVpbnQzMl90ICopZCA9IGlvcmVhZDMyKCh2b2lkICop cmVnKTsNCiAJCX0gZWxzZSBpZiAobGVuID49IDIpIHsNCiAJCQlzaXplID0gMjsNCi0jaWYg ZGVmaW5lZChSVEVfQVJDSF9YODYpDQotCQkJKih1aW50MTZfdCAqKWQgPSBpbncocmVnKTsN Ci0jZWxzZQ0KLQkJCSoodWludDE2X3QgKilkID0gKih2b2xhdGlsZSB1aW50MTZfdCAqKXJl ZzsNCi0jZW5kaWYNCisJCQkqKHVpbnQxNl90ICopZCA9IGlvcmVhZDE2KCh2b2lkICopcmVn KTsNCiAJCX0gZWxzZSB7DQogCQkJc2l6ZSA9IDE7DQotI2lmIGRlZmluZWQoUlRFX0FSQ0hf WDg2KQ0KLQkJCSpkID0gaW5iKHJlZyk7DQotI2Vsc2UNCi0JCQkqZCA9ICoodm9sYXRpbGUg dWludDhfdCAqKXJlZzsNCi0jZW5kaWYNCisJCQkqZCA9IGlvcmVhZDgoKHZvaWQgKilyZWcp Ow0KIAkJfQ0KIAl9DQogfQ0KQEAgLTUzNCwyNSArNjA4LDEzIEBADQogCWZvciAocyA9IGRh dGE7IGxlbiA+IDA7IHMgKz0gc2l6ZSwgcmVnICs9IHNpemUsIGxlbiAtPSBzaXplKSB7DQog CQlpZiAobGVuID49IDQpIHsNCiAJCQlzaXplID0gNDsNCi0jaWYgZGVmaW5lZChSVEVfQVJD SF9YODYpDQotCQkJb3V0bF9wKCooY29uc3QgdWludDMyX3QgKilzLCByZWcpOw0KLSNlbHNl DQotCQkJKih2b2xhdGlsZSB1aW50MzJfdCAqKXJlZyA9ICooY29uc3QgdWludDMyX3QgKilz Ow0KLSNlbmRpZg0KKwkJCWlvd3JpdGUzMigqKGNvbnN0IHVpbnQzMl90ICopcywgKHZvaWQg KilyZWcpOw0KIAkJfSBlbHNlIGlmIChsZW4gPj0gMikgew0KIAkJCXNpemUgPSAyOw0KLSNp ZiBkZWZpbmVkKFJURV9BUkNIX1g4NikNCi0JCQlvdXR3X3AoKihjb25zdCB1aW50MTZfdCAq KXMsIHJlZyk7DQotI2Vsc2UNCi0JCQkqKHZvbGF0aWxlIHVpbnQxNl90ICopcmVnID0gKihj b25zdCB1aW50MTZfdCAqKXM7DQotI2VuZGlmDQorCQkJaW93cml0ZTE2KCooY29uc3QgdWlu dDE2X3QgKilzLCAodm9pZCAqKXJlZyk7DQogCQl9IGVsc2Ugew0KIAkJCXNpemUgPSAxOw0K LSNpZiBkZWZpbmVkKFJURV9BUkNIX1g4NikNCi0JCQlvdXRiX3AoKnMsIHJlZyk7DQotI2Vs c2UNCi0JCQkqKHZvbGF0aWxlIHVpbnQ4X3QgKilyZWcgPSAqczsNCi0jZW5kaWYNCisJCQlp b3dyaXRlOCgqcywgKHZvaWQgKilyZWcpOw0KIAkJfQ0KIAl9DQogfQ0KLS0gDQoxLjguMy4x --------------E25B2EA9957C656A6D83007C--