From: Keith Packard Subject: [PATCH 7/7] vulkan: Add VK_GOOGLE_display_timing extension (x11 and display backends) Date: Fri, 9 Feb 2018 20:45:16 -0800 Message-ID: <20180210044516.16944-8-keithp@keithp.com> References: <20180210044516.16944-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180210044516.16944-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: mesa-dev@lists.freedesktop.org Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBhZGRzIHN1cHBvcnQgZm9yIHRoZSBWS19HT09HTEVfZGlzcGxheSB0aW1pbmcgZXh0ZW5z aW9uLCB3aGljaApwcm92aWRlcyB0d28gdGhpbmdzOgoKIDEpIERldGFpbGVkIGluZm9ybWF0aW9u IGFib3V0IHdoZW4gZnJhbWVzIGFyZSBkaXNwbGF5ZWQsIGluY2x1ZGluZwogICAgc2xhY2sgdGlt ZSBiZXR3ZWVuIEdQVSBleGVjdXRpb24gYW5kIGRpc3BsYXkgZnJhbWUuCgogMikgQWJzb2x1dGUg dGltZSBjb250cm9sIG92ZXIgc3dhcGNoYWluIHF1ZXVlIHByb2Nlc3NpbmcuIFRoaXMgYWxsb3dz CiAgICB0aGUgYXBwbGljYXRpb24gdG8gcmVxdWVzdCBmcmFtZXMgYmUgZGlzcGxheWVkIGF0IHNw ZWNpZmljCiAgICBhYnNvbHV0ZSB0aW1lcywgdXNpbmcgdGhlIHNhbWUgdGltZWJhc2UgYXMgdGhh dCBwcm92aWRlZCBpbiB2YmxhbmsKICAgIGV2ZW50cy4KClN1cHBvcnQgZm9yIHRoaXMgZXh0ZW5z aW9uIGhhcyBiZWVuIGltcGxlbWVudGVkIGZvciB0aGUgeDExIGFuZApkaXNwbGF5IGJhY2tlbmRz OyBhZGRpbmcgc3VwcG9ydCB0byBvdGhlciBiYWNrZW5kcyBzaG91bGQgYmUKcmVhc29uYWJsZSBz dHJhaWdodGZvcndhcmQgZm9yIG9uZSBmYW1pbGlhciB3aXRoIHRob3NlIHN5c3RlbXMgYW5kCnNo b3VsZCBub3QgcmVxdWlyZSBhbnkgYWRkaXRpb25hbCBkZXZpY2Utc3BlY2lmaWMgY29kZS4KClNp Z25lZC1vZmYtYnk6IEtlaXRoIFBhY2thcmQgPGtlaXRocEBrZWl0aHAuY29tPgotLS0KIHNyYy9h bWQvdnVsa2FuL3JhZHZfZXh0ZW5zaW9ucy5weSAgIHwgICAxICsKIHNyYy9hbWQvdnVsa2FuL3Jh ZHZfd3NpLmMgICAgICAgICAgIHwgIDMyICsrKysrCiBzcmMvaW50ZWwvdnVsa2FuL2Fudl9leHRl bnNpb25zLnB5ICB8ICAgMSArCiBzcmMvaW50ZWwvdnVsa2FuL2Fudl93c2kuYyAgICAgICAgICB8 ICAyOSArKysrCiBzcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uLmMgICAgICAgICB8IDI1NCArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIHNyYy92dWxrYW4vd3NpL3dzaV9jb21t b24uaCAgICAgICAgIHwgIDI0ICsrKysKIHNyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fZGlzcGxh eS5jIHwgMTQzICsrKysrKysrKysrKysrKysrKystCiBzcmMvdnVsa2FuL3dzaS93c2lfY29tbW9u X3ByaXZhdGUuaCB8ICAzNSArKysrKwogc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl94MTEuYyAg ICAgfCAgNjkgKysrKysrKysrLQogOSBmaWxlcyBjaGFuZ2VkLCA1NzcgaW5zZXJ0aW9ucygrKSwg MTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2FtZC92dWxrYW4vcmFkdl9leHRlbnNp b25zLnB5IGIvc3JjL2FtZC92dWxrYW4vcmFkdl9leHRlbnNpb25zLnB5CmluZGV4IGZlZDE5OGRm NDEyLi5mMzhkNjkwM2E4MCAxMDA2NDQKLS0tIGEvc3JjL2FtZC92dWxrYW4vcmFkdl9leHRlbnNp b25zLnB5CisrKyBiL3NyYy9hbWQvdnVsa2FuL3JhZHZfZXh0ZW5zaW9ucy5weQpAQCAtOTYsNiAr OTYsNyBAQCBFWFRFTlNJT05TID0gWwogICAgIEV4dGVuc2lvbignVktfQU1EX3Jhc3Rlcml6YXRp b25fb3JkZXInLCAgICAgICAgICAgICAgIDEsICdkZXZpY2UtPnJhZF9pbmZvLmNoaXBfY2xhc3Mg Pj0gVkkgJiYgZGV2aWNlLT5yYWRfaW5mby5tYXhfc2UgPj0gMicpLAogICAgIEV4dGVuc2lvbign VktfQU1EX3NoYWRlcl9pbmZvJywgICAgICAgICAgICAgICAgICAgICAgIDEsIFRydWUpLAogICAg IEV4dGVuc2lvbignVktfTUVTQV9xdWVyeV90aW1lc3RhbXAnLCAgICAgICAgICAgICAgICAgIDEs IFRydWUpLAorICAgIEV4dGVuc2lvbignVktfR09PR0xFX2Rpc3BsYXlfdGltaW5nJywgICAgICAg ICAgICAgICAgIDEsIFRydWUpLAogXQogCiBjbGFzcyBWa1ZlcnNpb246CmRpZmYgLS1naXQgYS9z cmMvYW1kL3Z1bGthbi9yYWR2X3dzaS5jIGIvc3JjL2FtZC92dWxrYW4vcmFkdl93c2kuYwppbmRl eCAyZDJhMzBlYmJiMS4uNDhmZjcxMDcyMzIgMTAwNjQ0Ci0tLSBhL3NyYy9hbWQvdnVsa2FuL3Jh ZHZfd3NpLmMKKysrIGIvc3JjL2FtZC92dWxrYW4vcmFkdl93c2kuYwpAQCAtMjQ3LDMgKzI0Nywz NSBAQCBWa1Jlc3VsdCByYWR2X1F1ZXVlUHJlc2VudEtIUigKIAkJCQkJcXVldWUtPnF1ZXVlX2Zh bWlseV9pbmRleCwKIAkJCQkJcFByZXNlbnRJbmZvKTsKIH0KKworLyogVktfR09PR0xFX2Rpc3Bs YXlfdGltaW5nICovCitWa1Jlc3VsdAorcmFkdl9HZXRSZWZyZXNoQ3ljbGVEdXJhdGlvbkdPT0dM RSgKKwlWa0RldmljZSAgICAgICAgICAgICAgICAgICAgICBfZGV2aWNlLAorCVZrU3dhcGNoYWlu S0hSICAgICAgICAgICAgICAgIHN3YXBjaGFpbiwKKwlWa1JlZnJlc2hDeWNsZUR1cmF0aW9uR09P R0xFICAqcERpc3BsYXlUaW1pbmdQcm9wZXJ0aWVzKQoreworCVJBRFZfRlJPTV9IQU5ETEUocmFk dl9kZXZpY2UsIGRldmljZSwgX2RldmljZSk7CisJc3RydWN0IHJhZHZfcGh5c2ljYWxfZGV2aWNl ICpwZGV2aWNlID0gZGV2aWNlLT5waHlzaWNhbF9kZXZpY2U7CisKKwlyZXR1cm4gd3NpX2NvbW1v bl9nZXRfcmVmcmVzaF9jeWNsZV9kdXJhdGlvbigmcGRldmljZS0+d3NpX2RldmljZSwKKwkJCQkJ CSAgICAgX2RldmljZSwKKwkJCQkJCSAgICAgc3dhcGNoYWluLAorCQkJCQkJICAgICBwRGlzcGxh eVRpbWluZ1Byb3BlcnRpZXMpOworfQorCitWa1Jlc3VsdAorcmFkdl9HZXRQYXN0UHJlc2VudGF0 aW9uVGltaW5nR09PR0xFKFZrRGV2aWNlICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9kZXZp Y2UsCisJCQkJICAgICBWa1N3YXBjaGFpbktIUiAgICAgICAgICAgICAgICAgICAgICBzd2FwY2hh aW4sCisJCQkJICAgICB1aW50MzJfdCAgICAgICAgICAgICAgICAgICAgICAgICAgICAqcFByZXNl bnRhdGlvblRpbWluZ0NvdW50LAorCQkJCSAgICAgVmtQYXN0UHJlc2VudGF0aW9uVGltaW5nR09P R0xFICAgICAgKnBQcmVzZW50YXRpb25UaW1pbmdzKQoreworCVJBRFZfRlJPTV9IQU5ETEUocmFk dl9kZXZpY2UsIGRldmljZSwgX2RldmljZSk7CisJc3RydWN0IHJhZHZfcGh5c2ljYWxfZGV2aWNl ICpwZGV2aWNlID0gZGV2aWNlLT5waHlzaWNhbF9kZXZpY2U7CisKKwlyZXR1cm4gd3NpX2NvbW1v bl9nZXRfcGFzdF9wcmVzZW50YXRpb25fdGltaW5nKCZwZGV2aWNlLT53c2lfZGV2aWNlLAorCQkJ CQkJICAgICAgIF9kZXZpY2UsCisJCQkJCQkgICAgICAgc3dhcGNoYWluLAorCQkJCQkJICAgICAg IHBQcmVzZW50YXRpb25UaW1pbmdDb3VudCwKKwkJCQkJCSAgICAgICBwUHJlc2VudGF0aW9uVGlt aW5ncyk7Cit9CmRpZmYgLS1naXQgYS9zcmMvaW50ZWwvdnVsa2FuL2Fudl9leHRlbnNpb25zLnB5 IGIvc3JjL2ludGVsL3Z1bGthbi9hbnZfZXh0ZW5zaW9ucy5weQppbmRleCBkZDRkNWExZjk3MC4u YzQ1ZWY5YWQwOWYgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlbC92dWxrYW4vYW52X2V4dGVuc2lvbnMu cHkKKysrIGIvc3JjL2ludGVsL3Z1bGthbi9hbnZfZXh0ZW5zaW9ucy5weQpAQCAtOTIsNiArOTIs NyBAQCBFWFRFTlNJT05TID0gWwogICAgIEV4dGVuc2lvbignVktfRVhUX2Rpc3BsYXlfc3VyZmFj ZV9jb3VudGVyJywgICAgICAgICAgIDEsICdWS19VU0VfUExBVEZPUk1fRElTUExBWV9LSFInKSwK ICAgICBFeHRlbnNpb24oJ1ZLX0VYVF9kaXNwbGF5X2NvbnRyb2wnLCAgICAgICAgICAgICAgICAg ICAxLCAnVktfVVNFX1BMQVRGT1JNX0RJU1BMQVlfS0hSJyksCiAgICAgRXh0ZW5zaW9uKCdWS19N RVNBX3F1ZXJ5X3RpbWVzdGFtcCcsICAgICAgICAgICAgICAgICAgMSwgVHJ1ZSksCisgICAgRXh0 ZW5zaW9uKCdWS19HT09HTEVfZGlzcGxheV90aW1pbmcnLCAgICAgICAgICAgICAgICAgMSwgVHJ1 ZSksCiBdCiAKIGNsYXNzIFZrVmVyc2lvbjoKZGlmZiAtLWdpdCBhL3NyYy9pbnRlbC92dWxrYW4v YW52X3dzaS5jIGIvc3JjL2ludGVsL3Z1bGthbi9hbnZfd3NpLmMKaW5kZXggNTIzNjJhZGZiNzEu Ljc4MDFhOTg5ZTBkIDEwMDY0NAotLS0gYS9zcmMvaW50ZWwvdnVsa2FuL2Fudl93c2kuYworKysg Yi9zcmMvaW50ZWwvdnVsa2FuL2Fudl93c2kuYwpAQCAtMjM5LDMgKzIzOSwzMiBAQCBWa1Jlc3Vs dCBhbnZfUXVldWVQcmVzZW50S0hSKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBfcXVldWUsIDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBQcmVzZW50 SW5mbyk7CiB9CisKKy8qIFZLX0dPT0dMRV9kaXNwbGF5X3RpbWluZyAqLworVmtSZXN1bHQKK2Fu dl9HZXRSZWZyZXNoQ3ljbGVEdXJhdGlvbkdPT0dMRShWa0RldmljZSAgICAgICAgICAgICAgICAg ICAgICBfZGV2aWNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrU3dhcGNo YWluS0hSICAgICAgICAgICAgICAgIHN3YXBjaGFpbiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBWa1JlZnJlc2hDeWNsZUR1cmF0aW9uR09PR0xFICAqcERpc3BsYXlUaW1pbmdQ cm9wZXJ0aWVzKQoreworICAgQU5WX0ZST01fSEFORExFKGFudl9kZXZpY2UsIGRldmljZSwgX2Rl dmljZSk7CisKKyAgIHJldHVybiB3c2lfY29tbW9uX2dldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9u KCZkZXZpY2UtPmluc3RhbmNlLT5waHlzaWNhbERldmljZS53c2lfZGV2aWNlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX2RldmljZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN3YXBjaGFpbiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBEaXNwbGF5VGltaW5n UHJvcGVydGllcyk7Cit9CisKK1ZrUmVzdWx0CithbnZfR2V0UGFzdFByZXNlbnRhdGlvblRpbWlu Z0dPT0dMRShWa0RldmljZSAgICAgICAgICAgICAgICAgICAgICAgICAgICBfZGV2aWNlLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtTd2FwY2hhaW5LSFIgICAgICAgICAg ICAgICAgICAgICAgc3dhcGNoYWluLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdWludDMyX3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgKnBQcmVzZW50YXRpb25UaW1p bmdDb3VudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrUGFzdFByZXNl bnRhdGlvblRpbWluZ0dPT0dMRSAgICAgICpwUHJlc2VudGF0aW9uVGltaW5ncykKK3sKKyAgIEFO Vl9GUk9NX0hBTkRMRShhbnZfZGV2aWNlLCBkZXZpY2UsIF9kZXZpY2UpOworCisgICByZXR1cm4g d3NpX2NvbW1vbl9nZXRfcGFzdF9wcmVzZW50YXRpb25fdGltaW5nKCZkZXZpY2UtPmluc3RhbmNl LT5waHlzaWNhbERldmljZS53c2lfZGV2aWNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBfZGV2aWNlLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzd2FwY2hhaW4sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBQcmVzZW50YXRpb25UaW1pbmdDb3VudCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcFByZXNl bnRhdGlvblRpbWluZ3MpOworfQpkaWZmIC0tZ2l0IGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1v bi5jIGIvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbi5jCmluZGV4IDAyYWJjOWVmN2ZiLi5jMzZl NGNjZGNiZSAxMDA2NDQKLS0tIGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbi5jCisrKyBiL3Ny Yy92dWxrYW4vd3NpL3dzaV9jb21tb24uYwpAQCAtNDAsMTEgKzQwLDE2IEBAIHdzaV9kZXZpY2Vf aW5pdChzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogICAgUEZOX3ZrIyNmdW5jIGZ1bmMgPSAoUEZO X3ZrIyNmdW5jKXByb2NfYWRkcihwZGV2aWNlLCAidmsiICNmdW5jKQogICAgV1NJX0dFVF9DQihH ZXRQaHlzaWNhbERldmljZU1lbW9yeVByb3BlcnRpZXMpOwogICAgV1NJX0dFVF9DQihHZXRQaHlz aWNhbERldmljZVF1ZXVlRmFtaWx5UHJvcGVydGllcyk7CisgICBXU0lfR0VUX0NCKEdldFBoeXNp Y2FsRGV2aWNlUHJvcGVydGllcyk7CiAjdW5kZWYgV1NJX0dFVF9DQgogCiAgICBHZXRQaHlzaWNh bERldmljZU1lbW9yeVByb3BlcnRpZXMocGRldmljZSwgJndzaS0+bWVtb3J5X3Byb3BzKTsKICAg IEdldFBoeXNpY2FsRGV2aWNlUXVldWVGYW1pbHlQcm9wZXJ0aWVzKHBkZXZpY2UsICZ3c2ktPnF1 ZXVlX2ZhbWlseV9jb3VudCwgTlVMTCk7CiAKKyAgIFZrUGh5c2ljYWxEZXZpY2VQcm9wZXJ0aWVz IHByb3BlcnRpZXM7CisgICBHZXRQaHlzaWNhbERldmljZVByb3BlcnRpZXMocGRldmljZSwgJnBy b3BlcnRpZXMpOworICAgd3NpLT50aW1lc3RhbXBfcGVyaW9kID0gcHJvcGVydGllcy5saW1pdHMu dGltZXN0YW1wUGVyaW9kOworCiAjZGVmaW5lIFdTSV9HRVRfQ0IoZnVuYykgXAogICAgd3NpLT5m dW5jID0gKFBGTl92ayMjZnVuYylwcm9jX2FkZHIocGRldmljZSwgInZrIiAjZnVuYykKICAgIFdT SV9HRVRfQ0IoQWxsb2NhdGVNZW1vcnkpOwpAQCAtNTMsMTQgKzU4LDE4IEBAIHdzaV9kZXZpY2Vf aW5pdChzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogICAgV1NJX0dFVF9DQihCaW5kSW1hZ2VNZW1v cnkpOwogICAgV1NJX0dFVF9DQihCZWdpbkNvbW1hbmRCdWZmZXIpOwogICAgV1NJX0dFVF9DQihD bWRDb3B5SW1hZ2VUb0J1ZmZlcik7CisgICBXU0lfR0VUX0NCKENtZFJlc2V0UXVlcnlQb29sKTsK KyAgIFdTSV9HRVRfQ0IoQ21kV3JpdGVUaW1lc3RhbXApOwogICAgV1NJX0dFVF9DQihDcmVhdGVC dWZmZXIpOwogICAgV1NJX0dFVF9DQihDcmVhdGVDb21tYW5kUG9vbCk7CiAgICBXU0lfR0VUX0NC KENyZWF0ZUZlbmNlKTsKICAgIFdTSV9HRVRfQ0IoQ3JlYXRlSW1hZ2UpOworICAgV1NJX0dFVF9D QihDcmVhdGVRdWVyeVBvb2wpOwogICAgV1NJX0dFVF9DQihEZXN0cm95QnVmZmVyKTsKICAgIFdT SV9HRVRfQ0IoRGVzdHJveUNvbW1hbmRQb29sKTsKICAgIFdTSV9HRVRfQ0IoRGVzdHJveUZlbmNl KTsKICAgIFdTSV9HRVRfQ0IoRGVzdHJveUltYWdlKTsKKyAgIFdTSV9HRVRfQ0IoRGVzdHJveVF1 ZXJ5UG9vbCk7CiAgICBXU0lfR0VUX0NCKEVuZENvbW1hbmRCdWZmZXIpOwogICAgV1NJX0dFVF9D QihGcmVlTWVtb3J5KTsKICAgIFdTSV9HRVRfQ0IoRnJlZUNvbW1hbmRCdWZmZXJzKTsKQEAgLTY4 LDkgKzc3LDEzIEBAIHdzaV9kZXZpY2VfaW5pdChzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogICAg V1NJX0dFVF9DQihHZXRJbWFnZU1lbW9yeVJlcXVpcmVtZW50cyk7CiAgICBXU0lfR0VUX0NCKEdl dEltYWdlU3VicmVzb3VyY2VMYXlvdXQpOwogICAgV1NJX0dFVF9DQihHZXRNZW1vcnlGZEtIUik7 CisgICBXU0lfR0VUX0NCKEdldFBoeXNpY2FsRGV2aWNlUHJvcGVydGllcyk7CiAgICBXU0lfR0VU X0NCKEdldFBoeXNpY2FsRGV2aWNlRm9ybWF0UHJvcGVydGllcyk7CisgICBXU0lfR0VUX0NCKEdl dFBoeXNpY2FsRGV2aWNlUXVldWVGYW1pbHlQcm9wZXJ0aWVzKTsKKyAgIFdTSV9HRVRfQ0IoR2V0 UXVlcnlQb29sUmVzdWx0cyk7CiAgICBXU0lfR0VUX0NCKFJlc2V0RmVuY2VzKTsKICAgIFdTSV9H RVRfQ0IoUXVldWVTdWJtaXQpOworICAgV1NJX0dFVF9DQihRdWVyeUN1cnJlbnRUaW1lc3RhbXBN RVNBKTsKICAgIFdTSV9HRVRfQ0IoV2FpdEZvckZlbmNlcyk7CiAjdW5kZWYgV1NJX0dFVF9DQgog CkBAIC0xMzYsNiArMTQ5LDggQEAgd3NpX3N3YXBjaGFpbl9pbml0KGNvbnN0IHN0cnVjdCB3c2lf ZGV2aWNlICp3c2ksCiAgICBjaGFpbi0+ZGV2aWNlID0gZGV2aWNlOwogICAgY2hhaW4tPmFsbG9j ID0gKnBBbGxvY2F0b3I7CiAgICBjaGFpbi0+dXNlX3ByaW1lX2JsaXQgPSBmYWxzZTsKKyAgIGNo YWluLT50aW1pbmdfaW5zZXJ0ID0gMDsKKyAgIGNoYWluLT50aW1pbmdfY291bnQgPSAwOwogCiAg ICBjaGFpbi0+Y21kX3Bvb2xzID0KICAgICAgIHZrX3phbGxvYyhwQWxsb2NhdG9yLCBzaXplb2Yo VmtDb21tYW5kUG9vbCkgKiB3c2ktPnF1ZXVlX2ZhbWlseV9jb3VudCwgOCwKQEAgLTIwOSw2ICsy MjQsNjAgQEAgYWxpZ25fdTMyKHVpbnQzMl90IHYsIHVpbnQzMl90IGEpCiAgICByZXR1cm4gKHYg KyBhIC0gMSkgJiB+KGEgLSAxKTsKIH0KIAorc3RhdGljIFZrUmVzdWx0Cit3c2lfaW1hZ2VfaW5p dF90aW1lc3RhbXAoY29uc3Qgc3RydWN0IHdzaV9zd2FwY2hhaW4gKmNoYWluLAorICAgICAgICAg ICAgICAgICAgICAgICAgIHN0cnVjdCB3c2lfaW1hZ2UgKmltYWdlKQoreworICAgY29uc3Qgc3Ry dWN0IHdzaV9kZXZpY2UgKndzaSA9IGNoYWluLT53c2k7CisgICBWa1Jlc3VsdCByZXN1bHQ7Cisg ICAvKiBTZXQgdXAgY29tbWFuZCBidWZmZXIgdG8gZ2V0IHRpbWVzdGFtcCBpbmZvICovCisKKyAg IHJlc3VsdCA9IHdzaS0+Q3JlYXRlUXVlcnlQb29sKGNoYWluLT5kZXZpY2UsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAmKGNvbnN0IFZrUXVlcnlQb29sQ3JlYXRlSW5mbykgewor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLnNUeXBlID0gVktfU1RSVUNUVVJF X1RZUEVfUVVFUllfUE9PTF9DUkVBVEVfSU5GTywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC5xdWVyeVR5cGUgPSBWS19RVUVSWV9UWVBFX1RJTUVTVEFNUCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5xdWVyeUNvdW50ID0gMSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBOVUxMLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmlt YWdlLT5xdWVyeV9wb29sKTsKKworICAgaWYgKHJlc3VsdCAhPSBWS19TVUNDRVNTKQorICAgICAg Z290byBmYWlsOworCisgICByZXN1bHQgPSB3c2ktPkFsbG9jYXRlQ29tbWFuZEJ1ZmZlcnMoY2hh aW4tPmRldmljZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmKGNv bnN0IFZrQ29tbWFuZEJ1ZmZlckFsbG9jYXRlSW5mbykgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIC5zVHlwZSA9IFZLX1NUUlVDVFVSRV9UWVBFX0NPTU1BTkRf QlVGRkVSX0FMTE9DQVRFX0lORk8sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgLnBOZXh0ID0gTlVMTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAuY29tbWFuZFBvb2wgPSBjaGFpbi0+Y21kX3Bvb2xzWzBdLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC5sZXZlbCA9IFZLX0NP TU1BTkRfQlVGRkVSX0xFVkVMX1BSSU1BUlksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLmNvbW1hbmRCdWZmZXJDb3VudCA9IDEsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmaW1hZ2UtPnRpbWVzdGFtcF9idWZmZXIpOworICAgaWYgKHJl c3VsdCAhPSBWS19TVUNDRVNTKQorICAgICAgZ290byBmYWlsOworCisgICB3c2ktPkJlZ2luQ29t bWFuZEJ1ZmZlcihpbWFnZS0+dGltZXN0YW1wX2J1ZmZlciwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICYoVmtDb21tYW5kQnVmZmVyQmVnaW5JbmZvKSB7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAuc1R5cGUgPSBWS19TVFJVQ1RVUkVfVFlQRV9DT01NQU5EX0JVRkZFUl9CRUdJ Tl9JTkZPLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLmZsYWdzID0gMAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSk7CisKKyAgIHdzaS0+Q21kUmVzZXRRdWVy eVBvb2woaW1hZ2UtPnRpbWVzdGFtcF9idWZmZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAg IGltYWdlLT5xdWVyeV9wb29sLAorICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAxKTsKKwor ICAgd3NpLT5DbWRXcml0ZVRpbWVzdGFtcChpbWFnZS0+dGltZXN0YW1wX2J1ZmZlciwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgVktfUElQRUxJTkVfU1RBR0VfVE9QX09GX1BJUEVfQklULAor ICAgICAgICAgICAgICAgICAgICAgICAgICBpbWFnZS0+cXVlcnlfcG9vbCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgMCk7CisKKyAgIHdzaS0+RW5kQ29tbWFuZEJ1ZmZlcihpbWFnZS0+dGlt ZXN0YW1wX2J1ZmZlcik7CisKKyAgIHJldHVybiBWS19TVUNDRVNTOworZmFpbDoKKyAgIHJldHVy biByZXN1bHQ7Cit9CisKIFZrUmVzdWx0CiB3c2lfY3JlYXRlX25hdGl2ZV9pbWFnZShjb25zdCBz dHJ1Y3Qgd3NpX3N3YXBjaGFpbiAqY2hhaW4sCiAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBWa1N3YXBjaGFpbkNyZWF0ZUluZm9LSFIgKnBDcmVhdGVJbmZvLApAQCAtMzAzLDYgKzM3Miwx MSBAQCB3c2lfY3JlYXRlX25hdGl2ZV9pbWFnZShjb25zdCBzdHJ1Y3Qgd3NpX3N3YXBjaGFpbiAq Y2hhaW4sCiAgICB9OwogICAgaW50IGZkOwogICAgcmVzdWx0ID0gd3NpLT5HZXRNZW1vcnlGZEtI UihjaGFpbi0+ZGV2aWNlLCAmbWVtb3J5X2dldF9mZF9pbmZvLCAmZmQpOworICAgaWYgKHJlc3Vs dCAhPSBWS19TVUNDRVNTKQorICAgICAgZ290byBmYWlsOworCisgICByZXN1bHQgPSB3c2lfaW1h Z2VfaW5pdF90aW1lc3RhbXAoY2hhaW4sIGltYWdlKTsKKwogICAgaWYgKHJlc3VsdCAhPSBWS19T VUNDRVNTKQogICAgICAgZ290byBmYWlsOwogCkBAIC00OTcsNiArNTcxLDExIEBAIHdzaV9jcmVh dGVfcHJpbWVfaW1hZ2UoY29uc3Qgc3RydWN0IHdzaV9zd2FwY2hhaW4gKmNoYWluLAogICAgICAg ICAgZ290byBmYWlsOwogICAgfQogCisgICByZXN1bHQgPSB3c2lfaW1hZ2VfaW5pdF90aW1lc3Rh bXAoY2hhaW4sIGltYWdlKTsKKworICAgaWYgKHJlc3VsdCAhPSBWS19TVUNDRVNTKQorICAgICAg Z290byBmYWlsOworCiAgICBjb25zdCBWa01lbW9yeUdldEZkSW5mb0tIUiBsaW5lYXJfbWVtb3J5 X2dldF9mZF9pbmZvID0gewogICAgICAgLnNUeXBlID0gVktfU1RSVUNUVVJFX1RZUEVfTUVNT1JZ X0dFVF9GRF9JTkZPX0tIUiwKICAgICAgIC5wTmV4dCA9IE5VTEwsCkBAIC02OTUsNiArNzc0LDg3 IEBAIHdzaV9jb21tb25fYWNxdWlyZV9uZXh0X2ltYWdlKGNvbnN0IHN0cnVjdCB3c2lfZGV2aWNl ICp3c2ksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VtYXBob3Jl LCBwSW1hZ2VJbmRleCk7CiB9CiAKK3N0YXRpYyBzdHJ1Y3Qgd3NpX3RpbWluZyAqCit3c2lfZ2V0 X3RpbWluZyhzdHJ1Y3Qgd3NpX3N3YXBjaGFpbiAqY2hhaW4sIHVpbnQzMl90IGkpCit7CisgICB1 aW50MzJfdCBqID0gV1NJX1RJTUlOR19ISVNUT1JZICsgY2hhaW4tPnRpbWluZ19pbnNlcnQgLSBj aGFpbi0+dGltaW5nX2NvdW50ICsgaTsKKworICAgaWYgKGogPj0gV1NJX1RJTUlOR19ISVNUT1JZ KQorICAgICAgaiAtPSBXU0lfVElNSU5HX0hJU1RPUlk7CisgICByZXR1cm4gJmNoYWluLT50aW1p bmdbal07Cit9CisKK3N0YXRpYyBzdHJ1Y3Qgd3NpX3RpbWluZyAqCit3c2lfbmV4dF90aW1pbmco c3RydWN0IHdzaV9zd2FwY2hhaW4gKmNoYWluLCBpbnQgaW1hZ2VfaW5kZXgpCit7CisgICB1aW50 MzJfdCBqOworICAgc3RydWN0IHdzaV90aW1pbmcgKnRpbWluZzsKKworICAgaiA9IGNoYWluLT50 aW1pbmdfaW5zZXJ0OworICAgKytjaGFpbi0+dGltaW5nX2luc2VydDsKKyAgIGlmIChjaGFpbi0+ dGltaW5nX2luc2VydCA+PSBXU0lfVElNSU5HX0hJU1RPUlkpCisgICAgICBjaGFpbi0+dGltaW5n X2luc2VydCA9IDA7CisgICBpZiAoY2hhaW4tPnRpbWluZ19jb3VudCA8IFdTSV9USU1JTkdfSElT VE9SWSkKKyAgICAgICsrY2hhaW4tPnRpbWluZ19jb3VudDsKKyAgIHRpbWluZyA9ICZjaGFpbi0+ dGltaW5nW2pdOworICAgbWVtc2V0KHRpbWluZywgJ1wwJywgc2l6ZW9mICgqdGltaW5nKSk7Cisg ICByZXR1cm4gdGltaW5nOworfQorCit2b2lkCit3c2lfbWFya190aW1pbmcoc3RydWN0IHdzaV9z d2FwY2hhaW4gKnN3YXBjaGFpbiwKKyAgICAgICAgICAgICAgICBzdHJ1Y3Qgd3NpX2ltYWdlICpp bWFnZSwKKyAgICAgICAgICAgICAgICB1aW50NjRfdCB1c3QsCisgICAgICAgICAgICAgICAgdWlu dDY0X3QgbXNjKQoreworICAgY29uc3Qgc3RydWN0IHdzaV9kZXZpY2UgKndzaSA9IHN3YXBjaGFp bi0+d3NpOworICAgc3RydWN0IHdzaV90aW1pbmcgKnRpbWluZyA9IGltYWdlLT50aW1pbmc7Cisg ICBWa1Jlc3VsdCByZXN1bHQ7CisKKyAgIGlmICghdGltaW5nKQorICAgICAgcmV0dXJuOworCisg ICBzd2FwY2hhaW4tPmZyYW1lX21zYyA9IG1zYzsKKyAgIHN3YXBjaGFpbi0+ZnJhbWVfdXN0ID0g dXN0OworCisgICB1aW50NjRfdCAgICAgcmVuZGVyX3RpbWVzdGFtcDsKKworICAgcmVzdWx0ID0g d3NpLT5HZXRRdWVyeVBvb2xSZXN1bHRzKHN3YXBjaGFpbi0+ZGV2aWNlLCBpbWFnZS0+cXVlcnlf cG9vbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCAxLCBzaXplb2Yo cmVuZGVyX3RpbWVzdGFtcCksICZyZW5kZXJfdGltZXN0YW1wLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNpemVvZiAodWludDY0X3QpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFZLX1FVRVJZX1JFU1VMVF82NF9CSVR8VktfUVVFUllfUkVTVUxU X1dBSVRfQklUKTsKKworICAgaWYgKHJlc3VsdCAhPSBWS19TVUNDRVNTKQorICAgICAgcmV0dXJu OworCisgICB1aW50NjRfdCAgICAgY3VycmVudF9ncHVfdGltZXN0YW1wOworICAgcmVzdWx0ID0g d3NpLT5RdWVyeUN1cnJlbnRUaW1lc3RhbXBNRVNBKHN3YXBjaGFpbi0+ZGV2aWNlLCAmY3VycmVu dF9ncHVfdGltZXN0YW1wKTsKKyAgIGlmIChyZXN1bHQgIT0gVktfU1VDQ0VTUykKKyAgICAgIHJl dHVybjsKKyAgIHVpbnQ2NF90ICAgICBjdXJyZW50X3RpbWUgPSBzd2FwY2hhaW4tPmdldF9jdXJy ZW50X3RpbWUoKTsKKworICAgVmtSZWZyZXNoQ3ljbGVEdXJhdGlvbkdPT0dMRSBkaXNwbGF5X3Rp bWluZ3M7CisgICBzd2FwY2hhaW4tPmdldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9uKHN3YXBjaGFp biwgJmRpc3BsYXlfdGltaW5ncyk7CisKKyAgIHVpbnQ2NF90ICAgICByZWZyZXNoX2R1cmF0aW9u ID0gZGlzcGxheV90aW1pbmdzLnJlZnJlc2hEdXJhdGlvbjsKKworICAgLyogV2hlbiBkaWQgZHJh d2luZyBjb21wbGV0ZSAoaW4gbnNlYykgKi8KKworICAgdWludDY0X3QgICAgIHJlbmRlcl90aW1l ID0gY3VycmVudF90aW1lIC0gKGN1cnJlbnRfZ3B1X3RpbWVzdGFtcCAtIHJlbmRlcl90aW1lc3Rh bXApICogd3NpLT50aW1lc3RhbXBfcGVyaW9kOworCisgICBpZiAocmVuZGVyX3RpbWUgPiB1c3Qp CisgICAgICByZW5kZXJfdGltZSA9IHVzdDsKKworICAgdWludDY0X3QgICAgIHJlbmRlcl9mcmFt ZXMgPSAodXN0IC0gcmVuZGVyX3RpbWUpIC8gcmVmcmVzaF9kdXJhdGlvbjsKKworICAgdWludDY0 X3QgICAgIGVhcmxpZXN0X3RpbWUgPSB1c3QgLSByZW5kZXJfZnJhbWVzICogcmVmcmVzaF9kdXJh dGlvbjsKKworICAgdGltaW5nLT50aW1pbmcuYWN0dWFsUHJlc2VudFRpbWUgPSB1c3Q7CisgICB0 aW1pbmctPnRpbWluZy5lYXJsaWVzdFByZXNlbnRUaW1lID0gZWFybGllc3RfdGltZTsKKyAgIHRp bWluZy0+dGltaW5nLnByZXNlbnRNYXJnaW4gPSBlYXJsaWVzdF90aW1lIC0gcmVuZGVyX3RpbWU7 CisgICB0aW1pbmctPmNvbXBsZXRlID0gdHJ1ZTsKK30KKwogVmtSZXN1bHQKIHdzaV9jb21tb25f cXVldWVfcHJlc2VudChjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogICAgICAgICAgICAg ICAgICAgICAgICAgIFZrRGV2aWNlIGRldmljZSwKQEAgLTcwNiwxMCArODY2LDEzIEBAIHdzaV9j b21tb25fcXVldWVfcHJlc2VudChjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogCiAgICBj b25zdCBWa1ByZXNlbnRSZWdpb25zS0hSICpyZWdpb25zID0KICAgICAgIHZrX2ZpbmRfc3RydWN0 X2NvbnN0KHBQcmVzZW50SW5mby0+cE5leHQsIFBSRVNFTlRfUkVHSU9OU19LSFIpOworICAgY29u c3QgVmtQcmVzZW50VGltZXNJbmZvR09PR0xFICpwcmVzZW50X3RpbWVzX2luZm8gPQorICAgICAg dmtfZmluZF9zdHJ1Y3RfY29uc3QocFByZXNlbnRJbmZvLT5wTmV4dCwgUFJFU0VOVF9USU1FU19J TkZPX0dPT0dMRSk7CiAKICAgIGZvciAodWludDMyX3QgaSA9IDA7IGkgPCBwUHJlc2VudEluZm8t PnN3YXBjaGFpbkNvdW50OyBpKyspIHsKICAgICAgIFdTSV9GUk9NX0hBTkRMRSh3c2lfc3dhcGNo YWluLCBzd2FwY2hhaW4sIHBQcmVzZW50SW5mby0+cFN3YXBjaGFpbnNbaV0pOwogICAgICAgVmtS ZXN1bHQgcmVzdWx0OworICAgICAgc3RydWN0IHdzaV90aW1pbmcgKnRpbWluZyA9IE5VTEw7CiAK ICAgICAgIGlmIChzd2FwY2hhaW4tPmZlbmNlc1swXSA9PSBWS19OVUxMX0hBTkRMRSkgewogICAg ICAgICAgY29uc3QgVmtGZW5jZUNyZWF0ZUluZm8gZmVuY2VfaW5mbyA9IHsKQEAgLTcyNiw5ICs4 ODksMTIgQEAgd3NpX2NvbW1vbl9xdWV1ZV9wcmVzZW50KGNvbnN0IHN0cnVjdCB3c2lfZGV2aWNl ICp3c2ksCiAgICAgICAgICB3c2ktPlJlc2V0RmVuY2VzKGRldmljZSwgMSwgJnN3YXBjaGFpbi0+ ZmVuY2VzWzBdKTsKICAgICAgIH0KIAorICAgICAgVmtDb21tYW5kQnVmZmVyIHN1Ym1pdF9idWZm ZXJzWzJdOwogICAgICAgVmtTdWJtaXRJbmZvIHN1Ym1pdF9pbmZvID0gewogICAgICAgICAgLnNU eXBlID0gVktfU1RSVUNUVVJFX1RZUEVfU1VCTUlUX0lORk8sCiAgICAgICAgICAucE5leHQgPSBO VUxMLAorICAgICAgICAgLnBDb21tYW5kQnVmZmVycyA9IHN1Ym1pdF9idWZmZXJzLAorICAgICAg ICAgLmNvbW1hbmRCdWZmZXJDb3VudCA9IDAKICAgICAgIH07CiAKICAgICAgIFZrUGlwZWxpbmVT dGFnZUZsYWdzICpzdGFnZV9mbGFncyA9IE5VTEw7CkBAIC03NjEsOSArOTI3LDQ0IEBAIHdzaV9j b21tb25fcXVldWVfcHJlc2VudChjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogICAgICAg ICAgICovCiAgICAgICAgICBzdHJ1Y3Qgd3NpX2ltYWdlICppbWFnZSA9CiAgICAgICAgICAgICBz d2FwY2hhaW4tPmdldF93c2lfaW1hZ2Uoc3dhcGNoYWluLCBwUHJlc2VudEluZm8tPnBJbWFnZUlu ZGljZXNbaV0pOwotICAgICAgICAgc3VibWl0X2luZm8uY29tbWFuZEJ1ZmZlckNvdW50ID0gMTsK LSAgICAgICAgIHN1Ym1pdF9pbmZvLnBDb21tYW5kQnVmZmVycyA9Ci0gICAgICAgICAgICAmaW1h Z2UtPnByaW1lLmJsaXRfY21kX2J1ZmZlcnNbcXVldWVfZmFtaWx5X2luZGV4XTsKKyAgICAgICAg IHN1Ym1pdF9idWZmZXJzW3N1Ym1pdF9pbmZvLmNvbW1hbmRCdWZmZXJDb3VudCsrXSA9IAorICAg ICAgICAgICAgaW1hZ2UtPnByaW1lLmJsaXRfY21kX2J1ZmZlcnNbcXVldWVfZmFtaWx5X2luZGV4 XTsKKyAgICAgIH0KKworICAgICAgLyogU2V0IHVwIEdPT0dMRV9kaXNwbGF5X3RpbWluZyBiaXRz ICovCisgICAgICBpZiAocHJlc2VudF90aW1lc19pbmZvICYmCisgICAgICAgICAgcHJlc2VudF90 aW1lc19pbmZvLT5wVGltZXMgIT0gTlVMTCAmJgorICAgICAgICAgIGkgPCBwcmVzZW50X3RpbWVz X2luZm8tPnN3YXBjaGFpbkNvdW50KQorICAgICAgeworICAgICAgICAgY29uc3QgVmtQcmVzZW50 VGltZUdPT0dMRSAqcHJlc2VudF90aW1lID0gJnByZXNlbnRfdGltZXNfaW5mby0+cFRpbWVzW2ld OworCisgICAgICAgICBzdHJ1Y3Qgd3NpX2ltYWdlICppbWFnZSA9IHN3YXBjaGFpbi0+Z2V0X3dz aV9pbWFnZShzd2FwY2hhaW4sIHBQcmVzZW50SW5mby0+cEltYWdlSW5kaWNlc1tpXSk7CisKKyAg ICAgICAgIHRpbWluZyA9IHdzaV9uZXh0X3RpbWluZyhzd2FwY2hhaW4sIHBQcmVzZW50SW5mby0+ cEltYWdlSW5kaWNlc1tpXSk7CisgICAgICAgICB0aW1pbmctPnRpbWluZy5wcmVzZW50SUQgPSBw cmVzZW50X3RpbWUtPnByZXNlbnRJRDsKKyAgICAgICAgIHRpbWluZy0+dGltaW5nLmRlc2lyZWRQ cmVzZW50VGltZSA9IHByZXNlbnRfdGltZS0+ZGVzaXJlZFByZXNlbnRUaW1lOworICAgICAgICAg dGltaW5nLT50YXJnZXRfbXNjID0gMDsKKyAgICAgICAgIGltYWdlLT50aW1pbmcgPSB0aW1pbmc7 CisKKyAgICAgICAgIGlmIChwcmVzZW50X3RpbWUtPmRlc2lyZWRQcmVzZW50VGltZSAhPSAwKQor ICAgICAgICAgeworICAgICAgICAgICAgaW50NjRfdCBkZWx0YV9uc2VjID0gKGludDY0X3QpIChw cmVzZW50X3RpbWUtPmRlc2lyZWRQcmVzZW50VGltZSAtIHN3YXBjaGFpbi0+ZnJhbWVfdXN0KTsK KworICAgICAgICAgICAgLyogU2V0IHRoZSB0YXJnZXQgbXNjIG9ubHkgaWYgaXQncyBubyBtb3Jl IHRoYW4gdHdvIHNlY29uZHMgZnJvbQorICAgICAgICAgICAgICogbm93LCBhbmQgbm90IHN0YWxl CisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAgIGlmICgwIDw9IGRlbHRhX25zZWMgJiYgZGVs dGFfbnNlYyA8PSAyMDAwMDAwMDAwdWwpIHsKKyAgICAgICAgICAgICAgIFZrUmVmcmVzaEN5Y2xl RHVyYXRpb25HT09HTEUgcmVmcmVzaF90aW1pbmc7CisKKyAgICAgICAgICAgICAgIHN3YXBjaGFp bi0+Z2V0X3JlZnJlc2hfY3ljbGVfZHVyYXRpb24oc3dhcGNoYWluLCAmcmVmcmVzaF90aW1pbmcp OworCisgICAgICAgICAgICAgICBpbnQ2NF90IHJlZnJlc2ggPSAoaW50NjRfdCkgcmVmcmVzaF90 aW1pbmcucmVmcmVzaER1cmF0aW9uOworICAgICAgICAgICAgICAgaW50NjRfdCBmcmFtZXMgPSAo ZGVsdGFfbnNlYyArIHJlZnJlc2gvMikgLyByZWZyZXNoOworICAgICAgICAgICAgICAgdGltaW5n LT50YXJnZXRfbXNjID0gc3dhcGNoYWluLT5mcmFtZV9tc2MgKyBmcmFtZXM7CisgICAgICAgICAg ICB9CisgICAgICAgICB9CisKKyAgICAgICAgIHN1Ym1pdF9idWZmZXJzW3N1Ym1pdF9pbmZvLmNv bW1hbmRCdWZmZXJDb3VudCsrXSA9IGltYWdlLT50aW1lc3RhbXBfYnVmZmVyOwogICAgICAgfQog CiAgICAgICByZXN1bHQgPSB3c2ktPlF1ZXVlU3VibWl0KHF1ZXVlLCAxLCAmc3VibWl0X2luZm8s IHN3YXBjaGFpbi0+ZmVuY2VzWzBdKTsKQEAgLTgwMSwzICsxMDAyLDUwIEBAIHdzaV9jb21tb25f cXVldWVfcHJlc2VudChjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAogCiAgICByZXR1cm4g ZmluYWxfcmVzdWx0OwogfQorCitWa1Jlc3VsdAord3NpX2NvbW1vbl9nZXRfcmVmcmVzaF9jeWNs ZV9kdXJhdGlvbihjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBWa0RldmljZSBkZXZpY2VfaCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgVmtTd2FwY2hhaW5LSFIgX3N3YXBjaGFpbiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtSZWZyZXNoQ3ljbGVEdXJhdGlvbkdP T0dMRSAqcERpc3BsYXlUaW1pbmdQcm9wZXJ0aWVzKQoreworICAgV1NJX0ZST01fSEFORExFKHdz aV9zd2FwY2hhaW4sIHN3YXBjaGFpbiwgX3N3YXBjaGFpbik7CisKKyAgIGlmICghc3dhcGNoYWlu LT5nZXRfcmVmcmVzaF9jeWNsZV9kdXJhdGlvbikKKyAgICAgIHJldHVybiBWS19FUlJPUl9FWFRF TlNJT05fTk9UX1BSRVNFTlQ7CisgICByZXR1cm4gc3dhcGNoYWluLT5nZXRfcmVmcmVzaF9jeWNs ZV9kdXJhdGlvbihzd2FwY2hhaW4sIHBEaXNwbGF5VGltaW5nUHJvcGVydGllcyk7Cit9CisKKwor VmtSZXN1bHQKK3dzaV9jb21tb25fZ2V0X3Bhc3RfcHJlc2VudGF0aW9uX3RpbWluZyhjb25zdCBz dHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFZrRGV2aWNlIGRldmljZV9oLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFZrU3dhcGNoYWluS0hSIF9zd2FwY2hhaW4sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgKmNvdW50LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFZrUGFzdFByZXNlbnRhdGlvblRpbWluZ0dPT0dMRSAqdGlt aW5ncykKK3sKKyAgIFdTSV9GUk9NX0hBTkRMRSh3c2lfc3dhcGNoYWluLCBzd2FwY2hhaW4sIF9z d2FwY2hhaW4pOworICAgdWludDMyX3QgdGltaW5nX2NvdW50X3JlcXVlc3RlZCA9ICpjb3VudDsK KyAgIHVpbnQzMl90IHRpbWluZ19jb3VudF9hdmFpbGFibGUgPSAwOworICAgdWludDMyX3QgdDsK KworICAgLyogQ291bnQgdGhlIG51bWJlciBvZiBjb21wbGV0ZWQgZW50cmllcywgY29weSAqLwor ICAgZm9yICh0ID0gMDsgdCA8IHN3YXBjaGFpbi0+dGltaW5nX2NvdW50OyB0KyspIHsKKyAgICAg IHN0cnVjdCB3c2lfdGltaW5nICp0aW1pbmcgPSB3c2lfZ2V0X3RpbWluZyhzd2FwY2hhaW4sIHQp OworCisgICAgICBpZiAodGltaW5nLT5jb21wbGV0ZSAmJiAhdGltaW5nLT5jb25zdW1lZCkgewor ICAgICAgICAgaWYgKHRpbWluZ3MgJiYgdGltaW5nX2NvdW50X2F2YWlsYWJsZSA8IHRpbWluZ19j b3VudF9yZXF1ZXN0ZWQpIHsKKyAgICAgICAgICAgIHRpbWluZ3NbdGltaW5nX2NvdW50X2F2YWls YWJsZV0gPSB0aW1pbmctPnRpbWluZzsKKyAgICAgICAgICAgIHRpbWluZy0+Y29uc3VtZWQgPSB0 cnVlOworICAgICAgICAgfQorICAgICAgICAgdGltaW5nX2NvdW50X2F2YWlsYWJsZSsrOworICAg ICAgfQorICAgfQorCisgICAqY291bnQgPSB0aW1pbmdfY291bnRfYXZhaWxhYmxlOworCisgICBp ZiAodGltaW5nX2NvdW50X2F2YWlsYWJsZSA+IHRpbWluZ19jb3VudF9yZXF1ZXN0ZWQgJiYgdGlt aW5ncyAhPSBOVUxMKQorICAgICAgcmV0dXJuIFZLX0lOQ09NUExFVEU7CisKKyAgIHJldHVybiBW S19TVUNDRVNTOworfQpkaWZmIC0tZ2l0IGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbi5oIGIv c3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbi5oCmluZGV4IGU1MDRmNDEyMGFkLi40Nzc4NjgxMGI2 NiAxMDA2NDQKLS0tIGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbi5oCisrKyBiL3NyYy92dWxr YW4vd3NpL3dzaV9jb21tb24uaApAQCAtNjQsNiArNjQsNyBAQCBzdHJ1Y3Qgd3NpX2ludGVyZmFj ZTsKIHN0cnVjdCB3c2lfZGV2aWNlIHsKICAgIFZrUGh5c2ljYWxEZXZpY2VNZW1vcnlQcm9wZXJ0 aWVzIG1lbW9yeV9wcm9wczsKICAgIHVpbnQzMl90IHF1ZXVlX2ZhbWlseV9jb3VudDsKKyAgIGZs b2F0IHRpbWVzdGFtcF9wZXJpb2Q7CiAKICNkZWZpbmUgV1NJX0NCKGNiKSBQRk5fdmsjI2NiIGNi CiAgICBXU0lfQ0IoQWxsb2NhdGVNZW1vcnkpOwpAQCAtNzIsMTQgKzczLDE4IEBAIHN0cnVjdCB3 c2lfZGV2aWNlIHsKICAgIFdTSV9DQihCaW5kSW1hZ2VNZW1vcnkpOwogICAgV1NJX0NCKEJlZ2lu Q29tbWFuZEJ1ZmZlcik7CiAgICBXU0lfQ0IoQ21kQ29weUltYWdlVG9CdWZmZXIpOworICAgV1NJ X0NCKENtZFJlc2V0UXVlcnlQb29sKTsKKyAgIFdTSV9DQihDbWRXcml0ZVRpbWVzdGFtcCk7CiAg ICBXU0lfQ0IoQ3JlYXRlQnVmZmVyKTsKICAgIFdTSV9DQihDcmVhdGVDb21tYW5kUG9vbCk7CiAg ICBXU0lfQ0IoQ3JlYXRlRmVuY2UpOwogICAgV1NJX0NCKENyZWF0ZUltYWdlKTsKKyAgIFdTSV9D QihDcmVhdGVRdWVyeVBvb2wpOwogICAgV1NJX0NCKERlc3Ryb3lCdWZmZXIpOwogICAgV1NJX0NC KERlc3Ryb3lDb21tYW5kUG9vbCk7CiAgICBXU0lfQ0IoRGVzdHJveUZlbmNlKTsKICAgIFdTSV9D QihEZXN0cm95SW1hZ2UpOworICAgV1NJX0NCKERlc3Ryb3lRdWVyeVBvb2wpOwogICAgV1NJX0NC KEVuZENvbW1hbmRCdWZmZXIpOwogICAgV1NJX0NCKEZyZWVNZW1vcnkpOwogICAgV1NJX0NCKEZy ZWVDb21tYW5kQnVmZmVycyk7CkBAIC04Nyw5ICs5MiwxMyBAQCBzdHJ1Y3Qgd3NpX2RldmljZSB7 CiAgICBXU0lfQ0IoR2V0SW1hZ2VNZW1vcnlSZXF1aXJlbWVudHMpOwogICAgV1NJX0NCKEdldElt YWdlU3VicmVzb3VyY2VMYXlvdXQpOwogICAgV1NJX0NCKEdldE1lbW9yeUZkS0hSKTsKKyAgIFdT SV9DQihHZXRQaHlzaWNhbERldmljZVByb3BlcnRpZXMpOwogICAgV1NJX0NCKEdldFBoeXNpY2Fs RGV2aWNlRm9ybWF0UHJvcGVydGllcyk7CisgICBXU0lfQ0IoR2V0UGh5c2ljYWxEZXZpY2VRdWV1 ZUZhbWlseVByb3BlcnRpZXMpOworICAgV1NJX0NCKEdldFF1ZXJ5UG9vbFJlc3VsdHMpOwogICAg V1NJX0NCKFJlc2V0RmVuY2VzKTsKICAgIFdTSV9DQihRdWV1ZVN1Ym1pdCk7CisgICBXU0lfQ0Io UXVlcnlDdXJyZW50VGltZXN0YW1wTUVTQSk7CiAgICBXU0lfQ0IoV2FpdEZvckZlbmNlcyk7CiAj dW5kZWYgV1NJX0NCCiAKQEAgLTIwMSw0ICsyMTAsMTkgQEAgd3NpX2NvbW1vbl9xdWV1ZV9wcmVz ZW50KGNvbnN0IHN0cnVjdCB3c2lfZGV2aWNlICp3c2ksCiAgICAgICAgICAgICAgICAgICAgICAg ICAgaW50IHF1ZXVlX2ZhbWlseV9pbmRleCwKICAgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBWa1ByZXNlbnRJbmZvS0hSICpwUHJlc2VudEluZm8pOwogCisvKiBWS19HT09HTEVfZGlzcGxh eV90aW1pbmcgKi8KK1ZrUmVzdWx0Cit3c2lfY29tbW9uX2dldF9yZWZyZXNoX2N5Y2xlX2R1cmF0 aW9uKGNvbnN0IHN0cnVjdCB3c2lfZGV2aWNlICp3c2ksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFZrRGV2aWNlIGRldmljZV9oLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBWa1N3YXBjaGFpbktIUiBzd2FwY2hhaW4sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFZrUmVmcmVzaEN5Y2xlRHVyYXRpb25HT09HTEUgKnBE aXNwbGF5VGltaW5nUHJvcGVydGllcyk7CisKKworVmtSZXN1bHQKK3dzaV9jb21tb25fZ2V0X3Bh c3RfcHJlc2VudGF0aW9uX3RpbWluZyhjb25zdCBzdHJ1Y3Qgd3NpX2RldmljZSAqd3NpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrRGV2aWNlIGRldmljZV9oLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrU3dhcGNoYWluS0hSIHN3 YXBjaGFpbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJf dCAqcFByZXNlbnRhdGlvblRpbWluZ0NvdW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFZrUGFzdFByZXNlbnRhdGlvblRpbWluZ0dPT0dMRSAqcFByZXNlbnRhdGlv blRpbWluZ3MpOworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21t b25fZGlzcGxheS5jIGIvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl9kaXNwbGF5LmMKaW5kZXgg YzM2MDhmMTNlNTQuLjYwYmM2ZThiZTAwIDEwMDY0NAotLS0gYS9zcmMvdnVsa2FuL3dzaS93c2lf Y29tbW9uX2Rpc3BsYXkuYworKysgYi9zcmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX2Rpc3BsYXku YwpAQCAtNzUsNiArNzUsOCBAQCB0eXBlZGVmIHN0cnVjdCB3c2lfZGlzcGxheV9jb25uZWN0b3Ig ewogICAgY2hhciAgICAgICAgICAgICAgICAgICAgICAgICAqbmFtZTsKICAgIGJvb2wgICAgICAg ICAgICAgICAgICAgICAgICAgY29ubmVjdGVkOwogICAgYm9vbCAgICAgICAgICAgICAgICAgICAg ICAgICBhY3RpdmU7CisgICB1aW50NjRfdCAgICAgICAgICAgICAgICAgICAgIGxhc3RfZnJhbWU7 CisgICB1aW50NjRfdCAgICAgICAgICAgICAgICAgICAgIGxhc3RfbnNlYzsKICAgIHdzaV9kaXNw bGF5X21vZGUgICAgICAgICAgICAgKmN1cnJlbnRfbW9kZTsKICAgIGRybU1vZGVNb2RlSW5mbyAg ICAgICAgICAgICAgY3VycmVudF9kcm1fbW9kZTsKICAgIHVpbnQzMl90ICAgICAgICAgICAgICAg ICAgICAgZHBtc19wcm9wZXJ0eTsKQEAgLTEwNCw2ICsxMDYsNyBAQCBzdHJ1Y3Qgd3NpX2Rpc3Bs YXkgewogZW51bSB3c2lfaW1hZ2Vfc3RhdGUgewogICAgd3NpX2ltYWdlX2lkbGUsCiAgICB3c2lf aW1hZ2VfZHJhd2luZywKKyAgIHdzaV9pbWFnZV93YWl0aW5nLAogICAgd3NpX2ltYWdlX3F1ZXVl ZCwKICAgIHdzaV9pbWFnZV9mbGlwcGluZywKICAgIHdzaV9pbWFnZV9kaXNwbGF5aW5nCkBAIC0x MTMsNiArMTE2LDcgQEAgc3RydWN0IHdzaV9kaXNwbGF5X2ltYWdlIHsKICAgIHN0cnVjdCB3c2lf aW1hZ2UgICAgICAgICAgICAgYmFzZTsKICAgIHN0cnVjdCB3c2lfZGlzcGxheV9zd2FwY2hhaW4g KmNoYWluOwogICAgZW51bSB3c2lfaW1hZ2Vfc3RhdGUgICAgICAgICBzdGF0ZTsKKyAgIHN0cnVj dCB3c2lfZGlzcGxheV9mZW5jZSAgICAgKmZlbmNlOwogICAgdWludDMyX3QgICAgICAgICAgICAg ICAgICAgICBmYl9pZDsKICAgIHVpbnQ2NF90ICAgICAgICAgICAgICAgICAgICAgZmxpcF9zZXF1 ZW5jZTsKIH07CkBAIC0xMjIsNiArMTI2LDcgQEAgc3RydWN0IHdzaV9kaXNwbGF5X3N3YXBjaGFp biB7CiAgICBzdHJ1Y3Qgd3NpX2Rpc3BsYXkgICAgICAgICAgICp3c2k7CiAgICBWa0ljZFN1cmZh Y2VEaXNwbGF5ICAgICAgICAgICpzdXJmYWNlOwogICAgdWludDY0X3QgICAgICAgICAgICAgICAg ICAgICBmbGlwX3NlcXVlbmNlOworICAgY29uc3QgVmtBbGxvY2F0aW9uQ2FsbGJhY2tzICAqYWxs b2NhdG9yOwogICAgc3RydWN0IHdzaV9kaXNwbGF5X2ltYWdlICAgICBpbWFnZXNbMF07CiB9Owog CkBAIC0xMzAsNiArMTM1LDcgQEAgc3RydWN0IHdzaV9kaXNwbGF5X2ZlbmNlIHsKICAgIGJvb2wg ICAgICAgICAgICAgICAgICAgICAgICAgZXZlbnRfcmVjZWl2ZWQ7CiAgICBib29sICAgICAgICAg ICAgICAgICAgICAgICAgIGRlc3Ryb3llZDsKICAgIHVpbnQ2NF90ICAgICAgICAgICAgICAgICAg ICAgc2VxdWVuY2U7CisgICBzdHJ1Y3Qgd3NpX2Rpc3BsYXlfaW1hZ2UgICAgICppbWFnZTsKIH07 CiAKIHN0YXRpYyB1aW50NjRfdCBmZW5jZV9zZXF1ZW5jZTsKQEAgLTc5OSw2ICs4MDUsNyBAQCB3 c2lfZGlzcGxheV9pbWFnZV9pbml0KFZrRGV2aWNlICAgICAgICAgICAgICAgICAgICAgICAgIGRl dmljZV9oLAogCiAgICBpbWFnZS0+Y2hhaW4gPSBjaGFpbjsKICAgIGltYWdlLT5zdGF0ZSA9IHdz aV9pbWFnZV9pZGxlOworICAgaW1hZ2UtPmZlbmNlID0gTlVMTDsKICAgIGltYWdlLT5mYl9pZCA9 IDA7CiAKICAgIC8qIFhYWCBleHRyYWN0IGRlcHRoIGFuZCBicHAgZnJvbSBpbWFnZSBzb21laG93 ICovCkBAIC04NjYsNiArODczLDExIEBAIHdzaV9kaXNwbGF5X2lkbGVfb2xkX2Rpc3BsYXlpbmco c3RydWN0IHdzaV9kaXNwbGF5X2ltYWdlICphY3RpdmVfaW1hZ2UpCiBzdGF0aWMgVmtSZXN1bHQK IF93c2lfZGlzcGxheV9xdWV1ZV9uZXh0KHN0cnVjdCB3c2lfc3dhcGNoYWluICAgICAqZHJ2X2No YWluKTsKIAorc3RhdGljIHVpbnQ2NF90IHdpZGVuXzMyX3RvXzY0KHVpbnQzMl90IG5hcnJvdywg dWludDY0X3QgbmVhcikKK3sKKwlyZXR1cm4gbmVhciArIChpbnQzMl90KSAobmFycm93IC0gbmVh cik7Cit9CisKIHN0YXRpYyB2b2lkCiB3c2lfZGlzcGxheV9wYWdlX2ZsaXBfaGFuZGxlcjIoaW50 ICAgICAgICAgICAgICBmZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBpbnQgICAgIGZyYW1lLApAQCAtODc1LDExICs4ODcsMjUgQEAgd3NpX2Rpc3BsYXlfcGFnZV9m bGlwX2hhbmRsZXIyKGludCAgICAgICAgICAgICAgZmQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdm9pZCAgICAgICAgICAgICAqZGF0YSkKIHsKICAgIHN0cnVjdCB3c2lfZGlzcGxh eV9pbWFnZSAgICAgKmltYWdlID0gZGF0YTsKKyAgIHN0cnVjdCB3c2lfZGlzcGxheV9zd2FwY2hh aW4gKmNoYWluID0gaW1hZ2UtPmNoYWluOworICAgVmtJY2RTdXJmYWNlRGlzcGxheSAgICAgICAg ICAqc3VyZmFjZSA9IGNoYWluLT5zdXJmYWNlOworICAgd3NpX2Rpc3BsYXlfbW9kZSAgICAgICAg ICAgICAqZGlzcGxheV9tb2RlID0gd3NpX2Rpc3BsYXlfbW9kZV9mcm9tX2hhbmRsZShzdXJmYWNl LT5kaXNwbGF5TW9kZSk7CisgICB3c2lfZGlzcGxheV9jb25uZWN0b3IgICAgICAgICpjb25uZWN0 b3IgPSBkaXNwbGF5X21vZGUtPmNvbm5lY3RvcjsKKyAgIHVpbnQ2NF90ICAgICAgICAgICAgICAg ICAgICAgZnJhbWU2NCA9IHdpZGVuXzMyX3RvXzY0KGZyYW1lLCBjb25uZWN0b3ItPmxhc3RfZnJh bWUpOworICAgdWludDY0X3QgICAgICAgICAgICAgICAgICAgICBuc2VjID0gKHVpbnQ2NF90KSBz ZWMgKiAxMDAwMDAwMDAwICsgKHVpbnQ2NF90KSB1c2VjICogMTAwMDsKKworICAgLyogRG9uJ3Qg bGV0IHRpbWUgZ28gYmFja3dhcmRzIGJlY2F1c2UgdGhpcyBmdW5jdGlvbiBoYXMgbG93ZXIgcmVz b2x1dGlvbiB0aGFuIGt0aW1lICovCisgICBpZiAobnNlYyA8IGNvbm5lY3Rvci0+bGFzdF9uc2Vj KQorICAgICAgbnNlYyA9IGNvbm5lY3Rvci0+bGFzdF9uc2VjOwogCi0gICB3c2lfZGlzcGxheV9k ZWJ1ZygiaW1hZ2UgJWxkIGRpc3BsYXllZCBhdCAlZFxuIiwgaW1hZ2UgLSAmKGltYWdlLT5jaGFp bi0+aW1hZ2VzWzBdKSwgZnJhbWUpOworICAgd3NpX2Rpc3BsYXlfZGVidWcoImltYWdlICVsZCBk aXNwbGF5ZWQgYXQgJWxkXG4iLCBpbWFnZSAtICYoaW1hZ2UtPmNoYWluLT5pbWFnZXNbMF0pLCBm cmFtZTY0KTsKICAgIGltYWdlLT5zdGF0ZSA9IHdzaV9pbWFnZV9kaXNwbGF5aW5nOworICAgY29u bmVjdG9yLT5sYXN0X2ZyYW1lID0gZnJhbWU2NDsKKyAgIGNvbm5lY3Rvci0+bGFzdF9uc2VjID0g bnNlYzsKKyAgIHdzaV9tYXJrX3RpbWluZygmaW1hZ2UtPmNoYWluLT5iYXNlLCAmaW1hZ2UtPmJh c2UsCisgICAgICAgICAgICAgICAgICAgbnNlYywgZnJhbWU2NCk7CiAgICB3c2lfZGlzcGxheV9p ZGxlX29sZF9kaXNwbGF5aW5nKGltYWdlKTsKLSAgICh2b2lkKSBfd3NpX2Rpc3BsYXlfcXVldWVf bmV4dCgmKGltYWdlLT5jaGFpbi0+YmFzZSkpOworICAgKHZvaWQpIF93c2lfZGlzcGxheV9xdWV1 ZV9uZXh0KCYoY2hhaW4tPmJhc2UpKTsKIH0KIAogc3RhdGljIHZvaWQgd3NpX2Rpc3BsYXlfcGFn ZV9mbGlwX2hhbmRsZXIoaW50IGZkLCB1bnNpZ25lZCBpbnQgZnJhbWUsCkBAIC0xMjI4LDYgKzEy NTQsNyBAQCB3c2lfZGlzcGxheV9mZW5jZV9hbGxvYyhWa0RldmljZSAgICAgICAgICAgICAgICAg ICAgICAgIGRldmljZSwKICAgIGZlbmNlLT5ldmVudF9yZWNlaXZlZCA9IGZhbHNlOwogICAgZmVu Y2UtPmRlc3Ryb3llZCA9IGZhbHNlOwogICAgZmVuY2UtPnNlcXVlbmNlID0gKytmZW5jZV9zZXF1 ZW5jZTsKKyAgIGZlbmNlLT5pbWFnZSA9IE5VTEw7CiAgICByZXR1cm4gZmVuY2U7CiB9CiAKQEAg LTEzMjMsNiArMTM1MCwxMiBAQCBfd3NpX2Rpc3BsYXlfcXVldWVfbmV4dChzdHJ1Y3Qgd3NpX3N3 YXBjaGFpbiAgICAgKmRydl9jaGFpbikKICAgICAgIGlmICghaW1hZ2UpCiAgICAgICAgICByZXR1 cm4gVktfU1VDQ0VTUzsKIAorICAgICAgaWYgKGltYWdlLT5mZW5jZSkgeworICAgICAgICAgaW1h Z2UtPmZlbmNlLT5pbWFnZSA9IE5VTEw7CisgICAgICAgICB3c2lfZGlzcGxheV9mZW5jZV9kZXN0 cm95KCZpbWFnZS0+ZmVuY2UtPmJhc2UpOworICAgICAgICAgaW1hZ2UtPmZlbmNlID0gTlVMTDsK KyAgICAgIH0KKwogICAgICAgaWYgKGNvbm5lY3Rvci0+YWN0aXZlKSB7CiAgICAgICAgICByZXQg PSBkcm1Nb2RlUGFnZUZsaXAod3NpLT5tYXN0ZXJfZmQsIGNvbm5lY3Rvci0+Y3J0Y19pZCwgaW1h Z2UtPmZiX2lkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERSTV9NT0RFX1BBR0Vf RkxJUF9FVkVOVCwgaW1hZ2UpOwpAQCAtMTM4NSwxNiArMTQxOCw4MyBAQCB3c2lfZGlzcGxheV9x dWV1ZV9wcmVzZW50KHN0cnVjdCB3c2lfc3dhcGNoYWluICAgICAgICAgICpkcnZfY2hhaW4sCiAK ICAgIHB0aHJlYWRfbXV0ZXhfbG9jaygmd3NpLT53YWl0X211dGV4KTsKIAorICAgaWYgKGltYWdl LT5iYXNlLnRpbWluZyAmJiBpbWFnZS0+YmFzZS50aW1pbmctPnRhcmdldF9tc2MgIT0gMCkgewor ICAgICAgVmtJY2RTdXJmYWNlRGlzcGxheSAgICAgICAgICAqc3VyZmFjZSA9IGNoYWluLT5zdXJm YWNlOworICAgICAgd3NpX2Rpc3BsYXlfbW9kZSAgICAgICAgICAgICAqZGlzcGxheV9tb2RlID0g d3NpX2Rpc3BsYXlfbW9kZV9mcm9tX2hhbmRsZShzdXJmYWNlLT5kaXNwbGF5TW9kZSk7CisgICAg ICB3c2lfZGlzcGxheV9jb25uZWN0b3IgICAgICAgICpjb25uZWN0b3IgPSBkaXNwbGF5X21vZGUt PmNvbm5lY3RvcjsKKworICAgICAgd3NpX2Rpc3BsYXlfZGVidWcoImRlbHRhIGZyYW1lICVsZFxu IiwgaW1hZ2UtPmJhc2UudGltaW5nLT50YXJnZXRfbXNjIC0gY29ubmVjdG9yLT5sYXN0X2ZyYW1l KTsKKyAgICAgIGlmIChpbWFnZS0+YmFzZS50aW1pbmctPnRhcmdldF9tc2MgPiBjb25uZWN0b3It Pmxhc3RfZnJhbWUpIHsKKyAgICAgICAgIHVpbnQ2NF90IGZyYW1lX3F1ZXVlZDsKKyAgICAgICAg IFZrRGlzcGxheUtIUiBkaXNwbGF5ID0gd3NpX2Rpc3BsYXlfY29ubmVjdG9yX3RvX2hhbmRsZShj b25uZWN0b3IpOworCisgICAgICAgICB3c2lfZGlzcGxheV9kZWJ1Z19jb2RlKHVpbnQ2NF90IGN1 cnJlbnRfZnJhbWUsIGN1cnJlbnRfbnNlYzsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZHJtQ3J0Y0dldFNlcXVlbmNlKHdzaS0+bWFzdGVyX2ZkLCBjb25uZWN0b3ItPmNydGNfaWQs ICZjdXJyZW50X2ZyYW1lLCAmY3VycmVudF9uc2VjKTsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgd3NpX2Rpc3BsYXlfZGVidWcoImZyb20gY3VycmVudDogJWxkXG4iLCBpbWFnZS0+ YmFzZS50aW1pbmctPnRhcmdldF9tc2MgLSBjdXJyZW50X2ZyYW1lKSk7CisKKyAgICAgICAgIGlt YWdlLT5mZW5jZSA9IHdzaV9kaXNwbGF5X2ZlbmNlX2FsbG9jKGNoYWluLT5iYXNlLmRldmljZSwg Y2hhaW4tPmJhc2Uud3NpLCBkaXNwbGF5LCAmY2hhaW4tPmJhc2UuYWxsb2MpOworCisgICAgICAg ICBpZiAoIWltYWdlLT5mZW5jZSkgeworICAgICAgICAgICAgcmVzdWx0ID0gVktfRVJST1JfT1VU X09GX0hPU1RfTUVNT1JZOworICAgICAgICAgICAgZ290byBiYWlsX3VubG9jazsKKyAgICAgICAg IH0KKworICAgICAgICAgcmVzdWx0ID0gd3NpX3JlZ2lzdGVyX3ZibGFua19ldmVudChpbWFnZS0+ ZmVuY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNoYWlu LT5iYXNlLndzaSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlzcGxheSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW1hZ2UtPmJhc2Uu dGltaW5nLT50YXJnZXRfbXNjIC0gMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJmZyYW1lX3F1ZXVlZCk7CisKKyAgICAgICAgIGlmIChyZXN1bHQgIT0gVktf U1VDQ0VTUykKKyAgICAgICAgICAgIGdvdG8gYmFpbF91bmxvY2s7CisKKyAgICAgICAgIC8qIENo ZWNrIGFuZCBtYWtlIHN1cmUgd2UgYXJlIHF1ZXVlZCBmb3IgdGhlIHJpZ2h0IGZyYW1lLCBvdGhl cndpc2UganVzdAorICAgICAgICAgICogZ28gcXVldWUgYW4gaW1hZ2UKKyAgICAgICAgICAqLwor ICAgICAgICAgaWYgKGZyYW1lX3F1ZXVlZCA8PSBpbWFnZS0+YmFzZS50aW1pbmctPnRhcmdldF9t c2MgLSAxKSB7CisgICAgICAgICAgICBpbWFnZS0+c3RhdGUgPSB3c2lfaW1hZ2Vfd2FpdGluZzsK KworICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAqIERvbid0IHNldCB0aGUgaW1hZ2UgbWVt YmVyIHVudGlsIHdlJ3JlIGdvaW5nIHRvIHdhaXQgZm9yIHRoZQorICAgICAgICAgICAgICogZXZl bnQgdG8gYXJyaXZlIGJlZm9yZSBmbGlwcGluZyB0byB0aGUgaW1hZ2UuIFRoYXQgd2F5LCBpZiB0 aGUKKyAgICAgICAgICAgICAqIHJlZ2lzdGVyX3ZibGFua19ldmVudCBjYWxsIGhhcHBlbnMgdG8g cHJvY2VzcyB0aGUgZXZlbnQsIGl0CisgICAgICAgICAgICAgKiB3b24ndCBhY3R1YWxseSBkbyBh bnl0aGluZworICAgICAgICAgICAgICovCisgICAgICAgICAgICBpbWFnZS0+ZmVuY2UtPmltYWdl ID0gaW1hZ2U7CisgICAgICAgICAgICB3c2lfZGlzcGxheV9zdGFydF93YWl0X3RocmVhZCh3c2kp OworICAgICAgICAgICAgcmVzdWx0ID0gVktfU1VDQ0VTUzsKKyAgICAgICAgICAgIGdvdG8gYmFp bF91bmxvY2s7CisgICAgICAgICB9CisKKyAgICAgIH0KKyAgIH0KKworCiAgICBpbWFnZS0+Zmxp cF9zZXF1ZW5jZSA9ICsrY2hhaW4tPmZsaXBfc2VxdWVuY2U7CiAgICBpbWFnZS0+c3RhdGUgPSB3 c2lfaW1hZ2VfcXVldWVkOwogCiAgICByZXN1bHQgPSBfd3NpX2Rpc3BsYXlfcXVldWVfbmV4dChk cnZfY2hhaW4pOwogCitiYWlsX3VubG9jazoKICAgIHB0aHJlYWRfbXV0ZXhfdW5sb2NrKCZ3c2kt PndhaXRfbXV0ZXgpOwogCiAgICByZXR1cm4gcmVzdWx0OwogfQogCitzdGF0aWMgVmtSZXN1bHQK K3dzaV9kaXNwbGF5X2dldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9uKHN0cnVjdCB3c2lfc3dhcGNo YWluICpkcnZfY2hhaW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBW a1JlZnJlc2hDeWNsZUR1cmF0aW9uR09PR0xFICpkdXJhdGlvbikKK3sKKyAgIHN0cnVjdCB3c2lf ZGlzcGxheV9zd2FwY2hhaW4gKmNoYWluID0gKHN0cnVjdCB3c2lfZGlzcGxheV9zd2FwY2hhaW4g KikgZHJ2X2NoYWluOworICAgVmtJY2RTdXJmYWNlRGlzcGxheSAgICAgICAgICAqc3VyZmFjZSA9 IGNoYWluLT5zdXJmYWNlOworICAgd3NpX2Rpc3BsYXlfbW9kZSAgICAgICAgICAgICAqZGlzcGxh eV9tb2RlID0gd3NpX2Rpc3BsYXlfbW9kZV9mcm9tX2hhbmRsZShzdXJmYWNlLT5kaXNwbGF5TW9k ZSk7CisgICBkb3VibGUgICAgICAgICAgICAgICAgICAgICAgIHJlZnJlc2ggPSB3c2lfZGlzcGxh eV9tb2RlX3JlZnJlc2goZGlzcGxheV9tb2RlKTsKKworICAgZHVyYXRpb24tPnJlZnJlc2hEdXJh dGlvbiA9ICh1aW50NjRfdCkgKGZsb29yICgxLjAvcmVmcmVzaCAqIDFlOSArIDAuNSkpOworICAg cmV0dXJuIFZLX1NVQ0NFU1M7Cit9CisKIHN0YXRpYyBWa1Jlc3VsdAogd3NpX2Rpc3BsYXlfc3Vy ZmFjZV9jcmVhdGVfc3dhcGNoYWluKFZrSWNkU3VyZmFjZUJhc2UgICAgICAgICAgICAgICAgICAg KmljZF9zdXJmYWNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrRGV2 aWNlICAgICAgICAgICAgICAgICAgICAgICAgICAgZGV2aWNlLApAQCAtMTQyNiwxMCArMTUyNiwx MyBAQCB3c2lfZGlzcGxheV9zdXJmYWNlX2NyZWF0ZV9zd2FwY2hhaW4oVmtJY2RTdXJmYWNlQmFz ZSAgICAgICAgICAgICAgICAgICAqaWNkX3N1cgogICAgY2hhaW4tPmJhc2UuZ2V0X3dzaV9pbWFn ZSA9IHdzaV9kaXNwbGF5X2dldF93c2lfaW1hZ2U7CiAgICBjaGFpbi0+YmFzZS5hY3F1aXJlX25l eHRfaW1hZ2UgPSB3c2lfZGlzcGxheV9hY3F1aXJlX25leHRfaW1hZ2U7CiAgICBjaGFpbi0+YmFz ZS5xdWV1ZV9wcmVzZW50ID0gd3NpX2Rpc3BsYXlfcXVldWVfcHJlc2VudDsKKyAgIGNoYWluLT5i YXNlLmdldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9uID0gd3NpX2Rpc3BsYXlfZ2V0X3JlZnJlc2hf Y3ljbGVfZHVyYXRpb247CisgICBjaGFpbi0+YmFzZS5nZXRfY3VycmVudF90aW1lID0gd3NpX2dl dF9jdXJyZW50X21vbm90b25pYzsKICAgIGNoYWluLT5iYXNlLnByZXNlbnRfbW9kZSA9IGNyZWF0 ZV9pbmZvLT5wcmVzZW50TW9kZTsKICAgIGNoYWluLT5iYXNlLmltYWdlX2NvdW50ID0gbnVtX2lt YWdlczsKIAogICAgY2hhaW4tPndzaSA9IHdzaTsKKyAgIGNoYWluLT5hbGxvY2F0b3IgPSBhbGxv Y2F0b3I7CiAKICAgIGNoYWluLT5zdXJmYWNlID0gKFZrSWNkU3VyZmFjZURpc3BsYXkgKikgaWNk X3N1cmZhY2U7CiAKQEAgLTIxMzAsNiArMjIzMyw3IEBAIHdzaV9nZXRfc3dhcGNoYWluX2NvdW50 ZXIoVmtEZXZpY2UgICAgICAgICAgICAgICAgICAgICAgZGV2aWNlLAogICAgc3RydWN0IHdzaV9k aXNwbGF5X3N3YXBjaGFpbiAqc3dhcGNoYWluID0gKHN0cnVjdCB3c2lfZGlzcGxheV9zd2FwY2hh aW4gKikgd3NpX3N3YXBjaGFpbl9mcm9tX2hhbmRsZShfc3dhcGNoYWluKTsKICAgIHN0cnVjdCB3 c2lfZGlzcGxheV9jb25uZWN0b3IgKmNvbm5lY3RvciA9IHdzaV9kaXNwbGF5X21vZGVfZnJvbV9o YW5kbGUoc3dhcGNoYWluLT5zdXJmYWNlLT5kaXNwbGF5TW9kZSktPmNvbm5lY3RvcjsKICAgIGlu dCByZXQ7CisgICB1aW50NjRfdCBuc2VjOwogCiAgICBpZiAod3NpLT5tYXN0ZXJfZmQgPCAwKQog ICAgICAgcmV0dXJuIFZLX0VSUk9SX0lOSVRJQUxJWkFUSU9OX0ZBSUxFRDsKQEAgLTIxMzksOSAr MjI0MywxMyBAQCB3c2lfZ2V0X3N3YXBjaGFpbl9jb3VudGVyKFZrRGV2aWNlICAgICAgICAgICAg ICAgICAgICAgIGRldmljZSwKICAgICAgIHJldHVybiBWS19TVUNDRVNTOwogICAgfQogCi0gICBy ZXQgPSBkcm1DcnRjR2V0U2VxdWVuY2Uod3NpLT5tYXN0ZXJfZmQsIGNvbm5lY3Rvci0+Y3J0Y19p ZCwgdmFsdWUsIE5VTEwpOworICAgcmV0ID0gZHJtQ3J0Y0dldFNlcXVlbmNlKHdzaS0+bWFzdGVy X2ZkLCBjb25uZWN0b3ItPmNydGNfaWQsIHZhbHVlLCAmbnNlYyk7CiAgICBpZiAocmV0KQogICAg ICAgKnZhbHVlID0gMDsKKyAgIGVsc2UgeworICAgICAgY29ubmVjdG9yLT5sYXN0X2ZyYW1lID0g KnZhbHVlOworICAgICAgY29ubmVjdG9yLT5sYXN0X25zZWMgPSBuc2VjOworICAgfQogCiAgICBy ZXR1cm4gVktfU1VDQ0VTUzsKIH0KQEAgLTIxNTAsMTkgKzIyNTgsNDQgQEAgc3RhdGljIHZvaWQg d3NpX2Rpc3BsYXlfdmJsYW5rX2hhbmRsZXIoaW50IGZkLCB1bnNpZ25lZCBpbnQgZnJhbWUsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgc2VjLCB1 bnNpZ25lZCBpbnQgdXNlYywgdm9pZCAqZGF0YSkKIHsKICAgIHN0cnVjdCB3c2lfZGlzcGxheV9m ZW5jZSAgICAgKmZlbmNlID0gZGF0YTsKLQotICAgd3NpX2Rpc3BsYXlfZGVidWcoIiU5bHUgZmVu Y2UgJWx1IHJlY2VpdmVkICVkXG4iLCBwdGhyZWFkX3NlbGYoKSwgZmVuY2UtPnNlcXVlbmNlLCBm cmFtZSk7CisgICBzdHJ1Y3Qgd3NpX2Rpc3BsYXlfY29ubmVjdG9yICpjb25uZWN0b3IgPSB3c2lf ZGlzcGxheV9jb25uZWN0b3JfZnJvbV9oYW5kbGUoZmVuY2UtPmJhc2UuZGlzcGxheSk7CisgICB1 aW50NjRfdCBmcmFtZTY0ID0gd2lkZW5fMzJfdG9fNjQoZnJhbWUsIGNvbm5lY3Rvci0+bGFzdF9m cmFtZSk7CisgICB1aW50NjRfdCBuc2VjID0gKHVpbnQ2NF90KSBzZWMgKiAxMDAwMDAwMDAwICsg KHVpbnQ2NF90KSB1c2VjICogMTAwMDsKKyAgIHN0cnVjdCB3c2lfZGlzcGxheV9pbWFnZSAqaW1h Z2UgPSBmZW5jZS0+aW1hZ2U7CisKKyAgIC8qIERvbid0IGxldCB0aW1lIGdvIGJhY2t3YXJkcyBi ZWNhdXNlIHRoaXMgZnVuY3Rpb24gaGFzIGxvd2VyIHJlc29sdXRpb24gdGhhbiBrdGltZSAqLwor ICAgaWYgKG5zZWMgPCBjb25uZWN0b3ItPmxhc3RfbnNlYykKKyAgICAgIG5zZWMgPSBjb25uZWN0 b3ItPmxhc3RfbnNlYzsKKworICAgd3NpX2Rpc3BsYXlfZGVidWcoIiU5bHUgZmVuY2UgJWx1IHJl Y2VpdmVkICVsdSBuc2VjICVsdVxuIiwgcHRocmVhZF9zZWxmKCksIGZlbmNlLT5zZXF1ZW5jZSwg ZnJhbWU2NCwgbnNlYyk7CisgICBjb25uZWN0b3ItPmxhc3RfbnNlYyA9IG5zZWM7CisgICBjb25u ZWN0b3ItPmxhc3RfZnJhbWUgPSBmcmFtZTY0OwogICAgZmVuY2UtPmV2ZW50X3JlY2VpdmVkID0g dHJ1ZTsKICAgIHdzaV9kaXNwbGF5X2ZlbmNlX2NoZWNrX2ZyZWUoZmVuY2UpOworICAgaWYgKGlt YWdlKSB7CisgICAgICBpbWFnZS0+ZmxpcF9zZXF1ZW5jZSA9ICsraW1hZ2UtPmNoYWluLT5mbGlw X3NlcXVlbmNlOworICAgICAgaW1hZ2UtPnN0YXRlID0gd3NpX2ltYWdlX3F1ZXVlZDsKKyAgICAg ICh2b2lkKSBfd3NpX2Rpc3BsYXlfcXVldWVfbmV4dCgmaW1hZ2UtPmNoYWluLT5iYXNlKTsKKyAg IH0KIH0KIAogc3RhdGljIHZvaWQgd3NpX2Rpc3BsYXlfc2VxdWVuY2VfaGFuZGxlcihpbnQgZmQs IHVpbnQ2NF90IGZyYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1aW50NjRfdCBucywgdWludDY0X3QgdXNlcl9kYXRhKQogewogICAgc3RydWN0IHdzaV9kaXNw bGF5X2ZlbmNlICAgICAqZmVuY2UgPSAoc3RydWN0IHdzaV9kaXNwbGF5X2ZlbmNlICopICh1aW50 cHRyX3QpIHVzZXJfZGF0YTsKKyAgIHN0cnVjdCB3c2lfZGlzcGxheV9jb25uZWN0b3IgKmNvbm5l Y3RvciA9IHdzaV9kaXNwbGF5X2Nvbm5lY3Rvcl9mcm9tX2hhbmRsZShmZW5jZS0+YmFzZS5kaXNw bGF5KTsKKyAgIHN0cnVjdCB3c2lfZGlzcGxheV9pbWFnZSAqaW1hZ2UgPSBmZW5jZS0+aW1hZ2U7 CiAKICAgIHdzaV9kaXNwbGF5X2RlYnVnKCIlOWx1IGZlbmNlICVsdSByZWNlaXZlZCAlbHVcbiIs IHB0aHJlYWRfc2VsZigpLCBmZW5jZS0+c2VxdWVuY2UsIGZyYW1lKTsKKyAgIGNvbm5lY3Rvci0+ bGFzdF9uc2VjID0gbnM7CisgICBjb25uZWN0b3ItPmxhc3RfZnJhbWUgPSBmcmFtZTsKICAgIGZl bmNlLT5ldmVudF9yZWNlaXZlZCA9IHRydWU7CiAgICB3c2lfZGlzcGxheV9mZW5jZV9jaGVja19m cmVlKGZlbmNlKTsKKyAgIGlmIChpbWFnZSkgeworICAgICAgaW1hZ2UtPmZsaXBfc2VxdWVuY2Ug PSArK2ltYWdlLT5jaGFpbi0+ZmxpcF9zZXF1ZW5jZTsKKyAgICAgIGltYWdlLT5zdGF0ZSA9IHdz aV9pbWFnZV9xdWV1ZWQ7CisgICAgICAodm9pZCkgX3dzaV9kaXNwbGF5X3F1ZXVlX25leHQoJmlt YWdlLT5jaGFpbi0+YmFzZSk7CisgICB9CiB9CiAKKy8qIFZLX0dPT0dMRV9kaXNwbGF5X3RpbWlu ZyAqLwpkaWZmIC0tZ2l0IGEvc3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl9wcml2YXRlLmggYi9z cmMvdnVsa2FuL3dzaS93c2lfY29tbW9uX3ByaXZhdGUuaAppbmRleCAwZDkwMjg0NjIzOC4uNmY5 ZDczMjMwODUgMTAwNjQ0Ci0tLSBhL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fcHJpdmF0ZS5o CisrKyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21tb25fcHJpdmF0ZS5oCkBAIC0yNSw2ICsyNSwx MyBAQAogCiAjaW5jbHVkZSAid3NpX2NvbW1vbi5oIgogCitzdHJ1Y3Qgd3NpX3RpbWluZyB7Cisg ICBib29sIGNvbXBsZXRlOworICAgYm9vbCBjb25zdW1lZDsKKyAgIHVpbnQ2NF90IHRhcmdldF9t c2M7CisgICBWa1Bhc3RQcmVzZW50YXRpb25UaW1pbmdHT09HTEUgdGltaW5nOworfTsKKwogc3Ry dWN0IHdzaV9pbWFnZSB7CiAgICBWa0ltYWdlIGltYWdlOwogICAgVmtEZXZpY2VNZW1vcnkgbWVt b3J5OwpAQCAtMzksOCArNDYsMTYgQEAgc3RydWN0IHdzaV9pbWFnZSB7CiAgICB1aW50MzJfdCBv ZmZzZXQ7CiAgICB1aW50MzJfdCByb3dfcGl0Y2g7CiAgICBpbnQgZmQ7CisKKyAgIFZrUXVlcnlQ b29sIHF1ZXJ5X3Bvb2w7CisKKyAgIFZrQ29tbWFuZEJ1ZmZlciB0aW1lc3RhbXBfYnVmZmVyOwor CisgICBzdHJ1Y3Qgd3NpX3RpbWluZyAqdGltaW5nOwogfTsKIAorI2RlZmluZSBXU0lfVElNSU5H X0hJU1RPUlkgICAgICAxNgorCiBzdHJ1Y3Qgd3NpX3N3YXBjaGFpbiB7CiAgICBjb25zdCBzdHJ1 Y3Qgd3NpX2RldmljZSAqd3NpOwogCkBAIC01Miw2ICs2NywxNiBAQCBzdHJ1Y3Qgd3NpX3N3YXBj aGFpbiB7CiAKICAgIGJvb2wgdXNlX3ByaW1lX2JsaXQ7CiAKKyAgIHVpbnQzMl90IHRpbWluZ19p bnNlcnQ7CisgICB1aW50MzJfdCB0aW1pbmdfY291bnQ7CisKKyAgIHN0cnVjdCB3c2lfdGltaW5n IHRpbWluZ1tXU0lfVElNSU5HX0hJU1RPUlldOworCisgICB1aW50NjRfdCBmcmFtZV9tc2M7Cisg ICB1aW50NjRfdCBmcmFtZV91c3Q7CisKKyAgIGZsb2F0IHRpbWVzdGFtcF9wZXJpb2Q7CisKICAg IC8qIENvbW1hbmQgcG9vbHMsIG9uZSBwZXIgcXVldWUgZmFtaWx5ICovCiAgICBWa0NvbW1hbmRQ b29sICpjbWRfcG9vbHM7CiAKQEAgLTY1LDYgKzkwLDEwIEBAIHN0cnVjdCB3c2lfc3dhcGNoYWlu IHsKICAgIFZrUmVzdWx0ICgqcXVldWVfcHJlc2VudCkoc3RydWN0IHdzaV9zd2FwY2hhaW4gKnN3 YXBfY2hhaW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGltYWdlX2lu ZGV4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBWa1ByZXNlbnRSZWdpb25L SFIgKmRhbWFnZSk7CisgICBWa1Jlc3VsdCAoKmdldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9uKShz dHJ1Y3Qgd3NpX3N3YXBjaGFpbiAqc3dhcF9jaGFpbiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFZrUmVmcmVzaEN5Y2xlRHVyYXRpb25HT09HTEUgKnBEaXNwbGF5 VGltaW5nUHJvcGVydGllcyk7CisKKyAgIHVpbnQ2NF90ICgqZ2V0X2N1cnJlbnRfdGltZSkodm9p ZCk7CiB9OwogCiBWa1Jlc3VsdApAQCAtOTEsNiArMTIwLDEyIEBAIHdzaV9kZXN0cm95X2ltYWdl KGNvbnN0IHN0cnVjdCB3c2lfc3dhcGNoYWluICpjaGFpbiwKICAgICAgICAgICAgICAgICAgIHN0 cnVjdCB3c2lfaW1hZ2UgKmltYWdlKTsKIAogCit2b2lkCit3c2lfbWFya190aW1pbmcoc3RydWN0 IHdzaV9zd2FwY2hhaW4gKnN3YXBjaGFpbiwKKyAgICAgICAgICAgICAgICBzdHJ1Y3Qgd3NpX2lt YWdlICppbWFnZSwKKyAgICAgICAgICAgICAgICB1aW50NjRfdCB1c3QsCisgICAgICAgICAgICAg ICAgdWludDY0X3QgbXNjKTsKKwogc3RydWN0IHdzaV9pbnRlcmZhY2UgewogICAgVmtSZXN1bHQg KCpnZXRfc3VwcG9ydCkoVmtJY2RTdXJmYWNlQmFzZSAqc3VyZmFjZSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0cnVjdCB3c2lfZGV2aWNlICp3c2lfZGV2aWNlLApkaWZmIC0tZ2l0IGEv c3JjL3Z1bGthbi93c2kvd3NpX2NvbW1vbl94MTEuYyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21t b25feDExLmMKaW5kZXggNzE0NTIzNjc4ZDQuLmUwZDkxMzVkYTUzIDEwMDY0NAotLS0gYS9zcmMv dnVsa2FuL3dzaS93c2lfY29tbW9uX3gxMS5jCisrKyBiL3NyYy92dWxrYW4vd3NpL3dzaV9jb21t b25feDExLmMKQEAgLTY0MSw2ICs2NDEsNyBAQCBzdHJ1Y3QgeDExX2ltYWdlIHsKICAgIGJvb2wg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJ1c3k7CiAgICBzdHJ1Y3QgeHNo bWZlbmNlICogICAgICAgICAgICAgICAgICAgICAgICBzaG1fZmVuY2U7CiAgICB1aW50MzJfdCAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzeW5jX2ZlbmNlOworICAgdWludDMyX3Qg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VyaWFsOwogfTsKIAogc3RydWN0IHgx MV9zd2FwY2hhaW4gewpAQCAtNjU3LDYgKzY1OCw4IEBAIHN0cnVjdCB4MTFfc3dhcGNoYWluIHsK ICAgIHVpbnQ2NF90ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbmRfc2Jj OwogICAgdWludDY0X3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdF9w cmVzZW50X21zYzsKICAgIHVpbnQzMl90ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN0YW1wOworICAgdWludDY0X3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbGFzdF9wcmVzZW50X25zZWM7CisgICB1aW50NjRfdCAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZWZyZXNoX3BlcmlvZDsKIAogICAgYm9vbCAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdGhyZWFkZWQ7CiAgICBWa1Jlc3VsdCAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXM7CkBAIC03MDYsOCArNzA5LDM2IEBAIHgx MV9oYW5kbGVfZHJpM19wcmVzZW50X2V2ZW50KHN0cnVjdCB4MTFfc3dhcGNoYWluICpjaGFpbiwK IAogICAgY2FzZSBYQ0JfUFJFU0VOVF9FVkVOVF9DT01QTEVURV9OT1RJRlk6IHsKICAgICAgIHhj Yl9wcmVzZW50X2NvbXBsZXRlX25vdGlmeV9ldmVudF90ICpjb21wbGV0ZSA9ICh2b2lkICopIGV2 ZW50OwotICAgICAgaWYgKGNvbXBsZXRlLT5raW5kID09IFhDQl9QUkVTRU5UX0NPTVBMRVRFX0tJ TkRfUElYTUFQKQorICAgICAgaWYgKGNvbXBsZXRlLT5raW5kID09IFhDQl9QUkVTRU5UX0NPTVBM RVRFX0tJTkRfUElYTUFQKSB7CisgICAgICAgICB1aW50NjRfdCAgICAgICBmcmFtZXMgPSBjb21w bGV0ZS0+bXNjIC0gY2hhaW4tPmxhc3RfcHJlc2VudF9tc2M7CisgICAgICAgICB1aW50NjRfdCAg ICAgICBwcmVzZW50X25zZWMgPSBjb21wbGV0ZS0+dXN0ICogMTAwMDsKKworICAgICAgICAgLyoK KyAgICAgICAgICAqIFdlbGwsIHRoaXMgaXMgYWJvdXQgYXMgZ29vZCBhcyB3ZSBjYW4gZG8gLS0g bWVhc3VyZSB0aGUgcmVmcmVzaAorICAgICAgICAgICogaW5zdGVhZCBvZiBhc2tpbmcgZm9yIHRo ZSBjdXJyZW50IG1vZGUgYW5kIHVzaW5nIHRoYXQuIFR1cm5zIG91dCwKKyAgICAgICAgICAqIGZv ciBlRFAgcGFuZWxzLCB0aGlzIHdvcmtzIGJldHRlciBhbnl3YXlzIGFzIHRoZXkgdXNlZCB0aGUg YnVpbHRpbgorICAgICAgICAgICogZml4ZWQgbW9kZSBmb3IgZXZlcnl0aGluZworICAgICAgICAg ICovCisgICAgICAgICBpZiAoMCA8IGZyYW1lcyAmJiBmcmFtZXMgPCAxMCAmJiBwcmVzZW50X25z ZWMgPiBjaGFpbi0+bGFzdF9wcmVzZW50X25zZWMpIHsKKworICAgICAgICAgICAgdWludDY0X3Qg cmVmcmVzaF9wZXJpb2QgPSAocHJlc2VudF9uc2VjIC0gY2hhaW4tPmxhc3RfcHJlc2VudF9uc2Vj ICsgZnJhbWVzIC8gMikgLyBmcmFtZXM7CisKKyAgICAgICAgICAgIGlmIChjaGFpbi0+cmVmcmVz aF9wZXJpb2QpCisgICAgICAgICAgICAgICByZWZyZXNoX3BlcmlvZCA9ICgzICogY2hhaW4tPnJl ZnJlc2hfcGVyaW9kICsgcmVmcmVzaF9wZXJpb2QpID4+IDI7CisKKyAgICAgICAgICAgIGNoYWlu LT5yZWZyZXNoX3BlcmlvZCA9IHJlZnJlc2hfcGVyaW9kOworICAgICAgICAgfQorCiAgICAgICAg ICBjaGFpbi0+bGFzdF9wcmVzZW50X21zYyA9IGNvbXBsZXRlLT5tc2M7CisgICAgICAgICBjaGFp bi0+bGFzdF9wcmVzZW50X25zZWMgPSBwcmVzZW50X25zZWM7CisgICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgY2hhaW4tPmJhc2UuaW1hZ2VfY291bnQ7IGkrKykgeworICAgICAgICAg ICAgaWYgKGNoYWluLT5pbWFnZXNbaV0uc2VyaWFsID09IGNvbXBsZXRlLT5zZXJpYWwpIHsKKyAg ICAgICAgICAgICAgIHdzaV9tYXJrX3RpbWluZygmY2hhaW4tPmJhc2UsICZjaGFpbi0+aW1hZ2Vz W2ldLmJhc2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc2VudF9uc2VjLCBj b21wbGV0ZS0+bXNjKTsKKyAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAg ICAgICAgfQorICAgICAgfQogICAgICAgYnJlYWs7CiAgICB9CiAKQEAgLTgyMyw3ICs4NTQsNyBA QCB4MTFfYWNxdWlyZV9uZXh0X2ltYWdlX2Zyb21fcXVldWUoc3RydWN0IHgxMV9zd2FwY2hhaW4g KmNoYWluLAogCiBzdGF0aWMgVmtSZXN1bHQKIHgxMV9wcmVzZW50X3RvX3gxMShzdHJ1Y3QgeDEx X3N3YXBjaGFpbiAqY2hhaW4sIHVpbnQzMl90IGltYWdlX2luZGV4LAotICAgICAgICAgICAgICAg ICAgIHVpbnQzMl90IHRhcmdldF9tc2MpCisgICAgICAgICAgICAgICAgICAgdWludDY0X3QgdGFy Z2V0X21zYykKIHsKICAgIHN0cnVjdCB4MTFfaW1hZ2UgKmltYWdlID0gJmNoYWluLT5pbWFnZXNb aW1hZ2VfaW5kZXhdOwogCkBAIC04NDAsMTEgKzg3MSwxMiBAQCB4MTFfcHJlc2VudF90b194MTEo c3RydWN0IHgxMV9zd2FwY2hhaW4gKmNoYWluLCB1aW50MzJfdCBpbWFnZV9pbmRleCwKICAgIHhz aG1mZW5jZV9yZXNldChpbWFnZS0+c2htX2ZlbmNlKTsKIAogICAgKytjaGFpbi0+c2VuZF9zYmM7 CisgICBpbWFnZS0+c2VyaWFsID0gKHVpbnQzMl90KSBjaGFpbi0+c2VuZF9zYmM7CiAgICB4Y2Jf dm9pZF9jb29raWVfdCBjb29raWUgPQogICAgICAgeGNiX3ByZXNlbnRfcGl4bWFwKGNoYWluLT5j b25uLAogICAgICAgICAgICAgICAgICAgICAgICAgIGNoYWluLT53aW5kb3csCiAgICAgICAgICAg ICAgICAgICAgICAgICAgaW1hZ2UtPnBpeG1hcCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAo dWludDMyX3QpIGNoYWluLT5zZW5kX3NiYywKKyAgICAgICAgICAgICAgICAgICAgICAgICBpbWFn ZS0+c2VyaWFsLAogICAgICAgICAgICAgICAgICAgICAgICAgIDAsICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLyogdmFsaWQgKi8KICAgICAgICAgICAgICAgICAgICAgICAgICAw LCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8qIHVwZGF0ZSAqLwogICAgICAg ICAgICAgICAgICAgICAgICAgIDAsICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg LyogeF9vZmYgKi8KQEAgLTg5NCw2ICs5MjYsMjYgQEAgeDExX3F1ZXVlX3ByZXNlbnQoc3RydWN0 IHdzaV9zd2FwY2hhaW4gKmFudl9jaGFpbiwKICAgIH0KIH0KIAorc3RhdGljIHVpbnQ2NF90Cit4 MTFfcmVmcmVzaF9kdXJhdGlvbihzdHJ1Y3QgeDExX3N3YXBjaGFpbiAqY2hhaW4pCit7CisgICAv KiBQaWNrIDYwSHogaWYgd2UgZG9uJ3Qga25vdyB3aGF0IGl0IGFjdHVhbGx5IGlzIHlldCAqLwor ICAgaWYgKCFjaGFpbi0+cmVmcmVzaF9wZXJpb2QpCisgICAgICByZXR1cm4gKHVpbnQ2NF90KSAo MWU5IC8gNTkuOTggKyAwLjUpOworCisgICByZXR1cm4gY2hhaW4tPnJlZnJlc2hfcGVyaW9kOwor fQorCitzdGF0aWMgVmtSZXN1bHQKK3gxMV9nZXRfcmVmcmVzaChzdHJ1Y3Qgd3NpX3N3YXBjaGFp biAqd3NpX2NoYWluLAorICAgICAgICAgICAgICAgIFZrUmVmcmVzaEN5Y2xlRHVyYXRpb25HT09H TEUgKnRpbWluZ3MpCit7CisgICBzdHJ1Y3QgeDExX3N3YXBjaGFpbiAqY2hhaW4gPSAoc3RydWN0 IHgxMV9zd2FwY2hhaW4gKil3c2lfY2hhaW47CisKKyAgIHRpbWluZ3MtPnJlZnJlc2hEdXJhdGlv biA9IHgxMV9yZWZyZXNoX2R1cmF0aW9uKGNoYWluKTsKKyAgIHJldHVybiBWS19TVUNDRVNTOwor fQorCiBzdGF0aWMgdm9pZCAqCiB4MTFfbWFuYWdlX2ZpZm9fcXVldWVzKHZvaWQgKnN0YXRlKQog ewpAQCAtOTEwLDYgKzk2Miw3IEBAIHgxMV9tYW5hZ2VfZmlmb19xdWV1ZXModm9pZCAqc3RhdGUp CiAgICAgICAgKiBvdGhlciB0aGFuIHRoZSBjdXJyZW50bHkgcHJlc2VudGVkIG9uZS4KICAgICAg ICAqLwogICAgICAgdWludDMyX3QgaW1hZ2VfaW5kZXg7CisgICAgICBzdHJ1Y3QgeDExX2ltYWdl ICppbWFnZTsKICAgICAgIHJlc3VsdCA9IHdzaV9xdWV1ZV9wdWxsKCZjaGFpbi0+cHJlc2VudF9x dWV1ZSwgJmltYWdlX2luZGV4LCBJTlQ2NF9NQVgpOwogICAgICAgaWYgKHJlc3VsdCAhPSBWS19T VUNDRVNTKSB7CiAgICAgICAgICBnb3RvIGZhaWw7CkBAIC05MTgsNiArOTcxLDEzIEBAIHgxMV9t YW5hZ2VfZmlmb19xdWV1ZXModm9pZCAqc3RhdGUpCiAgICAgICB9CiAKICAgICAgIHVpbnQ2NF90 IHRhcmdldF9tc2MgPSBjaGFpbi0+bGFzdF9wcmVzZW50X21zYyArIDE7CisKKyAgICAgIGltYWdl ID0gJmNoYWluLT5pbWFnZXNbaW1hZ2VfaW5kZXhdOworCisgICAgICBzdHJ1Y3Qgd3NpX3RpbWlu ZyAqdGltaW5nID0gaW1hZ2UtPmJhc2UudGltaW5nOworICAgICAgaWYgKHRpbWluZyAmJiB0aW1p bmctPnRhcmdldF9tc2MgIT0gMCAmJiB0aW1pbmctPnRhcmdldF9tc2MgPiB0YXJnZXRfbXNjKQor ICAgICAgICAgdGFyZ2V0X21zYyA9IHRpbWluZy0+dGFyZ2V0X21zYzsKKwogICAgICAgcmVzdWx0 ID0geDExX3ByZXNlbnRfdG9feDExKGNoYWluLCBpbWFnZV9pbmRleCwgdGFyZ2V0X21zYyk7CiAg ICAgICBpZiAocmVzdWx0ICE9IFZLX1NVQ0NFU1MpCiAgICAgICAgICBnb3RvIGZhaWw7CkBAIC0x MDk4LDcgKzExNTgsOSBAQCB4MTFfc3VyZmFjZV9jcmVhdGVfc3dhcGNoYWluKFZrSWNkU3VyZmFj ZUJhc2UgKmljZF9zdXJmYWNlLAogICAgY2hhaW4tPmJhc2UuZ2V0X3dzaV9pbWFnZSA9IHgxMV9n ZXRfd3NpX2ltYWdlOwogICAgY2hhaW4tPmJhc2UuYWNxdWlyZV9uZXh0X2ltYWdlID0geDExX2Fj cXVpcmVfbmV4dF9pbWFnZTsKICAgIGNoYWluLT5iYXNlLnF1ZXVlX3ByZXNlbnQgPSB4MTFfcXVl dWVfcHJlc2VudDsKKyAgIGNoYWluLT5iYXNlLmdldF9jdXJyZW50X3RpbWUgPSB3c2lfZ2V0X2N1 cnJlbnRfdGltZTsKICAgIGNoYWluLT5iYXNlLnByZXNlbnRfbW9kZSA9IHBDcmVhdGVJbmZvLT5w cmVzZW50TW9kZTsKKyAgIGNoYWluLT5iYXNlLmdldF9yZWZyZXNoX2N5Y2xlX2R1cmF0aW9uID0g eDExX2dldF9yZWZyZXNoOwogICAgY2hhaW4tPmJhc2UuaW1hZ2VfY291bnQgPSBudW1faW1hZ2Vz OwogICAgY2hhaW4tPmNvbm4gPSBjb25uOwogICAgY2hhaW4tPndpbmRvdyA9IHdpbmRvdzsKQEAg LTExMDYsNiArMTE2OCw3IEBAIHgxMV9zdXJmYWNlX2NyZWF0ZV9zd2FwY2hhaW4oVmtJY2RTdXJm YWNlQmFzZSAqaWNkX3N1cmZhY2UsCiAgICBjaGFpbi0+ZXh0ZW50ID0gcENyZWF0ZUluZm8tPmlt YWdlRXh0ZW50OwogICAgY2hhaW4tPnNlbmRfc2JjID0gMDsKICAgIGNoYWluLT5sYXN0X3ByZXNl bnRfbXNjID0gMDsKKyAgIGNoYWluLT5sYXN0X3ByZXNlbnRfbnNlYyA9IDA7CiAgICBjaGFpbi0+ dGhyZWFkZWQgPSBmYWxzZTsKICAgIGNoYWluLT5zdGF0dXMgPSBWS19TVUNDRVNTOwogCi0tIAoy LjE1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK