From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Courbot Subject: [PATCH v2 2/3] nvc0: use NV_VRAM_DOMAIN() macro Date: Wed, 19 Nov 2014 14:41:44 +0900 Message-ID: <1416375705-14068-3-git-send-email-acourbot@nvidia.com> References: <1416375705-14068-1-git-send-email-acourbot@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1416375705-14068-1-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ilia Mirkin Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, mesa-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: linux-tegra@vger.kernel.org VXNlIHRoZSBuZXdseS1pbnRyb2R1Y2VkIE5WX1ZSQU1fRE9NQUlOKCkgbWFjcm8gdG8gc3VwcG9y dCBhbHRlcm5hdGl2ZQpWUkFNIGRvbWFpbnMgZm9yIGNoaXBzIHRoYXQgZG8gbm90IHVzZSBkZWRp Y2F0ZWQgdmlkZW8gbWVtb3J5LgoKU2lnbmVkLW9mZi1ieTogQWxleGFuZHJlIENvdXJib3QgPGFj b3VyYm90QG52aWRpYS5jb20+Ci0tLQogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L25vdXZl YXVfYnVmZmVyLmMgICAgICAgICAgIHwgIDYgKystLS0tCiBzcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnY1MC9udjUwX21pcHRyZWUuYyAgICAgICAgfCAgNCArKy0tCiBzcmMvZ2FsbGl1bS9k cml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX2NvbXB1dGUuYyAgICAgICAgfCAgMiArLQogc3JjL2dh bGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9jb250ZXh0LmMgICAgICAgIHwgIDQgKyst LQogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0cmVlLmMgICAgICAg IHwgIDIgKy0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcHJvZ3JhbS5j ICAgICAgICB8ICA4ICsrKystLS0tCiBzcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9u dmMwX3NjcmVlbi5jICAgICAgICAgfCAxMiArKysrKystLS0tLS0KIHNyYy9nYWxsaXVtL2RyaXZl cnMvbm91dmVhdS9udmMwL252YzBfc2hhZGVyX3N0YXRlLmMgICB8ICAyICstCiBzcmMvZ2FsbGl1 bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3N0YXRlX3ZhbGlkYXRlLmMgfCAgMiArLQogc3Jj L2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF90ZXguYyAgICAgICAgICAgIHwgIDIg Ky0KIHNyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252ZTRfY29tcHV0ZS5jICAgICAg ICB8ICAyICstCiAxMSBmaWxlcyBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV9i dWZmZXIuYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9ub3V2ZWF1X2J1ZmZlci5jCmlu ZGV4IDQ5ZmYxMDBjNGVjZS4uNGMyMTY5MWVlNjcxIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9k cml2ZXJzL25vdXZlYXUvbm91dmVhdV9idWZmZXIuYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJz L25vdXZlYXUvbm91dmVhdV9idWZmZXIuYwpAQCAtNjU4LDEzICs2NTgsMTEgQEAgbm91dmVhdV9i dWZmZXJfY3JlYXRlKHN0cnVjdCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwKICAgICAgIHN3aXRjaCAo YnVmZmVyLT5iYXNlLnVzYWdlKSB7CiAgICAgICBjYXNlIFBJUEVfVVNBR0VfREVGQVVMVDoKICAg ICAgIGNhc2UgUElQRV9VU0FHRV9JTU1VVEFCTEU6Ci0gICAgICAgICBidWZmZXItPmRvbWFpbiA9 IE5PVVZFQVVfQk9fVlJBTTsKLSAgICAgICAgIGJyZWFrOwogICAgICAgY2FzZSBQSVBFX1VTQUdF X0RZTkFNSUM6CiAgICAgICAgICAvKiBGb3IgbW9zdCBhcHBzLCB3ZSdkIGhhdmUgdG8gZG8gc3Rh Z2luZyB0cmFuc2ZlcnMgdG8gYXZvaWQgc3luYwogICAgICAgICAgICogd2l0aCB0aGlzIHVzYWdl LCBhbmQgR0FSVCAtPiBHQVJUIGNvcGllcyB3b3VsZCBiZSBzdWJvcHRpbWFsLgogICAgICAgICAg ICovCi0gICAgICAgICBidWZmZXItPmRvbWFpbiA9IE5PVVZFQVVfQk9fVlJBTTsKKyAgICAgICAg IGJ1ZmZlci0+ZG9tYWluID0gTlZfVlJBTV9ET01BSU4oc2NyZWVuKTsKICAgICAgICAgIGJyZWFr OwogICAgICAgY2FzZSBQSVBFX1VTQUdFX1NUQUdJTkc6CiAgICAgICBjYXNlIFBJUEVfVVNBR0Vf U1RSRUFNOgpAQCAtNjc2LDcgKzY3NCw3IEBAIG5vdXZlYXVfYnVmZmVyX2NyZWF0ZShzdHJ1Y3Qg cGlwZV9zY3JlZW4gKnBzY3JlZW4sCiAgICAgICB9CiAgICB9IGVsc2UgewogICAgICAgaWYgKGJ1 ZmZlci0+YmFzZS5iaW5kICYgc2NyZWVuLT52aWRtZW1fYmluZGluZ3MpCi0gICAgICAgICBidWZm ZXItPmRvbWFpbiA9IE5PVVZFQVVfQk9fVlJBTTsKKyAgICAgICAgIGJ1ZmZlci0+ZG9tYWluID0g TlZfVlJBTV9ET01BSU4oc2NyZWVuKTsKICAgICAgIGVsc2UKICAgICAgIGlmIChidWZmZXItPmJh c2UuYmluZCAmIHNjcmVlbi0+c3lzbWVtX2JpbmRpbmdzKQogICAgICAgICAgYnVmZmVyLT5kb21h aW4gPSBOT1VWRUFVX0JPX0dBUlQ7CmRpZmYgLS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnY1MC9udjUwX21pcHRyZWUuYyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9u djUwL252NTBfbWlwdHJlZS5jCmluZGV4IDFhYWNhZWM4OWFjZi4uZGRmZjUwOGM0NzVjIDEwMDY0 NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX21pcHRyZWUuYwor KysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX21pcHRyZWUuYwpAQCAt MzU5LDcgKzM1OSw3IEBAIG52NTBfbWlwdHJlZV9jcmVhdGUoc3RydWN0IHBpcGVfc2NyZWVuICpw c2NyZWVuLAogICAgaWYgKCFib19jb25maWcubnY1MC5tZW10eXBlICYmIChwdC0+YmluZCAmIFBJ UEVfQklORF9TSEFSRUQpKQogICAgICAgbXQtPmJhc2UuZG9tYWluID0gTk9VVkVBVV9CT19HQVJU OwogICAgZWxzZQotICAgICAgbXQtPmJhc2UuZG9tYWluID0gTk9VVkVBVV9CT19WUkFNOworICAg ICAgbXQtPmJhc2UuZG9tYWluID0gTlZfVlJBTV9ET01BSU4obm91dmVhdV9zY3JlZW4ocHNjcmVl bikpOwogCiAgICBib19mbGFncyA9IG10LT5iYXNlLmRvbWFpbiB8IE5PVVZFQVVfQk9fTk9TTk9P UDsKICAgIGlmIChtdC0+YmFzZS5iYXNlLmJpbmQgJiAoUElQRV9CSU5EX0NVUlNPUiB8IFBJUEVf QklORF9ESVNQTEFZX1RBUkdFVCkpCkBAIC00MDEsNyArNDAxLDcgQEAgbnY1MF9taXB0cmVlX2Zy b21faGFuZGxlKHN0cnVjdCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwKICAgICAgIEZSRUUobXQpOwog ICAgICAgcmV0dXJuIE5VTEw7CiAgICB9Ci0gICBtdC0+YmFzZS5kb21haW4gPSBOT1VWRUFVX0JP X1ZSQU07CisgICBtdC0+YmFzZS5kb21haW4gPSBOVl9WUkFNX0RPTUFJTihub3V2ZWF1X3NjcmVl bihwc2NyZWVuKSk7CiAgICBtdC0+YmFzZS5hZGRyZXNzID0gbXQtPmJhc2UuYm8tPm9mZnNldDsK IAogICAgbXQtPmJhc2UuYmFzZSA9ICp0ZW1wbDsKZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL2Ry aXZlcnMvbm91dmVhdS9udmMwL252YzBfY29tcHV0ZS5jIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9u b3V2ZWF1L252YzAvbnZjMF9jb21wdXRlLmMKaW5kZXggYWQyODdhMmFmNmI2Li41NmZjODNkMzY3 OWYgMTAwNjQ0Ci0tLSBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfY29t cHV0ZS5jCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfY29tcHV0 ZS5jCkBAIC01Nyw3ICs1Nyw3IEBAIG52YzBfc2NyZWVuX2NvbXB1dGVfc2V0dXAoc3RydWN0IG52 YzBfc2NyZWVuICpzY3JlZW4sCiAgICAgICByZXR1cm4gcmV0OwogICAgfQogCi0gICByZXQgPSBu b3V2ZWF1X2JvX25ldyhkZXYsIE5PVVZFQVVfQk9fVlJBTSwgMCwgMSA8PCAxMiwgTlVMTCwKKyAg IHJldCA9IG5vdXZlYXVfYm9fbmV3KGRldiwgTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSks IDAsIDEgPDwgMTIsIE5VTEwsCiAgICAgICAgICAgICAgICAgICAgICAgICAmc2NyZWVuLT5wYXJt KTsKICAgIGlmIChyZXQpCiAgICAgICByZXR1cm4gcmV0OwpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxp dW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9jb250ZXh0LmMgYi9zcmMvZ2FsbGl1bS9kcml2 ZXJzL25vdXZlYXUvbnZjMC9udmMwX2NvbnRleHQuYwppbmRleCBiMzNhNjczMWExYzAuLmEwMTg5 ZjUyOGU2ZiAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZj MF9jb250ZXh0LmMKKysrIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9j b250ZXh0LmMKQEAgLTMyMiw3ICszMjIsNyBAQCBudmMwX2NyZWF0ZShzdHJ1Y3QgcGlwZV9zY3Jl ZW4gKnBzY3JlZW4sIHZvaWQgKnByaXYpCiAKICAgIC8qIGFkZCBwZXJtYW5lbnRseSByZXNpZGVu dCBidWZmZXJzIHRvIGJ1ZmN0eHRzICovCiAKLSAgIGZsYWdzID0gTk9VVkVBVV9CT19WUkFNIHwg Tk9VVkVBVV9CT19SRDsKKyAgIGZsYWdzID0gTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSkg fCBOT1VWRUFVX0JPX1JEOwogCiAgICBCQ1RYX1JFRk5fYm8obnZjMC0+YnVmY3R4XzNkLCBTQ1JF RU4sIGZsYWdzLCBzY3JlZW4tPnRleHQpOwogICAgQkNUWF9SRUZOX2JvKG52YzAtPmJ1ZmN0eF8z ZCwgU0NSRUVOLCBmbGFncywgc2NyZWVuLT51bmlmb3JtX2JvKTsKQEAgLTMzMyw3ICszMzMsNyBA QCBudmMwX2NyZWF0ZShzdHJ1Y3QgcGlwZV9zY3JlZW4gKnBzY3JlZW4sIHZvaWQgKnByaXYpCiAg ICAgICBCQ1RYX1JFRk5fYm8obnZjMC0+YnVmY3R4X2NwLCBDUF9TQ1JFRU4sIGZsYWdzLCBzY3Jl ZW4tPnBhcm0pOwogICAgfQogCi0gICBmbGFncyA9IE5PVVZFQVVfQk9fVlJBTSB8IE5PVVZFQVVf Qk9fUkRXUjsKKyAgIGZsYWdzID0gTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSkgfCBOT1VW RUFVX0JPX1JEV1I7CiAKICAgIGlmIChzY3JlZW4tPnBvbHlfY2FjaGUpCiAgICAgICBCQ1RYX1JF Rk5fYm8obnZjMC0+YnVmY3R4XzNkLCBTQ1JFRU4sIGZsYWdzLCBzY3JlZW4tPnBvbHlfY2FjaGUp OwpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0 cmVlLmMgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX21pcHRyZWUuYwpp bmRleCAxYmVkYTdkNGEyYzguLjNhZmRlMzhlNzFiYSAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0v ZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0cmVlLmMKKysrIGIvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L252YzAvbnZjMF9taXB0cmVlLmMKQEAgLTMwMiw3ICszMDIsNyBAQCBudmMw X21pcHRyZWVfY3JlYXRlKHN0cnVjdCBwaXBlX3NjcmVlbiAqcHNjcmVlbiwKICAgIGlmICghYm9f Y29uZmlnLm52YzAubWVtdHlwZSAmJiAocHQtPnVzYWdlID09IFBJUEVfVVNBR0VfU1RBR0lORyB8 fCBwdC0+YmluZCAmIFBJUEVfQklORF9TSEFSRUQpKQogICAgICAgbXQtPmJhc2UuZG9tYWluID0g Tk9VVkVBVV9CT19HQVJUOwogICAgZWxzZQotICAgICAgbXQtPmJhc2UuZG9tYWluID0gTk9VVkVB VV9CT19WUkFNOworICAgICAgbXQtPmJhc2UuZG9tYWluID0gTlZfVlJBTV9ET01BSU4obm91dmVh dV9zY3JlZW4ocHNjcmVlbikpOwogCiAgICBib19mbGFncyA9IG10LT5iYXNlLmRvbWFpbiB8IE5P VVZFQVVfQk9fTk9TTk9PUDsKIApkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2 ZWF1L252YzAvbnZjMF9wcm9ncmFtLmMgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZj MC9udmMwX3Byb2dyYW0uYwppbmRleCAyMWJlOGI3MjQwZWEuLjc2MDBkYzRlNzIwOCAxMDA2NDQK LS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9wcm9ncmFtLmMKKysr IGIvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9wcm9ncmFtLmMKQEAgLTcz NCwxMiArNzM0LDEyIEBAIG52YzBfcHJvZ3JhbV91cGxvYWRfY29kZShzdHJ1Y3QgbnZjMF9jb250 ZXh0ICpudmMwLCBzdHJ1Y3QgbnZjMF9wcm9ncmFtICpwcm9nKQogCiAgICBpZiAoIWlzX2NwKQog ICAgICAgbnZjMC0+YmFzZS5wdXNoX2RhdGEoJm52YzAtPmJhc2UsIHNjcmVlbi0+dGV4dCwgcHJv Zy0+Y29kZV9iYXNlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgTk9VVkVBVV9CT19WUkFN LCBOVkMwX1NIQURFUl9IRUFERVJfU0laRSwgcHJvZy0+aGRyKTsKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIE5WX1ZSQU1fRE9NQUlOKCZzY3JlZW4tPmJhc2UpLCBOVkMwX1NIQURFUl9IRUFE RVJfU0laRSwgcHJvZy0+aGRyKTsKICAgIG52YzAtPmJhc2UucHVzaF9kYXRhKCZudmMwLT5iYXNl LCBzY3JlZW4tPnRleHQsIGNvZGVfcG9zLAotICAgICAgICAgICAgICAgICAgICAgICAgTk9VVkVB VV9CT19WUkFNLCBwcm9nLT5jb2RlX3NpemUsIHByb2ctPmNvZGUpOworICAgICAgICAgICAgICAg ICAgICAgICAgTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSksIHByb2ctPmNvZGVfc2l6ZSwg cHJvZy0+Y29kZSk7CiAgICBpZiAocHJvZy0+aW1tZF9zaXplKQogICAgICAgbnZjMC0+YmFzZS5w dXNoX2RhdGEoJm52YzAtPmJhc2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JlZW4t PnRleHQsIHByb2ctPmltbWRfYmFzZSwgTk9VVkVBVV9CT19WUkFNLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2NyZWVuLT50ZXh0LCBwcm9nLT5pbW1kX2Jhc2UsIE5WX1ZSQU1fRE9NQUlO KCZzY3JlZW4tPmJhc2UpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJvZy0+aW1tZF9z aXplLCBwcm9nLT5pbW1kX2RhdGEpOwogCiAgICBCRUdJTl9OVkMwKG52YzAtPmJhc2UucHVzaGJ1 ZiwgTlZDMF8zRChNRU1fQkFSUklFUiksIDEpOwpAQCAtNzcwLDcgKzc3MCw3IEBAIG52YzBfcHJv Z3JhbV9saWJyYXJ5X3VwbG9hZChzdHJ1Y3QgbnZjMF9jb250ZXh0ICpudmMwKQogICAgICAgcmV0 dXJuOwogCiAgICBudmMwLT5iYXNlLnB1c2hfZGF0YSgmbnZjMC0+YmFzZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgIHNjcmVlbi0+dGV4dCwgc2NyZWVuLT5saWJfY29kZS0+c3RhcnQsIE5PVVZF QVVfQk9fVlJBTSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHNjcmVlbi0+dGV4dCwgc2NyZWVu LT5saWJfY29kZS0+c3RhcnQsIE5WX1ZSQU1fRE9NQUlOKCZzY3JlZW4tPmJhc2UpLAogICAgICAg ICAgICAgICAgICAgICAgICAgc2l6ZSwgY29kZSk7CiAgICAvKiBubyBuZWVkIGZvciBhIG1lbW9y eSBiYXJyaWVyLCB3aWxsIGJlIGVtaXR0ZWQgd2l0aCBmaXJzdCBwcm9ncmFtICovCiB9CmRpZmYg LS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3NjcmVlbi5jIGIv c3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9zY3JlZW4uYwppbmRleCAyYTc1 OTMxMWJmNzYuLjUwNjE2NWQxNzlkZSAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9u b3V2ZWF1L252YzAvbnZjMF9zY3JlZW4uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZl YXUvbnZjMC9udmMwX3NjcmVlbi5jCkBAIC01NzAsNyArNTcwLDcgQEAgbnZjMF9zY3JlZW5fcmVz aXplX3Rsc19hcmVhKHN0cnVjdCBudmMwX3NjcmVlbiAqc2NyZWVuLAogCiAgICBzaXplID0gYWxp Z24oc2l6ZSwgMSA8PCAxNyk7CiAKLSAgIHJldCA9IG5vdXZlYXVfYm9fbmV3KHNjcmVlbi0+YmFz ZS5kZXZpY2UsIE5PVVZFQVVfQk9fVlJBTSwgMSA8PCAxNywgc2l6ZSwKKyAgIHJldCA9IG5vdXZl YXVfYm9fbmV3KHNjcmVlbi0+YmFzZS5kZXZpY2UsIE5WX1ZSQU1fRE9NQUlOKCZzY3JlZW4tPmJh c2UpLCAxIDw8IDE3LCBzaXplLAogICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgJmJvKTsK ICAgIGlmIChyZXQpIHsKICAgICAgIE5PVVZFQVVfRVJSKCJmYWlsZWQgdG8gYWxsb2NhdGUgVExT IGFyZWEsIHNpemU6IDB4JSJQUkl4NjQiXG4iLCBzaXplKTsKQEAgLTgxMiw3ICs4MTIsNyBAQCBu dmMwX3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYpCiAKICAgIG52YzBf bWFnaWNfM2RfaW5pdChwdXNoLCBzY3JlZW4tPmVuZzNkLT5vY2xhc3MpOwogCi0gICByZXQgPSBu b3V2ZWF1X2JvX25ldyhkZXYsIE5PVVZFQVVfQk9fVlJBTSwgMSA8PCAxNywgMSA8PCAyMCwgTlVM TCwKKyAgIHJldCA9IG5vdXZlYXVfYm9fbmV3KGRldiwgTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+ YmFzZSksIDEgPDwgMTcsIDEgPDwgMjAsIE5VTEwsCiAgICAgICAgICAgICAgICAgICAgICAgICAm c2NyZWVuLT50ZXh0KTsKICAgIGlmIChyZXQpCiAgICAgICBnb3RvIGZhaWw7CkBAIC04MjIsMTIg KzgyMiwxMiBAQCBudmMwX3NjcmVlbl9jcmVhdGUoc3RydWN0IG5vdXZlYXVfZGV2aWNlICpkZXYp CiAgICAgKi8KICAgIG5vdXZlYXVfaGVhcF9pbml0KCZzY3JlZW4tPnRleHRfaGVhcCwgMCwgKDEg PDwgMjApIC0gMHgxMDApOwogCi0gICByZXQgPSBub3V2ZWF1X2JvX25ldyhkZXYsIE5PVVZFQVVf Qk9fVlJBTSwgMSA8PCAxMiwgNiA8PCAxNiwgTlVMTCwKKyAgIHJldCA9IG5vdXZlYXVfYm9fbmV3 KGRldiwgTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSksIDEgPDwgMTIsIDYgPDwgMTYsIE5V TEwsCiAgICAgICAgICAgICAgICAgICAgICAgICAmc2NyZWVuLT51bmlmb3JtX2JvKTsKICAgIGlm IChyZXQpCiAgICAgICBnb3RvIGZhaWw7CiAKLSAgIFBVU0hfUkVGTiAocHVzaCwgc2NyZWVuLT51 bmlmb3JtX2JvLCBOT1VWRUFVX0JPX1ZSQU0gfCBOT1VWRUFVX0JPX1dSKTsKKyAgIFBVU0hfUkVG TiAocHVzaCwgc2NyZWVuLT51bmlmb3JtX2JvLCBOVl9WUkFNX0RPTUFJTigmc2NyZWVuLT5iYXNl KSB8IE5PVVZFQVVfQk9fV1IpOwogCiAgICBmb3IgKGkgPSAwOyBpIDwgNTsgKytpKSB7CiAgICAg ICAvKiBUSUMgYW5kIFRTQyBlbnRyaWVzIGZvciBlYWNoIHVuaXQgKG52ZTQrIG9ubHkpICovCkBA IC04OTgsNyArODk4LDcgQEAgbnZjMF9zY3JlZW5fY3JlYXRlKHN0cnVjdCBub3V2ZWF1X2Rldmlj ZSAqZGV2KQogICAgUFVTSF9EQVRBIChwdXNoLCAwKTsKIAogICAgaWYgKHNjcmVlbi0+ZW5nM2Qt Pm9jbGFzcyA8IEdNMTA3XzNEX0NMQVNTKSB7Ci0gICAgICByZXQgPSBub3V2ZWF1X2JvX25ldyhk ZXYsIE5PVVZFQVVfQk9fVlJBTSwgMSA8PCAxNywgMSA8PCAyMCwgTlVMTCwKKyAgICAgIHJldCA9 IG5vdXZlYXVfYm9fbmV3KGRldiwgTlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSksIDEgPDwg MTcsIDEgPDwgMjAsIE5VTEwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAmc2NyZWVuLT5w b2x5X2NhY2hlKTsKICAgICAgIGlmIChyZXQpCiAgICAgICAgICBnb3RvIGZhaWw7CkBAIC05MDks NyArOTA5LDcgQEAgbnZjMF9zY3JlZW5fY3JlYXRlKHN0cnVjdCBub3V2ZWF1X2RldmljZSAqZGV2 KQogICAgICAgUFVTSF9EQVRBIChwdXNoLCAzKTsKICAgIH0KIAotICAgcmV0ID0gbm91dmVhdV9i b19uZXcoZGV2LCBOT1VWRUFVX0JPX1ZSQU0sIDEgPDwgMTcsIDEgPDwgMTcsIE5VTEwsCisgICBy ZXQgPSBub3V2ZWF1X2JvX25ldyhkZXYsIE5WX1ZSQU1fRE9NQUlOKCZzY3JlZW4tPmJhc2UpLCAx IDw8IDE3LCAxIDw8IDE3LCBOVUxMLAogICAgICAgICAgICAgICAgICAgICAgICAgJnNjcmVlbi0+ dHhjKTsKICAgIGlmIChyZXQpCiAgICAgICBnb3RvIGZhaWw7CmRpZmYgLS1naXQgYS9zcmMvZ2Fs bGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3NoYWRlcl9zdGF0ZS5jIGIvc3JjL2dhbGxp dW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9zaGFkZXJfc3RhdGUuYwppbmRleCAxMDAwZDgy ODZkNzcuLjNmY2NhMTY3MWM4YyAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2 ZWF1L252YzAvbnZjMF9zaGFkZXJfc3RhdGUuYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnZjMC9udmMwX3NoYWRlcl9zdGF0ZS5jCkBAIC0zNCw3ICszNCw3IEBAIG52YzBfcHJv Z3JhbV91cGRhdGVfY29udGV4dF9zdGF0ZShzdHJ1Y3QgbnZjMF9jb250ZXh0ICpudmMwLAogICAg c3RydWN0IG5vdXZlYXVfcHVzaGJ1ZiAqcHVzaCA9IG52YzAtPmJhc2UucHVzaGJ1ZjsKIAogICAg aWYgKHByb2cgJiYgcHJvZy0+bmVlZF90bHMpIHsKLSAgICAgIGNvbnN0IHVpbnQzMl90IGZsYWdz ID0gTk9VVkVBVV9CT19WUkFNIHwgTk9VVkVBVV9CT19SRFdSOworICAgICAgY29uc3QgdWludDMy X3QgZmxhZ3MgPSBOVl9WUkFNX0RPTUFJTigmbnZjMC0+c2NyZWVuLT5iYXNlKSB8IE5PVVZFQVVf Qk9fUkRXUjsKICAgICAgIGlmICghbnZjMC0+c3RhdGUudGxzX3JlcXVpcmVkKQogICAgICAgICAg QkNUWF9SRUZOX2JvKG52YzAtPmJ1ZmN0eF8zZCwgVExTLCBmbGFncywgbnZjMC0+c2NyZWVuLT50 bHMpOwogICAgICAgbnZjMC0+c3RhdGUudGxzX3JlcXVpcmVkIHw9IDEgPDwgc3RhZ2U7CmRpZmYg LS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3N0YXRlX3ZhbGlk YXRlLmMgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3N0YXRlX3ZhbGlk YXRlLmMKaW5kZXggMjVhMzIzMmI0OGQ5Li42OTZlYWNhYTFlMjAgMTAwNjQ0Ci0tLSBhL3NyYy9n YWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfc3RhdGVfdmFsaWRhdGUuYworKysgYi9z cmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3N0YXRlX3ZhbGlkYXRlLmMKQEAg LTQzOSw3ICs0MzksNyBAQCBudmMwX2NvbnN0YnVmc192YWxpZGF0ZShzdHJ1Y3QgbnZjMF9jb250 ZXh0ICpudmMwKQogICAgICAgICAgICAgICAgQkVHSU5fTlZDMChwdXNoLCBOVkMwXzNEKENCX0JJ TkQocykpLCAxKTsKICAgICAgICAgICAgICAgIFBVU0hfREFUQSAocHVzaCwgKDAgPDwgNCkgfCAx KTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIG52YzBfY2JfcHVzaCgmbnZjMC0+YmFzZSwg Ym8sIE5PVVZFQVVfQk9fVlJBTSwKKyAgICAgICAgICAgIG52YzBfY2JfcHVzaCgmbnZjMC0+YmFz ZSwgYm8sIE5WX1ZSQU1fRE9NQUlOKCZudmMwLT5zY3JlZW4tPmJhc2UpLAogICAgICAgICAgICAg ICAgICAgICAgICAgIGJhc2UsIG52YzAtPnN0YXRlLnVuaWZvcm1fYnVmZmVyX2JvdW5kW3NdLAog ICAgICAgICAgICAgICAgICAgICAgICAgIDAsIChzaXplICsgMykgLyA0LAogICAgICAgICAgICAg ICAgICAgICAgICAgIG52YzAtPmNvbnN0YnVmW3NdWzBdLnUuZGF0YSk7CmRpZmYgLS1naXQgYS9z cmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3RleC5jIGIvc3JjL2dhbGxpdW0v ZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF90ZXguYwppbmRleCBkYjZiNjAzNmE3MmQuLmRjNDM4 OWQ3NDMyZiAxMDA2NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZj MF90ZXguYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmMwX3RleC5j CkBAIC0zOTYsNyArMzk2LDcgQEAgbnZjMF92YWxpZGF0ZV90c2Moc3RydWN0IG52YzBfY29udGV4 dCAqbnZjMCwgaW50IHMpCiAgICAgICAgICB0c2MtPmlkID0gbnZjMF9zY3JlZW5fdHNjX2FsbG9j KG52YzAtPnNjcmVlbiwgdHNjKTsKIAogICAgICAgICAgbnZjMF9tMm1mX3B1c2hfbGluZWFyKCZu dmMwLT5iYXNlLCBudmMwLT5zY3JlZW4tPnR4YywKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA2NTUzNiArIHRzYy0+aWQgKiAzMiwgTk9VVkVBVV9CT19WUkFNLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDY1NTM2ICsgdHNjLT5pZCAqIDMyLCBOVl9WUkFNX0RPTUFJTigm bnZjMC0+c2NyZWVuLT5iYXNlKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAzMiwg dHNjLT50c2MpOwogICAgICAgICAgbmVlZF9mbHVzaCA9IFRSVUU7CiAgICAgICB9CmRpZmYgLS1n aXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnZjMC9udmU0X2NvbXB1dGUuYyBiL3Ny Yy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMwL252ZTRfY29tcHV0ZS5jCmluZGV4IGYyNDMz MTZiODk5Yy4uZmNlMDJhN2NjNTc2IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnZjMC9udmU0X2NvbXB1dGUuYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZl YXUvbnZjMC9udmU0X2NvbXB1dGUuYwpAQCAtNjMsNyArNjMsNyBAQCBudmU0X3NjcmVlbl9jb21w dXRlX3NldHVwKHN0cnVjdCBudmMwX3NjcmVlbiAqc2NyZWVuLAogICAgICAgcmV0dXJuIHJldDsK ICAgIH0KIAotICAgcmV0ID0gbm91dmVhdV9ib19uZXcoZGV2LCBOT1VWRUFVX0JPX1ZSQU0sIDAs IE5WRTRfQ1BfUEFSQU1fU0laRSwgTlVMTCwKKyAgIHJldCA9IG5vdXZlYXVfYm9fbmV3KGRldiwg TlZfVlJBTV9ET01BSU4oJnNjcmVlbi0+YmFzZSksIDAsIE5WRTRfQ1BfUEFSQU1fU0laRSwgTlVM TCwKICAgICAgICAgICAgICAgICAgICAgICAgICZzY3JlZW4tPnBhcm0pOwogICAgaWYgKHJldCkK ICAgICAgIHJldHVybiByZXQ7Ci0tIAoyLjEuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KTm91dmVhdSBtYWlsaW5nIGxpc3QKTm91dmVhdUBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL25vdXZlYXUK