From: Karol Herbst Subject: [PATCH 05/32] clk: Improve names of pstate/cstate related variables and fields Date: Fri, 17 Nov 2017 01:04:09 +0100 Message-ID: <20171117000436.2432-6-karolherbst@gmail.com> References: <20171117000436.2432-1-karolherbst@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171117000436.2432-1-karolherbst-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org RnJvbTogS2Fyb2wgSGVyYnN0IDxraGVyYnN0QHJlZGhhdC5jb20+CgppZDogaWQgb2YgdGhlIHN0 YXRlCmlkeDogaW5kZXggb2YgdGhlIHN0YXRlIGluc2lkZSB0aGUgcGFyZW50IGxpc3QKcHN0YXRl L2NzdGF0ZTogdGhlIHN0cnVjdCBpdHNlbGYKClNpZ25lZC1vZmYtYnk6IEthcm9sIEhlcmJzdCA8 a2hlcmJzdEByZWRoYXQuY29tPgotLS0KIGRybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYv Ymlvcy9ib29zdC5oIHwgIDIgKy0KIGRybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYvYmlv cy9wZXJmLmggIHwgIDIgKy0KIGRybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYvY2xrLmgg ICAgICAgIHwgIDQgKy0KIGRybS9ub3V2ZWF1L25vdXZlYXVfZGVidWdmcy5jICAgICAgICAgICAg ICAgIHwgMTQgKysrLS0tCiBkcm0vbm91dmVhdS9udmttL2VuZ2luZS9kZXZpY2UvY3RybC5jICAg ICAgICB8ICA0ICstCiBkcm0vbm91dmVhdS9udmttL3N1YmRldi9iaW9zL2Jvb3N0LmMgICAgICAg ICB8IDExICsrKy0tCiBkcm0vbm91dmVhdS9udmttL3N1YmRldi9iaW9zL3BlcmYuYyAgICAgICAg ICB8ICAyICstCiBkcm0vbm91dmVhdS9udmttL3N1YmRldi9jbGsvYmFzZS5jICAgICAgICAgICB8 IDcwICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIGRybS9ub3V2ZWF1L252a20vc3ViZGV2 L2Nsay9nazIwYS5jICAgICAgICAgIHwgIDIgKy0KIGRybS9ub3V2ZWF1L252a20vc3ViZGV2L3Bt dS9nazIwYS5jICAgICAgICAgIHwgIDQgKy0KIDEwIGZpbGVzIGNoYW5nZWQsIDU5IGluc2VydGlv bnMoKyksIDU2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RybS9ub3V2ZWF1L2luY2x1ZGUv bnZrbS9zdWJkZXYvYmlvcy9ib29zdC5oIGIvZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRl di9iaW9zL2Jvb3N0LmgKaW5kZXggMmZmNjRhMjAuLjc0NzkxMzQ5IDEwMDY0NAotLS0gYS9kcm0v bm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Jpb3MvYm9vc3QuaAorKysgYi9kcm0vbm91dmVh dS9pbmNsdWRlL252a20vc3ViZGV2L2Jpb3MvYm9vc3QuaApAQCAtMyw3ICszLDcgQEAKIHUzMiBu dmJpb3NfYm9vc3RUZShzdHJ1Y3QgbnZrbV9iaW9zICosIHU4ICosIHU4ICosIHU4ICosIHU4ICos IHU4ICosIHU4ICopOwogCiBzdHJ1Y3QgbnZiaW9zX2Jvb3N0RSB7Ci0JdTggIHBzdGF0ZTsKKwl1 OCAgcHN0YXRlX2lkOwogCXUzMiBtaW47CiAJdTMyIG1heDsKIH07CmRpZmYgLS1naXQgYS9kcm0v bm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Jpb3MvcGVyZi5oIGIvZHJtL25vdXZlYXUvaW5j bHVkZS9udmttL3N1YmRldi9iaW9zL3BlcmYuaAppbmRleCA0NzhiMWMwZC4uNjk4MDAxNjggMTAw NjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYvYmlvcy9wZXJmLmgKKysr IGIvZHJtL25vdXZlYXUvaW5jbHVkZS9udmttL3N1YmRldi9iaW9zL3BlcmYuaApAQCAtNCw3ICs0 LDcgQEAgdTMyIG52Ymlvc19wZXJmX3RhYmxlKHN0cnVjdCBudmttX2Jpb3MgKiwgdTggKnZlciwg dTggKmhkciwKIAkJICAgICAgdTggKmNudCwgdTggKmxlbiwgdTggKnNuciwgdTggKnNzeik7CiAK IHN0cnVjdCBudmJpb3NfcGVyZkUgewotCXU4ICBwc3RhdGU7CisJdTggIHBzdGF0ZV9pZDsKIAl1 OCAgZmFuc3BlZWQ7CiAJdTggIHZvbHRhZ2U7CiAJdTMyIGNvcmU7CmRpZmYgLS1naXQgYS9kcm0v bm91dmVhdS9pbmNsdWRlL252a20vc3ViZGV2L2Nsay5oIGIvZHJtL25vdXZlYXUvaW5jbHVkZS9u dmttL3N1YmRldi9jbGsuaAppbmRleCA1MDZmOGNjNi4uMWY0ZmE1ZjUgMTAwNjQ0Ci0tLSBhL2Ry bS9ub3V2ZWF1L2luY2x1ZGUvbnZrbS9zdWJkZXYvY2xrLmgKKysrIGIvZHJtL25vdXZlYXUvaW5j bHVkZS9udmttL3N1YmRldi9jbGsuaApAQCAtNjMsNyArNjMsNyBAQCBzdHJ1Y3QgbnZrbV9wc3Rh dGUgewogCXN0cnVjdCBsaXN0X2hlYWQgaGVhZDsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGxpc3Q7IC8q IGMtc3RhdGVzICovCiAJc3RydWN0IG52a21fY3N0YXRlIGJhc2U7Ci0JdTggcHN0YXRlOworCXU4 IGlkOwogCXU4IGZhbnNwZWVkOwogCWVudW0gbnZrbV9wY2llX3NwZWVkIHBjaWVfc3BlZWQ7CiAJ dTggcGNpZV93aWR0aDsKQEAgLTk1LDcgKzk1LDcgQEAgc3RydWN0IG52a21fY2xrIHsKIAogCXN0 cnVjdCBudmttX25vdGlmeSBwd3JzcmNfbnRmeTsKIAlpbnQgcHdyc3JjOwotCWludCBwc3RhdGU7 IC8qIGN1cnJlbnQgKi8KKwlpbnQgcHN0YXRlX2lkeDsgLyogY3VycmVudCAqLwogCWludCB1c3Rh dGVfYWM7IC8qIHVzZXItcmVxdWVzdGVkICgtMSBkaXNhYmxlZCwgLTIgcGVyZm1vbikgKi8KIAlp bnQgdXN0YXRlX2RjOyAvKiB1c2VyLXJlcXVlc3RlZCAoLTEgZGlzYWJsZWQsIC0yIHBlcmZtb24p ICovCiAJaW50IGFzdGF0ZTsgLyogcGVyZm1vbiBhZGp1c3RtZW50IChiYXNlKSAqLwpkaWZmIC0t Z2l0IGEvZHJtL25vdXZlYXUvbm91dmVhdV9kZWJ1Z2ZzLmMgYi9kcm0vbm91dmVhdS9ub3V2ZWF1 X2RlYnVnZnMuYwppbmRleCA5MTA5YjY5Yy4uZGY3ZTJmMjkgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2 ZWF1L25vdXZlYXVfZGVidWdmcy5jCisrKyBiL2RybS9ub3V2ZWF1L25vdXZlYXVfZGVidWdmcy5j CkBAIC02MywxMCArNjMsMTAgQEAgbm91dmVhdV9kZWJ1Z2ZzX3BzdGF0ZV9nZXQoc3RydWN0IHNl cV9maWxlICptLCB2b2lkICpkYXRhKQogCQlyZXR1cm4gcmV0OwogCiAJZm9yIChpID0gMDsgaSA8 IGluZm8uY291bnQgKyAxOyBpKyspIHsKLQkJY29uc3QgczMyIHN0YXRlID0gaSA8IGluZm8uY291 bnQgPyBpIDoKKwkJY29uc3QgczMyIHN0YXRlX2lkeCA9IGkgPCBpbmZvLmNvdW50ID8gaSA6CiAJ CQlOVklGX0NPTlRST0xfUFNUQVRFX0FUVFJfVjBfU1RBVEVfQ1VSUkVOVDsKIAkJc3RydWN0IG52 aWZfY29udHJvbF9wc3RhdGVfYXR0cl92MCBhdHRyID0gewotCQkJLnN0YXRlID0gc3RhdGUsCisJ CQkuc3RhdGUgPSBzdGF0ZV9pZHgsCiAJCQkuaW5kZXggPSAwLAogCQl9OwogCkBAIC04Myw3ICs4 Myw3IEBAIG5vdXZlYXVfZGVidWdmc19wc3RhdGVfZ2V0KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9p ZCAqZGF0YSkKIAogCQlhdHRyLmluZGV4ID0gMDsKIAkJZG8gewotCQkJYXR0ci5zdGF0ZSA9IHN0 YXRlOworCQkJYXR0ci5zdGF0ZSA9IHN0YXRlX2lkeDsKIAkJCXJldCA9IG52aWZfbXRoZChjdHJs LCBOVklGX0NPTlRST0xfUFNUQVRFX0FUVFIsCiAJCQkJCSZhdHRyLCBzaXplb2YoYXR0cikpOwog CQkJaWYgKHJldCkKQEAgLTk1LDEyICs5NSwxMiBAQCBub3V2ZWF1X2RlYnVnZnNfcHN0YXRlX2dl dChzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJCQlzZXFfcHJpbnRmKG0sICIgJXMi LCBhdHRyLnVuaXQpOwogCQl9IHdoaWxlIChhdHRyLmluZGV4KTsKIAotCQlpZiAoc3RhdGUgPj0g MCkgewotCQkJaWYgKGluZm8udXN0YXRlX2FjID09IHN0YXRlKQorCQlpZiAoc3RhdGVfaWR4ID49 IDApIHsKKwkJCWlmIChpbmZvLnVzdGF0ZV9hYyA9PSBzdGF0ZV9pZHgpCiAJCQkJc2VxX3ByaW50 ZihtLCAiIEFDIik7Ci0JCQlpZiAoaW5mby51c3RhdGVfZGMgPT0gc3RhdGUpCisJCQlpZiAoaW5m by51c3RhdGVfZGMgPT0gc3RhdGVfaWR4KQogCQkJCXNlcV9wcmludGYobSwgIiBEQyIpOwotCQkJ aWYgKGluZm8ucHN0YXRlID09IHN0YXRlKQorCQkJaWYgKGluZm8ucHN0YXRlID09IHN0YXRlX2lk eCkKIAkJCQlzZXFfcHJpbnRmKG0sICIgKiIpOwogCQl9IGVsc2UgewogCQkJaWYgKGluZm8udXN0 YXRlX2FjIDwgLTEpCmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9kZXZpY2Uv Y3RybC5jIGIvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwppbmRleCBiMGVj ZTcxYS4uZTA3OTQ4ZTYgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20vZW5naW5lL2Rldmlj ZS9jdHJsLmMKKysrIGIvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZGV2aWNlL2N0cmwuYwpAQCAt NTIsNyArNTIsNyBAQCBudmttX2NvbnRyb2xfbXRoZF9wc3RhdGVfaW5mbyhzdHJ1Y3QgbnZrbV9j b250cm9sICpjdHJsLCB2b2lkICpkYXRhLCB1MzIgc2l6ZSkKIAkJYXJncy0+djAudXN0YXRlX2Fj ID0gY2xrLT51c3RhdGVfYWM7CiAJCWFyZ3MtPnYwLnVzdGF0ZV9kYyA9IGNsay0+dXN0YXRlX2Rj OwogCQlhcmdzLT52MC5wd3JzcmMgPSBjbGstPnB3cnNyYzsKLQkJYXJncy0+djAucHN0YXRlID0g Y2xrLT5wc3RhdGU7CisJCWFyZ3MtPnYwLnBzdGF0ZSA9IGNsay0+cHN0YXRlX2lkeDsKIAl9IGVs c2UgewogCQlhcmdzLT52MC5jb3VudCA9IDA7CiAJCWFyZ3MtPnYwLnVzdGF0ZV9hYyA9IE5WSUZf Q09OVFJPTF9QU1RBVEVfSU5GT19WMF9VU1RBVEVfRElTQUJMRTsKQEAgLTExNSw3ICsxMTUsNyBA QCBudmttX2NvbnRyb2xfbXRoZF9wc3RhdGVfYXR0cihzdHJ1Y3QgbnZrbV9jb250cm9sICpjdHJs LCB2b2lkICpkYXRhLCB1MzIgc2l6ZSkKIAkJCWhpID0gbWF4KGhpLCBjc3RhdGUtPmRvbWFpbltk b21haW4tPm5hbWVdKTsKIAkJfQogCi0JCWFyZ3MtPnYwLnN0YXRlID0gcHN0YXRlLT5wc3RhdGU7 CisJCWFyZ3MtPnYwLnN0YXRlID0gcHN0YXRlLT5pZDsKIAl9IGVsc2UgewogCQlsbyA9IG1heChu dmttX2Nsa19yZWFkKGNsaywgZG9tYWluLT5uYW1lKSwgMCk7CiAJCWhpID0gbG87CmRpZmYgLS1n aXQgYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9iaW9zL2Jvb3N0LmMgYi9kcm0vbm91dmVhdS9u dmttL3N1YmRldi9iaW9zL2Jvb3N0LmMKaW5kZXggOGFiODk2ZGQuLjY1NTRlOTM3IDEwMDY0NAot LS0gYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9iaW9zL2Jvb3N0LmMKKysrIGIvZHJtL25vdXZl YXUvbnZrbS9zdWJkZXYvYmlvcy9ib29zdC5jCkBAIC03OCwyMCArNzgsMjEgQEAgbnZiaW9zX2Jv b3N0RXAoc3RydWN0IG52a21fYmlvcyAqYmlvcywgaW50IGlkeCwKIAl1MzIgZGF0YSA9IG52Ymlv c19ib29zdEVlKGJpb3MsIGlkeCwgdmVyLCBoZHIsIGNudCwgbGVuKTsKIAltZW1zZXQoaW5mbywg MHgwMCwgc2l6ZW9mKCppbmZvKSk7CiAJaWYgKGRhdGEpIHsKLQkJaW5mby0+cHN0YXRlID0gKG52 Ymlvc19yZDE2KGJpb3MsIGRhdGEgKyAweDAwKSAmIDB4MDFlMCkgPj4gNTsKLQkJaW5mby0+bWlu ICAgID0gIG52Ymlvc19yZDE2KGJpb3MsIGRhdGEgKyAweDAyKSAqIDEwMDA7Ci0JCWluZm8tPm1h eCAgICA9ICBudmJpb3NfcmQxNihiaW9zLCBkYXRhICsgMHgwNCkgKiAxMDAwOworCQlpbmZvLT5w c3RhdGVfaWQgPQorCQkJKG52Ymlvc19yZDE2KGJpb3MsIGRhdGEgKyAweDAwKSAmIDB4MDFlMCkg Pj4gNTsKKwkJaW5mby0+bWluICAgICAgID0gIG52Ymlvc19yZDE2KGJpb3MsIGRhdGEgKyAweDAy KSAqIDEwMDA7CisJCWluZm8tPm1heCAgICAgICA9ICBudmJpb3NfcmQxNihiaW9zLCBkYXRhICsg MHgwNCkgKiAxMDAwOwogCX0KIAlyZXR1cm4gZGF0YTsKIH0KIAogdTMyCi1udmJpb3NfYm9vc3RF bShzdHJ1Y3QgbnZrbV9iaW9zICpiaW9zLCB1OCBwc3RhdGUsCitudmJpb3NfYm9vc3RFbShzdHJ1 Y3QgbnZrbV9iaW9zICpiaW9zLCB1OCBwc3RhdGVfaWQsCiAJICAgICAgIHU4ICp2ZXIsIHU4ICpo ZHIsIHU4ICpjbnQsIHU4ICpsZW4sIHN0cnVjdCBudmJpb3NfYm9vc3RFICppbmZvKQogewogCXUz MiBkYXRhLCBpZHggPSAwOwogCXdoaWxlICgoZGF0YSA9IG52Ymlvc19ib29zdEVwKGJpb3MsIGlk eCsrLCB2ZXIsIGhkciwgY250LCBsZW4sIGluZm8pKSkgewotCQlpZiAoaW5mby0+cHN0YXRlID09 IHBzdGF0ZSkKKwkJaWYgKGluZm8tPnBzdGF0ZV9pZCA9PSBwc3RhdGVfaWQpCiAJCQlicmVhazsK IAl9CiAJcmV0dXJuIGRhdGE7CmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9i aW9zL3BlcmYuYyBiL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2Jpb3MvcGVyZi5jCmluZGV4IGMz MDY4MzU4Li44MmJhNDMwMCAxMDA2NDQKLS0tIGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvYmlv cy9wZXJmLmMKKysrIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvYmlvcy9wZXJmLmMKQEAgLTk3 LDcgKzk3LDcgQEAgbnZiaW9zX3BlcmZFcChzdHJ1Y3QgbnZrbV9iaW9zICpiaW9zLCBpbnQgaWR4 LAogewogCXUzMiBwZXJmID0gbnZiaW9zX3BlcmZfZW50cnkoYmlvcywgaWR4LCB2ZXIsIGhkciwg Y250LCBsZW4pOwogCW1lbXNldChpbmZvLCAweDAwLCBzaXplb2YoKmluZm8pKTsKLQlpbmZvLT5w c3RhdGUgPSBudmJpb3NfcmQwOChiaW9zLCBwZXJmICsgMHgwMCk7CisJaW5mby0+cHN0YXRlX2lk ID0gbnZiaW9zX3JkMDgoYmlvcywgcGVyZiArIDB4MDApOwogCXN3aXRjaCAoISFwZXJmICogKnZl cikgewogCWNhc2UgMHgxMjoKIAljYXNlIDB4MTM6CmRpZmYgLS1naXQgYS9kcm0vbm91dmVhdS9u dmttL3N1YmRldi9jbGsvYmFzZS5jIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvY2xrL2Jhc2Uu YwppbmRleCAwYjI4ZGJiOS4uNzdhMDYyNGEgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1L252a20v c3ViZGV2L2Nsay9iYXNlLmMKKysrIGIvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvY2xrL2Jhc2Uu YwpAQCAtMzksMTQgKzM5LDE1IEBACiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovCiBzdGF0aWMgdTMy CiBudmttX2Nsa19hZGp1c3Qoc3RydWN0IG52a21fY2xrICpjbGssIGJvb2wgYWRqdXN0LAotCQl1 OCBwc3RhdGUsIHU4IGRvbWFpbiwgdTMyIGlucHV0KQorCQl1OCBwc3RhdGVfaWQsIHU4IGRvbWFp biwgdTMyIGlucHV0KQogewogCXN0cnVjdCBudmttX2Jpb3MgKmJpb3MgPSBjbGstPnN1YmRldi5k ZXZpY2UtPmJpb3M7CiAJc3RydWN0IG52Ymlvc19ib29zdEUgYm9vc3RFOwogCXU4ICB2ZXIsIGhk ciwgY250LCBsZW47CiAJdTMyIGRhdGE7CiAKLQlkYXRhID0gbnZiaW9zX2Jvb3N0RW0oYmlvcywg cHN0YXRlLCAmdmVyLCAmaGRyLCAmY250LCAmbGVuLCAmYm9vc3RFKTsKKwlkYXRhID0gbnZiaW9z X2Jvb3N0RW0oYmlvcywgcHN0YXRlX2lkLCAmdmVyLCAmaGRyLCAmY250LCAmbGVuLAorCQkJICAg ICAgJmJvb3N0RSk7CiAJaWYgKGRhdGEpIHsKIAkJc3RydWN0IG52Ymlvc19ib29zdFMgYm9vc3RT OwogCQl1OCAgaWR4ID0gMCwgc3Zlciwgc2hkcjsKQEAgLTE0MywxNCArMTQ0LDE0IEBAIG52a21f Y3N0YXRlX2ZpbmRfYmVzdChzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgc3RydWN0IG52a21fcHN0YXRl ICpwc3RhdGUsCiB9CiAKIHN0YXRpYyBzdHJ1Y3QgbnZrbV9jc3RhdGUgKgotbnZrbV9jc3RhdGVf Z2V0KHN0cnVjdCBudmttX2NsayAqY2xrLCBzdHJ1Y3QgbnZrbV9wc3RhdGUgKnBzdGF0ZSwgaW50 IGNzdGF0ZWkpCitudmttX2NzdGF0ZV9nZXQoc3RydWN0IG52a21fY2xrICpjbGssIHN0cnVjdCBu dmttX3BzdGF0ZSAqcHN0YXRlLCBpbnQgY3N0YXRlX2lkKQogewogCXN0cnVjdCBudmttX2NzdGF0 ZSAqY3N0YXRlOwotCWlmIChjc3RhdGVpID09IE5WS01fQ0xLX0NTVEFURV9ISUdIRVNUKQorCWlm IChjc3RhdGVfaWQgPT0gTlZLTV9DTEtfQ1NUQVRFX0hJR0hFU1QpCiAJCXJldHVybiBsaXN0X2xh c3RfZW50cnkoJnBzdGF0ZS0+bGlzdCwgdHlwZW9mKCpjc3RhdGUpLCBoZWFkKTsKIAllbHNlIHsK IAkJbGlzdF9mb3JfZWFjaF9lbnRyeShjc3RhdGUsICZwc3RhdGUtPmxpc3QsIGhlYWQpIHsKLQkJ CWlmIChjc3RhdGUtPmlkID09IGNzdGF0ZWkpCisJCQlpZiAoY3N0YXRlLT5pZCA9PSBjc3RhdGVf aWQpCiAJCQkJcmV0dXJuIGNzdGF0ZTsKIAkJfQogCX0KQEAgLTE1OCw3ICsxNTksOCBAQCBudmtt X2NzdGF0ZV9nZXQoc3RydWN0IG52a21fY2xrICpjbGssIHN0cnVjdCBudmttX3BzdGF0ZSAqcHN0 YXRlLCBpbnQgY3N0YXRlaSkKIH0KIAogc3RhdGljIGludAotbnZrbV9jc3RhdGVfcHJvZyhzdHJ1 Y3QgbnZrbV9jbGsgKmNsaywgc3RydWN0IG52a21fcHN0YXRlICpwc3RhdGUsIGludCBjc3RhdGVp KQorbnZrbV9jc3RhdGVfcHJvZyhzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgc3RydWN0IG52a21fcHN0 YXRlICpwc3RhdGUsCisJCSBpbnQgY3N0YXRlX2lkKQogewogCXN0cnVjdCBudmttX3N1YmRldiAq c3ViZGV2ID0gJmNsay0+c3ViZGV2OwogCXN0cnVjdCBudmttX2RldmljZSAqZGV2aWNlID0gc3Vi ZGV2LT5kZXZpY2U7CkBAIC0xNjgsNyArMTcwLDcgQEAgbnZrbV9jc3RhdGVfcHJvZyhzdHJ1Y3Qg bnZrbV9jbGsgKmNsaywgc3RydWN0IG52a21fcHN0YXRlICpwc3RhdGUsIGludCBjc3RhdGVpKQog CWludCByZXQ7CiAKIAlpZiAoIWxpc3RfZW1wdHkoJnBzdGF0ZS0+bGlzdCkpIHsKLQkJY3N0YXRl ID0gbnZrbV9jc3RhdGVfZ2V0KGNsaywgcHN0YXRlLCBjc3RhdGVpKTsKKwkJY3N0YXRlID0gbnZr bV9jc3RhdGVfZ2V0KGNsaywgcHN0YXRlLCBjc3RhdGVfaWQpOwogCQljc3RhdGUgPSBudmttX2Nz dGF0ZV9maW5kX2Jlc3QoY2xrLCBwc3RhdGUsIGNzdGF0ZSk7CiAJfSBlbHNlIHsKIAkJY3N0YXRl ID0gJnBzdGF0ZS0+YmFzZTsKQEAgLTI0OCw3ICsyNTAsNyBAQCBudmttX2NzdGF0ZV9uZXcoc3Ry dWN0IG52a21fY2xrICpjbGssIGludCBpZHgsIHN0cnVjdCBudmttX3BzdGF0ZSAqcHN0YXRlKQog CiAJd2hpbGUgKGRvbWFpbiAmJiBkb21haW4tPm5hbWUgIT0gbnZfY2xrX3NyY19tYXgpIHsKIAkJ aWYgKGRvbWFpbi0+ZmxhZ3MgJiBOVktNX0NMS19ET01fRkxBR19DT1JFKSB7Ci0JCQl1MzIgZnJl cSA9IG52a21fY2xrX2FkanVzdChjbGssIHRydWUsIHBzdGF0ZS0+cHN0YXRlLAorCQkJdTMyIGZy ZXEgPSBudmttX2Nsa19hZGp1c3QoY2xrLCB0cnVlLCBwc3RhdGUtPmlkLAogCQkJCQkJICAgZG9t YWluLT5iaW9zLCBjc3RlcFguZnJlcSk7CiAJCQljc3RhdGUtPmRvbWFpbltkb21haW4tPm5hbWVd ID0gZnJlcTsKIAkJfQpAQCAtMjYzLDcgKzI2NSw3IEBAIG52a21fY3N0YXRlX25ldyhzdHJ1Y3Qg bnZrbV9jbGsgKmNsaywgaW50IGlkeCwgc3RydWN0IG52a21fcHN0YXRlICpwc3RhdGUpCiAgKiBQ LVN0YXRlcwogICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogc3RhdGljIGludAotbnZrbV9wc3RhdGVf cHJvZyhzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgaW50IHBzdGF0ZWkpCitudmttX3BzdGF0ZV9wcm9n KHN0cnVjdCBudmttX2NsayAqY2xrLCBpbnQgcHN0YXRlX2lkeCkKIHsKIAlzdHJ1Y3QgbnZrbV9z dWJkZXYgKnN1YmRldiA9ICZjbGstPnN1YmRldjsKIAlzdHJ1Y3QgbnZrbV9mYiAqZmIgPSBzdWJk ZXYtPmRldmljZS0+ZmI7CkBAIC0yNzIsMTIgKzI3NCwxMiBAQCBudmttX3BzdGF0ZV9wcm9nKHN0 cnVjdCBudmttX2NsayAqY2xrLCBpbnQgcHN0YXRlaSkKIAlpbnQgcmV0LCBpZHggPSAwOwogCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeShwc3RhdGUsICZjbGstPnN0YXRlcywgaGVhZCkgewotCQlpZiAo aWR4KysgPT0gcHN0YXRlaSkKKwkJaWYgKGlkeCsrID09IHBzdGF0ZV9pZHgpCiAJCQlicmVhazsK IAl9CiAKLQludmttX2RlYnVnKHN1YmRldiwgInNldHRpbmcgcGVyZm9ybWFuY2Ugc3RhdGUgJWRc biIsIHBzdGF0ZWkpOwotCWNsay0+cHN0YXRlID0gcHN0YXRlaTsKKwludmttX2RlYnVnKHN1YmRl diwgInNldHRpbmcgcGVyZm9ybWFuY2Ugc3RhdGUgJWRcbiIsIHBzdGF0ZV9pZHgpOworCWNsay0+ cHN0YXRlX2lkeCA9IHBzdGF0ZV9pZHg7CiAKIAludmttX3BjaWVfc2V0X2xpbmsocGNpLCBwc3Rh dGUtPnBjaWVfc3BlZWQsIHBzdGF0ZS0+cGNpZV93aWR0aCk7CiAKQEAgLTMwMCwzMSArMzAyLDMx IEBAIG52a21fcHN0YXRlX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewogCXN0cnVj dCBudmttX2NsayAqY2xrID0gY29udGFpbmVyX29mKHdvcmssIHR5cGVvZigqY2xrKSwgd29yayk7 CiAJc3RydWN0IG52a21fc3ViZGV2ICpzdWJkZXYgPSAmY2xrLT5zdWJkZXY7Ci0JaW50IHBzdGF0 ZTsKKwlpbnQgcHN0YXRlX2lkeDsKIAogCWlmICghYXRvbWljX3hjaGcoJmNsay0+d2FpdGluZywg MCkpCiAJCXJldHVybjsKIAljbGstPnB3cnNyYyA9IHBvd2VyX3N1cHBseV9pc19zeXN0ZW1fc3Vw cGxpZWQoKTsKIAogCW52a21fdHJhY2Uoc3ViZGV2LCAiUCAlZCBQV1IgJWQgVShBQykgJWQgVShE QykgJWQgQSAlZCBUICVkwrBDIEQgJWRcbiIsCi0JCSAgIGNsay0+cHN0YXRlLCBjbGstPnB3cnNy YywgY2xrLT51c3RhdGVfYWMsIGNsay0+dXN0YXRlX2RjLAorCQkgICBjbGstPnBzdGF0ZV9pZHgs IGNsay0+cHdyc3JjLCBjbGstPnVzdGF0ZV9hYywgY2xrLT51c3RhdGVfZGMsCiAJCSAgIGNsay0+ YXN0YXRlLCBjbGstPnRlbXAsIGNsay0+ZHN0YXRlKTsKIAotCXBzdGF0ZSA9IGNsay0+cHdyc3Jj ID8gY2xrLT51c3RhdGVfYWMgOiBjbGstPnVzdGF0ZV9kYzsKLQlpZiAoY2xrLT5zdGF0ZV9uciAm JiBwc3RhdGUgIT0gLTEpIHsKLQkJcHN0YXRlID0gKHBzdGF0ZSA8IDApID8gY2xrLT5hc3RhdGUg OiBwc3RhdGU7Ci0JCXBzdGF0ZSA9IG1pbihwc3RhdGUsIGNsay0+c3RhdGVfbnIgLSAxKTsKLQkJ cHN0YXRlID0gbWF4KHBzdGF0ZSwgY2xrLT5kc3RhdGUpOworCXBzdGF0ZV9pZHggPSBjbGstPnB3 cnNyYyA/IGNsay0+dXN0YXRlX2FjIDogY2xrLT51c3RhdGVfZGM7CisJaWYgKGNsay0+c3RhdGVf bnIgJiYgcHN0YXRlX2lkeCAhPSAtMSkgeworCQlwc3RhdGVfaWR4ID0gKHBzdGF0ZV9pZHggPCAw KSA/IGNsay0+YXN0YXRlIDogcHN0YXRlX2lkeDsKKwkJcHN0YXRlX2lkeCA9IG1pbihwc3RhdGVf aWR4LCBjbGstPnN0YXRlX25yIC0gMSk7CisJCXBzdGF0ZV9pZHggPSBtYXgocHN0YXRlX2lkeCwg Y2xrLT5kc3RhdGUpOwogCX0gZWxzZSB7Ci0JCXBzdGF0ZSA9IGNsay0+cHN0YXRlID0gLTE7CisJ CXBzdGF0ZV9pZHggPSBjbGstPnBzdGF0ZV9pZHggPSAtMTsKIAl9CiAKLQludmttX3RyYWNlKHN1 YmRldiwgIi0+ICVkXG4iLCBwc3RhdGUpOwotCWlmIChwc3RhdGUgIT0gY2xrLT5wc3RhdGUpIHsK LQkJaW50IHJldCA9IG52a21fcHN0YXRlX3Byb2coY2xrLCBwc3RhdGUpOworCW52a21fdHJhY2Uo c3ViZGV2LCAiLT4gJWRcbiIsIHBzdGF0ZV9pZHgpOworCWlmIChwc3RhdGVfaWR4ICE9IGNsay0+ cHN0YXRlX2lkeCkgeworCQlpbnQgcmV0ID0gbnZrbV9wc3RhdGVfcHJvZyhjbGssIHBzdGF0ZV9p ZHgpOwogCQlpZiAocmV0KSB7CiAJCQludmttX2Vycm9yKHN1YmRldiwgImVycm9yIHNldHRpbmcg cHN0YXRlICVkOiAlZFxuIiwKLQkJCQkgICBwc3RhdGUsIHJldCk7CisJCQkJICAgcHN0YXRlX2lk eCwgcmV0KTsKIAkJfQogCX0KIApAQCAtMzUyLDggKzM1NCw4IEBAIG52a21fcHN0YXRlX2luZm8o c3RydWN0IG52a21fY2xrICpjbGssIHN0cnVjdCBudmttX3BzdGF0ZSAqcHN0YXRlKQogCWNoYXIg bmFtZVs0XSA9ICItLSI7CiAJaW50IGkgPSAtMTsKIAotCWlmIChwc3RhdGUtPnBzdGF0ZSAhPSAw eGZmKQotCQlzbnByaW50ZihuYW1lLCBzaXplb2YobmFtZSksICIlMDJ4IiwgcHN0YXRlLT5wc3Rh dGUpOworCWlmIChwc3RhdGUtPmlkICE9IDB4ZmYpCisJCXNucHJpbnRmKG5hbWUsIHNpemVvZihu YW1lKSwgIiUwMngiLCBwc3RhdGUtPmlkKTsKIAogCXdoaWxlICgoKytjbG9jayktPm5hbWUgIT0g bnZfY2xrX3NyY19tYXgpIHsKIAkJdTMyIGxvID0gcHN0YXRlLT5iYXNlLmRvbWFpbltjbG9jay0+ bmFtZV07CkBAIC00MTMsNyArNDE1LDcgQEAgbnZrbV9wc3RhdGVfbmV3KHN0cnVjdCBudmttX2Ns ayAqY2xrLCBpbnQgaWR4KQogCWRhdGEgPSBudmJpb3NfcGVyZkVwKGJpb3MsIGlkeCwgJnZlciwg JmhkciwgJmNudCwgJmxlbiwgJnBlcmZFKTsKIAlpZiAoIWRhdGEpCiAJCXJldHVybiAtRUlOVkFM OwotCWlmIChwZXJmRS5wc3RhdGUgPT0gMHhmZikKKwlpZiAocGVyZkUucHN0YXRlX2lkID09IDB4 ZmYpCiAJCXJldHVybiAwOwogCiAJcHN0YXRlID0ga3phbGxvYyhzaXplb2YoKnBzdGF0ZSksIEdG UF9LRVJORUwpOwpAQCAtNDIzLDcgKzQyNSw3IEBAIG52a21fcHN0YXRlX25ldyhzdHJ1Y3QgbnZr bV9jbGsgKmNsaywgaW50IGlkeCkKIAogCUlOSVRfTElTVF9IRUFEKCZwc3RhdGUtPmxpc3QpOwog Ci0JcHN0YXRlLT5wc3RhdGUgPSBwZXJmRS5wc3RhdGU7CisJcHN0YXRlLT5pZCA9IHBlcmZFLnBz dGF0ZV9pZDsKIAlwc3RhdGUtPmZhbnNwZWVkID0gcGVyZkUuZmFuc3BlZWQ7CiAJcHN0YXRlLT5w Y2llX3NwZWVkID0gcGVyZkUucGNpZV9zcGVlZDsKIAlwc3RhdGUtPnBjaWVfd2lkdGggPSBwZXJm RS5wY2llX3dpZHRoOwpAQCAtNDQ0LDcgKzQ0Niw3IEBAIG52a21fcHN0YXRlX25ldyhzdHJ1Y3Qg bnZrbV9jbGsgKmNsaywgaW50IGlkeCkKIAogCQlpZiAoZG9tYWluLT5mbGFncyAmIE5WS01fQ0xL X0RPTV9GTEFHX0NPUkUpIHsKIAkJCXBlcmZTLnY0MC5mcmVxID0gbnZrbV9jbGtfYWRqdXN0KGNs aywgZmFsc2UsCi0JCQkJCQkJIHBzdGF0ZS0+cHN0YXRlLAorCQkJCQkJCSBwc3RhdGUtPmlkLAog CQkJCQkJCSBkb21haW4tPmJpb3MsCiAJCQkJCQkJIHBlcmZTLnY0MC5mcmVxKTsKIAkJfQpAQCAt NDUyLDcgKzQ1NCw3IEBAIG52a21fcHN0YXRlX25ldyhzdHJ1Y3QgbnZrbV9jbGsgKmNsaywgaW50 IGlkeCkKIAkJY3N0YXRlLT5kb21haW5bZG9tYWluLT5uYW1lXSA9IHBlcmZTLnY0MC5mcmVxOwog CX0KIAotCWRhdGEgPSBudmJpb3NfY3N0ZXBFbShiaW9zLCBwc3RhdGUtPnBzdGF0ZSwgJnZlciwg JmhkciwgJmNzdGVwRSk7CisJZGF0YSA9IG52Ymlvc19jc3RlcEVtKGJpb3MsIHBzdGF0ZS0+aWQs ICZ2ZXIsICZoZHIsICZjc3RlcEUpOwogCWlmIChkYXRhKSB7CiAJCWludCBpZHggPSBjc3RlcEUu aW5kZXg7CiAJCWRvIHsKQEAgLTQ4MCwxMiArNDgyLDEyIEBAIG52a21fY2xrX3VzdGF0ZV91cGRh dGUoc3RydWN0IG52a21fY2xrICpjbGssIGludCByZXEpCiAKIAlpZiAocmVxICE9IC0xICYmIHJl cSAhPSAtMikgewogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5KHBzdGF0ZSwgJmNsay0+c3RhdGVzLCBo ZWFkKSB7Ci0JCQlpZiAocHN0YXRlLT5wc3RhdGUgPT0gcmVxKQorCQkJaWYgKHBzdGF0ZS0+aWQg PT0gcmVxKQogCQkJCWJyZWFrOwogCQkJaSsrOwogCQl9CiAKLQkJaWYgKHBzdGF0ZS0+cHN0YXRl ICE9IHJlcSkKKwkJaWYgKHBzdGF0ZS0+aWQgIT0gcmVxKQogCQkJcmV0dXJuIC1FSU5WQUw7CiAJ CXJlcSA9IGk7CiAJfQpAQCAtNTk3LDcgKzU5OSw3IEBAIG52a21fY2xrX2luaXQoc3RydWN0IG52 a21fc3ViZGV2ICpzdWJkZXYpCiAKIAltZW1zZXQoJmNsay0+YnN0YXRlLCAweDAwLCBzaXplb2Yo Y2xrLT5ic3RhdGUpKTsKIAlJTklUX0xJU1RfSEVBRCgmY2xrLT5ic3RhdGUubGlzdCk7Ci0JY2xr LT5ic3RhdGUucHN0YXRlID0gMHhmZjsKKwljbGstPmJzdGF0ZS5pZCA9IDB4ZmY7CiAKIAl3aGls ZSAoY2xvY2stPm5hbWUgIT0gbnZfY2xrX3NyY19tYXgpIHsKIAkJcmV0ID0gbnZrbV9jbGtfcmVh ZChjbGssIGNsb2NrLT5uYW1lKTsKQEAgLTYxNiw3ICs2MTgsNyBAQCBudmttX2Nsa19pbml0KHN0 cnVjdCBudmttX3N1YmRldiAqc3ViZGV2KQogCiAJY2xrLT5hc3RhdGUgPSBjbGstPnN0YXRlX25y IC0gMTsKIAljbGstPmRzdGF0ZSA9IDA7Ci0JY2xrLT5wc3RhdGUgPSAtMTsKKwljbGstPnBzdGF0 ZV9pZHggPSAtMTsKIAljbGstPnRlbXAgPSA5MDsgLyogcmVhc29uYWJsZSBkZWZhdWx0IHZhbHVl ICovCiAJbnZrbV9wc3RhdGVfY2FsYyhjbGssIHRydWUpOwogCXJldHVybiAwOwpkaWZmIC0tZ2l0 IGEvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvY2xrL2drMjBhLmMgYi9kcm0vbm91dmVhdS9udmtt L3N1YmRldi9jbGsvZ2syMGEuYwppbmRleCAyMTg4OTNlMy4uZGM5OGFkNjIgMTAwNjQ0Ci0tLSBh L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2Nsay9nazIwYS5jCisrKyBiL2RybS9ub3V2ZWF1L252 a20vc3ViZGV2L2Nsay9nazIwYS5jCkBAIC02MjIsNyArNjIyLDcgQEAgZ2syMGFfY2xrX2N0b3Io c3RydWN0IG52a21fZGV2aWNlICpkZXZpY2UsIGludCBpbmRleCwKIAkvKiBGaW5pc2ggaW5pdGlh bGl6aW5nIHRoZSBwc3RhdGVzICovCiAJZm9yIChpID0gMDsgaSA8IGZ1bmMtPm5yX3BzdGF0ZXM7 IGkrKykgewogCQlJTklUX0xJU1RfSEVBRCgmZnVuYy0+cHN0YXRlc1tpXS5saXN0KTsKLQkJZnVu Yy0+cHN0YXRlc1tpXS5wc3RhdGUgPSBpICsgMTsKKwkJZnVuYy0+cHN0YXRlc1tpXS5pZCA9IGkg KyAxOwogCX0KIAogCWNsay0+cGFyYW1zID0gcGFyYW1zOwpkaWZmIC0tZ2l0IGEvZHJtL25vdXZl YXUvbnZrbS9zdWJkZXYvcG11L2drMjBhLmMgYi9kcm0vbm91dmVhdS9udmttL3N1YmRldi9wbXUv Z2syMGEuYwppbmRleCAwNWU4MTg1NS4uMGMxNjkyMTUgMTAwNjQ0Ci0tLSBhL2RybS9ub3V2ZWF1 L252a20vc3ViZGV2L3BtdS9nazIwYS5jCisrKyBiL2RybS9ub3V2ZWF1L252a20vc3ViZGV2L3Bt dS9nazIwYS5jCkBAIC02MCw3ICs2MCw3IEBAIGdrMjBhX3BtdV9kdmZzX2dldF9jdXJfc3RhdGUo c3RydWN0IGdrMjBhX3BtdSAqcG11LCBpbnQgKnN0YXRlKQogewogCXN0cnVjdCBudmttX2NsayAq Y2xrID0gcG11LT5iYXNlLnN1YmRldi5kZXZpY2UtPmNsazsKIAotCSpzdGF0ZSA9IGNsay0+cHN0 YXRlOworCSpzdGF0ZSA9IGNsay0+cHN0YXRlX2lkeDsKIH0KIAogc3RhdGljIGludApAQCAtNzIs NyArNzIsNyBAQCBnazIwYV9wbXVfZHZmc19nZXRfdGFyZ2V0X3N0YXRlKHN0cnVjdCBnazIwYV9w bXUgKnBtdSwKIAlpbnQgY3VyX2xldmVsLCBsZXZlbDsKIAogCS8qIEZvciBHSzIwQSwgdGhlIHBl cmZvcm1hbmNlIGxldmVsIGlzIGRpcmVjdGx5IG1hcHBlZCB0byBwc3RhdGUgKi8KLQlsZXZlbCA9 IGN1cl9sZXZlbCA9IGNsay0+cHN0YXRlOworCWxldmVsID0gY3VyX2xldmVsID0gY2xrLT5wc3Rh dGVfaWR4OwogCiAJaWYgKGxvYWQgPiBkYXRhLT5wX2xvYWRfbWF4KSB7CiAJCWxldmVsID0gbWlu KGNsay0+c3RhdGVfbnIgLSAxLCBsZXZlbCArIChjbGstPnN0YXRlX25yIC8gMykpOwotLSAKMi4x NS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpOb3V2 ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK