From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexey Kardashevskiy Subject: [PATCH kernel v4 05/11] powerpc/powernv/npu: TCE Kill helpers cleanup Date: Fri, 29 Apr 2016 18:55:18 +1000 Message-ID: <1461920124-21719-6-git-send-email-aik@ozlabs.ru> References: <1461920124-21719-1-git-send-email-aik@ozlabs.ru> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: kvm@vger.kernel.org, Alexey Kardashevskiy , Alistair Popple , Gavin Shan , linux-kernel@vger.kernel.org, Alex Williamson , David Gibson , Dan Carpenter , Daniel Axtens To: linuxppc-dev@lists.ozlabs.org Return-path: In-Reply-To: <1461920124-21719-1-git-send-email-aik@ozlabs.ru> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" List-Id: kvm.vger.kernel.org TlBVIFBIQiBUQ0UgS2lsbCByZWdpc3RlciBpcyBleGFjdGx5IHRoZSBzYW1lIGFzIGluIHRoZSBy ZXN0IG9mIFBPV0VSOApzbyBsZXQncyByZXVzZSB0aGUgZXhpc3RpbmcgY29kZSBmb3IgTlBVLiBU aGUgb25seSBiaXQgbWlzc2luZyBpcwphIGhlbHBlciB0byByZXNldCB0aGUgZW50aXJlIFRDRSBj YWNoZSBzbyB0aGlzIG1vdmVzIHN1Y2ggYSBoZWxwZXIKZnJvbSBOUFUgY29kZSBhbmQgcmVuYW1l cyBpdC4KClNpbmNlIHBudl9ucHVfdGNlX2ludmFsaWRhdGUoKSBkb2VzIHJlYWxseSBpbnZhbGlk YXRlIHRoZSBlbnRpcmUgY2FjaGUsCnRoaXMgdXNlcyBwbnZfcGNpX2lvZGEyX3RjZV9pbnZhbGlk YXRlX2VudGlyZSgpIGRpcmVjdGx5IGZvciBOUFUuClRoaXMgYWRkcyBhbiBleHBsaWNpdCBjb21t ZW50IGZvciB3b3JrYXJvdW5kIGZvciBpbnZhbGlkYXRpbmcgTlBVIFRDRQpjYWNoZS4KClNpZ25l ZC1vZmYtYnk6IEFsZXhleSBLYXJkYXNoZXZza2l5IDxhaWtAb3psYWJzLnJ1PgpSZXZpZXdlZC1i eTogRGF2aWQgR2lic29uIDxkYXZpZEBnaWJzb24uZHJvcGJlYXIuaWQuYXU+ClJldmlld2VkLWJ5 OiBBbGlzdGFpciBQb3BwbGUgPGFsaXN0YWlyQHBvcHBsZS5pZC5hdT4KLS0tCiBhcmNoL3Bvd2Vy cGMvcGxhdGZvcm1zL3Bvd2VybnYvbnB1LWRtYS5jICB8IDQxIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIGFyY2gvcG93ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9wY2ktaW9kYS5jIHwg MjkgKysrKysrKysrKysrKysrKysrLS0tLQogYXJjaC9wb3dlcnBjL3BsYXRmb3Jtcy9wb3dlcm52 L3BjaS5oICAgICAgfCAgNyArLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygr KSwgNTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9wb3dlcnBjL3BsYXRmb3Jtcy9w b3dlcm52L25wdS1kbWEuYyBiL2FyY2gvcG93ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9ucHUtZG1h LmMKaW5kZXggNzIyOWFjZC4uNzc4NTcwYyAxMDA2NDQKLS0tIGEvYXJjaC9wb3dlcnBjL3BsYXRm b3Jtcy9wb3dlcm52L25wdS1kbWEuYworKysgYi9hcmNoL3Bvd2VycGMvcGxhdGZvcm1zL3Bvd2Vy bnYvbnB1LWRtYS5jCkBAIC0yNSw4ICsyNSw2IEBACiAgKiBPdGhlciB0eXBlcyBvZiBUQ0UgY2Fj aGUgaW52YWxpZGF0aW9uIGFyZSBub3QgZnVuY3Rpb25hbCBpbiB0aGUKICAqIGhhcmR3YXJlLgog ICovCi0jZGVmaW5lIFRDRV9LSUxMX0lOVkFMX0FMTCBQUENfQklUKDApCi0KIHN0YXRpYyBzdHJ1 Y3QgcGNpX2RldiAqZ2V0X3BjaV9kZXYoc3RydWN0IGRldmljZV9ub2RlICpkbikKIHsKIAlyZXR1 cm4gUENJX0ROKGRuKS0+cGNpZGV2OwpAQCAtMTYxLDQ1ICsxNTksNiBAQCBzdGF0aWMgc3RydWN0 IHBudl9pb2RhX3BlICpnZXRfZ3B1X3BjaV9kZXZfYW5kX3BlKHN0cnVjdCBwbnZfaW9kYV9wZSAq bnBlLAogCXJldHVybiBwZTsKIH0KIAotdm9pZCBwbnZfbnB1X3RjZV9pbnZhbGlkYXRlX2VudGly ZShzdHJ1Y3QgcG52X2lvZGFfcGUgKm5wZSkKLXsKLQlzdHJ1Y3QgcG52X3BoYiAqcGhiID0gbnBl LT5waGI7Ci0KLQlpZiAoV0FSTl9PTihwaGItPnR5cGUgIT0gUE5WX1BIQl9OUFUgfHwKLQkJICAg ICFwaGItPmlvZGEudGNlX2ludmFsX3JlZyB8fAotCQkgICAgIShucGUtPmZsYWdzICYgUE5WX0lP REFfUEVfREVWKSkpCi0JCXJldHVybjsKLQotCW1iKCk7IC8qIEVuc3VyZSBwcmV2aW91cyBUQ0Ug dGFibGUgc3RvcmVzIGFyZSB2aXNpYmxlICovCi0JX19yYXdfd3JpdGVxKGNwdV90b19iZTY0KFRD RV9LSUxMX0lOVkFMX0FMTCksCi0JCXBoYi0+aW9kYS50Y2VfaW52YWxfcmVnKTsKLX0KLQotdm9p ZCBwbnZfbnB1X3RjZV9pbnZhbGlkYXRlKHN0cnVjdCBwbnZfaW9kYV9wZSAqbnBlLAotCQkJCXN0 cnVjdCBpb21tdV90YWJsZSAqdGJsLAotCQkJCXVuc2lnbmVkIGxvbmcgaW5kZXgsCi0JCQkJdW5z aWduZWQgbG9uZyBucGFnZXMsCi0JCQkJYm9vbCBybSkKLXsKLQlzdHJ1Y3QgcG52X3BoYiAqcGhi ID0gbnBlLT5waGI7Ci0KLQkvKiBXZSBjYW4gb25seSBpbnZhbGlkYXRlIHRoZSB3aG9sZSBjYWNo ZSBvbiBOUFUgKi8KLQl1bnNpZ25lZCBsb25nIHZhbCA9IFRDRV9LSUxMX0lOVkFMX0FMTDsKLQot CWlmIChXQVJOX09OKHBoYi0+dHlwZSAhPSBQTlZfUEhCX05QVSB8fAotCQkgICAgIXBoYi0+aW9k YS50Y2VfaW52YWxfcmVnIHx8Ci0JCSAgICAhKG5wZS0+ZmxhZ3MgJiBQTlZfSU9EQV9QRV9ERVYp KSkKLQkJcmV0dXJuOwotCi0JbWIoKTsgLyogRW5zdXJlIHByZXZpb3VzIFRDRSB0YWJsZSBzdG9y ZXMgYXJlIHZpc2libGUgKi8KLQlpZiAocm0pCi0JCV9fcmF3X3JtX3dyaXRlcShjcHVfdG9fYmU2 NCh2YWwpLAotCQkgIChfX2JlNjQgX19pb21lbSAqKSBwaGItPmlvZGEudGNlX2ludmFsX3JlZ19w aHlzKTsKLQllbHNlCi0JCV9fcmF3X3dyaXRlcShjcHVfdG9fYmU2NCh2YWwpLAotCQkJcGhiLT5p b2RhLnRjZV9pbnZhbF9yZWcpOwotfQotCiB2b2lkIHBudl9ucHVfaW5pdF9kbWFfcGUoc3RydWN0 IHBudl9pb2RhX3BlICpucGUpCiB7CiAJc3RydWN0IHBudl9pb2RhX3BlICpncGU7CmRpZmYgLS1n aXQgYS9hcmNoL3Bvd2VycGMvcGxhdGZvcm1zL3Bvd2VybnYvcGNpLWlvZGEuYyBiL2FyY2gvcG93 ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9wY2ktaW9kYS5jCmluZGV4IDAzYmUyNWQuLmE2N2Q1MWUg MTAwNjQ0Ci0tLSBhL2FyY2gvcG93ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9wY2ktaW9kYS5jCisr KyBiL2FyY2gvcG93ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9wY2ktaW9kYS5jCkBAIC0xODExLDkg KzE4MTEsMjMgQEAgc3RhdGljIHN0cnVjdCBpb21tdV90YWJsZV9vcHMgcG52X2lvZGExX2lvbW11 X29wcyA9IHsKIAkuZ2V0ID0gcG52X3RjZV9nZXQsCiB9OwogCisjZGVmaW5lIFRDRV9LSUxMX0lO VkFMX0FMTCAgUFBDX0JJVCgwKQogI2RlZmluZSBUQ0VfS0lMTF9JTlZBTF9QRSAgIFBQQ19CSVQo MSkKICNkZWZpbmUgVENFX0tJTExfSU5WQUxfVENFICBQUENfQklUKDIpCiAKK3ZvaWQgcG52X3Bj aV9pb2RhMl90Y2VfaW52YWxpZGF0ZV9lbnRpcmUoc3RydWN0IHBudl9waGIgKnBoYiwgYm9vbCBy bSkKK3sKKwljb25zdCB1bnNpZ25lZCBsb25nIHZhbCA9IFRDRV9LSUxMX0lOVkFMX0FMTDsKKwor CW1iKCk7IC8qIEVuc3VyZSBwcmV2aW91cyBUQ0UgdGFibGUgc3RvcmVzIGFyZSB2aXNpYmxlICov CisJaWYgKHJtKQorCQlfX3Jhd19ybV93cml0ZXEoY3B1X3RvX2JlNjQodmFsKSwKKwkJCQkoX19i ZTY0IF9faW9tZW0gKikKKwkJCQlwaGItPmlvZGEudGNlX2ludmFsX3JlZ19waHlzKTsKKwllbHNl CisJCV9fcmF3X3dyaXRlcShjcHVfdG9fYmU2NCh2YWwpLCBwaGItPmlvZGEudGNlX2ludmFsX3Jl Zyk7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZCBwbnZfcGNpX2lvZGEyX3RjZV9pbnZhbGlkYXRl X3BlKHN0cnVjdCBwbnZfaW9kYV9wZSAqcGUpCiB7CiAJLyogMDF4YiAtIGludmFsaWRhdGUgVENF cyB0aGF0IG1hdGNoIHRoZSBzcGVjaWZpZWQgUEUjICovCkBAIC0xODM0LDcgKzE4NDgsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgcG52X3BjaV9pb2RhMl90Y2VfaW52YWxpZGF0ZV9wZShzdHJ1Y3Qg cG52X2lvZGFfcGUgKnBlKQogCQkJaWYgKCFucGUgfHwgbnBlLT5waGItPnR5cGUgIT0gUE5WX1BI Ql9OUFUpCiAJCQkJY29udGludWU7CiAKLQkJCXBudl9ucHVfdGNlX2ludmFsaWRhdGVfZW50aXJl KG5wZSk7CisJCQlwbnZfcGNpX2lvZGEyX3RjZV9pbnZhbGlkYXRlX2VudGlyZShucGUtPnBoYiwg ZmFsc2UpOwogCQl9CiB9CiAKQEAgLTE4ODMsMTQgKzE4OTcsMTkgQEAgc3RhdGljIHZvaWQgcG52 X3BjaV9pb2RhMl90Y2VfaW52YWxpZGF0ZShzdHJ1Y3QgaW9tbXVfdGFibGUgKnRibCwKIAkJCWlu ZGV4LCBucGFnZXMpOwogCiAJCWlmIChwZS0+ZmxhZ3MgJiBQTlZfSU9EQV9QRV9QRUVSKQotCQkJ LyogSW52YWxpZGF0ZSBQRXMgdXNpbmcgdGhlIHNhbWUgVENFIHRhYmxlICovCisJCQkvKgorCQkJ ICogVGhlIE5WTGluayBoYXJkd2FyZSBkb2VzIG5vdCBzdXBwb3J0IFRDRSBraWxsCisJCQkgKiBw ZXIgVENFIGVudHJ5IHNvIHdlIGhhdmUgdG8gaW52YWxpZGF0ZQorCQkJICogdGhlIGVudGlyZSBj YWNoZSBmb3IgaXQuCisJCQkgKi8KIAkJCWZvciAoaSA9IDA7IGkgPCBQTlZfSU9EQV9NQVhfUEVF Ul9QRVM7IGkrKykgewogCQkJCW5wZSA9IHBlLT5wZWVyc1tpXTsKLQkJCQlpZiAoIW5wZSB8fCBu cGUtPnBoYi0+dHlwZSAhPSBQTlZfUEhCX05QVSkKKwkJCQlpZiAoIW5wZSB8fCBucGUtPnBoYi0+ dHlwZSAhPSBQTlZfUEhCX05QVSB8fAorCQkJCQkJIW5wZS0+cGhiLT5pb2RhLnRjZV9pbnZhbF9y ZWcpCiAJCQkJCWNvbnRpbnVlOwogCi0JCQkJcG52X25wdV90Y2VfaW52YWxpZGF0ZShucGUsIHRi bCwgaW5kZXgsCi0JCQkJCQkJbnBhZ2VzLCBybSk7CisJCQkJcG52X3BjaV9pb2RhMl90Y2VfaW52 YWxpZGF0ZV9lbnRpcmUobnBlLT5waGIsCisJCQkJCQlybSk7CiAJCQl9CiAJfQogfQpkaWZmIC0t Z2l0IGEvYXJjaC9wb3dlcnBjL3BsYXRmb3Jtcy9wb3dlcm52L3BjaS5oIGIvYXJjaC9wb3dlcnBj L3BsYXRmb3Jtcy9wb3dlcm52L3BjaS5oCmluZGV4IDNmODE0ZjMuLjBiODlhNGMgMTAwNjQ0Ci0t LSBhL2FyY2gvcG93ZXJwYy9wbGF0Zm9ybXMvcG93ZXJudi9wY2kuaAorKysgYi9hcmNoL3Bvd2Vy cGMvcGxhdGZvcm1zL3Bvd2VybnYvcGNpLmgKQEAgLTIzNywxNSArMjM3LDEwIEBAIGV4dGVybiBp bnQgcG52X3NldHVwX21zaV9pcnFzKHN0cnVjdCBwY2lfZGV2ICpwZGV2LCBpbnQgbnZlYywgaW50 IHR5cGUpOwogZXh0ZXJuIHZvaWQgcG52X3RlYXJkb3duX21zaV9pcnFzKHN0cnVjdCBwY2lfZGV2 ICpwZGV2KTsKIAogLyogTnZsaW5rIGZ1bmN0aW9ucyAqLwotZXh0ZXJuIHZvaWQgcG52X25wdV90 Y2VfaW52YWxpZGF0ZV9lbnRpcmUoc3RydWN0IHBudl9pb2RhX3BlICpucGUpOwotZXh0ZXJuIHZv aWQgcG52X25wdV90Y2VfaW52YWxpZGF0ZShzdHJ1Y3QgcG52X2lvZGFfcGUgKm5wZSwKLQkJCQkg ICAgICAgc3RydWN0IGlvbW11X3RhYmxlICp0YmwsCi0JCQkJICAgICAgIHVuc2lnbmVkIGxvbmcg aW5kZXgsCi0JCQkJICAgICAgIHVuc2lnbmVkIGxvbmcgbnBhZ2VzLAotCQkJCSAgICAgICBib29s IHJtKTsKIGV4dGVybiB2b2lkIHBudl9ucHVfaW5pdF9kbWFfcGUoc3RydWN0IHBudl9pb2RhX3Bl ICpucGUpOwogZXh0ZXJuIHZvaWQgcG52X25wdV9zZXR1cF9kbWFfcGUoc3RydWN0IHBudl9pb2Rh X3BlICpucGUpOwogZXh0ZXJuIGludCBwbnZfbnB1X2RtYV9zZXRfYnlwYXNzKHN0cnVjdCBwbnZf aW9kYV9wZSAqbnBlLCBib29sIGVuYWJsZWQpOwogZXh0ZXJuIGludCBwbnZfbnB1X2RtYV9zZXRf bWFzayhzdHJ1Y3QgcGNpX2RldiAqbnBkZXYsIHU2NCBkbWFfbWFzayk7CitleHRlcm4gdm9pZCBw bnZfcGNpX2lvZGEyX3RjZV9pbnZhbGlkYXRlX2VudGlyZShzdHJ1Y3QgcG52X3BoYiAqcGhiLCBi b29sIHJtKTsKIAogI2VuZGlmIC8qIF9fUE9XRVJOVl9QQ0lfSCAqLwotLSAKMi41LjAucmMzCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpMaW51eHBwYy1k ZXYgbWFpbGluZyBsaXN0CkxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnCmh0dHBzOi8vbGlz dHMub3psYWJzLm9yZy9saXN0aW5mby9saW51eHBwYy1kZXY=