From: Michel Thierry Subject: [PATCH 21/24] drm/i915/bdw: Split out mappings Date: Thu, 18 Dec 2014 17:10:18 +0000 Message-ID: <1418922621-25818-22-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C7A96EA58 for ; Thu, 18 Dec 2014 09:18:07 -0800 (PST) In-Reply-To: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpXaGVuIHdl IGRvIGR5bmFtaWMgcGFnZSB0YWJsZSBhbGxvY2F0aW9ucyBmb3IgZ2VuOCwgd2UnbGwgbmVlZCB0 byBoYXZlCm1vcmUgY29udHJvbCBvdmVyIGhvdyBhbmQgd2hlbiB3ZSBtYXAgcGFnZSB0YWJsZXMs IHNpbWlsYXIgdG8gZ2VuNi4KSW4gcGFydGljdWxhciwgRE1BIG1hcHBpbmdzIGZvciBwYWdlIGRp cmVjdG9yaWVzL3RhYmxlcyBvY2N1ciBhdCBhbGxvY2F0aW9uCnRpbWUuCgpUaGlzIHBhdGNoIGFk ZHMgdGhlIGZ1bmN0aW9uYWxpdHkgYW5kIGNhbGxzIGl0IGF0IGluaXQsIHdoaWNoIHNob3VsZApo YXZlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKVGhlIFBEUEVzIGFyZSBzdGlsbCBhIHNwZWNpYWwg Y2FzZSBmb3Igbm93LiBXZSdsbCBuZWVkIGEgZnVuY3Rpb24gZm9yCnRoYXQgaW4gdGhlIGZ1dHVy ZSBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogQmVuIFdpZGF3c2t5IDxiZW5AYndpZGF3c2submV0 PgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMTg2ICsrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcyIGluc2VydGlv bnMoKyksIDExNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmlu ZGV4IDBjMzJhOTEuLjczZTdjMDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2d0dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBA IC00MTUsMjEgKzQxNSwyMyBAQCBlcnJfb3V0OgogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyB2 b2lkIF9fZnJlZV9wZF9zaW5nbGUoc3RydWN0IGk5MTVfcGFnZWRpciAqcGQpCitzdGF0aWMgdm9p ZCBfX2ZyZWVfcGRfc2luZ2xlKHN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBkLCBzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogeworCWk5MTVfZG1hX3VubWFwX3NpbmdsZShwZCwgZGV2KTsKIAlfX2ZyZWVf cGFnZShwZC0+cGFnZSk7CiAJa2ZyZWUocGQpOwogfQogCi0jZGVmaW5lIGZyZWVfcGRfc2luZ2xl KHBkKSBkbyB7IFwKKyNkZWZpbmUgZnJlZV9wZF9zaW5nbGUocGQsICBkZXYpIGRvIHsgXAogCWlm ICgocGQpLT5wYWdlKSB7IFwKLQkJX19mcmVlX3BkX3NpbmdsZShwZCk7IFwKKwkJX19mcmVlX3Bk X3NpbmdsZShwZCwgZGV2KTsgXAogCX0gXAogfSB3aGlsZSAoMCkKIAotc3RhdGljIHN0cnVjdCBp OTE1X3BhZ2VkaXIgKmFsbG9jX3BkX3NpbmdsZSh2b2lkKQorc3RhdGljIHN0cnVjdCBpOTE1X3Bh Z2VkaXIgKmFsbG9jX3BkX3NpbmdsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBpOTE1X3BhZ2VkaXIgKnBkOworCWludCByZXQ7CiAKIAlwZCA9IGt6YWxsb2Moc2l6ZW9mKCpw ZCksIEdGUF9LRVJORUwpOwogCWlmICghcGQpCkBAIC00NDEsNiArNDQzLDEzIEBAIHN0YXRpYyBz dHJ1Y3QgaTkxNV9wYWdlZGlyICphbGxvY19wZF9zaW5nbGUodm9pZCkKIAkJcmV0dXJuIEVSUl9Q VFIoLUVOT01FTSk7CiAJfQogCisJcmV0ID0gaTkxNV9kbWFfbWFwX3B4X3NpbmdsZShwZCwgZGV2 KTsKKwlpZiAocmV0KSB7CisJCV9fZnJlZV9wYWdlKHBkLT5wYWdlKTsKKwkJa2ZyZWUocGQpOwor CQlyZXR1cm4gRVJSX1BUUihyZXQpOworCX0KKwogCXJldHVybiBwZDsKIH0KIApAQCAtNTgwLDYg KzU4OSwzNiBAQCBzdGF0aWMgdm9pZCBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzKHN0cnVjdCBp OTE1X2FkZHJlc3Nfc3BhY2UgKnZtLAogCX0KIH0KIAorc3RhdGljIHZvaWQgX19nZW44X2RvX21h cF9wdChnZW44X3BwZ3R0X3BkZV90ICpwZGUsCisJCQkgICAgIHN0cnVjdCBpOTE1X3BhZ2V0YWIg KnB0LAorCQkJICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoreworCWdlbjhfcHBndHRfcGRl X3QgZW50cnkgPQorCQlnZW44X3BkZV9lbmNvZGUoZGV2LCBwdC0+ZGFkZHIsIEk5MTVfQ0FDSEVf TExDKTsKKwkqcGRlID0gZW50cnk7Cit9CisKKy8qIEl0J3MgbGlrZWx5IHdlJ2xsIG1hcCBtb3Jl IHRoYW4gb25lIHBhZ2V0YWJsZSBhdCBhIHRpbWUuIFRoaXMgZnVuY3Rpb24gd2lsbAorICogc2F2 ZSB1cyB1bm5lY2Vzc2FyeSBrbWFwIGNhbGxzLCBidXQgZG8gbm8gbW9yZSBmdW5jdGlvbmFsbHkg dGhhbiBtdWx0aXBsZQorICogY2FsbHMgdG8gbWFwX3B0LiAqLworc3RhdGljIHZvaWQgZ2VuOF9t YXBfcGFnZXRhYmxlX3JhbmdlKHN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBkLAorCQkJCSAgICAgdWlu dDY0X3Qgc3RhcnQsCisJCQkJICAgICB1aW50NjRfdCBsZW5ndGgsCisJCQkJICAgICBzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQoreworCWdlbjhfcHBndHRfcGRlX3QgKnBhZ2VkaXIgPSBrbWFwX2F0 b21pYyhwZC0+cGFnZSk7CisJc3RydWN0IGk5MTVfcGFnZXRhYiAqcHQ7CisJdWludDY0X3QgdGVt cCwgcGRlOworCisJZ2VuOF9mb3JfZWFjaF9wZGUocHQsIHBkLCBzdGFydCwgbGVuZ3RoLCB0ZW1w LCBwZGUpCisJCV9fZ2VuOF9kb19tYXBfcHQocGFnZWRpciArIHBkZSwgcHQsIGRldik7CisKKwlp ZiAoIUhBU19MTEMoZGV2KSkKKwkJZHJtX2NsZmx1c2hfdmlydF9yYW5nZShwYWdlZGlyLCBQQUdF X1NJWkUpOworCisJa3VubWFwX2F0b21pYyhwYWdlZGlyKTsKK30KKwogc3RhdGljIHZvaWQgZ2Vu OF90ZWFyZG93bl92YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKIAkJCQkg ICB1aW50NjRfdCBzdGFydCwgdWludDY0X3QgbGVuZ3RoKQogewpAQCAtNTk3LDcgKzYzNiw3IEBA IHN0YXRpYyB2b2lkIGdlbjhfdGVhcmRvd25fdmFfcmFuZ2Uoc3RydWN0IGk5MTVfYWRkcmVzc19z cGFjZSAqdm0sCiAJCQlmcmVlX3B0X3NpbmdsZShwdCwgdm0tPmRldik7CiAJCQlwZC0+cGFnZV90 YWJsZXNbcGRlXSA9IE5VTEw7CiAJCX0KLQkJZnJlZV9wZF9zaW5nbGUocGQpOworCQlmcmVlX3Bk X3NpbmdsZShwZCwgdm0tPmRldik7CiAJCXBwZ3R0LT5wZHAucGFnZWRpcltwZHBlXSA9IE5VTEw7 CiAJfQogfQpAQCAtNjI5LDkgKzY2OCw2IEBAIHN0YXRpYyB2b2lkIGdlbjhfcHBndHRfdW5tYXBf cGFnZXMoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogCiBzdGF0aWMgdm9pZCBnZW44X3Bw Z3R0X2ZyZWUoc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0KQogewotCXRyYWNlX2k5MTVfdmFf dGVhcmRvd24oJnBwZ3R0LT5iYXNlLAotCQkJICAgICAgIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0 dC0+YmFzZS50b3RhbCwKLQkJCSAgICAgICBWTV9UT19UUkFDRV9OQU1FKCZwcGd0dC0+YmFzZSkp OwogCWdlbjhfdGVhcmRvd25fdmFfcmFuZ2UoJnBwZ3R0LT5iYXNlLAogCQkJICAgICAgIHBwZ3R0 LT5iYXNlLnN0YXJ0LCBwcGd0dC0+YmFzZS50b3RhbCk7CiB9CkBAIC02NzIsNyArNzA4LDggQEAg dW53aW5kX291dDoKIAogc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VkaXJzKHN0cnVj dCBpOTE1X3BhZ2VkaXJwbyAqcGRwLAogCQkJCSAgICAgdWludDY0X3Qgc3RhcnQsCi0JCQkJICAg ICB1aW50NjRfdCBsZW5ndGgpCisJCQkJICAgICB1aW50NjRfdCBsZW5ndGgsCisJCQkJICAgICBz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBpOTE1X3BhZ2VkaXIgKnVudXNlZDsK IAl1aW50NjRfdCB0ZW1wOwpAQCAtNjgzLDcgKzcyMCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9wcGd0 dF9hbGxvY19wYWdlZGlycyhzdHJ1Y3QgaTkxNV9wYWdlZGlycG8gKnBkcCwKIAogCWdlbjhfZm9y X2VhY2hfcGRwZSh1bnVzZWQsIHBkcCwgc3RhcnQsIGxlbmd0aCwgdGVtcCwgcGRwZSkgewogCQlC VUdfT04odW51c2VkKTsKLQkJcGRwLT5wYWdlZGlyW3BkcGVdID0gYWxsb2NfcGRfc2luZ2xlKCk7 CisJCXBkcC0+cGFnZWRpcltwZHBlXSA9IGFsbG9jX3BkX3NpbmdsZShkZXYpOwogCQlpZiAoSVNf RVJSKHBkcC0+cGFnZWRpcltwZHBlXSkpCiAJCQlnb3RvIHVud2luZF9vdXQ7CiAJfQpAQCAtNjky LDIxICs3MjksMjUgQEAgc3RhdGljIGludCBnZW44X3BwZ3R0X2FsbG9jX3BhZ2VkaXJzKHN0cnVj dCBpOTE1X3BhZ2VkaXJwbyAqcGRwLAogCiB1bndpbmRfb3V0OgogCXdoaWxlIChwZHBlLS0pCi0J CWZyZWVfcGRfc2luZ2xlKHBkcC0+cGFnZWRpcltwZHBlXSk7CisJCWZyZWVfcGRfc2luZ2xlKHBk cC0+cGFnZWRpcltwZHBlXSwgZGV2KTsKIAogCXJldHVybiAtRU5PTUVNOwogfQogCi1zdGF0aWMg aW50IGdlbjhfcHBndHRfYWxsb2Moc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAotCQkJICAg IHVpbnQ2NF90IHN0YXJ0LAotCQkJICAgIHVpbnQ2NF90IGxlbmd0aCkKK3N0YXRpYyBpbnQgZ2Vu OF9hbGxvY192YV9yYW5nZShzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSwKKwkJCSAgICAg ICB1aW50NjRfdCBzdGFydCwKKwkJCSAgICAgICB1aW50NjRfdCBsZW5ndGgpCiB7CisJc3RydWN0 IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0KKwkJY29udGFpbmVyX29mKHZtLCBzdHJ1Y3QgaTkxNV9o d19wcGd0dCwgYmFzZSk7CiAJc3RydWN0IGk5MTVfcGFnZWRpciAqcGQ7CisJY29uc3QgdWludDY0 X3Qgb3JpZ19zdGFydCA9IHN0YXJ0OwogCXVpbnQ2NF90IHRlbXA7CiAJdWludDMyX3QgcGRwZTsK IAlpbnQgcmV0OwogCi0JcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlZGlycygmcHBndHQtPnBk cCwgc3RhcnQsIGxlbmd0aCk7CisJcmV0ID0gZ2VuOF9wcGd0dF9hbGxvY19wYWdlZGlycygmcHBn dHQtPnBkcCwgc3RhcnQsIGxlbmd0aCwKKwkJCQkJcHBndHQtPmJhc2UuZGV2KTsKIAlpZiAocmV0 KQogCQlyZXR1cm4gcmV0OwogCkBAIC03MTksMTMzICs3NjAsNTAgQEAgc3RhdGljIGludCBnZW44 X3BwZ3R0X2FsbG9jKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKIAogCXJldHVybiAwOwog Ci0JLyogVE9ETzogQ2hlY2sgdGhpcyBmb3IgYWxsIGNhc2VzICovCiBlcnJfb3V0OgotCWdlbjhf cHBndHRfZnJlZShwcGd0dCk7CisJZ2VuOF90ZWFyZG93bl92YV9yYW5nZSh2bSwgb3JpZ19zdGFy dCwgc3RhcnQpOwogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9zZXR1 cF9wYWdlX2RpcmVjdG9yaWVzKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJICAg ICBjb25zdCBpbnQgcGQpCi17Ci0JZG1hX2FkZHJfdCBwZF9hZGRyOwotCWludCByZXQ7Ci0KLQlw ZF9hZGRyID0gcGNpX21hcF9wYWdlKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwKLQkJCSAgICAgICBw cGd0dC0+cGRwLnBhZ2VkaXJbcGRdLT5wYWdlLCAwLAotCQkJICAgICAgIFBBR0VfU0laRSwgUENJ X0RNQV9CSURJUkVDVElPTkFMKTsKLQotCXJldCA9IHBjaV9kbWFfbWFwcGluZ19lcnJvcihwcGd0 dC0+YmFzZS5kZXYtPnBkZXYsIHBkX2FkZHIpOwotCWlmIChyZXQpCi0JCXJldHVybiByZXQ7Ci0K LQlwcGd0dC0+cGRwLnBhZ2VkaXJbcGRdLT5kYWRkciA9IHBkX2FkZHI7Ci0KLQlyZXR1cm4gMDsK LX0KLQotc3RhdGljIGludCBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHN0cnVjdCBpOTE1 X2h3X3BwZ3R0ICpwcGd0dCwKLQkJCQkJY29uc3QgaW50IHBkLAotCQkJCQljb25zdCBpbnQgcHQp Ci17Ci0JZG1hX2FkZHJfdCBwdF9hZGRyOwotCXN0cnVjdCBpOTE1X3BhZ2VkaXIgKnBkaXIgPSBw cGd0dC0+cGRwLnBhZ2VkaXJbcGRdOwotCXN0cnVjdCBpOTE1X3BhZ2V0YWIgKnB0YWIgPSBwZGly LT5wYWdlX3RhYmxlc1twdF07Ci0Jc3RydWN0IHBhZ2UgKnAgPSBwdGFiLT5wYWdlOwotCWludCBy ZXQ7Ci0KLQlwdF9hZGRyID0gcGNpX21hcF9wYWdlKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwKLQkJ CSAgICAgICBwLCAwLCBQQUdFX1NJWkUsIFBDSV9ETUFfQklESVJFQ1RJT05BTCk7Ci0JcmV0ID0g cGNpX2RtYV9tYXBwaW5nX2Vycm9yKHBwZ3R0LT5iYXNlLmRldi0+cGRldiwgcHRfYWRkcik7Ci0J aWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQotCXB0YWItPmRhZGRyID0gcHRfYWRkcjsKLQotCXJl dHVybiAwOwotfQotCiAvKioKICAqIEdFTjggbGVnYWN5IHBwZ3R0IHByb2dyYW1taW5nIGlzIGFj Y29tcGxpc2hlZCB0aHJvdWdoIGEgbWF4IDQgUERQIHJlZ2lzdGVycwogICogd2l0aCBhIG5ldCBl ZmZlY3QgcmVzZW1ibGluZyBhIDItbGV2ZWwgcGFnZSB0YWJsZSBpbiBub3JtYWwgeDg2IHRlcm1z LiBFYWNoCiAgKiBQRFAgcmVwcmVzZW50cyAxR0Igb2YgbWVtb3J5IDQgKiA1MTIgKiA1MTIgKiA0 MDk2ID0gNEdCIGxlZ2FjeSAzMmIgYWRkcmVzcwogICogc3BhY2UuCiAgKgotICogRklYTUU6IHNw bGl0IGFsbG9jYXRpb24gaW50byBzbWFsbGVyIHBpZWNlcy4gRm9yIG5vdyB3ZSBvbmx5IGV2ZXIg ZG8gdGhpcwotICogb25jZSwgYnV0IHdpdGggZnVsbCBQUEdUVCwgdGhlIG11bHRpcGxlIGNvbnRp Z3VvdXMgYWxsb2NhdGlvbnMgd2lsbCBiZSBiYWQuCi0gKiBUT0RPOiBEbyBzb21ldGhpbmcgd2l0 aCB0aGUgc2l6ZSBwYXJhbWV0ZXIKICAqLwogc3RhdGljIGludCBnZW44X3BwZ3R0X2luaXQoc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LCB1aW50NjRfdCBzaXplKQogewotCWNvbnN0IGludCBt YXhfcGRwID0gRElWX1JPVU5EX1VQKHNpemUsIDEgPDwgMzApOwotCWludCBpLCBqLCByZXQ7Ci0K LQlpZiAoc2l6ZSAlICgxPDwzMCkpCi0JCURSTV9JTkZPKCJQYWdlcyB3aWxsIGJlIHdhc3RlZCB1 bmxlc3MgR1RUIHNpemUgKCVsbHUpIGlzIGRpdmlzaWJsZSBieSAxR0JcbiIsIHNpemUpOworCXN0 cnVjdCBpOTE1X3BhZ2VkaXIgKnBkOworCXVpbnQ2NF90IHRlbXAsIHN0YXJ0ID0gMDsKKwljb25z dCB1aW50NjRfdCBvcmlnX2xlbmd0aCA9IHNpemU7CisJdWludDMyX3QgcGRwZTsKKwlpbnQgcmV0 OwogCiAJcHBndHQtPmJhc2Uuc3RhcnQgPSAwOwogCXBwZ3R0LT5iYXNlLnRvdGFsID0gc2l6ZTsK KwlwcGd0dC0+YmFzZS5jbGVhcl9yYW5nZSA9IGdlbjhfcHBndHRfY2xlYXJfcmFuZ2U7CisJcHBn dHQtPmJhc2UuaW5zZXJ0X2VudHJpZXMgPSBnZW44X3BwZ3R0X2luc2VydF9lbnRyaWVzOworCXBw Z3R0LT5iYXNlLmNsZWFudXAgPSBnZW44X3BwZ3R0X2NsZWFudXA7CisJcHBndHQtPnN3aXRjaF9t bSA9IGdlbjhfbW1fc3dpdGNoOwogCiAJcHBndHQtPnNjcmF0Y2hfcGQgPSBhbGxvY19wdF9zY3Jh dGNoKHBwZ3R0LT5iYXNlLmRldik7CiAJaWYgKElTX0VSUihwcGd0dC0+c2NyYXRjaF9wZCkpCiAJ CXJldHVybiBQVFJfRVJSKHBwZ3R0LT5zY3JhdGNoX3BkKTsKIAotCS8qIDEuIERvIGFsbCBvdXIg YWxsb2NhdGlvbnMgZm9yIHBhZ2UgZGlyZWN0b3JpZXMgYW5kIHBhZ2UgdGFibGVzLiAqLwotCXJl dCA9IGdlbjhfcHBndHRfYWxsb2MocHBndHQsIHBwZ3R0LT5iYXNlLnN0YXJ0LCBwcGd0dC0+YmFz ZS50b3RhbCk7CisJcmV0ID0gZ2VuOF9hbGxvY192YV9yYW5nZSgmcHBndHQtPmJhc2UsIHN0YXJ0 LCBzaXplKTsKIAlpZiAocmV0KSB7CiAJCWZyZWVfcHRfc2NyYXRjaChwcGd0dC0+c2NyYXRjaF9w ZCwgcHBndHQtPmJhc2UuZGV2KTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQkvKgotCSAqIDIuIENy ZWF0ZSBETUEgbWFwcGluZ3MgZm9yIHRoZSBwYWdlIGRpcmVjdG9yaWVzIGFuZCBwYWdlIHRhYmxl cy4KLQkgKi8KLQlmb3IgKGkgPSAwOyBpIDwgbWF4X3BkcDsgaSsrKSB7Ci0JCXJldCA9IGdlbjhf cHBndHRfc2V0dXBfcGFnZV9kaXJlY3RvcmllcyhwcGd0dCwgaSk7Ci0JCWlmIChyZXQpCi0JCQln b3RvIGJhaWw7Ci0KLQkJZm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7 Ci0JCQlyZXQgPSBnZW44X3BwZ3R0X3NldHVwX3BhZ2VfdGFibGVzKHBwZ3R0LCBpLCBqKTsKLQkJ CWlmIChyZXQpCi0JCQkJZ290byBiYWlsOwotCQl9Ci0JfQotCi0JLyoKLQkgKiAzLiBNYXAgYWxs IHRoZSBwYWdlIGRpcmVjdG9yeSBlbnRpcmVzIHRvIHBvaW50IHRvIHRoZSBwYWdlIHRhYmxlcwot CSAqIHdlJ3ZlIGFsbG9jYXRlZC4KLQkgKgotCSAqIEZvciBub3csIHRoZSBQUEdUVCBoZWxwZXIg ZnVuY3Rpb25zIGFsbCByZXF1aXJlIHRoYXQgdGhlIFBERXMgYXJlCi0JICogcGx1Z2dlZCBpbiBj b3JyZWN0bHkuIFNvIHdlIGRvIHRoYXQgbm93L2hlcmUuIEZvciBhbGlhc2luZyBQUEdUVCwgd2UK LQkgKiB3aWxsIG5ldmVyIG5lZWQgdG8gdG91Y2ggdGhlIFBERXMgYWdhaW4uCi0JICovCi0JZm9y IChpID0gMDsgaSA8IG1heF9wZHA7IGkrKykgewotCQlzdHJ1Y3QgaTkxNV9wYWdlZGlyICpwZCA9 IHBwZ3R0LT5wZHAucGFnZWRpcltpXTsKLQkJZ2VuOF9wcGd0dF9wZGVfdCAqcGRfdmFkZHI7Ci0J CXBkX3ZhZGRyID0ga21hcF9hdG9taWMocHBndHQtPnBkcC5wYWdlZGlyW2ldLT5wYWdlKTsKLQkJ Zm9yIChqID0gMDsgaiA8IEdFTjhfUERFU19QRVJfUEFHRTsgaisrKSB7Ci0JCQlzdHJ1Y3QgaTkx NV9wYWdldGFiICpwdCA9IHBkLT5wYWdlX3RhYmxlc1tqXTsKLQkJCWRtYV9hZGRyX3QgYWRkciA9 IHB0LT5kYWRkcjsKLQkJCXBkX3ZhZGRyW2pdID0gZ2VuOF9wZGVfZW5jb2RlKHBwZ3R0LT5iYXNl LmRldiwgYWRkciwKLQkJCQkJCSAgICAgIEk5MTVfQ0FDSEVfTExDKTsKLQkJfQotCQlpZiAoIUhB U19MTEMocHBndHQtPmJhc2UuZGV2KSkKLQkJCWRybV9jbGZsdXNoX3ZpcnRfcmFuZ2UocGRfdmFk ZHIsIFBBR0VfU0laRSk7Ci0JCWt1bm1hcF9hdG9taWMocGRfdmFkZHIpOwotCX0KKwlzdGFydCA9 IDA7CisJc2l6ZSA9IG9yaWdfbGVuZ3RoOwogCi0JcHBndHQtPnN3aXRjaF9tbSA9IGdlbjhfbW1f c3dpdGNoOwotCXBwZ3R0LT5iYXNlLmNsZWFyX3JhbmdlID0gZ2VuOF9wcGd0dF9jbGVhcl9yYW5n ZTsKLQlwcGd0dC0+YmFzZS5pbnNlcnRfZW50cmllcyA9IGdlbjhfcHBndHRfaW5zZXJ0X2VudHJp ZXM7Ci0JcHBndHQtPmJhc2UuY2xlYW51cCA9IGdlbjhfcHBndHRfY2xlYW51cDsKKwlnZW44X2Zv cl9lYWNoX3BkcGUocGQsICZwcGd0dC0+cGRwLCBzdGFydCwgc2l6ZSwgdGVtcCwgcGRwZSkKKwkJ Z2VuOF9tYXBfcGFnZXRhYmxlX3JhbmdlKHBkLCBzdGFydCwgc2l6ZSwgcHBndHQtPmJhc2UuZGV2 KTsKIAogCXJldHVybiAwOwotCi1iYWlsOgotCWdlbjhfcHBndHRfdW5tYXBfcGFnZXMocHBndHQp OwotCWdlbjhfcHBndHRfZnJlZShwcGd0dCk7Ci0JcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIHZv aWQgZ2VuNl9kdW1wX3BwZ3R0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgc3RydWN0IHNl cV9maWxlICptKQpAQCAtMTI4MSw3ICsxMjM5LDcgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9m cmVlKHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAogCS8qIENvbnNpZGVyIHB1dHRpbmcg dGhpcyBhcyBwYXJ0IG9mIHBkIGZyZWUuICovCiAJZnJlZV9wdF9zY3JhdGNoKHBwZ3R0LT5zY3Jh dGNoX3B0LCBwcGd0dC0+YmFzZS5kZXYpOwotCWZyZWVfcGRfc2luZ2xlKCZwcGd0dC0+cGQpOwor CWZyZWVfcGRfc2luZ2xlKCZwcGd0dC0+cGQsIHBwZ3R0LT5iYXNlLmRldik7CiB9CiAKIHN0YXRp YyB2b2lkIGdlbjZfcHBndHRfY2xlYW51cChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkK LS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=