From: Takashi Iwai Subject: [PATCH v2 1/3] drm/i915: Split audio component to a generic type Date: Tue, 17 Jul 2018 11:26:50 +0200 Message-ID: <20180717092652.25630-2-tiwai@suse.de> References: <20180717092652.25630-1-tiwai@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180717092652.25630-1-tiwai@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: alsa-devel@alsa-project.org Cc: Jim Qu , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: alsa-devel@alsa-project.org Rm9yIGFsbG93aW5nIG90aGVyIGRyaXZlcnMgdG8gdXNlIHRoZSBEUk0gYXVkaW8gY29tcG9uZW50 LCByZW5hbWUgdGhlCmk5MTVfYXVkaW9fY29tcG9uZW50Xyogd2l0aCBkcm1fYXVkaW9fY29tcG9u ZW50XyosIGFuZCBzcGxpdCB0aGUKZ2VuZXJpYyBwYXJ0IGludG8gZHJtX2F1ZGlvX2NvbXBvbmVu dC5oLiAgVGhlIGk5MTUgc3BlY2lmaWMgc3R1ZmYKcmVtYWlucyBpbiBzdHJ1Y3QgaTkxNV9hdWRp b19jb21wb25lbnQsIHdoaWNoIGNvbnRhaW5zCmRybV9hdWRpb19jb21wb25lbnQgYXMgdGhlIGJh c2UuCgpUaGUgbGljZW5zZSBvZiBkcm1fYXVkaW9fY29tcG9uZW50LmggaXMga2VwdCB0byBNSVQg YXMgc2FtZSBhcyB0aGUgdGhlCm9yaWdpbmFsIGk5MTVfY29tcG9uZW50LmguCgpUaGlzIGlzIGEg cHJlbGltaW5hcnkgY2hhbmdlIGZvciBmdXJ0aGVyIGRldmVsb3BtZW50LCBhbmQgbm8KZnVuY3Rp b25hbCBjaGFuZ2VzIGJ5IHRoaXMgcGF0Y2ggaXRzZWxmLCBtZXJlbHkgY29kZS1zcGxpdCBhbmQK cmVuYW1lcy4KCnYxLT52MjogVXNlIFNQRFggZm9yIGRybV9hdWRpb19jb21wb25lbnQuaCwgZml4 IHJlbWFpbmluZyBpOTE1CiAgICAgICAgYXJndW1lbnQgaW4gZHJtX2F1ZGlvX2NvbXBvbmVudC5o CgpTaWduZWQtb2ZmLWJ5OiBUYWthc2hpIEl3YWkgPHRpd2FpQHN1c2UuZGU+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyB8IDIyICsrKy0tLS0KIGluY2x1ZGUvZHJtL2Ry bV9hdWRpb19jb21wb25lbnQuaCAgfCA5NSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK IGluY2x1ZGUvZHJtL2k5MTVfY29tcG9uZW50LmggICAgICAgfCA4NSArKy0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogaW5jbHVkZS9zb3VuZC9oZGFfaTkxNS5oICAgICAgICAgICB8ICA2ICstCiBp bmNsdWRlL3NvdW5kL2hkYXVkaW8uaCAgICAgICAgICAgIHwgIDYgKy0KIHNvdW5kL2hkYS9oZGFj X2k5MTUuYyAgICAgICAgICAgICAgfCA0MCArKysrKysrLS0tLS0tCiBzb3VuZC9wY2kvaGRhL3Bh dGNoX2hkbWkuYyAgICAgICAgIHwgIDggKy0tCiBzb3VuZC9zb2MvY29kZWNzL2hkYWNfaGRtaS5j ICAgICAgIHwgIDIgKy0KIDggZmlsZXMgY2hhbmdlZCwgMTQ0IGluc2VydGlvbnMoKyksIDEyMCBk ZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2RybS9kcm1fYXVkaW9fY29t cG9uZW50LmgKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwppbmRleCAzZWE1NjZmOTk0NTAu LjdkZDU2MDVkOTRhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVk aW8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCkBAIC02MzksMTEg KzYzOSwxMiBAQCB2b2lkIGludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5j b2RlciAqZW5jb2RlciwKIAlkZXZfcHJpdi0+YXZfZW5jX21hcFtwaXBlXSA9IGVuY29kZXI7CiAJ bXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+YXZfbXV0ZXgpOwogCi0JaWYgKGFjb21wICYmIGFjb21w LT5hdWRpb19vcHMgJiYgYWNvbXAtPmF1ZGlvX29wcy0+cGluX2VsZF9ub3RpZnkpIHsKKwlpZiAo YWNvbXAgJiYgYWNvbXAtPmJhc2UuYXVkaW9fb3BzICYmCisJICAgIGFjb21wLT5iYXNlLmF1ZGlv X29wcy0+cGluX2VsZF9ub3RpZnkpIHsKIAkJLyogYXVkaW8gZHJpdmVycyBleHBlY3QgcGlwZSA9 IC0xIHRvIGluZGljYXRlIE5vbi1NU1QgY2FzZXMgKi8KIAkJaWYgKCFpbnRlbF9jcnRjX2hhc190 eXBlKGNydGNfc3RhdGUsIElOVEVMX09VVFBVVF9EUF9NU1QpKQogCQkJcGlwZSA9IC0xOwotCQlh Y29tcC0+YXVkaW9fb3BzLT5waW5fZWxkX25vdGlmeShhY29tcC0+YXVkaW9fb3BzLT5hdWRpb19w dHIsCisJCWFjb21wLT5iYXNlLmF1ZGlvX29wcy0+cGluX2VsZF9ub3RpZnkoYWNvbXAtPmJhc2Uu YXVkaW9fb3BzLT5hdWRpb19wdHIsCiAJCQkJCQkgKGludCkgcG9ydCwgKGludCkgcGlwZSk7CiAJ fQogCkBAIC02ODEsMTEgKzY4MiwxMiBAQCB2b2lkIGludGVsX2F1ZGlvX2NvZGVjX2Rpc2FibGUo c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJZGV2X3ByaXYtPmF2X2VuY19tYXBbcGlw ZV0gPSBOVUxMOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmF2X211dGV4KTsKIAotCWlmIChh Y29tcCAmJiBhY29tcC0+YXVkaW9fb3BzICYmIGFjb21wLT5hdWRpb19vcHMtPnBpbl9lbGRfbm90 aWZ5KSB7CisJaWYgKGFjb21wICYmIGFjb21wLT5iYXNlLmF1ZGlvX29wcyAmJgorCSAgICBhY29t cC0+YmFzZS5hdWRpb19vcHMtPnBpbl9lbGRfbm90aWZ5KSB7CiAJCS8qIGF1ZGlvIGRyaXZlcnMg ZXhwZWN0IHBpcGUgPSAtMSB0byBpbmRpY2F0ZSBOb24tTVNUIGNhc2VzICovCiAJCWlmICghaW50 ZWxfY3J0Y19oYXNfdHlwZShvbGRfY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RQX01TVCkpCiAJ CQlwaXBlID0gLTE7Ci0JCWFjb21wLT5hdWRpb19vcHMtPnBpbl9lbGRfbm90aWZ5KGFjb21wLT5h dWRpb19vcHMtPmF1ZGlvX3B0ciwKKwkJYWNvbXAtPmJhc2UuYXVkaW9fb3BzLT5waW5fZWxkX25v dGlmeShhY29tcC0+YmFzZS5hdWRpb19vcHMtPmF1ZGlvX3B0ciwKIAkJCQkJCSAoaW50KSBwb3J0 LCAoaW50KSBwaXBlKTsKIAl9CiAKQEAgLTg4MCw3ICs4ODIsNyBAQCBzdGF0aWMgaW50IGk5MTVf YXVkaW9fY29tcG9uZW50X2dldF9lbGQoc3RydWN0IGRldmljZSAqa2RldiwgaW50IHBvcnQsCiAJ cmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVu dF9vcHMgaTkxNV9hdWRpb19jb21wb25lbnRfb3BzID0geworc3RhdGljIGNvbnN0IHN0cnVjdCBk cm1fYXVkaW9fY29tcG9uZW50X29wcyBpOTE1X2F1ZGlvX2NvbXBvbmVudF9vcHMgPSB7CiAJLm93 bmVyCQk9IFRISVNfTU9EVUxFLAogCS5nZXRfcG93ZXIJPSBpOTE1X2F1ZGlvX2NvbXBvbmVudF9n ZXRfcG93ZXIsCiAJLnB1dF9wb3dlcgk9IGk5MTVfYXVkaW9fY29tcG9uZW50X3B1dF9wb3dlciwK QEAgLTg5NywxMiArODk5LDEyIEBAIHN0YXRpYyBpbnQgaTkxNV9hdWRpb19jb21wb25lbnRfYmlu ZChzdHJ1Y3QgZGV2aWNlICppOTE1X2tkZXYsCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0ga2Rldl90b19pOTE1KGk5MTVfa2Rldik7CiAJaW50IGk7CiAKLQlpZiAoV0FSTl9P TihhY29tcC0+b3BzIHx8IGFjb21wLT5kZXYpKQorCWlmIChXQVJOX09OKGFjb21wLT5iYXNlLm9w cyB8fCBhY29tcC0+YmFzZS5kZXYpKQogCQlyZXR1cm4gLUVFWElTVDsKIAogCWRybV9tb2Rlc2V0 X2xvY2tfYWxsKCZkZXZfcHJpdi0+ZHJtKTsKLQlhY29tcC0+b3BzID0gJmk5MTVfYXVkaW9fY29t cG9uZW50X29wczsKLQlhY29tcC0+ZGV2ID0gaTkxNV9rZGV2OworCWFjb21wLT5iYXNlLm9wcyA9 ICZpOTE1X2F1ZGlvX2NvbXBvbmVudF9vcHM7CisJYWNvbXAtPmJhc2UuZGV2ID0gaTkxNV9rZGV2 OwogCUJVSUxEX0JVR19PTihNQVhfUE9SVFMgIT0gSTkxNV9NQVhfUE9SVFMpOwogCWZvciAoaSA9 IDA7IGkgPCBBUlJBWV9TSVpFKGFjb21wLT5hdWRfc2FtcGxlX3JhdGUpOyBpKyspCiAJCWFjb21w LT5hdWRfc2FtcGxlX3JhdGVbaV0gPSAwOwpAQCAtOTE5LDggKzkyMSw4IEBAIHN0YXRpYyB2b2lk IGk5MTVfYXVkaW9fY29tcG9uZW50X3VuYmluZChzdHJ1Y3QgZGV2aWNlICppOTE1X2tkZXYsCiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0ga2Rldl90b19pOTE1KGk5MTVfa2Rl dik7CiAKIAlkcm1fbW9kZXNldF9sb2NrX2FsbCgmZGV2X3ByaXYtPmRybSk7Ci0JYWNvbXAtPm9w cyA9IE5VTEw7Ci0JYWNvbXAtPmRldiA9IE5VTEw7CisJYWNvbXAtPmJhc2Uub3BzID0gTlVMTDsK KwlhY29tcC0+YmFzZS5kZXYgPSBOVUxMOwogCWRldl9wcml2LT5hdWRpb19jb21wb25lbnQgPSBO VUxMOwogCWRybV9tb2Rlc2V0X3VubG9ja19hbGwoJmRldl9wcml2LT5kcm0pOwogfQpkaWZmIC0t Z2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F1ZGlvX2NvbXBvbmVudC5oIGIvaW5jbHVkZS9kcm0vZHJt X2F1ZGlvX2NvbXBvbmVudC5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MC4uZTg1Njg5ZjIxMmMyCi0tLSAvZGV2L251bGwKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2F1ZGlv X2NvbXBvbmVudC5oCkBAIC0wLDAgKzEsOTUgQEAKKy8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVy OiBNSVQKKy8vIENvcHlyaWdodCDCqSAyMDE0IEludGVsIENvcnBvcmF0aW9uCisKKyNpZm5kZWYg X0RSTV9BVURJT19DT01QT05FTlRfSF8KKyNkZWZpbmUgX0RSTV9BVURJT19DT01QT05FTlRfSF8K KworLyoqCisgKiBzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVudF9vcHMgLSBPcHMgaW1wbGVtZW50 ZWQgYnkgRFJNIGRyaXZlciwgY2FsbGVkIGJ5IGhkYSBkcml2ZXIKKyAqLworc3RydWN0IGRybV9h dWRpb19jb21wb25lbnRfb3BzIHsKKwkvKioKKwkgKiBAb3duZXI6IGRybSBtb2R1bGUgdG8gcGlu IGRvd24KKwkgKi8KKwlzdHJ1Y3QgbW9kdWxlICpvd25lcjsKKwkvKioKKwkgKiBAZ2V0X3Bvd2Vy OiBnZXQgdGhlIFBPV0VSX0RPTUFJTl9BVURJTyBwb3dlciB3ZWxsCisJICoKKwkgKiBSZXF1ZXN0 IHRoZSBwb3dlciB3ZWxsIHRvIGJlIHR1cm5lZCBvbi4KKwkgKi8KKwl2b2lkICgqZ2V0X3Bvd2Vy KShzdHJ1Y3QgZGV2aWNlICopOworCS8qKgorCSAqIEBwdXRfcG93ZXI6IHB1dCB0aGUgUE9XRVJf RE9NQUlOX0FVRElPIHBvd2VyIHdlbGwKKwkgKgorCSAqIEFsbG93IHRoZSBwb3dlciB3ZWxsIHRv IGJlIHR1cm5lZCBvZmYuCisJICovCisJdm9pZCAoKnB1dF9wb3dlcikoc3RydWN0IGRldmljZSAq KTsKKwkvKioKKwkgKiBAY29kZWNfd2FrZV9vdmVycmlkZTogRW5hYmxlL2Rpc2FibGUgY29kZWMg d2FrZSBzaWduYWwKKwkgKi8KKwl2b2lkICgqY29kZWNfd2FrZV9vdmVycmlkZSkoc3RydWN0IGRl dmljZSAqLCBib29sIGVuYWJsZSk7CisJLyoqCisJICogQGdldF9jZGNsa19mcmVxOiBHZXQgdGhl IENvcmUgRGlzcGxheSBDbG9jayBpbiBrSHoKKwkgKi8KKwlpbnQgKCpnZXRfY2RjbGtfZnJlcSko c3RydWN0IGRldmljZSAqKTsKKwkvKioKKwkgKiBAc3luY19hdWRpb19yYXRlOiBzZXQgbi9jdHMg YmFzZWQgb24gdGhlIHNhbXBsZSByYXRlCisJICoKKwkgKiBDYWxsZWQgZnJvbSBhdWRpbyBkcml2 ZXIuIEFmdGVyIGF1ZGlvIGRyaXZlciBzZXRzIHRoZQorCSAqIHNhbXBsZSByYXRlLCBpdCB3aWxs IGNhbGwgdGhpcyBmdW5jdGlvbiB0byBzZXQgbi9jdHMKKwkgKi8KKwlpbnQgKCpzeW5jX2F1ZGlv X3JhdGUpKHN0cnVjdCBkZXZpY2UgKiwgaW50IHBvcnQsIGludCBwaXBlLCBpbnQgcmF0ZSk7CisJ LyoqCisJICogQGdldF9lbGQ6IGZpbGwgdGhlIGF1ZGlvIHN0YXRlIGFuZCBFTEQgYnl0ZXMgZm9y IHRoZSBnaXZlbiBwb3J0CisJICoKKwkgKiBDYWxsZWQgZnJvbSBhdWRpbyBkcml2ZXIgdG8gZ2V0 IHRoZSBIRE1JL0RQIGF1ZGlvIHN0YXRlIG9mIHRoZSBnaXZlbgorCSAqIGRpZ2l0YWwgcG9ydCwg YW5kIGFsc28gZmV0Y2ggRUxEIGJ5dGVzIHRvIHRoZSBnaXZlbiBwb2ludGVyLgorCSAqCisJICog SXQgcmV0dXJucyB0aGUgYnl0ZSBzaXplIG9mIHRoZSBvcmlnaW5hbCBFTEQgKG5vdCB0aGUgYWN0 dWFsbHkKKwkgKiBjb3BpZWQgc2l6ZSksIHplcm8gZm9yIGFuIGludmFsaWQgRUxELCBvciBhIG5l Z2F0aXZlIGVycm9yIGNvZGUuCisJICoKKwkgKiBOb3RlIHRoYXQgdGhlIHJldHVybmVkIHNpemUg bWF5IGJlIG92ZXIgQG1heF9ieXRlcy4gIFRoZW4gaXQKKwkgKiBpbXBsaWVzIHRoYXQgb25seSBh IHBhcnQgb2YgRUxEIGhhcyBiZWVuIGNvcGllZCB0byB0aGUgYnVmZmVyLgorCSAqLworCWludCAo KmdldF9lbGQpKHN0cnVjdCBkZXZpY2UgKiwgaW50IHBvcnQsIGludCBwaXBlLCBib29sICplbmFi bGVkLAorCQkgICAgICAgdW5zaWduZWQgY2hhciAqYnVmLCBpbnQgbWF4X2J5dGVzKTsKK307CisK Ky8qKgorICogc3RydWN0IGRybV9hdWRpb19jb21wb25lbnRfYXVkaW9fb3BzIC0gT3BzIGltcGxl bWVudGVkIGJ5IGhkYSBkcml2ZXIsIGNhbGxlZCBieSBEUk0gZHJpdmVyCisgKi8KK3N0cnVjdCBk cm1fYXVkaW9fY29tcG9uZW50X2F1ZGlvX29wcyB7CisJLyoqCisJICogQGF1ZGlvX3B0cjogUG9p bnRlciB0byBiZSB1c2VkIGluIGNhbGwgdG8gcGluX2VsZF9ub3RpZnkKKwkgKi8KKwl2b2lkICph dWRpb19wdHI7CisJLyoqCisJICogQHBpbl9lbGRfbm90aWZ5OiBOb3RpZnkgdGhlIEhEQSBkcml2 ZXIgdGhhdCBwaW4gc2Vuc2UgYW5kL29yIEVMRCBpbmZvcm1hdGlvbiBoYXMgY2hhbmdlZAorCSAq CisJICogQ2FsbGVkIHdoZW4gdGhlIERSTSBkcml2ZXIgaGFzIHNldCB1cCBhdWRpbyBwaXBlbGlu ZSBvciBoYXMganVzdAorCSAqIGJlZ3VuIHRvIHRlYXIgaXQgZG93bi4gVGhpcyBhbGxvd3MgdGhl IEhEQSBkcml2ZXIgdG8gdXBkYXRlIGl0cworCSAqIHN0YXR1cyBhY2NvcmRpbmdseSAoZXZlbiB3 aGVuIHRoZSBIREEgY29udHJvbGxlciBpcyBpbiBwb3dlciBzYXZlCisJICogbW9kZSkuCisJICov CisJdm9pZCAoKnBpbl9lbGRfbm90aWZ5KSh2b2lkICphdWRpb19wdHIsIGludCBwb3J0LCBpbnQg cGlwZSk7Cit9OworCisvKioKKyAqIHN0cnVjdCBkcm1fYXVkaW9fY29tcG9uZW50IC0gVXNlZCBm b3IgZGlyZWN0IGNvbW11bmljYXRpb24gYmV0d2VlbiBEUk0gYW5kIGhkYSBkcml2ZXJzCisgKi8K K3N0cnVjdCBkcm1fYXVkaW9fY29tcG9uZW50IHsKKwkvKioKKwkgKiBAZGV2OiBEUk0gZGV2aWNl LCB1c2VkIGFzIHBhcmFtZXRlciBmb3Igb3BzCisJICovCisJc3RydWN0IGRldmljZSAqZGV2Owor CS8qKgorCSAqIEBvcHM6IE9wcyBpbXBsZW1lbnRlZCBieSBEUk0gZHJpdmVyLCBjYWxsZWQgYnkg aGRhIGRyaXZlcgorCSAqLworCWNvbnN0IHN0cnVjdCBkcm1fYXVkaW9fY29tcG9uZW50X29wcyAq b3BzOworCS8qKgorCSAqIEBhdWRpb19vcHM6IE9wcyBpbXBsZW1lbnRlZCBieSBoZGEgZHJpdmVy LCBjYWxsZWQgYnkgRFJNIGRyaXZlcgorCSAqLworCWNvbnN0IHN0cnVjdCBkcm1fYXVkaW9fY29t cG9uZW50X2F1ZGlvX29wcyAqYXVkaW9fb3BzOworfTsKKworI2VuZGlmIC8qIF9EUk1fQVVESU9f Q09NUE9ORU5UX0hfICovCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9pOTE1X2NvbXBvbmVudC5o IGIvaW5jbHVkZS9kcm0vaTkxNV9jb21wb25lbnQuaAppbmRleCAzNDZiMWY1Y2IxODAuLmZjYTIy ZDQ2M2UxYiAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vaTkxNV9jb21wb25lbnQuaAorKysgYi9p bmNsdWRlL2RybS9pOTE1X2NvbXBvbmVudC5oCkBAIC0yNCwxMDEgKzI0LDI2IEBACiAjaWZuZGVm IF9JOTE1X0NPTVBPTkVOVF9IXwogI2RlZmluZSBfSTkxNV9DT01QT05FTlRfSF8KIAorI2luY2x1 ZGUgImRybV9hdWRpb19jb21wb25lbnQuaCIKKwogLyogTUFYX1BPUlQgaXMgdGhlIG51bWJlciBv ZiBwb3J0CiAgKiBJdCBtdXN0IGJlIHN5bmMgd2l0aCBJOTE1X01BWF9QT1JUUyBkZWZpbmVkIGk5 MTVfZHJ2LmgKICAqLwogI2RlZmluZSBNQVhfUE9SVFMgNgogCi0vKioKLSAqIHN0cnVjdCBpOTE1 X2F1ZGlvX2NvbXBvbmVudF9vcHMgLSBPcHMgaW1wbGVtZW50ZWQgYnkgaTkxNSBkcml2ZXIsIGNh bGxlZCBieSBoZGEgZHJpdmVyCi0gKi8KLXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9vcHMg ewotCS8qKgotCSAqIEBvd25lcjogaTkxNSBtb2R1bGUKLQkgKi8KLQlzdHJ1Y3QgbW9kdWxlICpv d25lcjsKLQkvKioKLQkgKiBAZ2V0X3Bvd2VyOiBnZXQgdGhlIFBPV0VSX0RPTUFJTl9BVURJTyBw b3dlciB3ZWxsCi0JICoKLQkgKiBSZXF1ZXN0IHRoZSBwb3dlciB3ZWxsIHRvIGJlIHR1cm5lZCBv bi4KLQkgKi8KLQl2b2lkICgqZ2V0X3Bvd2VyKShzdHJ1Y3QgZGV2aWNlICopOwotCS8qKgotCSAq IEBwdXRfcG93ZXI6IHB1dCB0aGUgUE9XRVJfRE9NQUlOX0FVRElPIHBvd2VyIHdlbGwKLQkgKgot CSAqIEFsbG93IHRoZSBwb3dlciB3ZWxsIHRvIGJlIHR1cm5lZCBvZmYuCi0JICovCi0Jdm9pZCAo KnB1dF9wb3dlcikoc3RydWN0IGRldmljZSAqKTsKLQkvKioKLQkgKiBAY29kZWNfd2FrZV9vdmVy cmlkZTogRW5hYmxlL2Rpc2FibGUgY29kZWMgd2FrZSBzaWduYWwKLQkgKi8KLQl2b2lkICgqY29k ZWNfd2FrZV9vdmVycmlkZSkoc3RydWN0IGRldmljZSAqLCBib29sIGVuYWJsZSk7Ci0JLyoqCi0J ICogQGdldF9jZGNsa19mcmVxOiBHZXQgdGhlIENvcmUgRGlzcGxheSBDbG9jayBpbiBrSHoKLQkg Ki8KLQlpbnQgKCpnZXRfY2RjbGtfZnJlcSkoc3RydWN0IGRldmljZSAqKTsKLQkvKioKLQkgKiBA c3luY19hdWRpb19yYXRlOiBzZXQgbi9jdHMgYmFzZWQgb24gdGhlIHNhbXBsZSByYXRlCi0JICoK LQkgKiBDYWxsZWQgZnJvbSBhdWRpbyBkcml2ZXIuIEFmdGVyIGF1ZGlvIGRyaXZlciBzZXRzIHRo ZQotCSAqIHNhbXBsZSByYXRlLCBpdCB3aWxsIGNhbGwgdGhpcyBmdW5jdGlvbiB0byBzZXQgbi9j dHMKLQkgKi8KLQlpbnQgKCpzeW5jX2F1ZGlvX3JhdGUpKHN0cnVjdCBkZXZpY2UgKiwgaW50IHBv cnQsIGludCBwaXBlLCBpbnQgcmF0ZSk7Ci0JLyoqCi0JICogQGdldF9lbGQ6IGZpbGwgdGhlIGF1 ZGlvIHN0YXRlIGFuZCBFTEQgYnl0ZXMgZm9yIHRoZSBnaXZlbiBwb3J0Ci0JICoKLQkgKiBDYWxs ZWQgZnJvbSBhdWRpbyBkcml2ZXIgdG8gZ2V0IHRoZSBIRE1JL0RQIGF1ZGlvIHN0YXRlIG9mIHRo ZSBnaXZlbgotCSAqIGRpZ2l0YWwgcG9ydCwgYW5kIGFsc28gZmV0Y2ggRUxEIGJ5dGVzIHRvIHRo ZSBnaXZlbiBwb2ludGVyLgotCSAqCi0JICogSXQgcmV0dXJucyB0aGUgYnl0ZSBzaXplIG9mIHRo ZSBvcmlnaW5hbCBFTEQgKG5vdCB0aGUgYWN0dWFsbHkKLQkgKiBjb3BpZWQgc2l6ZSksIHplcm8g Zm9yIGFuIGludmFsaWQgRUxELCBvciBhIG5lZ2F0aXZlIGVycm9yIGNvZGUuCi0JICoKLQkgKiBO b3RlIHRoYXQgdGhlIHJldHVybmVkIHNpemUgbWF5IGJlIG92ZXIgQG1heF9ieXRlcy4gIFRoZW4g aXQKLQkgKiBpbXBsaWVzIHRoYXQgb25seSBhIHBhcnQgb2YgRUxEIGhhcyBiZWVuIGNvcGllZCB0 byB0aGUgYnVmZmVyLgotCSAqLwotCWludCAoKmdldF9lbGQpKHN0cnVjdCBkZXZpY2UgKiwgaW50 IHBvcnQsIGludCBwaXBlLCBib29sICplbmFibGVkLAotCQkgICAgICAgdW5zaWduZWQgY2hhciAq YnVmLCBpbnQgbWF4X2J5dGVzKTsKLX07Ci0KLS8qKgotICogc3RydWN0IGk5MTVfYXVkaW9fY29t cG9uZW50X2F1ZGlvX29wcyAtIE9wcyBpbXBsZW1lbnRlZCBieSBoZGEgZHJpdmVyLCBjYWxsZWQg YnkgaTkxNSBkcml2ZXIKLSAqLwotc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50X2F1ZGlvX29w cyB7Ci0JLyoqCi0JICogQGF1ZGlvX3B0cjogUG9pbnRlciB0byBiZSB1c2VkIGluIGNhbGwgdG8g cGluX2VsZF9ub3RpZnkKLQkgKi8KLQl2b2lkICphdWRpb19wdHI7Ci0JLyoqCi0JICogQHBpbl9l bGRfbm90aWZ5OiBOb3RpZnkgdGhlIEhEQSBkcml2ZXIgdGhhdCBwaW4gc2Vuc2UgYW5kL29yIEVM RCBpbmZvcm1hdGlvbiBoYXMgY2hhbmdlZAotCSAqCi0JICogQ2FsbGVkIHdoZW4gdGhlIGk5MTUg ZHJpdmVyIGhhcyBzZXQgdXAgYXVkaW8gcGlwZWxpbmUgb3IgaGFzIGp1c3QKLQkgKiBiZWd1biB0 byB0ZWFyIGl0IGRvd24uIFRoaXMgYWxsb3dzIHRoZSBIREEgZHJpdmVyIHRvIHVwZGF0ZSBpdHMK LQkgKiBzdGF0dXMgYWNjb3JkaW5nbHkgKGV2ZW4gd2hlbiB0aGUgSERBIGNvbnRyb2xsZXIgaXMg aW4gcG93ZXIgc2F2ZQotCSAqIG1vZGUpLgotCSAqLwotCXZvaWQgKCpwaW5fZWxkX25vdGlmeSko dm9pZCAqYXVkaW9fcHRyLCBpbnQgcG9ydCwgaW50IHBpcGUpOwotfTsKLQogLyoqCiAgKiBzdHJ1 Y3QgaTkxNV9hdWRpb19jb21wb25lbnQgLSBVc2VkIGZvciBkaXJlY3QgY29tbXVuaWNhdGlvbiBi ZXR3ZWVuIGk5MTUgYW5kIGhkYSBkcml2ZXJzCiAgKi8KIHN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBv bmVudCB7CiAJLyoqCi0JICogQGRldjogaTkxNSBkZXZpY2UsIHVzZWQgYXMgcGFyYW1ldGVyIGZv ciBvcHMKKwkgKiBAYmFzZTogdGhlIGRybV9hdWRpb19jb21wb25lbnQgYmFzZSBjbGFzcwogCSAq LwotCXN0cnVjdCBkZXZpY2UgKmRldjsKKwlzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVudAliYXNl OworCiAJLyoqCiAJICogQGF1ZF9zYW1wbGVfcmF0ZTogdGhlIGFycmF5IG9mIGF1ZGlvIHNhbXBs ZSByYXRlIHBlciBwb3J0CiAJICovCiAJaW50IGF1ZF9zYW1wbGVfcmF0ZVtNQVhfUE9SVFNdOwot CS8qKgotCSAqIEBvcHM6IE9wcyBpbXBsZW1lbnRlZCBieSBpOTE1IGRyaXZlciwgY2FsbGVkIGJ5 IGhkYSBkcml2ZXIKLQkgKi8KLQljb25zdCBzdHJ1Y3QgaTkxNV9hdWRpb19jb21wb25lbnRfb3Bz ICpvcHM7Ci0JLyoqCi0JICogQGF1ZGlvX29wczogT3BzIGltcGxlbWVudGVkIGJ5IGhkYSBkcml2 ZXIsIGNhbGxlZCBieSBpOTE1IGRyaXZlcgotCSAqLwotCWNvbnN0IHN0cnVjdCBpOTE1X2F1ZGlv X2NvbXBvbmVudF9hdWRpb19vcHMgKmF1ZGlvX29wczsKIH07CiAKICNlbmRpZiAvKiBfSTkxNV9D T01QT05FTlRfSF8gKi8KZGlmZiAtLWdpdCBhL2luY2x1ZGUvc291bmQvaGRhX2k5MTUuaCBiL2lu Y2x1ZGUvc291bmQvaGRhX2k5MTUuaAppbmRleCBhOTRmNWI2ZjkyYWMuLmY2OWVhODRlN2I2NSAx MDA2NDQKLS0tIGEvaW5jbHVkZS9zb3VuZC9oZGFfaTkxNS5oCisrKyBiL2luY2x1ZGUvc291bmQv aGRhX2k5MTUuaApAQCAtNSw3ICs1LDcgQEAKICNpZm5kZWYgX19TT1VORF9IREFfSTkxNV9ICiAj ZGVmaW5lIF9fU09VTkRfSERBX0k5MTVfSAogCi0jaW5jbHVkZSA8ZHJtL2k5MTVfY29tcG9uZW50 Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV9hdWRpb19jb21wb25lbnQuaD4KIAogI2lmZGVmIENPTkZJ R19TTkRfSERBX0k5MTUKIGludCBzbmRfaGRhY19zZXRfY29kZWNfd2FrZXVwKHN0cnVjdCBoZGFj X2J1cyAqYnVzLCBib29sIGVuYWJsZSk7CkBAIC0xNyw3ICsxNyw3IEBAIGludCBzbmRfaGRhY19h Y29tcF9nZXRfZWxkKHN0cnVjdCBoZGFjX2RldmljZSAqY29kZWMsIGhkYV9uaWRfdCBuaWQsIGlu dCBkZXZfaWQsCiAJCQkgICBib29sICphdWRpb19lbmFibGVkLCBjaGFyICpidWZmZXIsIGludCBt YXhfYnl0ZXMpOwogaW50IHNuZF9oZGFjX2k5MTVfaW5pdChzdHJ1Y3QgaGRhY19idXMgKmJ1cyk7 CiBpbnQgc25kX2hkYWNfaTkxNV9leGl0KHN0cnVjdCBoZGFjX2J1cyAqYnVzKTsKLWludCBzbmRf aGRhY19pOTE1X3JlZ2lzdGVyX25vdGlmaWVyKGNvbnN0IHN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBv bmVudF9hdWRpb19vcHMgKik7CitpbnQgc25kX2hkYWNfaTkxNV9yZWdpc3Rlcl9ub3RpZmllcihj b25zdCBzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVudF9hdWRpb19vcHMgKik7CiAjZWxzZQogc3Rh dGljIGlubGluZSBpbnQgc25kX2hkYWNfc2V0X2NvZGVjX3dha2V1cChzdHJ1Y3QgaGRhY19idXMg KmJ1cywgYm9vbCBlbmFibGUpCiB7CkBAIC00OSw3ICs0OSw3IEBAIHN0YXRpYyBpbmxpbmUgaW50 IHNuZF9oZGFjX2k5MTVfZXhpdChzdHJ1Y3QgaGRhY19idXMgKmJ1cykKIHsKIAlyZXR1cm4gMDsK IH0KLXN0YXRpYyBpbmxpbmUgaW50IHNuZF9oZGFjX2k5MTVfcmVnaXN0ZXJfbm90aWZpZXIoY29u c3Qgc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50X2F1ZGlvX29wcyAqb3BzKQorc3RhdGljIGlu bGluZSBpbnQgc25kX2hkYWNfaTkxNV9yZWdpc3Rlcl9ub3RpZmllcihjb25zdCBzdHJ1Y3QgZHJt X2F1ZGlvX2NvbXBvbmVudF9hdWRpb19vcHMgKm9wcykKIHsKIAlyZXR1cm4gLUVOT0RFVjsKIH0K ZGlmZiAtLWdpdCBhL2luY2x1ZGUvc291bmQvaGRhdWRpby5oIGIvaW5jbHVkZS9zb3VuZC9oZGF1 ZGlvLmgKaW5kZXggZjFiYWFhODhlNzY2Li5hYjVlZTNlZjIxOTggMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvc291bmQvaGRhdWRpby5oCisrKyBiL2luY2x1ZGUvc291bmQvaGRhdWRpby5oCkBAIC0zMzMs OSArMzMzLDkgQEAgc3RydWN0IGhkYWNfYnVzIHsKIAlzcGlubG9ja190IHJlZ19sb2NrOwogCXN0 cnVjdCBtdXRleCBjbWRfbXV0ZXg7CiAKLQkvKiBpOTE1IGNvbXBvbmVudCBpbnRlcmZhY2UgKi8K LQlzdHJ1Y3QgaTkxNV9hdWRpb19jb21wb25lbnQgKmF1ZGlvX2NvbXBvbmVudDsKLQlpbnQgaTkx NV9wb3dlcl9yZWZjb3VudDsKKwkvKiBEUk0gY29tcG9uZW50IGludGVyZmFjZSAqLworCXN0cnVj dCBkcm1fYXVkaW9fY29tcG9uZW50ICphdWRpb19jb21wb25lbnQ7CisJaW50IGRybV9wb3dlcl9y ZWZjb3VudDsKIAogCS8qIHBhcmFtZXRlcnMgcmVxdWlyZWQgZm9yIGVuaGFuY2VkIGNhcGFiaWxp dGllcyAqLwogCWludCBudW1fc3RyZWFtczsKZGlmZiAtLWdpdCBhL3NvdW5kL2hkYS9oZGFjX2k5 MTUuYyBiL3NvdW5kL2hkYS9oZGFjX2k5MTUuYwppbmRleCBjYmU4MThlZGEzMzYuLjFhODhjMWFh ZjliYiAxMDA2NDQKLS0tIGEvc291bmQvaGRhL2hkYWNfaTkxNS5jCisrKyBiL3NvdW5kL2hkYS9o ZGFjX2k5MTUuYwpAQCAtMTYsMTMgKzE2LDEzIEBACiAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+ CiAjaW5jbHVkZSA8bGludXgvcGNpLmg+CiAjaW5jbHVkZSA8bGludXgvY29tcG9uZW50Lmg+Ci0j aW5jbHVkZSA8ZHJtL2k5MTVfY29tcG9uZW50Lmg+CisjaW5jbHVkZSA8ZHJtL2RybV9hdWRpb19j b21wb25lbnQuaD4KICNpbmNsdWRlIDxzb3VuZC9jb3JlLmg+CiAjaW5jbHVkZSA8c291bmQvaGRh dWRpby5oPgogI2luY2x1ZGUgPHNvdW5kL2hkYV9pOTE1Lmg+CiAjaW5jbHVkZSA8c291bmQvaGRh X3JlZ2lzdGVyLmg+CiAKLXN0YXRpYyBzdHJ1Y3QgaTkxNV9hdWRpb19jb21wb25lbnQgKmhkYWNf YWNvbXA7CitzdGF0aWMgc3RydWN0IGRybV9hdWRpb19jb21wb25lbnQgKmhkYWNfYWNvbXA7CiAK IC8qKgogICogc25kX2hkYWNfc2V0X2NvZGVjX3dha2V1cCAtIEVuYWJsZSAvIGRpc2FibGUgSERN SS9EUCBjb2RlYyB3YWtldXAKQEAgLTM5LDcgKzM5LDcgQEAgc3RhdGljIHN0cnVjdCBpOTE1X2F1 ZGlvX2NvbXBvbmVudCAqaGRhY19hY29tcDsKICAqLwogaW50IHNuZF9oZGFjX3NldF9jb2RlY193 YWtldXAoc3RydWN0IGhkYWNfYnVzICpidXMsIGJvb2wgZW5hYmxlKQogewotCXN0cnVjdCBpOTE1 X2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSBidXMtPmF1ZGlvX2NvbXBvbmVudDsKKwlzdHJ1Y3Qg ZHJtX2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSBidXMtPmF1ZGlvX2NvbXBvbmVudDsKIAogCWlm ICghYWNvbXAgfHwgIWFjb21wLT5vcHMpCiAJCXJldHVybiAtRU5PREVWOwpAQCAtNzQsNyArNzQs NyBAQCBFWFBPUlRfU1lNQk9MX0dQTChzbmRfaGRhY19zZXRfY29kZWNfd2FrZXVwKTsKICAqLwog aW50IHNuZF9oZGFjX2Rpc3BsYXlfcG93ZXIoc3RydWN0IGhkYWNfYnVzICpidXMsIGJvb2wgZW5h YmxlKQogewotCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSBidXMtPmF1ZGlv X2NvbXBvbmVudDsKKwlzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSBidXMtPmF1 ZGlvX2NvbXBvbmVudDsKIAogCWlmICghYWNvbXAgfHwgIWFjb21wLT5vcHMpCiAJCXJldHVybiAt RU5PREVWOwpAQCAtODMsMTQgKzgzLDE0IEBAIGludCBzbmRfaGRhY19kaXNwbGF5X3Bvd2VyKHN0 cnVjdCBoZGFjX2J1cyAqYnVzLCBib29sIGVuYWJsZSkKIAkJZW5hYmxlID8gImVuYWJsZSIgOiAi ZGlzYWJsZSIpOwogCiAJaWYgKGVuYWJsZSkgewotCQlpZiAoIWJ1cy0+aTkxNV9wb3dlcl9yZWZj b3VudCsrKSB7CisJCWlmICghYnVzLT5kcm1fcG93ZXJfcmVmY291bnQrKykgewogCQkJYWNvbXAt Pm9wcy0+Z2V0X3Bvd2VyKGFjb21wLT5kZXYpOwogCQkJc25kX2hkYWNfc2V0X2NvZGVjX3dha2V1 cChidXMsIHRydWUpOwogCQkJc25kX2hkYWNfc2V0X2NvZGVjX3dha2V1cChidXMsIGZhbHNlKTsK IAkJfQogCX0gZWxzZSB7Ci0JCVdBUk5fT04oIWJ1cy0+aTkxNV9wb3dlcl9yZWZjb3VudCk7Ci0J CWlmICghLS1idXMtPmk5MTVfcG93ZXJfcmVmY291bnQpCisJCVdBUk5fT04oIWJ1cy0+ZHJtX3Bv d2VyX3JlZmNvdW50KTsKKwkJaWYgKCEtLWJ1cy0+ZHJtX3Bvd2VyX3JlZmNvdW50KQogCQkJYWNv bXAtPm9wcy0+cHV0X3Bvd2VyKGFjb21wLT5kZXYpOwogCX0KIApAQCAtMTE5LDcgKzExOSw3IEBA IEVYUE9SVF9TWU1CT0xfR1BMKHNuZF9oZGFjX2Rpc3BsYXlfcG93ZXIpOwogICovCiB2b2lkIHNu ZF9oZGFjX2k5MTVfc2V0X2JjbGsoc3RydWN0IGhkYWNfYnVzICpidXMpCiB7Ci0Jc3RydWN0IGk5 MTVfYXVkaW9fY29tcG9uZW50ICphY29tcCA9IGJ1cy0+YXVkaW9fY29tcG9uZW50OworCXN0cnVj dCBkcm1fYXVkaW9fY29tcG9uZW50ICphY29tcCA9IGJ1cy0+YXVkaW9fY29tcG9uZW50OwogCXN0 cnVjdCBwY2lfZGV2ICpwY2kgPSB0b19wY2lfZGV2KGJ1cy0+ZGV2KTsKIAlpbnQgY2RjbGtfZnJl cTsKIAl1bnNpZ25lZCBpbnQgYmNsa19tLCBiY2xrX247CkBAIC0yMDYsNyArMjA2LDcgQEAgaW50 IHNuZF9oZGFjX3N5bmNfYXVkaW9fcmF0ZShzdHJ1Y3QgaGRhY19kZXZpY2UgKmNvZGVjLCBoZGFf bmlkX3QgbmlkLAogCQkJICAgICBpbnQgZGV2X2lkLCBpbnQgcmF0ZSkKIHsKIAlzdHJ1Y3QgaGRh Y19idXMgKmJ1cyA9IGNvZGVjLT5idXM7Ci0Jc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50ICph Y29tcCA9IGJ1cy0+YXVkaW9fY29tcG9uZW50OworCXN0cnVjdCBkcm1fYXVkaW9fY29tcG9uZW50 ICphY29tcCA9IGJ1cy0+YXVkaW9fY29tcG9uZW50OwogCWludCBwb3J0LCBwaXBlOwogCiAJaWYg KCFhY29tcCB8fCAhYWNvbXAtPm9wcyB8fCAhYWNvbXAtPm9wcy0+c3luY19hdWRpb19yYXRlKQpA QCAtMjQ0LDcgKzI0NCw3IEBAIGludCBzbmRfaGRhY19hY29tcF9nZXRfZWxkKHN0cnVjdCBoZGFj X2RldmljZSAqY29kZWMsIGhkYV9uaWRfdCBuaWQsIGludCBkZXZfaWQsCiAJCQkgICBib29sICph dWRpb19lbmFibGVkLCBjaGFyICpidWZmZXIsIGludCBtYXhfYnl0ZXMpCiB7CiAJc3RydWN0IGhk YWNfYnVzICpidXMgPSBjb2RlYy0+YnVzOwotCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCAq YWNvbXAgPSBidXMtPmF1ZGlvX2NvbXBvbmVudDsKKwlzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVu dCAqYWNvbXAgPSBidXMtPmF1ZGlvX2NvbXBvbmVudDsKIAlpbnQgcG9ydCwgcGlwZTsKIAogCWlm ICghYWNvbXAgfHwgIWFjb21wLT5vcHMgfHwgIWFjb21wLT5vcHMtPmdldF9lbGQpCkBAIC0yNjIs NyArMjYyLDcgQEAgRVhQT1JUX1NZTUJPTF9HUEwoc25kX2hkYWNfYWNvbXBfZ2V0X2VsZCk7CiAK IHN0YXRpYyBpbnQgaGRhY19jb21wb25lbnRfbWFzdGVyX2JpbmQoc3RydWN0IGRldmljZSAqZGV2 KQogewotCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVudCAqYWNvbXAgPSBoZGFjX2Fjb21wOwor CXN0cnVjdCBkcm1fYXVkaW9fY29tcG9uZW50ICphY29tcCA9IGhkYWNfYWNvbXA7CiAJaW50IHJl dDsKIAogCXJldCA9IGNvbXBvbmVudF9iaW5kX2FsbChkZXYsIGFjb21wKTsKQEAgLTI5NCw3ICsy OTQsNyBAQCBzdGF0aWMgaW50IGhkYWNfY29tcG9uZW50X21hc3Rlcl9iaW5kKHN0cnVjdCBkZXZp Y2UgKmRldikKIAogc3RhdGljIHZvaWQgaGRhY19jb21wb25lbnRfbWFzdGVyX3VuYmluZChzdHJ1 Y3QgZGV2aWNlICpkZXYpCiB7Ci0Jc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50ICphY29tcCA9 IGhkYWNfYWNvbXA7CisJc3RydWN0IGRybV9hdWRpb19jb21wb25lbnQgKmFjb21wID0gaGRhY19h Y29tcDsKIAogCW1vZHVsZV9wdXQoYWNvbXAtPm9wcy0+b3duZXIpOwogCWNvbXBvbmVudF91bmJp bmRfYWxsKGRldiwgYWNvbXApOwpAQCAtMzIzLDcgKzMyMyw3IEBAIHN0YXRpYyBpbnQgaGRhY19j b21wb25lbnRfbWFzdGVyX21hdGNoKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0YSkKICAq CiAgKiBSZXR1cm5zIHplcm8gZm9yIHN1Y2Nlc3Mgb3IgYSBuZWdhdGl2ZSBlcnJvciBjb2RlLgog ICovCi1pbnQgc25kX2hkYWNfaTkxNV9yZWdpc3Rlcl9ub3RpZmllcihjb25zdCBzdHJ1Y3QgaTkx NV9hdWRpb19jb21wb25lbnRfYXVkaW9fb3BzICphb3BzKQoraW50IHNuZF9oZGFjX2k5MTVfcmVn aXN0ZXJfbm90aWZpZXIoY29uc3Qgc3RydWN0IGRybV9hdWRpb19jb21wb25lbnRfYXVkaW9fb3Bz ICphb3BzKQogewogCWlmICghaGRhY19hY29tcCkKIAkJcmV0dXJuIC1FTk9ERVY7CkBAIC0zNjEs NyArMzYxLDggQEAgaW50IHNuZF9oZGFjX2k5MTVfaW5pdChzdHJ1Y3QgaGRhY19idXMgKmJ1cykK IHsKIAlzdHJ1Y3QgY29tcG9uZW50X21hdGNoICptYXRjaCA9IE5VTEw7CiAJc3RydWN0IGRldmlj ZSAqZGV2ID0gYnVzLT5kZXY7Ci0Jc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50ICphY29tcDsK KwlzdHJ1Y3QgaTkxNV9hdWRpb19jb21wb25lbnQgKmk5MTVfYWNvbXA7CisJc3RydWN0IGRybV9h dWRpb19jb21wb25lbnQgKmFjb21wOwogCWludCByZXQ7CiAKIAlpZiAoV0FSTl9PTihoZGFjX2Fj b21wKSkKQEAgLTM3MCw5ICszNzEsMTAgQEAgaW50IHNuZF9oZGFjX2k5MTVfaW5pdChzdHJ1Y3Qg aGRhY19idXMgKmJ1cykKIAlpZiAoIWk5MTVfZ2Z4X3ByZXNlbnQoKSkKIAkJcmV0dXJuIC1FTk9E RVY7CiAKLQlhY29tcCA9IGt6YWxsb2Moc2l6ZW9mKCphY29tcCksIEdGUF9LRVJORUwpOwotCWlm ICghYWNvbXApCisJaTkxNV9hY29tcCA9IGt6YWxsb2Moc2l6ZW9mKCppOTE1X2Fjb21wKSwgR0ZQ X0tFUk5FTCk7CisJaWYgKCFpOTE1X2Fjb21wKQogCQlyZXR1cm4gLUVOT01FTTsKKwlhY29tcCA9 ICZpOTE1X2Fjb21wLT5iYXNlOwogCWJ1cy0+YXVkaW9fY29tcG9uZW50ID0gYWNvbXA7CiAJaGRh Y19hY29tcCA9IGFjb21wOwogCkBAIC00MjEsMTMgKzQyMywxMyBAQCBFWFBPUlRfU1lNQk9MX0dQ TChzbmRfaGRhY19pOTE1X2luaXQpOwogaW50IHNuZF9oZGFjX2k5MTVfZXhpdChzdHJ1Y3QgaGRh Y19idXMgKmJ1cykKIHsKIAlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBidXMtPmRldjsKLQlzdHJ1Y3Qg aTkxNV9hdWRpb19jb21wb25lbnQgKmFjb21wID0gYnVzLT5hdWRpb19jb21wb25lbnQ7CisJc3Ry dWN0IGRybV9hdWRpb19jb21wb25lbnQgKmFjb21wID0gYnVzLT5hdWRpb19jb21wb25lbnQ7CiAK IAlpZiAoIWFjb21wKQogCQlyZXR1cm4gMDsKIAotCVdBUk5fT04oYnVzLT5pOTE1X3Bvd2VyX3Jl ZmNvdW50KTsKLQlpZiAoYnVzLT5pOTE1X3Bvd2VyX3JlZmNvdW50ID4gMCAmJiBhY29tcC0+b3Bz KQorCVdBUk5fT04oYnVzLT5kcm1fcG93ZXJfcmVmY291bnQpOworCWlmIChidXMtPmRybV9wb3dl cl9yZWZjb3VudCA+IDAgJiYgYWNvbXAtPm9wcykKIAkJYWNvbXAtPm9wcy0+cHV0X3Bvd2VyKGFj b21wLT5kZXYpOwogCiAJY29tcG9uZW50X21hc3Rlcl9kZWwoZGV2LCAmaGRhY19jb21wb25lbnRf bWFzdGVyX29wcyk7CmRpZmYgLS1naXQgYS9zb3VuZC9wY2kvaGRhL3BhdGNoX2hkbWkuYyBiL3Nv dW5kL3BjaS9oZGEvcGF0Y2hfaGRtaS5jCmluZGV4IDhhNDk0MTVhZWJhYy4uYzA4NDcwMTcxMTRj IDEwMDY0NAotLS0gYS9zb3VuZC9wY2kvaGRhL3BhdGNoX2hkbWkuYworKysgYi9zb3VuZC9wY2kv aGRhL3BhdGNoX2hkbWkuYwpAQCAtMTc3LDcgKzE3Nyw3IEBAIHN0cnVjdCBoZG1pX3NwZWMgewog CiAJLyogaTkxNS9wb3dlcndlbGwgKEhhc3dlbGwrL1ZhbGxleXZpZXcrKSBzcGVjaWZpYyAqLwog CWJvb2wgdXNlX2Fjb21wX25vdGlmaWVyOyAvKiB1c2UgaTkxNSBlbGRfbm90aWZ5IGNhbGxiYWNr IGZvciBob3RwbHVnICovCi0Jc3RydWN0IGk5MTVfYXVkaW9fY29tcG9uZW50X2F1ZGlvX29wcyBp OTE1X2F1ZGlvX29wczsKKwlzdHJ1Y3QgZHJtX2F1ZGlvX2NvbXBvbmVudF9hdWRpb19vcHMgZHJt X2F1ZGlvX29wczsKIAogCXN0cnVjdCBoZGFjX2NobWFwIGNobWFwOwogCWhkYV9uaWRfdCB2ZW5k b3JfbmlkOwpAQCAtMjUxMSwxNCArMjUxMSwxNCBAQCBzdGF0aWMgdm9pZCByZWdpc3Rlcl9pOTE1 X25vdGlmaWVyKHN0cnVjdCBoZGFfY29kZWMgKmNvZGVjKQogCXN0cnVjdCBoZG1pX3NwZWMgKnNw ZWMgPSBjb2RlYy0+c3BlYzsKIAogCXNwZWMtPnVzZV9hY29tcF9ub3RpZmllciA9IHRydWU7Ci0J c3BlYy0+aTkxNV9hdWRpb19vcHMuYXVkaW9fcHRyID0gY29kZWM7CisJc3BlYy0+ZHJtX2F1ZGlv X29wcy5hdWRpb19wdHIgPSBjb2RlYzsKIAkvKiBpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoKSBv ciBpbnRlbF9hdWRpb19jb2RlY19kaXNhYmxlKCkKIAkgKiB3aWxsIGNhbGwgcGluX2VsZF9ub3Rp Znkgd2l0aCB1c2luZyBhdWRpb19wdHIgcG9pbnRlcgogCSAqIFdlIG5lZWQgbWFrZSBzdXJlIGF1 ZGlvX3B0ciBpcyByZWFsbHkgc2V0dXAKIAkgKi8KIAl3bWIoKTsKLQlzcGVjLT5pOTE1X2F1ZGlv X29wcy5waW5fZWxkX25vdGlmeSA9IGludGVsX3Bpbl9lbGRfbm90aWZ5OwotCXNuZF9oZGFjX2k5 MTVfcmVnaXN0ZXJfbm90aWZpZXIoJnNwZWMtPmk5MTVfYXVkaW9fb3BzKTsKKwlzcGVjLT5kcm1f YXVkaW9fb3BzLnBpbl9lbGRfbm90aWZ5ID0gaW50ZWxfcGluX2VsZF9ub3RpZnk7CisJc25kX2hk YWNfaTkxNV9yZWdpc3Rlcl9ub3RpZmllcigmc3BlYy0+ZHJtX2F1ZGlvX29wcyk7CiB9CiAKIC8q IHNldHVwX3N0cmVhbSBvcHMgb3ZlcnJpZGUgZm9yIEhTVysgKi8KZGlmZiAtLWdpdCBhL3NvdW5k L3NvYy9jb2RlY3MvaGRhY19oZG1pLmMgYi9zb3VuZC9zb2MvY29kZWNzL2hkYWNfaGRtaS5jCmlu ZGV4IDNlM2EyYTllZjMxMC4uNDYwMDc1NDc1ZjIwIDEwMDY0NAotLS0gYS9zb3VuZC9zb2MvY29k ZWNzL2hkYWNfaGRtaS5jCisrKyBiL3NvdW5kL3NvYy9jb2RlY3MvaGRhY19oZG1pLmMKQEAgLTE1 ODMsNyArMTU4Myw3IEBAIHN0YXRpYyB2b2lkIGhkYWNfaGRtaV9lbGRfbm90aWZ5X2NiKHZvaWQg KmFwdHIsIGludCBwb3J0LCBpbnQgcGlwZSkKIAogfQogCi1zdGF0aWMgc3RydWN0IGk5MTVfYXVk aW9fY29tcG9uZW50X2F1ZGlvX29wcyBhb3BzID0geworc3RhdGljIHN0cnVjdCBkcm1fYXVkaW9f Y29tcG9uZW50X2F1ZGlvX29wcyBhb3BzID0gewogCS5waW5fZWxkX25vdGlmeQk9IGhkYWNfaGRt aV9lbGRfbm90aWZ5X2NiLAogfTsKIAotLSAKMi4xOC4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK