From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: [PATCH RFC 049/111] staging: etnaviv: move MMU setup and teardown code to etnaviv_mmu.c Date: Thu, 2 Apr 2015 17:29:51 +0200 Message-ID: <1427988653-754-50-git-send-email-l.stach@pengutronix.de> References: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [92.198.50.35]) by gabe.freedesktop.org (Postfix) with ESMTP id CFA7F6EA43 for ; Thu, 2 Apr 2015 08:30:58 -0700 (PDT) In-Reply-To: <1427988653-754-1-git-send-email-l.stach@pengutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Russell King , kernel@pengutronix.de List-Id: dri-devel@lists.freedesktop.org RnJvbTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybS5saW51eC5vcmcudWs+CgpNb3ZlIHRo ZSBjb2RlIHdoaWNoIHNldHMgdXAgYW5kIHRlYXJzIGRvd24gdGhlIE1NVSBtYXBwaW5ncyAoaW93 LAphbGxvY2F0ZXMgYSBub2RlIGluIHRoZSBkcm1fbW0sIGFuZCB0aGVuIGNhbGxzIHRoZSBpb21t dSB0byBzZXR1cAp0aGUgYWN0dWFsIG1hcHBpbmcsIGFuZCB0aGUgcmV2ZXJzZSkgaW50byBldG5h dml2X21tdS5jCgpTaWduZWQtb2ZmLWJ5OiBSdXNzZWxsIEtpbmcgPHJtaytrZXJuZWxAYXJtLmxp bnV4Lm9yZy51az4KLS0tCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jIHwg MzMgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9l dG5hdml2X21tdS5jIHwgNDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRy aXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0bmF2aXZfbW11LmggfCAgNiArKysrKwogMyBmaWxlcyBj aGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jIGIvZHJpdmVycy9zdGFnaW5nL2V0 bmF2aXYvZXRuYXZpdl9nZW0uYwppbmRleCA2NDc4MTVlNGYxYmEuLmFiN2M2ZGI0ZWMxMCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9nZW0uYworKysgYi9kcml2 ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X2dlbS5jCkBAIC0yNzgsMzIgKzI3OCwxMiBAQCBp bnQgZXRuYXZpdl9nZW1fZ2V0X2lvdmFfbG9ja2VkKHN0cnVjdCBldG5hdml2X2dwdSAqZ3B1LAog CXN0cnVjdCBldG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqID0gdG9fZXRuYXZpdl9ibyhv YmopOwogCWludCByZXQgPSAwOwogCi0JaWYgKCFldG5hdml2X29iai0+aW92YSAgJiYgIShldG5h dml2X29iai0+ZmxhZ3MgJiBFVE5BX0JPX0NNRFNUUkVBTSkpIHsKLQkJc3RydWN0IGV0bmF2aXZf ZHJtX3ByaXZhdGUgKnByaXYgPSBvYmotPmRldi0+ZGV2X3ByaXZhdGU7Ci0JCXN0cnVjdCBldG5h dml2X2lvbW11ICptbXUgPSBwcml2LT5tbXU7CisJaWYgKCFldG5hdml2X29iai0+aW92YSAmJiAh KGV0bmF2aXZfb2JqLT5mbGFncyAmIEVUTkFfQk9fQ01EU1RSRUFNKSkgewogCQlzdHJ1Y3QgcGFn ZSAqKnBhZ2VzID0gZXRuYXZpdl9nZW1fZ2V0X3BhZ2VzKGV0bmF2aXZfb2JqKTsKLQkJdWludDMy X3Qgb2Zmc2V0OwotCQlzdHJ1Y3QgZHJtX21tX25vZGUgKm5vZGUgPSBOVUxMOwotCiAJCWlmIChJ U19FUlIocGFnZXMpKQogCQkJcmV0dXJuIFBUUl9FUlIocGFnZXMpOwogCi0JCW5vZGUgPSBremFs bG9jKHNpemVvZigqbm9kZSksIEdGUF9LRVJORUwpOwotCQlpZiAoIW5vZGUpCi0JCQlyZXR1cm4g LUVOT01FTTsKLQotCQlyZXQgPSBkcm1fbW1faW5zZXJ0X25vZGUoJm1tdS0+bW0sIG5vZGUsIG9i ai0+c2l6ZSwgMCwKLQkJCQlEUk1fTU1fU0VBUkNIX0RFRkFVTFQpOwotCi0JCWlmICghcmV0KSB7 Ci0JCQlvZmZzZXQgPSBub2RlLT5zdGFydDsKLQkJCWV0bmF2aXZfb2JqLT5pb3ZhID0gb2Zmc2V0 OwotCQkJZXRuYXZpdl9vYmotPmdwdV92cmFtX25vZGUgPSBub2RlOwotCi0JCQlyZXQgPSBldG5h dml2X2lvbW11X21hcChtbXUsIG9mZnNldCwgZXRuYXZpdl9vYmotPnNndCwKLQkJCQkJb2JqLT5z aXplLCBJT01NVV9SRUFEIHwgSU9NTVVfV1JJVEUpOwotCQl9IGVsc2UKLQkJCWtmcmVlKG5vZGUp OworCQlyZXQgPSBldG5hdml2X2lvbW11X21hcF9nZW0oZ3B1LT5tbXUsIGV0bmF2aXZfb2JqKTsK IAl9CiAKIAlpZiAoIXJldCkKQEAgLTUzMSwxMyArNTExLDggQEAgc3RhdGljIHZvaWQgZXRuYXZp dl9mcmVlX29iaihzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaikKIAlzdHJ1Y3QgZXRuYXZpdl9k cm1fcHJpdmF0ZSAqcHJpdiA9IG9iai0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZXRuYXZp dl9pb21tdSAqbW11ID0gcHJpdi0+bW11OwogCi0JaWYgKG1tdSAmJiBldG5hdml2X29iai0+aW92 YSkgewotCQl1aW50MzJfdCBvZmZzZXQgPSBldG5hdml2X29iai0+Z3B1X3ZyYW1fbm9kZS0+c3Rh cnQ7Ci0KLQkJZXRuYXZpdl9pb21tdV91bm1hcChtbXUsIG9mZnNldCwgZXRuYXZpdl9vYmotPnNn dCwgb2JqLT5zaXplKTsKLQkJZHJtX21tX3JlbW92ZV9ub2RlKGV0bmF2aXZfb2JqLT5ncHVfdnJh bV9ub2RlKTsKLQkJa2ZyZWUoZXRuYXZpdl9vYmotPmdwdV92cmFtX25vZGUpOwotCX0KKwlpZiAo bW11KQorCQlldG5hdml2X2lvbW11X3VubWFwX2dlbShtbXUsIGV0bmF2aXZfb2JqKTsKIH0KIAog c3RhdGljIHZvaWQgZXRuYXZpdl9nZW1fc2htZW1fcmVsZWFzZShzdHJ1Y3QgZXRuYXZpdl9nZW1f b2JqZWN0ICpldG5hdml2X29iaikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2 L2V0bmF2aXZfbW11LmMgYi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X21tdS5jCmlu ZGV4IDUxZDkxZTNkMzBlZC4uMmVmZmU3NWNiMTU0IDEwMDY0NAotLS0gYS9kcml2ZXJzL3N0YWdp bmcvZXRuYXZpdi9ldG5hdml2X21tdS5jCisrKyBiL2RyaXZlcnMvc3RhZ2luZy9ldG5hdml2L2V0 bmF2aXZfbW11LmMKQEAgLTE2LDYgKzE2LDcgQEAKICAqLwogCiAjaW5jbHVkZSAiZXRuYXZpdl9k cnYuaCIKKyNpbmNsdWRlICJldG5hdml2X2dlbS5oIgogI2luY2x1ZGUgImV0bmF2aXZfbW11Lmgi CiAKIHN0YXRpYyBpbnQgZXRuYXZpdl9mYXVsdF9oYW5kbGVyKHN0cnVjdCBpb21tdV9kb21haW4g KmlvbW11LCBzdHJ1Y3QgZGV2aWNlICpkZXYsCkBAIC05MCw2ICs5MSw0OCBAQCBpbnQgZXRuYXZp dl9pb21tdV91bm1hcChzdHJ1Y3QgZXRuYXZpdl9pb21tdSAqaW9tbXUsIHVpbnQzMl90IGlvdmEs CiAJcmV0dXJuIDA7CiB9CiAKK2ludCBldG5hdml2X2lvbW11X21hcF9nZW0oc3RydWN0IGV0bmF2 aXZfaW9tbXUgKm1tdSwKKwlzdHJ1Y3QgZXRuYXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iaikK K3sKKwlzdHJ1Y3Qgc2dfdGFibGUgKnNndCA9IGV0bmF2aXZfb2JqLT5zZ3Q7CisJdWludDMyX3Qg b2Zmc2V0OworCXN0cnVjdCBkcm1fbW1fbm9kZSAqbm9kZSA9IE5VTEw7CisJaW50IHJldDsKKwor CW5vZGUgPSBremFsbG9jKHNpemVvZigqbm9kZSksIEdGUF9LRVJORUwpOworCWlmICghbm9kZSkK KwkJcmV0dXJuIC1FTk9NRU07CisKKwlyZXQgPSBkcm1fbW1faW5zZXJ0X25vZGUoJm1tdS0+bW0s IG5vZGUsIGV0bmF2aXZfb2JqLT5iYXNlLnNpemUsIDAsCisJCQkJIERSTV9NTV9TRUFSQ0hfREVG QVVMVCk7CisKKwlpZiAoIXJldCkgeworCQlvZmZzZXQgPSBub2RlLT5zdGFydDsKKwkJZXRuYXZp dl9vYmotPmlvdmEgPSBvZmZzZXQ7CisJCWV0bmF2aXZfb2JqLT5ncHVfdnJhbV9ub2RlID0gbm9k ZTsKKworCQlyZXQgPSBldG5hdml2X2lvbW11X21hcChtbXUsIG9mZnNldCwgc2d0LAorCQkJCQll dG5hdml2X29iai0+YmFzZS5zaXplLAorCQkJCQlJT01NVV9SRUFEIHwgSU9NTVVfV1JJVEUpOwor CX0gZWxzZQorCQlrZnJlZShub2RlKTsKKworCXJldHVybiByZXQ7Cit9CisKK3ZvaWQgZXRuYXZp dl9pb21tdV91bm1hcF9nZW0oc3RydWN0IGV0bmF2aXZfaW9tbXUgKm1tdSwKKwlzdHJ1Y3QgZXRu YXZpdl9nZW1fb2JqZWN0ICpldG5hdml2X29iaikKK3sKKwlpZiAoZXRuYXZpdl9vYmotPmlvdmEp IHsKKwkJdWludDMyX3Qgb2Zmc2V0ID0gZXRuYXZpdl9vYmotPmdwdV92cmFtX25vZGUtPnN0YXJ0 OworCisJCWV0bmF2aXZfaW9tbXVfdW5tYXAobW11LCBvZmZzZXQsIGV0bmF2aXZfb2JqLT5zZ3Qs CisJCQkJICAgIGV0bmF2aXZfb2JqLT5iYXNlLnNpemUpOworCQlkcm1fbW1fcmVtb3ZlX25vZGUo ZXRuYXZpdl9vYmotPmdwdV92cmFtX25vZGUpOworCQlrZnJlZShldG5hdml2X29iai0+Z3B1X3Zy YW1fbm9kZSk7CisJfQorfQorCiB2b2lkIGV0bmF2aXZfaW9tbXVfZGVzdHJveShzdHJ1Y3QgZXRu YXZpdl9pb21tdSAqbW11KQogewogCWRybV9tbV90YWtlZG93bigmbW11LT5tbSk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X21tdS5oIGIvZHJpdmVycy9zdGFn aW5nL2V0bmF2aXYvZXRuYXZpdl9tbXUuaAppbmRleCAxYWRjYzNhYjRlYmMuLjI2MmM0ZTI2ZTkw MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL2V0bmF2aXYvZXRuYXZpdl9tbXUuaAorKysg Yi9kcml2ZXJzL3N0YWdpbmcvZXRuYXZpdi9ldG5hdml2X21tdS5oCkBAIC0yOSwxMiArMjksMTgg QEAgc3RydWN0IGV0bmF2aXZfaW9tbXUgewogCWJvb2wgbmVlZF9mbHVzaDsKIH07CiAKK3N0cnVj dCBldG5hdml2X2dlbV9vYmplY3Q7CisKIGludCBldG5hdml2X2lvbW11X2F0dGFjaChzdHJ1Y3Qg ZXRuYXZpdl9pb21tdSAqaW9tbXUsIGNvbnN0IGNoYXIgKipuYW1lcywKIAlpbnQgY250KTsKIGlu dCBldG5hdml2X2lvbW11X21hcChzdHJ1Y3QgZXRuYXZpdl9pb21tdSAqaW9tbXUsIHVpbnQzMl90 IGlvdmEsCiAJc3RydWN0IHNnX3RhYmxlICpzZ3QsIHVuc2lnbmVkIGxlbiwgaW50IHByb3QpOwog aW50IGV0bmF2aXZfaW9tbXVfdW5tYXAoc3RydWN0IGV0bmF2aXZfaW9tbXUgKmlvbW11LCB1aW50 MzJfdCBpb3ZhLAogCXN0cnVjdCBzZ190YWJsZSAqc2d0LCB1bnNpZ25lZCBsZW4pOworaW50IGV0 bmF2aXZfaW9tbXVfbWFwX2dlbShzdHJ1Y3QgZXRuYXZpdl9pb21tdSAqbW11LAorCXN0cnVjdCBl dG5hdml2X2dlbV9vYmplY3QgKmV0bmF2aXZfb2JqKTsKK3ZvaWQgZXRuYXZpdl9pb21tdV91bm1h cF9nZW0oc3RydWN0IGV0bmF2aXZfaW9tbXUgKm1tdSwKKwlzdHJ1Y3QgZXRuYXZpdl9nZW1fb2Jq ZWN0ICpldG5hdml2X29iaik7CiB2b2lkIGV0bmF2aXZfaW9tbXVfZGVzdHJveShzdHJ1Y3QgZXRu YXZpdl9pb21tdSAqaW9tbXUpOwogCiBzdHJ1Y3QgZXRuYXZpdl9pb21tdSAqZXRuYXZpdl9pb21t dV9uZXcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=