From: Keith Packard Subject: [PATCH 1/3] drm: Widen vblank UAPI to 64 bits. Change vblank time to ktime_t [v2] Date: Mon, 31 Jul 2017 22:03:04 -0700 Message-ID: <20170801050306.24423-2-keithp@keithp.com> References: <20170705221013.27940-1-keithp@keithp.com> <20170801050306.24423-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from elaine.keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E8D26EA67 for ; Tue, 1 Aug 2017 05:03:16 +0000 (UTC) In-Reply-To: <20170801050306.24423-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: linux-kernel@vger.kernel.org, Dave Airlie , Daniel Vetter Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBtb2RpZmllcyB0aGUgZGF0YXR5cGVzIHVzZWQgYnkgdGhlIHZibGFuayBjb2RlIHRvIHBy b3ZpZGUgYm90aCA2NApiaXRzIG9mIHZibGFuayBjb3VudCBhbmQgc3dpdGNoIHRvIHVzaW5nIGt0 aW1lX3QgZm9yIHRpbWVzdGFtcHMgdG8KaW5jcmVhc2UgcmVzb2x1dGlvbiBmcm9tIG1pY3Jvc2Vj b25kcyB0byBuYW5vc2Vjb25kcy4KClRoZSBkcml2ZXIgaW50ZXJmYWNlcyBoYXZlIGJlZW4gbGVm dCB1c2luZyAzMiBiaXRzIG9mIHZibGFuayBjb3VudDsKYWxsIG9mIHRoZSBjb2RlIG5lY2Vzc2Fy eSB0byB3aWRlbiB0aGF0IHZhbHVlIGZvciB0aGUgdXNlciBBUEkgd2FzCmFscmVhZHkgaW5jbHVk ZWQgdG8gaGFuZGxlIGRldmljZXMgcmV0dXJuaW5nIGZld2VyIHRoYW4gMzItYml0cy4KClRoaXMg d2lsbCBwcm92aWRlIHRoZSBuZWNlc3NhcnkgZGF0YXR5cGVzIGZvciB0aGUgVnVsa2FuIEFQSS4K CnYyOgoKICogUmUtd3JpdGUgd2FpdF92YmxhbmsgaW9jdGwgdG8gQUJTT0xVVEUgc2VxdWVuY2UK CglXaGVuIGFuIGFwcGxpY2F0aW9uIHVzZXMgdGhlIFdBSVRfVkJMQU5LIGlvY3RsIHdpdGggUkVM QVRJVkUKCW9yIE5FWFRPTk1JU1MgYml0cyBzZXQsIHRoZSB0YXJnZXQgdmJsYW5rIGludGVydmFs IGlzIHVwZGF0ZWQKCXdpdGhpbiB0aGUga2VybmVsLiBXZSBuZWVkIHRvIHdyaXRlIHRoYXQgdGFy Z2V0IGJhY2sgdG8gdGhlCglpb2N0bCBidWZmZXIgYW5kIHVwZGF0ZSB0aGUgZmxhZ3MgYml0cyBz byB0aGF0IGlmIHRoZSB3YWl0IGlzCglpbnRlcnJ1cHRlZCBieSBhIHNpZ25hbCwgd2hlbiBpdCBp cyByZS1zdGFydGVkLCBpdCB3aWxsIHRhcmdldAoJcHJlY2lzZWx5IHRoZSBzYW1lIHZibGFuayBj b3VudCBhcyBiZWZvcmUuCgogKiBMZWF2ZSBkcml2ZXIgQVBJIHdpdGggMzItYml0IHZibGFuayBj b3VudAoKU3VnZ2VzdGVkLWJ5OiAgTWljaGVsIETDpG56ZXIgPG1pY2hlbEBkYWVuemVyLm5ldD4K U3VnZ2VzdGVkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+ClNpZ25lZC1vZmYt Ynk6IEtlaXRoIFBhY2thcmQgPGtlaXRocEBrZWl0aHAuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9kcm1fdmJsYW5rLmMgfCAxODYgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtUC5oICAgICAgICAgICB8ICAgMiArLQogaW5jbHVkZS9k cm0vZHJtX2Rydi5oICAgICAgICB8ICAgMiArLQogaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5oICAg ICB8ICAxNiArKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDEyMCBpbnNlcnRpb25zKCspLCA4NiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jIGIvZHJp dmVycy9ncHUvZHJtL2RybV92YmxhbmsuYwppbmRleCA0NjNlNGQ4MWZiMGQuLjM0NjYwMWFkNjk4 ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX3ZibGFuay5jCkBAIC00Myw3ICs0Myw3IEBACiAKIHN0YXRpYyBib29sCiBk cm1fZ2V0X2xhc3RfdmJsdGltZXN0YW1wKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVk IGludCBwaXBlLAotCQkJICBzdHJ1Y3QgdGltZXZhbCAqdHZibGFuaywgYm9vbCBpbl92Ymxhbmtf aXJxKTsKKwkJCSAga3RpbWVfdCAqdHZibGFuaywgYm9vbCBpbl92YmxhbmtfaXJxKTsKIAogc3Rh dGljIHVuc2lnbmVkIGludCBkcm1fdGltZXN0YW1wX3ByZWNpc2lvbiA9IDIwOyAgLyogRGVmYXVs dCB0byAyMCB1c2Vjcy4gKi8KIApAQCAtNjQsNyArNjQsNyBAQCBNT0RVTEVfUEFSTV9ERVNDKHRp bWVzdGFtcF9tb25vdG9uaWMsICJVc2UgbW9ub3RvbmljIHRpbWVzdGFtcHMiKTsKIAogc3RhdGlj IHZvaWQgc3RvcmVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBw aXBlLAogCQkJIHUzMiB2YmxhbmtfY291bnRfaW5jLAotCQkJIHN0cnVjdCB0aW1ldmFsICp0X3Zi bGFuaywgdTMyIGxhc3QpCisJCQkga3RpbWVfdCB0X3ZibGFuaywgdTMyIGxhc3QpCiB7CiAJc3Ry dWN0IGRybV92YmxhbmtfY3J0YyAqdmJsYW5rID0gJmRldi0+dmJsYW5rW3BpcGVdOwogCkBAIC03 Myw3ICs3Myw3IEBAIHN0YXRpYyB2b2lkIHN0b3JlX3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKIAl2YmxhbmstPmxhc3QgPSBsYXN0OwogCiAJd3JpdGVf c2VxbG9jaygmdmJsYW5rLT5zZXFsb2NrKTsKLQl2YmxhbmstPnRpbWUgPSAqdF92Ymxhbms7CisJ dmJsYW5rLT50aW1lID0gdF92Ymxhbms7CiAJdmJsYW5rLT5jb3VudCArPSB2YmxhbmtfY291bnRf aW5jOwogCXdyaXRlX3NlcXVubG9jaygmdmJsYW5rLT5zZXFsb2NrKTsKIH0KQEAgLTExNiw3ICsx MTYsNyBAQCBzdGF0aWMgdm9pZCBkcm1fcmVzZXRfdmJsYW5rX3RpbWVzdGFtcChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZQogewogCXUzMiBjdXJfdmJsYW5rOwogCWJv b2wgcmM7Ci0Jc3RydWN0IHRpbWV2YWwgdF92Ymxhbms7CisJa3RpbWVfdCB0X3ZibGFuazsKIAlp bnQgY291bnQgPSBEUk1fVElNRVNUQU1QX01BWFJFVFJJRVM7CiAKIAlzcGluX2xvY2soJmRldi0+ dmJsYW5rX3RpbWVfbG9jayk7CkBAIC0xMzYsMTMgKzEzNiwxMyBAQCBzdGF0aWMgdm9pZCBkcm1f cmVzZXRfdmJsYW5rX3RpbWVzdGFtcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBp bnQgcGlwZQogCSAqIGludGVycnVwdCBhbmQgYXNzaWduIDAgZm9yIG5vdywgdG8gbWFyayB0aGUg dmJsYW5rdGltZXN0YW1wIGFzIGludmFsaWQuCiAJICovCiAJaWYgKCFyYykKLQkJdF92Ymxhbmsg PSAoc3RydWN0IHRpbWV2YWwpIHswLCAwfTsKKwkJdF92YmxhbmsgPSAwOwogCiAJLyoKIAkgKiAr MSB0byBtYWtlIHN1cmUgdXNlciB3aWxsIG5ldmVyIHNlZSB0aGUgc2FtZQogCSAqIHZibGFuayBj b3VudGVyIHZhbHVlIGJlZm9yZSBhbmQgYWZ0ZXIgYSBtb2Rlc2V0CiAJICovCi0Jc3RvcmVfdmJs YW5rKGRldiwgcGlwZSwgMSwgJnRfdmJsYW5rLCBjdXJfdmJsYW5rKTsKKwlzdG9yZV92Ymxhbmso ZGV2LCBwaXBlLCAxLCB0X3ZibGFuaywgY3VyX3ZibGFuayk7CiAKIAlzcGluX3VubG9jaygmZGV2 LT52YmxhbmtfdGltZV9sb2NrKTsKIH0KQEAgLTE2NSw3ICsxNjUsNyBAQCBzdGF0aWMgdm9pZCBk cm1fdXBkYXRlX3ZibGFua19jb3VudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBp bnQgcGlwZSwKIAlzdHJ1Y3QgZHJtX3ZibGFua19jcnRjICp2YmxhbmsgPSAmZGV2LT52Ymxhbmtb cGlwZV07CiAJdTMyIGN1cl92YmxhbmssIGRpZmY7CiAJYm9vbCByYzsKLQlzdHJ1Y3QgdGltZXZh bCB0X3ZibGFuazsKKwlrdGltZV90IHRfdmJsYW5rOwogCWludCBjb3VudCA9IERSTV9USU1FU1RB TVBfTUFYUkVUUklFUzsKIAlpbnQgZnJhbWVkdXJfbnMgPSB2YmxhbmstPmZyYW1lZHVyX25zOwog CkBAIC0xOTAsMTEgKzE5MCw5IEBAIHN0YXRpYyB2b2lkIGRybV91cGRhdGVfdmJsYW5rX2NvdW50 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCQkvKiB0cnVzdCB0 aGUgaHcgY291bnRlciB3aGVuIGl0J3MgYXJvdW5kICovCiAJCWRpZmYgPSAoY3VyX3ZibGFuayAt IHZibGFuay0+bGFzdCkgJiBkZXYtPm1heF92YmxhbmtfY291bnQ7CiAJfSBlbHNlIGlmIChyYyAm JiBmcmFtZWR1cl9ucykgewotCQljb25zdCBzdHJ1Y3QgdGltZXZhbCAqdF9vbGQ7Ci0JCXU2NCBk aWZmX25zOworCQlrdGltZV90IGRpZmZfbnM7CiAKLQkJdF9vbGQgPSAmdmJsYW5rLT50aW1lOwot CQlkaWZmX25zID0gdGltZXZhbF90b19ucygmdF92YmxhbmspIC0gdGltZXZhbF90b19ucyh0X29s ZCk7CisJCWRpZmZfbnMgPSB0X3ZibGFuayAtIHZibGFuay0+dGltZTsKIAogCQkvKgogCQkgKiBG aWd1cmUgb3V0IGhvdyBtYW55IHZibGFua3Mgd2UndmUgbWlzc2VkIGJhc2VkCkBAIC0yMjgsNyAr MjI2LDcgQEAgc3RhdGljIHZvaWQgZHJtX3VwZGF0ZV92YmxhbmtfY291bnQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUsCiAJfQogCiAJRFJNX0RFQlVHX1ZCTCgidXBk YXRpbmcgdmJsYW5rIGNvdW50IG9uIGNydGMgJXU6IgotCQkgICAgICAiIGN1cnJlbnQ9JXUsIGRp ZmY9JXUsIGh3PSV1IGh3X2xhc3Q9JXVcbiIsCisJCSAgICAgICIgY3VycmVudD0lbGx1LCBkaWZm PSV1LCBodz0ldSBod19sYXN0PSV1XG4iLAogCQkgICAgICBwaXBlLCB2YmxhbmstPmNvdW50LCBk aWZmLCBjdXJfdmJsYW5rLCB2YmxhbmstPmxhc3QpOwogCiAJaWYgKGRpZmYgPT0gMCkgewpAQCAt MjQzLDkgKzI0MSw5IEBAIHN0YXRpYyB2b2lkIGRybV91cGRhdGVfdmJsYW5rX2NvdW50KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCSAqIGZvciBub3csIHRvIG1h cmsgdGhlIHZibGFua3RpbWVzdGFtcCBhcyBpbnZhbGlkLgogCSAqLwogCWlmICghcmMgJiYgaW5f dmJsYW5rX2lycSkKLQkJdF92YmxhbmsgPSAoc3RydWN0IHRpbWV2YWwpIHswLCAwfTsKKwkJdF92 YmxhbmsgPSAwOwogCi0Jc3RvcmVfdmJsYW5rKGRldiwgcGlwZSwgZGlmZiwgJnRfdmJsYW5rLCBj dXJfdmJsYW5rKTsKKwlzdG9yZV92YmxhbmsoZGV2LCBwaXBlLCBkaWZmLCB0X3ZibGFuaywgY3Vy X3ZibGFuayk7CiB9CiAKIHN0YXRpYyB1MzIgZHJtX3ZibGFua19jb3VudChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKQEAgLTU2NywxMCArNTY1LDEwIEBAIEVYUE9S VF9TWU1CT0woZHJtX2NhbGNfdGltZXN0YW1waW5nX2NvbnN0YW50cyk7CiBib29sIGRybV9jYWxj X3ZibHRpbWVzdGFtcF9mcm9tX3NjYW5vdXRwb3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJ CQkJICAgdW5zaWduZWQgaW50IHBpcGUsCiAJCQkJCSAgIGludCAqbWF4X2Vycm9yLAotCQkJCQkg ICBzdHJ1Y3QgdGltZXZhbCAqdmJsYW5rX3RpbWUsCisJCQkJCSAgIGt0aW1lX3QgKnZibGFua190 aW1lLAogCQkJCQkgICBib29sIGluX3ZibGFua19pcnEpCiB7Ci0Jc3RydWN0IHRpbWV2YWwgdHZf ZXRpbWU7CisJa3RpbWVfdCBwcmV2X2V0aW1lOwogCWt0aW1lX3Qgc3RpbWUsIGV0aW1lOwogCWJv b2wgdmJsX3N0YXR1czsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CkBAIC02NjMsMjkgKzY2MSwy NiBAQCBib29sIGRybV9jYWxjX3ZibHRpbWVzdGFtcF9mcm9tX3NjYW5vdXRwb3Moc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJZXRpbWUgPSBrdGltZV9tb25vX3RvX3JlYWwoZXRpbWUpOwogCiAJ Lyogc2F2ZSB0aGlzIG9ubHkgZm9yIGRlYnVnZ2luZyBwdXJwb3NlcyAqLwotCXR2X2V0aW1lID0g a3RpbWVfdG9fdGltZXZhbChldGltZSk7CisJcHJldl9ldGltZSA9IGV0aW1lOwogCS8qIFN1YnRy YWN0IHRpbWUgZGVsdGEgZnJvbSByYXcgdGltZXN0YW1wIHRvIGdldCBmaW5hbAogCSAqIHZibGFu a190aW1lIHRpbWVzdGFtcCBmb3IgZW5kIG9mIHZibGFuay4KIAkgKi8KIAlldGltZSA9IGt0aW1l X3N1Yl9ucyhldGltZSwgZGVsdGFfbnMpOwotCSp2YmxhbmtfdGltZSA9IGt0aW1lX3RvX3RpbWV2 YWwoZXRpbWUpOworCSp2YmxhbmtfdGltZSA9IGV0aW1lOwogCi0JRFJNX0RFQlVHX1ZCTCgiY3J0 YyAldSA6IHYgcCglZCwlZClAICVsZC4lbGQgLT4gJWxkLiVsZCBbZSAlZCB1cywgJWQgcmVwXVxu IiwKKwlEUk1fREVCVUdfVkJMKCJjcnRjICV1IDogdiBwKCVkLCVkKUAgJWxsZCAtPiAlbGxkIFtl ICVkIHVzLCAlZCByZXBdXG4iLAogCQkgICAgICBwaXBlLCBocG9zLCB2cG9zLAotCQkgICAgICAo bG9uZyl0dl9ldGltZS50dl9zZWMsIChsb25nKXR2X2V0aW1lLnR2X3VzZWMsCi0JCSAgICAgIChs b25nKXZibGFua190aW1lLT50dl9zZWMsIChsb25nKXZibGFua190aW1lLT50dl91c2VjLAorCQkg ICAgICAobG9uZyBsb25nKSBwcmV2X2V0aW1lLAorCQkgICAgICAobG9uZyBsb25nKSBldGltZSwK IAkJICAgICAgZHVyYXRpb25fbnMvMTAwMCwgaSk7CiAKIAlyZXR1cm4gdHJ1ZTsKIH0KIEVYUE9S VF9TWU1CT0woZHJtX2NhbGNfdmJsdGltZXN0YW1wX2Zyb21fc2Nhbm91dHBvcyk7CiAKLXN0YXRp YyBzdHJ1Y3QgdGltZXZhbCBnZXRfZHJtX3RpbWVzdGFtcCh2b2lkKQorc3RhdGljIGt0aW1lX3Qg Z2V0X2RybV90aW1lc3RhbXAodm9pZCkKIHsKLQlrdGltZV90IG5vdzsKLQotCW5vdyA9IGRybV90 aW1lc3RhbXBfbW9ub3RvbmljID8ga3RpbWVfZ2V0KCkgOiBrdGltZV9nZXRfcmVhbCgpOwotCXJl dHVybiBrdGltZV90b190aW1ldmFsKG5vdyk7CisJcmV0dXJuIGRybV90aW1lc3RhbXBfbW9ub3Rv bmljID8ga3RpbWVfZ2V0KCkgOiBrdGltZV9nZXRfcmVhbCgpOwogfQogCiAvKioKQEAgLTcxMSw3 ICs3MDYsNyBAQCBzdGF0aWMgc3RydWN0IHRpbWV2YWwgZ2V0X2RybV90aW1lc3RhbXAodm9pZCkK ICAqLwogc3RhdGljIGJvb2wKIGRybV9nZXRfbGFzdF92Ymx0aW1lc3RhbXAoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUsCi0JCQkgIHN0cnVjdCB0aW1ldmFsICp0dmJs YW5rLCBib29sIGluX3ZibGFua19pcnEpCisJCQkgIGt0aW1lX3QgKnR2YmxhbmssIGJvb2wgaW5f dmJsYW5rX2lycSkKIHsKIAlib29sIHJldCA9IGZhbHNlOwogCkBAIC03NDMsNyArNzM4LDcgQEAg ZHJtX2dldF9sYXN0X3ZibHRpbWVzdGFtcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25l ZCBpbnQgcGlwZSwKICAqIFJldHVybnM6CiAgKiBUaGUgc29mdHdhcmUgdmJsYW5rIGNvdW50ZXIu CiAgKi8KLXUzMiBkcm1fY3J0Y192YmxhbmtfY291bnQoc3RydWN0IGRybV9jcnRjICpjcnRjKQor dTY0IGRybV9jcnRjX3ZibGFua19jb3VudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJcmV0 dXJuIGRybV92YmxhbmtfY291bnQoY3J0Yy0+ZGV2LCBkcm1fY3J0Y19pbmRleChjcnRjKSk7CiB9 CkBAIC03NjMsMTUgKzc1OCwxNSBAQCBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX3ZibGFua19jb3Vu dCk7CiAgKgogICogVGhpcyBpcyB0aGUgbGVnYWN5IHZlcnNpb24gb2YgZHJtX2NydGNfdmJsYW5r X2NvdW50X2FuZF90aW1lKCkuCiAgKi8KLXN0YXRpYyB1MzIgZHJtX3ZibGFua19jb3VudF9hbmRf dGltZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKLQkJCQkgICAg IHN0cnVjdCB0aW1ldmFsICp2Ymxhbmt0aW1lKQorc3RhdGljIHU2NCBkcm1fdmJsYW5rX2NvdW50 X2FuZF90aW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAorCQkJ CSAgICAga3RpbWVfdCAqdmJsYW5rdGltZSkKIHsKIAlzdHJ1Y3QgZHJtX3ZibGFua19jcnRjICp2 YmxhbmsgPSAmZGV2LT52YmxhbmtbcGlwZV07Ci0JdTMyIHZibGFua19jb3VudDsKKwl1NjQgdmJs YW5rX2NvdW50OwogCXVuc2lnbmVkIGludCBzZXE7CiAKIAlpZiAoV0FSTl9PTihwaXBlID49IGRl di0+bnVtX2NydGNzKSkgewotCQkqdmJsYW5rdGltZSA9IChzdHJ1Y3QgdGltZXZhbCkgeyAwIH07 CisJCSp2Ymxhbmt0aW1lID0gMDsKIAkJcmV0dXJuIDA7CiAJfQogCkBAIC03OTUsOCArNzkwLDgg QEAgc3RhdGljIHUzMiBkcm1fdmJsYW5rX2NvdW50X2FuZF90aW1lKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogICogbW9kZXNldHRpbmcgYWN0aXZpdHkuIFJldHVy bnMgY29ycmVzcG9uZGluZyBzeXN0ZW0gdGltZXN0YW1wIG9mIHRoZSB0aW1lCiAgKiBvZiB0aGUg dmJsYW5rIGludGVydmFsIHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIGN1cnJlbnQgdmJsYW5rIGNv dW50ZXIgdmFsdWUuCiAgKi8KLXUzMiBkcm1fY3J0Y192YmxhbmtfY291bnRfYW5kX3RpbWUoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSAgIHN0cnVjdCB0aW1ldmFsICp2Ymxhbmt0aW1lKQor dTY0IGRybV9jcnRjX3ZibGFua19jb3VudF9hbmRfdGltZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CisJCQkJICAga3RpbWVfdCAqdmJsYW5rdGltZSkKIHsKIAlyZXR1cm4gZHJtX3ZibGFua19jb3Vu dF9hbmRfdGltZShjcnRjLT5kZXYsIGRybV9jcnRjX2luZGV4KGNydGMpLAogCQkJCQkgdmJsYW5r dGltZSk7CkBAIC04MDUsMTEgKzgwMCwxNCBAQCBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX3ZibGFu a19jb3VudF9hbmRfdGltZSk7CiAKIHN0YXRpYyB2b2lkIHNlbmRfdmJsYW5rX2V2ZW50KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUs Ci0JCXVuc2lnbmVkIGxvbmcgc2VxLCBzdHJ1Y3QgdGltZXZhbCAqbm93KQorCQl1NjQgc2VxLCBr dGltZV90IG5vdykKIHsKKwlzdHJ1Y3QgdGltZXZhbCB0djsKKworCXR2ID0ga3RpbWVfdG9fdGlt ZXZhbChub3cpOwogCWUtPmV2ZW50LnNlcXVlbmNlID0gc2VxOwotCWUtPmV2ZW50LnR2X3NlYyA9 IG5vdy0+dHZfc2VjOwotCWUtPmV2ZW50LnR2X3VzZWMgPSBub3ctPnR2X3VzZWM7CisJZS0+ZXZl bnQudHZfc2VjID0gdHYudHZfc2VjOworCWUtPmV2ZW50LnR2X3VzZWMgPSB0di50dl91c2VjOwog CiAJdHJhY2VfZHJtX3ZibGFua19ldmVudF9kZWxpdmVyZWQoZS0+YmFzZS5maWxlX3ByaXYsIGUt PnBpcGUsCiAJCQkJCSBlLT5ldmVudC5zZXF1ZW5jZSk7CkBAIC04NjQsNyArODYyLDcgQEAgdm9p ZCBkcm1fY3J0Y19hcm1fdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlhc3Nl cnRfc3Bpbl9sb2NrZWQoJmRldi0+ZXZlbnRfbG9jayk7CiAKIAllLT5waXBlID0gcGlwZTsKLQll LT5ldmVudC5zZXF1ZW5jZSA9IGRybV92YmxhbmtfY291bnQoZGV2LCBwaXBlKTsKKwllLT5zZXF1 ZW5jZSA9IGRybV92YmxhbmtfY291bnQoZGV2LCBwaXBlKTsKIAllLT5ldmVudC5jcnRjX2lkID0g Y3J0Yy0+YmFzZS5pZDsKIAlsaXN0X2FkZF90YWlsKCZlLT5iYXNlLmxpbmssICZkZXYtPnZibGFu a19ldmVudF9saXN0KTsKIH0KQEAgLTg4NSwxOSArODgzLDE5IEBAIHZvaWQgZHJtX2NydGNfc2Vu ZF92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCXN0cnVjdCBkcm1fcGVu ZGluZ192YmxhbmtfZXZlbnQgKmUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmRldjsKLQl1bnNpZ25lZCBpbnQgc2VxLCBwaXBlID0gZHJtX2NydGNfaW5kZXgoY3J0Yyk7Ci0J c3RydWN0IHRpbWV2YWwgbm93OworCXU2NCBzZXE7CisJdW5zaWduZWQgaW50IHBpcGUgPSBkcm1f Y3J0Y19pbmRleChjcnRjKTsKKwlrdGltZV90IG5vdzsKIAogCWlmIChkZXYtPm51bV9jcnRjcyA+ IDApIHsKIAkJc2VxID0gZHJtX3ZibGFua19jb3VudF9hbmRfdGltZShkZXYsIHBpcGUsICZub3cp OwogCX0gZWxzZSB7CiAJCXNlcSA9IDA7Ci0KIAkJbm93ID0gZ2V0X2RybV90aW1lc3RhbXAoKTsK IAl9CiAJZS0+cGlwZSA9IHBpcGU7CiAJZS0+ZXZlbnQuY3J0Y19pZCA9IGNydGMtPmJhc2UuaWQ7 Ci0Jc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBlLCBzZXEsICZub3cpOworCXNlbmRfdmJsYW5rX2V2 ZW50KGRldiwgZSwgc2VxLCBub3cpOwogfQogRVhQT1JUX1NZTUJPTChkcm1fY3J0Y19zZW5kX3Zi bGFua19ldmVudCk7CiAKQEAgLTExMjQsOSArMTEyMiw5IEBAIHZvaWQgZHJtX2NydGNfdmJsYW5r X29mZihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJdW5zaWduZWQgaW50IHBpcGUgPSBkcm1fY3J0 Y19pbmRleChjcnRjKTsKIAlzdHJ1Y3QgZHJtX3ZibGFua19jcnRjICp2YmxhbmsgPSAmZGV2LT52 YmxhbmtbcGlwZV07CiAJc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZSwgKnQ7Ci0J c3RydWN0IHRpbWV2YWwgbm93OworCWt0aW1lX3Qgbm93OwogCXVuc2lnbmVkIGxvbmcgaXJxZmxh Z3M7Ci0JdW5zaWduZWQgaW50IHNlcTsKKwl1NjQgc2VxOwogCiAJaWYgKFdBUk5fT04ocGlwZSA+ PSBkZXYtPm51bV9jcnRjcykpCiAJCXJldHVybjsKQEAgLTExNjEsMTEgKzExNTksMTEgQEAgdm9p ZCBkcm1fY3J0Y192Ymxhbmtfb2ZmKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJaWYgKGUtPnBp cGUgIT0gcGlwZSkKIAkJCWNvbnRpbnVlOwogCQlEUk1fREVCVUcoIlNlbmRpbmcgcHJlbWF0dXJl IHZibGFuayBldmVudCBvbiBkaXNhYmxlOiAiCi0JCQkgICJ3YW50ZWQgJXUsIGN1cnJlbnQgJXVc biIsCi0JCQkgIGUtPmV2ZW50LnNlcXVlbmNlLCBzZXEpOworCQkJICAid2FudGVkICVsbHUgY3Vy cmVudCAlbGx1XG4iLAorCQkJICBlLT5zZXF1ZW5jZSwgc2VxKTsKIAkJbGlzdF9kZWwoJmUtPmJh c2UubGluayk7CiAJCWRybV92YmxhbmtfcHV0KGRldiwgcGlwZSk7Ci0JCXNlbmRfdmJsYW5rX2V2 ZW50KGRldiwgZSwgc2VxLCAmbm93KTsKKwkJc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBlLCBzZXEs IG5vdyk7CiAJfQogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmRldi0+ZXZlbnRfbG9jaywgaXJx ZmxhZ3MpOwogCkBAIC0xMzMxLDIwICsxMzI5LDIxIEBAIGludCBkcm1fbGVnYWN5X21vZGVzZXRf Y3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0dXJuIDA7CiB9CiAK LXN0YXRpYyBpbmxpbmUgYm9vbCB2YmxhbmtfcGFzc2VkKHUzMiBzZXEsIHUzMiByZWYpCitzdGF0 aWMgaW5saW5lIGJvb2wgdmJsYW5rX3Bhc3NlZCh1NjQgc2VxLCB1NjQgcmVmKQogewogCXJldHVy biAoc2VxIC0gcmVmKSA8PSAoMSA8PCAyMyk7CiB9CiAKIHN0YXRpYyBpbnQgZHJtX3F1ZXVlX3Zi bGFua19ldmVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKKwkJ CQkgIHU2NCByZXFfc2VxLAogCQkJCSAgdW5pb24gZHJtX3dhaXRfdmJsYW5rICp2Ymx3YWl0LAog CQkJCSAgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiB7CiAJc3RydWN0IGRybV92Ymxhbmtf Y3J0YyAqdmJsYW5rID0gJmRldi0+dmJsYW5rW3BpcGVdOwogCXN0cnVjdCBkcm1fcGVuZGluZ192 YmxhbmtfZXZlbnQgKmU7Ci0Jc3RydWN0IHRpbWV2YWwgbm93OworCWt0aW1lX3Qgbm93OwogCXVu c2lnbmVkIGxvbmcgZmxhZ3M7Ci0JdW5zaWduZWQgaW50IHNlcTsKKwl1NjQgc2VxOwogCWludCBy ZXQ7CiAKIAllID0ga3phbGxvYyhzaXplb2YoKmUpLCBHRlBfS0VSTkVMKTsKQEAgLTEzNzksMjEg KzEzNzgsMjAgQEAgc3RhdGljIGludCBkcm1fcXVldWVfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCiAJc2VxID0gZHJtX3ZibGFua19jb3Vu dF9hbmRfdGltZShkZXYsIHBpcGUsICZub3cpOwogCi0JRFJNX0RFQlVHKCJldmVudCBvbiB2Ymxh bmsgY291bnQgJXUsIGN1cnJlbnQgJXUsIGNydGMgJXVcbiIsCi0JCSAgdmJsd2FpdC0+cmVxdWVz dC5zZXF1ZW5jZSwgc2VxLCBwaXBlKTsKKwlEUk1fREVCVUcoImV2ZW50IG9uIHZibGFuayBjb3Vu dCAlbGx1LCBjdXJyZW50ICVsbHUsIGNydGMgJXVcbiIsCisJCSAgcmVxX3NlcSwgc2VxLCBwaXBl KTsKIAotCXRyYWNlX2RybV92YmxhbmtfZXZlbnRfcXVldWVkKGZpbGVfcHJpdiwgcGlwZSwKLQkJ CQkgICAgICB2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlKTsKKwl0cmFjZV9kcm1fdmJsYW5rX2V2 ZW50X3F1ZXVlZChmaWxlX3ByaXYsIHBpcGUsIHJlcV9zZXEpOwogCi0JZS0+ZXZlbnQuc2VxdWVu Y2UgPSB2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlOwotCWlmICh2YmxhbmtfcGFzc2VkKHNlcSwg dmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSkpIHsKKwllLT5zZXF1ZW5jZSA9IHJlcV9zZXE7CisJ aWYgKHZibGFua19wYXNzZWQoc2VxLCByZXFfc2VxKSkgewogCQlkcm1fdmJsYW5rX3B1dChkZXYs IHBpcGUpOwotCQlzZW5kX3ZibGFua19ldmVudChkZXYsIGUsIHNlcSwgJm5vdyk7CisJCXNlbmRf dmJsYW5rX2V2ZW50KGRldiwgZSwgc2VxLCBub3cpOwogCQl2Ymx3YWl0LT5yZXBseS5zZXF1ZW5j ZSA9IHNlcTsKIAl9IGVsc2UgewogCQkvKiBkcm1faGFuZGxlX3ZibGFua19ldmVudHMgd2lsbCBj YWxsIGRybV92YmxhbmtfcHV0ICovCiAJCWxpc3RfYWRkX3RhaWwoJmUtPmJhc2UubGluaywgJmRl di0+dmJsYW5rX2V2ZW50X2xpc3QpOwotCQl2Ymx3YWl0LT5yZXBseS5zZXF1ZW5jZSA9IHZibHdh aXQtPnJlcXVlc3Quc2VxdWVuY2U7CisJCXZibHdhaXQtPnJlcGx5LnNlcXVlbmNlID0gcmVxX3Nl cTsKIAl9CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdz KTsKQEAgLTE0MjAsNiArMTQxOCwyNyBAQCBzdGF0aWMgYm9vbCBkcm1fd2FpdF92YmxhbmtfaXNf cXVlcnkodW5pb24gZHJtX3dhaXRfdmJsYW5rICp2Ymx3YWl0KQogfQogCiAvKgorICogV2lkZW4g YSAzMi1iaXQgcGFyYW0gdG8gNjQtYml0cy4KKyAqCisgKiBccGFyYW0gbmFycm93IDMyLWJpdCB2 YWx1ZSAobWlzc2luZyB1cHBlciAzMiBiaXRzKQorICogXHBhcmFtIG5lYXIgNjQtYml0IHZhbHVl IHRoYXQgc2hvdWxkIGJlICdjbG9zZScgdG8gbmVhcgorICoKKyAqIFRoaXMgZnVuY3Rpb24gcmV0 dXJucyBhIDY0LWJpdCB2YWx1ZSB1c2luZyB0aGUgbG93ZXIgMzItYml0cyBmcm9tCisgKiAnbmFy cm93JyBhbmQgY29uc3RydWN0aW5nIHRoZSB1cHBlciAzMi1iaXRzIHNvIHRoYXQgdGhlIHJlc3Vs dCBpcworICogYXMgY2xvc2UgYXMgcG9zc2libGUgdG8gJ25lYXInLgorICovCisgCitzdGF0aWMg dTY0IHdpZGVuXzMyX3RvXzY0KHUzMiBuYXJyb3csIHU2NCBuZWFyKQoreworCXU2NCB3aWRlID0g bmFycm93IHwgKG5lYXIgJiAweGZmZmZmZmZmMDAwMDAwMDBVTEwpOworCWlmICgoaW50NjRfdCkg KHdpZGUgLSBuZWFyKSA+IDB4ODAwMDAwMDBMTCkKKwkJd2lkZSAtPSAweDEwMDAwMDAwMFVMTDsK KwllbHNlIGlmICgoaW50NjRfdCkgKG5lYXIgLSB3aWRlKSA+IDB4ODAwMDAwMDBMTCkKKwkJd2lk ZSArPSAweDEwMDAwMDAwMFVMTDsKKwlyZXR1cm4gd2lkZTsKK30KKworLyoKICAqIFdhaXQgZm9y IFZCTEFOSy4KICAqCiAgKiBccGFyYW0gaW5vZGUgZGV2aWNlIGlub2RlLgpAQCAtMTQzOSw2ICsx NDU4LDcgQEAgaW50IGRybV93YWl0X3ZibGFuayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lk ICpkYXRhLAogCXN0cnVjdCBkcm1fdmJsYW5rX2NydGMgKnZibGFuazsKIAl1bmlvbiBkcm1fd2Fp dF92YmxhbmsgKnZibHdhaXQgPSBkYXRhOwogCWludCByZXQ7CisJdTY0IHJlcV9zZXE7CiAJdW5z aWduZWQgaW50IGZsYWdzLCBzZXEsIHBpcGUsIGhpZ2hfcGlwZTsKIAogCWlmICghZGV2LT5pcnFf ZW5hYmxlZCkKQEAgLTE0NzQsMTIgKzE0OTQsMTQgQEAgaW50IGRybV93YWl0X3ZibGFuayhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCWlmIChkZXYtPnZibGFua19kaXNhYmxl X2ltbWVkaWF0ZSAmJgogCSAgICBkcm1fd2FpdF92YmxhbmtfaXNfcXVlcnkodmJsd2FpdCkgJiYK IAkgICAgUkVBRF9PTkNFKHZibGFuay0+ZW5hYmxlZCkpIHsKLQkJc3RydWN0IHRpbWV2YWwgbm93 OworCQlrdGltZV90IG5vdzsKKwkJc3RydWN0IHRpbWV2YWwgdHY7CiAKIAkJdmJsd2FpdC0+cmVw bHkuc2VxdWVuY2UgPQogCQkJZHJtX3ZibGFua19jb3VudF9hbmRfdGltZShkZXYsIHBpcGUsICZu b3cpOwotCQl2Ymx3YWl0LT5yZXBseS50dmFsX3NlYyA9IG5vdy50dl9zZWM7Ci0JCXZibHdhaXQt PnJlcGx5LnR2YWxfdXNlYyA9IG5vdy50dl91c2VjOworCQl0diA9IGt0aW1lX3RvX3RpbWV2YWwo bm93KTsKKwkJdmJsd2FpdC0+cmVwbHkudHZhbF9zZWMgPSB0di50dl9zZWM7CisJCXZibHdhaXQt PnJlcGx5LnR2YWxfdXNlYyA9IHR2LnR2X3VzZWM7CiAJCXJldHVybiAwOwogCX0KIApAQCAtMTQ5 Miw5ICsxNTE0LDEyIEBAIGludCBkcm1fd2FpdF92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKIAogCXN3aXRjaCAodmJsd2FpdC0+cmVxdWVzdC50eXBlICYgX0RSTV9W QkxBTktfVFlQRVNfTUFTSykgewogCWNhc2UgX0RSTV9WQkxBTktfUkVMQVRJVkU6Ci0JCXZibHdh aXQtPnJlcXVlc3Quc2VxdWVuY2UgKz0gc2VxOworCQlyZXFfc2VxID0gc2VxICsgdmJsd2FpdC0+ cmVxdWVzdC5zZXF1ZW5jZTsKIAkJdmJsd2FpdC0+cmVxdWVzdC50eXBlICY9IH5fRFJNX1ZCTEFO S19SRUxBVElWRTsKKwkJdmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSA9IHJlcV9zZXE7CisJCWJy ZWFrOwogCWNhc2UgX0RSTV9WQkxBTktfQUJTT0xVVEU6CisJCXJlcV9zZXEgPSB3aWRlbl8zMl90 b182NCh2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlLCBzZXEpOwogCQlicmVhazsKIAlkZWZhdWx0 OgogCQlyZXQgPSAtRUlOVkFMOwpAQCAtMTUwMiwzMSArMTUyNywzNiBAQCBpbnQgZHJtX3dhaXRf dmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJfQogCiAJaWYgKChm bGFncyAmIF9EUk1fVkJMQU5LX05FWFRPTk1JU1MpICYmCi0JICAgIHZibGFua19wYXNzZWQoc2Vx LCB2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlKSkKLQkJdmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5j ZSA9IHNlcSArIDE7CisJICAgIHZibGFua19wYXNzZWQoc2VxLCByZXFfc2VxKSkgeworCQlyZXFf c2VxID0gc2VxICsgMTsKKwkJdmJsd2FpdC0+cmVxdWVzdC50eXBlICY9IH5fRFJNX1ZCTEFOS19O RVhUT05NSVNTOworCQl2Ymx3YWl0LT5yZXF1ZXN0LnNlcXVlbmNlID0gcmVxX3NlcTsKKwl9CiAK IAlpZiAoZmxhZ3MgJiBfRFJNX1ZCTEFOS19FVkVOVCkgewogCQkvKiBtdXN0IGhvbGQgb24gdG8g dGhlIHZibGFuayByZWYgdW50aWwgdGhlIGV2ZW50IGZpcmVzCiAJCSAqIGRybV92YmxhbmtfcHV0 IHdpbGwgYmUgY2FsbGVkIGFzeW5jaHJvbm91c2x5CiAJCSAqLwotCQlyZXR1cm4gZHJtX3F1ZXVl X3ZibGFua19ldmVudChkZXYsIHBpcGUsIHZibHdhaXQsIGZpbGVfcHJpdik7CisJCXJldHVybiBk cm1fcXVldWVfdmJsYW5rX2V2ZW50KGRldiwgcGlwZSwgcmVxX3NlcSwgdmJsd2FpdCwgZmlsZV9w cml2KTsKIAl9CiAKLQlpZiAodmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSAhPSBzZXEpIHsKLQkJ RFJNX0RFQlVHKCJ3YWl0aW5nIG9uIHZibGFuayBjb3VudCAldSwgY3J0YyAldVxuIiwKLQkJCSAg dmJsd2FpdC0+cmVxdWVzdC5zZXF1ZW5jZSwgcGlwZSk7CisJaWYgKHJlcV9zZXEgIT0gc2VxKSB7 CisJCURSTV9ERUJVRygid2FpdGluZyBvbiB2YmxhbmsgY291bnQgJWxsdSwgY3J0YyAldVxuIiwK KwkJCSAgcmVxX3NlcSwgcGlwZSk7CiAJCURSTV9XQUlUX09OKHJldCwgdmJsYW5rLT5xdWV1ZSwg MyAqIEhaLAogCQkJICAgIHZibGFua19wYXNzZWQoZHJtX3ZibGFua19jb3VudChkZXYsIHBpcGUp LAotCQkJCQkgIHZibHdhaXQtPnJlcXVlc3Quc2VxdWVuY2UpIHx8CisJCQkJCSAgcmVxX3NlcSkg fHwKIAkJCSAgICAhUkVBRF9PTkNFKHZibGFuay0+ZW5hYmxlZCkpOwogCX0KIAogCWlmIChyZXQg IT0gLUVJTlRSKSB7Ci0JCXN0cnVjdCB0aW1ldmFsIG5vdzsKKwkJa3RpbWVfdCBub3c7CisJCXN0 cnVjdCB0aW1ldmFsIHR2OwogCiAJCXZibHdhaXQtPnJlcGx5LnNlcXVlbmNlID0gZHJtX3ZibGFu a19jb3VudF9hbmRfdGltZShkZXYsIHBpcGUsICZub3cpOwotCQl2Ymx3YWl0LT5yZXBseS50dmFs X3NlYyA9IG5vdy50dl9zZWM7Ci0JCXZibHdhaXQtPnJlcGx5LnR2YWxfdXNlYyA9IG5vdy50dl91 c2VjOworCQl0diA9IGt0aW1lX3RvX3RpbWV2YWwobm93KTsKKwkJdmJsd2FpdC0+cmVwbHkudHZh bF9zZWMgPSB0di50dl9zZWM7CisJCXZibHdhaXQtPnJlcGx5LnR2YWxfdXNlYyA9IHR2LnR2X3Vz ZWM7CiAKIAkJRFJNX0RFQlVHKCJjcnRjICVkIHJldHVybmluZyAldSB0byBjbGllbnRcbiIsCiAJ CQkgIHBpcGUsIHZibHdhaXQtPnJlcGx5LnNlcXVlbmNlKTsKQEAgLTE1NDIsOCArMTU3Miw4IEBA IGludCBkcm1fd2FpdF92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwK IHN0YXRpYyB2b2lkIGRybV9oYW5kbGVfdmJsYW5rX2V2ZW50cyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2 ZW50ICplLCAqdDsKLQlzdHJ1Y3QgdGltZXZhbCBub3c7Ci0JdW5zaWduZWQgaW50IHNlcTsKKwlr dGltZV90IG5vdzsKKwl1NjQgc2VxOwogCiAJYXNzZXJ0X3NwaW5fbG9ja2VkKCZkZXYtPmV2ZW50 X2xvY2spOwogCkBAIC0xNTUyLDE1ICsxNTgyLDE1IEBAIHN0YXRpYyB2b2lkIGRybV9oYW5kbGVf dmJsYW5rX2V2ZW50cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSkK IAlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZSwgdCwgJmRldi0+dmJsYW5rX2V2ZW50X2xpc3Qs IGJhc2UubGluaykgewogCQlpZiAoZS0+cGlwZSAhPSBwaXBlKQogCQkJY29udGludWU7Ci0JCWlm ICghdmJsYW5rX3Bhc3NlZChzZXEsIGUtPmV2ZW50LnNlcXVlbmNlKSkKKwkJaWYgKCF2Ymxhbmtf cGFzc2VkKHNlcSwgZS0+c2VxdWVuY2UpKQogCQkJY29udGludWU7CiAKLQkJRFJNX0RFQlVHKCJ2 YmxhbmsgZXZlbnQgb24gJXUsIGN1cnJlbnQgJXVcbiIsCi0JCQkgIGUtPmV2ZW50LnNlcXVlbmNl LCBzZXEpOworCQlEUk1fREVCVUcoInZibGFuayBldmVudCBvbiAlbGx1LCBjdXJyZW50ICVsbHVc biIsCisJCQkgIGUtPnNlcXVlbmNlLCBzZXEpOwogCiAJCWxpc3RfZGVsKCZlLT5iYXNlLmxpbmsp OwogCQlkcm1fdmJsYW5rX3B1dChkZXYsIHBpcGUpOwotCQlzZW5kX3ZibGFua19ldmVudChkZXYs IGUsIHNlcSwgJm5vdyk7CisJCXNlbmRfdmJsYW5rX2V2ZW50KGRldiwgZSwgc2VxLCBub3cpOwog CX0KIAogCXRyYWNlX2RybV92YmxhbmtfZXZlbnQocGlwZSwgc2VxKTsKZGlmZiAtLWdpdCBhL2lu Y2x1ZGUvZHJtL2RybVAuaCBiL2luY2x1ZGUvZHJtL2RybVAuaAppbmRleCAzOWRmMTZhZjdhNGEu LmU1MGNmMTUyZjU2NSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtUC5oCisrKyBiL2luY2x1 ZGUvZHJtL2RybVAuaApAQCAtNDAzLDcgKzQwMyw3IEBAIHN0cnVjdCBkcm1fZGV2aWNlIHsKIAlz cGlubG9ja190IHZibGFua190aW1lX2xvY2s7ICAgIC8qKjwgUHJvdGVjdHMgdmJsYW5rIGNvdW50 IGFuZCB0aW1lIHVwZGF0ZXMgZHVyaW5nIHZibGFuayBlbmFibGUvZGlzYWJsZSAqLwogCXNwaW5s b2NrX3QgdmJsX2xvY2s7CiAKLQl1MzIgbWF4X3ZibGFua19jb3VudDsgICAgICAgICAgIC8qKjwg c2l6ZSBvZiB2YmxhbmsgY291bnRlciByZWdpc3RlciAqLworCXU2NCBtYXhfdmJsYW5rX2NvdW50 OyAgICAgICAgICAgLyoqPCBzaXplIG9mIHZibGFuayBjb3VudGVyIHJlZ2lzdGVyICovCiAKIAkv KioKIAkgKiBMaXN0IG9mIGV2ZW50cwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2Rydi5o IGIvaW5jbHVkZS9kcm0vZHJtX2Rydi5oCmluZGV4IGQ4NTVmOWFlNDFhOC4uMmU0ZTQyNWI1ZmJh IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fZHJ2LmgKKysrIGIvaW5jbHVkZS9kcm0vZHJt X2Rydi5oCkBAIC0zMjUsNyArMzI1LDcgQEAgc3RydWN0IGRybV9kcml2ZXIgewogCSAqLwogCWJv b2wgKCpnZXRfdmJsYW5rX3RpbWVzdGFtcCkgKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2ln bmVkIGludCBwaXBlLAogCQkJCSAgICAgaW50ICptYXhfZXJyb3IsCi0JCQkJICAgICBzdHJ1Y3Qg dGltZXZhbCAqdmJsYW5rX3RpbWUsCisJCQkJICAgICBrdGltZV90ICp2YmxhbmtfdGltZSwKIAkJ CQkgICAgIGJvb2wgaW5fdmJsYW5rX2lycSk7CiAKIAkvKioKZGlmZiAtLWdpdCBhL2luY2x1ZGUv ZHJtL2RybV92YmxhbmsuaCBiL2luY2x1ZGUvZHJtL2RybV92YmxhbmsuaAppbmRleCA0Y2RlNDcz MzJkZmEuLmU4MDlhYjI0NDkxOSAxMDA2NDQKLS0tIGEvaW5jbHVkZS9kcm0vZHJtX3ZibGFuay5o CisrKyBiL2luY2x1ZGUvZHJtL2RybV92YmxhbmsuaApAQCAtNDgsNiArNDgsMTAgQEAgc3RydWN0 IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCB7CiAJICovCiAJdW5zaWduZWQgaW50IHBpcGU7CiAJ LyoqCisJICogQHNlcXVlbmNlOiBmcmFtZSBldmVudCBzaG91bGQgYmUgdHJpZ2dlcmVkIGF0CisJ ICovCisJdTY0IHNlcXVlbmNlOworCS8qKgogCSAqIEBldmVudDogQWN0dWFsIGV2ZW50IHdoaWNo IHdpbGwgYmUgc2VudCB0byB1c2Vyc3BhY2UuCiAJICovCiAJc3RydWN0IGRybV9ldmVudF92Ymxh bmsgZXZlbnQ7CkBAIC04OCwxMSArOTIsMTEgQEAgc3RydWN0IGRybV92YmxhbmtfY3J0YyB7CiAJ LyoqCiAJICogQGNvdW50OiBDdXJyZW50IHNvZnR3YXJlIHZibGFuayBjb3VudGVyLgogCSAqLwot CXUzMiBjb3VudDsKKwl1NjQgY291bnQ7CiAJLyoqCiAJICogQHRpbWU6IFZibGFuayB0aW1lc3Rh bXAgY29ycmVzcG9uZGluZyB0byBAY291bnQuCiAJICovCi0Jc3RydWN0IHRpbWV2YWwgdGltZTsK KwlrdGltZV90IHRpbWU7CiAKIAkvKioKIAkgKiBAcmVmY291bnQ6IE51bWJlciBvZiB1c2Vycy93 YWl0ZXJzIG9mIHRoZSB2YmxhbmsgaW50ZXJydXB0LiBPbmx5IHdoZW4KQEAgLTE1Miw5ICsxNTYs OSBAQCBzdHJ1Y3QgZHJtX3ZibGFua19jcnRjIHsKIH07CiAKIGludCBkcm1fdmJsYW5rX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IG51bV9jcnRjcyk7Ci11MzIgZHJt X2NydGNfdmJsYW5rX2NvdW50KHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7Ci11MzIgZHJtX2NydGNf dmJsYW5rX2NvdW50X2FuZF90aW1lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQkgICBzdHJ1 Y3QgdGltZXZhbCAqdmJsYW5rdGltZSk7Cit1NjQgZHJtX2NydGNfdmJsYW5rX2NvdW50KHN0cnVj dCBkcm1fY3J0YyAqY3J0Yyk7Cit1NjQgZHJtX2NydGNfdmJsYW5rX2NvdW50X2FuZF90aW1lKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKKwkJCQkgICBrdGltZV90ICp2Ymxhbmt0aW1lKTsKIHZvaWQg ZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJICAg ICAgIHN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUpOwogdm9pZCBkcm1fY3J0Y19h cm1fdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKQEAgLTE3Myw3ICsxNzcsNyBA QCB1MzIgZHJtX2FjY3VyYXRlX3ZibGFua19jb3VudChzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwog CiBib29sIGRybV9jYWxjX3ZibHRpbWVzdGFtcF9mcm9tX3NjYW5vdXRwb3Moc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCQkJICAgdW5zaWduZWQgaW50IHBpcGUsIGludCAqbWF4X2Vycm9yLAot CQkJCQkgICBzdHJ1Y3QgdGltZXZhbCAqdmJsYW5rX3RpbWUsCisJCQkJCSAgIGt0aW1lX3QgKnZi bGFua190aW1lLAogCQkJCQkgICBib29sIGluX3ZibGFua19pcnEpOwogdm9pZCBkcm1fY2FsY190 aW1lc3RhbXBpbmdfY29uc3RhbnRzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICAgIGNv bnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKTsKLS0gCjIuMTMuMwoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==