From: Jordan Crouse Subject: [PATCH 03/16] iommu/io-pgtable-arm: Remove ttbr[1] from io_pgtbl_cfg Date: Fri, 18 May 2018 15:34:47 -0600 Message-ID: <20180518213500.31595-4-jcrouse@codeaurora.org> References: <20180518213500.31595-1-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180518213500.31595-1-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, vivek.gautam-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgd2UgaGF2ZSBhIHdvcmtpbmcgZXhhbXBsZSBvZiBhbiBBUk0gZHJpdmVyIHRoYXQg aW1wbGVtZW50cwpzcGxpdCBwYWdldGFibGVzIGNvbXBsZXRlbHkgaW4gdGhlIGNsaWVudCBkcml2 ZXIgaXQgaXMgYXBwYXJlbnQgdGhhdAp3ZSBkb24ndCBuZWVkIHRvIHN0b3JlIGFuIGV4dHJhIHR0 YnIgdmFsdWUgaW4gdGhlIGlvX3BndGJsX2NmZyBzdHJ1Y3QKdGhhdCB3aWxsIG5ldmVyIGdldCB1 c2VkLgoKU2lnbmVkLW9mZi1ieTogSm9yZGFuIENyb3VzZSA8amNyb3VzZUBjb2RlYXVyb3JhLm9y Zz4KLS0tCiBkcml2ZXJzL2lvbW11L2FybS1zbW11LXYzLWNvbnRleHQuYyB8IDIgKy0KIGRyaXZl cnMvaW9tbXUvYXJtLXNtbXUuYyAgICAgICAgICAgIHwgOCArKysrLS0tLQogZHJpdmVycy9pb21t dS9pby1wZ3RhYmxlLWFybS12N3MuYyAgfCAzICstLQogZHJpdmVycy9pb21tdS9pby1wZ3RhYmxl LWFybS5jICAgICAgfCA1ICsrLS0tCiBkcml2ZXJzL2lvbW11L2lvLXBndGFibGUuaCAgICAgICAg ICB8IDQgKystLQogZHJpdmVycy9pb21tdS9pcG1tdS12bXNhLmMgICAgICAgICAgfCAyICstCiBk cml2ZXJzL2lvbW11L21zbV9pb21tdS5jICAgICAgICAgICB8IDQgKystLQogZHJpdmVycy9pb21t dS9tdGtfaW9tbXUuYyAgICAgICAgICAgfCA0ICsrLS0KIGRyaXZlcnMvaW9tbXUvcWNvbV9pb21t dS5jICAgICAgICAgIHwgMyArLS0KIDkgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwg MTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21tdS9hcm0tc21tdS12My1j b250ZXh0LmMgYi9kcml2ZXJzL2lvbW11L2FybS1zbW11LXYzLWNvbnRleHQuYwppbmRleCAyMmU3 YjgwYTc2ODIuLmQyM2UwMDkyZjkxNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9pb21tdS9hcm0tc21t dS12My1jb250ZXh0LmMKKysrIGIvZHJpdmVycy9pb21tdS9hcm0tc21tdS12My1jb250ZXh0LmMK QEAgLTUyMiw3ICs1MjIsNyBAQCBhcm1fc21tdV9hbGxvY19wcml2X2NkKHN0cnVjdCBpb21tdV9w YXNpZF90YWJsZV9vcHMgKm9wcywKIAogCXN3aXRjaCAoZm10KSB7CiAJY2FzZSBBUk1fNjRfTFBB RV9TMToKLQkJY2QtPnR0YnIJPSBjZmctPmFybV9scGFlX3MxX2NmZy50dGJyWzBdOworCQljZC0+ dHRicgk9IGNmZy0+YXJtX2xwYWVfczFfY2ZnLnR0YnI7CiAJCWNkLT50Y3IJCT0gY2ZnLT5hcm1f bHBhZV9zMV9jZmcudGNyOwogCQljZC0+bWFpcgk9IGNmZy0+YXJtX2xwYWVfczFfY2ZnLm1haXJb MF07CiAJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21tdS9hcm0tc21tdS5jIGIvZHJp dmVycy9pb21tdS9hcm0tc21tdS5jCmluZGV4IDM1NjhlOGIwNzNlYy4uZDQ1OTkwOTg3N2MzIDEw MDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2FybS1zbW11LmMKKysrIGIvZHJpdmVycy9pb21tdS9h cm0tc21tdS5jCkBAIC02NDQsNyArNjQ0LDcgQEAgc3RhdGljIHZvaWQgYXJtX3NtbXVfaW5pdF90 dGJyMShzdHJ1Y3QgYXJtX3NtbXVfZG9tYWluICpzbW11X2RvbWFpbiwKIAkJY2ItPnNwbGl0X3Rh YmxlX21hc2sgPSAoMVVMTCA8PCA0OCk7CiAJfQogCi0JY2ItPnR0YnJbMV0gPSBwZ3RibF9jZmct PmFybV9scGFlX3MxX2NmZy50dGJyWzBdOworCWNiLT50dGJyWzFdID0gcGd0YmxfY2ZnLT5hcm1f bHBhZV9zMV9jZmcudHRicjsKIAljYi0+dHRiclsxXSB8PSAodTY0KWNmZy0+YXNpZCA8PCBUVEJS bl9BU0lEX1NISUZUOwogfQogCkBAIC02NzUsMTAgKzY3NSwxMCBAQCBzdGF0aWMgdm9pZCBhcm1f c21tdV9pbml0X2NvbnRleHRfYmFuayhzdHJ1Y3QgYXJtX3NtbXVfZG9tYWluICpzbW11X2RvbWFp biwKIAkvKiBUVEJScyAqLwogCWlmIChzdGFnZTEpIHsKIAkJaWYgKGNmZy0+Zm10ID09IEFSTV9T TU1VX0NUWF9GTVRfQUFSQ0gzMl9TKSB7Ci0JCQljYi0+dHRiclswXSA9IHBndGJsX2NmZy0+YXJt X3Y3c19jZmcudHRiclswXTsKLQkJCWNiLT50dGJyWzFdID0gcGd0YmxfY2ZnLT5hcm1fdjdzX2Nm Zy50dGJyWzFdOworCQkJY2ItPnR0YnJbMF0gPSBwZ3RibF9jZmctPmFybV92N3NfY2ZnLnR0YnI7 CisJCQljYi0+dHRiclsxXSA9IDA7CiAJCX0gZWxzZSB7Ci0JCQljYi0+dHRiclswXSA9IHBndGJs X2NmZy0+YXJtX2xwYWVfczFfY2ZnLnR0YnJbMF07CisJCQljYi0+dHRiclswXSA9IHBndGJsX2Nm Zy0+YXJtX2xwYWVfczFfY2ZnLnR0YnI7CiAJCQljYi0+dHRiclswXSB8PSAodTY0KWNmZy0+YXNp ZCA8PCBUVEJSbl9BU0lEX1NISUZUOwogCiAJCQkvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21t dS9pby1wZ3RhYmxlLWFybS12N3MuYyBiL2RyaXZlcnMvaW9tbXUvaW8tcGd0YWJsZS1hcm0tdjdz LmMKaW5kZXggMTBlNGEzZDExYzAyLi4zN2Q2MDdhYzUxNTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv aW9tbXUvaW8tcGd0YWJsZS1hcm0tdjdzLmMKKysrIGIvZHJpdmVycy9pb21tdS9pby1wZ3RhYmxl LWFybS12N3MuYwpAQCAtNzY3LDExICs3NjcsMTAgQEAgc3RhdGljIHN0cnVjdCBpb19wZ3RhYmxl ICphcm1fdjdzX2FsbG9jX3BndGFibGUoc3RydWN0IGlvX3BndGFibGVfY2ZnICpjZmcsCiAJd21i KCk7CiAKIAkvKiBUVEJScyAqLwotCWNmZy0+YXJtX3Y3c19jZmcudHRiclswXSA9IHZpcnRfdG9f cGh5cyhkYXRhLT5wZ2QpIHwKKwljZmctPmFybV92N3NfY2ZnLnR0YnIgPSB2aXJ0X3RvX3BoeXMo ZGF0YS0+cGdkKSB8CiAJCQkJICAgQVJNX1Y3U19UVEJSX1MgfCBBUk1fVjdTX1RUQlJfTk9TIHwK IAkJCQkgICBBUk1fVjdTX1RUQlJfSVJHTl9BVFRSKEFSTV9WN1NfUkdOX1dCV0EpIHwKIAkJCQkg ICBBUk1fVjdTX1RUQlJfT1JHTl9BVFRSKEFSTV9WN1NfUkdOX1dCV0EpOwotCWNmZy0+YXJtX3Y3 c19jZmcudHRiclsxXSA9IDA7CiAJcmV0dXJuICZkYXRhLT5pb3A7CiAKIG91dF9mcmVlX2RhdGE6 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lvbW11L2lvLXBndGFibGUtYXJtLmMgYi9kcml2ZXJzL2lv bW11L2lvLXBndGFibGUtYXJtLmMKaW5kZXggOTIwZDlmYWEyYTc2Li41YmJhMzBkOTAxYjQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvaW9tbXUvaW8tcGd0YWJsZS1hcm0uYworKysgYi9kcml2ZXJzL2lv bW11L2lvLXBndGFibGUtYXJtLmMKQEAgLTc5Myw5ICs3OTMsOCBAQCBhcm1fNjRfbHBhZV9hbGxv Y19wZ3RhYmxlX3MxKHN0cnVjdCBpb19wZ3RhYmxlX2NmZyAqY2ZnLCB2b2lkICpjb29raWUpCiAJ LyogRW5zdXJlIHRoZSBlbXB0eSBwZ2QgaXMgdmlzaWJsZSBiZWZvcmUgYW55IGFjdHVhbCBUVEJS IHdyaXRlICovCiAJd21iKCk7CiAKLQkvKiBUVEJScyAqLwotCWNmZy0+YXJtX2xwYWVfczFfY2Zn LnR0YnJbMF0gPSB2aXJ0X3RvX3BoeXMoZGF0YS0+cGdkKTsKLQljZmctPmFybV9scGFlX3MxX2Nm Zy50dGJyWzFdID0gMDsKKwkvKiBUVEJSICovCisJY2ZnLT5hcm1fbHBhZV9zMV9jZmcudHRiciA9 IHZpcnRfdG9fcGh5cyhkYXRhLT5wZ2QpOwogCXJldHVybiAmZGF0YS0+aW9wOwogCiBvdXRfZnJl ZV9kYXRhOgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pb21tdS9pby1wZ3RhYmxlLmggYi9kcml2ZXJz L2lvbW11L2lvLXBndGFibGUuaAppbmRleCAyZGY3OTA5M2NhZDkuLmZkOWYwZmM0ZWI2MCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9pb21tdS9pby1wZ3RhYmxlLmgKKysrIGIvZHJpdmVycy9pb21tdS9p by1wZ3RhYmxlLmgKQEAgLTg3LDcgKzg3LDcgQEAgc3RydWN0IGlvX3BndGFibGVfY2ZnIHsKIAkv KiBMb3ctbGV2ZWwgZGF0YSBzcGVjaWZpYyB0byB0aGUgdGFibGUgZm9ybWF0ICovCiAJdW5pb24g ewogCQlzdHJ1Y3QgewotCQkJdTY0CXR0YnJbMl07CisJCQl1NjQJdHRicjsKIAkJCXU2NAl0Y3I7 CiAJCQl1NjQJbWFpclsyXTsKIAkJfSBhcm1fbHBhZV9zMV9jZmc7CkBAIC05OCw3ICs5OCw3IEBA IHN0cnVjdCBpb19wZ3RhYmxlX2NmZyB7CiAJCX0gYXJtX2xwYWVfczJfY2ZnOwogCiAJCXN0cnVj dCB7Ci0JCQl1MzIJdHRiclsyXTsKKwkJCXUzMgl0dGJyOwogCQkJdTMyCXRjcjsKIAkJCXUzMglu bXJyOwogCQkJdTMyCXBycnI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lvbW11L2lwbW11LXZtc2Eu YyBiL2RyaXZlcnMvaW9tbXUvaXBtbXUtdm1zYS5jCmluZGV4IDQwYWU2ZTg3Y2I4OC4uN2NkYWEw ZmVmODVhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2lwbW11LXZtc2EuYworKysgYi9kcml2 ZXJzL2lvbW11L2lwbW11LXZtc2EuYwpAQCAtNDQ3LDcgKzQ0Nyw3IEBAIHN0YXRpYyBpbnQgaXBt bXVfZG9tYWluX2luaXRfY29udGV4dChzdHJ1Y3QgaXBtbXVfdm1zYV9kb21haW4gKmRvbWFpbikK IAl9CiAKIAkvKiBUVEJSMCAqLwotCXR0YnIgPSBkb21haW4tPmNmZy5hcm1fbHBhZV9zMV9jZmcu dHRiclswXTsKKwl0dGJyID0gZG9tYWluLT5jZmcuYXJtX2xwYWVfczFfY2ZnLnR0YnI7CiAJaXBt bXVfY3R4X3dyaXRlX3Jvb3QoZG9tYWluLCBJTVRUTEJSMCwgdHRicik7CiAJaXBtbXVfY3R4X3dy aXRlX3Jvb3QoZG9tYWluLCBJTVRUVUJSMCwgdHRiciA+PiAzMik7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvaW9tbXUvbXNtX2lvbW11LmMgYi9kcml2ZXJzL2lvbW11L21zbV9pb21tdS5jCmluZGV4 IDBkMzM1MDQ2M2EzZi4uZWYzMjMzMDFjNTc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L21z bV9pb21tdS5jCisrKyBiL2RyaXZlcnMvaW9tbXUvbXNtX2lvbW11LmMKQEAgLTI4MSw4ICsyODEs OCBAQCBzdGF0aWMgdm9pZCBfX3Byb2dyYW1fY29udGV4dCh2b2lkIF9faW9tZW0gKmJhc2UsIGlu dCBjdHgsCiAJU0VUX1YyUENGRyhiYXNlLCBjdHgsIDB4Myk7CiAKIAlTRVRfVFRCQ1IoYmFzZSwg Y3R4LCBwcml2LT5jZmcuYXJtX3Y3c19jZmcudGNyKTsKLQlTRVRfVFRCUjAoYmFzZSwgY3R4LCBw cml2LT5jZmcuYXJtX3Y3c19jZmcudHRiclswXSk7Ci0JU0VUX1RUQlIxKGJhc2UsIGN0eCwgcHJp di0+Y2ZnLmFybV92N3NfY2ZnLnR0YnJbMV0pOworCVNFVF9UVEJSMChiYXNlLCBjdHgsIHByaXYt PmNmZy5hcm1fdjdzX2NmZy50dGJyKTsKKwlTRVRfVFRCUjEoYmFzZSwgY3R4LCAwKTsKIAogCS8q IFNldCBwcnJyIGFuZCBubXJyICovCiAJU0VUX1BSUlIoYmFzZSwgY3R4LCBwcml2LT5jZmcuYXJt X3Y3c19jZmcucHJycik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lvbW11L210a19pb21tdS5jIGIv ZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuYwppbmRleCBmMjgzMmExMGZjZWEuLmRiNzEwZDk5ZmM1 ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuYworKysgYi9kcml2ZXJzL2lv bW11L210a19pb21tdS5jCkBAIC0zNDQsNyArMzQ0LDcgQEAgc3RhdGljIGludCBtdGtfaW9tbXVf YXR0YWNoX2RldmljZShzdHJ1Y3QgaW9tbXVfZG9tYWluICpkb21haW4sCiAJLyogVXBkYXRlIHRo ZSBwZ3RhYmxlIGJhc2UgYWRkcmVzcyByZWdpc3RlciBvZiB0aGUgTTRVIEhXICovCiAJaWYgKCFk YXRhLT5tNHVfZG9tKSB7CiAJCWRhdGEtPm00dV9kb20gPSBkb207Ci0JCXdyaXRlbChkb20tPmNm Zy5hcm1fdjdzX2NmZy50dGJyWzBdLAorCQl3cml0ZWwoZG9tLT5jZmcuYXJtX3Y3c19jZmcudHRi ciwKIAkJICAgICAgIGRhdGEtPmJhc2UgKyBSRUdfTU1VX1BUX0JBU0VfQUREUik7CiAJfQogCkBA IC03MjUsNyArNzI1LDcgQEAgc3RhdGljIGludCBfX21heWJlX3VudXNlZCBtdGtfaW9tbXVfcmVz dW1lKHN0cnVjdCBkZXZpY2UgKmRldikKIAl3cml0ZWxfcmVsYXhlZChyZWctPmludF9tYWluX2Nv bnRyb2wsIGJhc2UgKyBSRUdfTU1VX0lOVF9NQUlOX0NPTlRST0wpOwogCXdyaXRlbF9yZWxheGVk KHJlZy0+aXZycF9wYWRkciwgYmFzZSArIFJFR19NTVVfSVZSUF9QQUREUik7CiAJaWYgKGRhdGEt Pm00dV9kb20pCi0JCXdyaXRlbChkYXRhLT5tNHVfZG9tLT5jZmcuYXJtX3Y3c19jZmcudHRiclsw XSwKKwkJd3JpdGVsKGRhdGEtPm00dV9kb20tPmNmZy5hcm1fdjdzX2NmZy50dGJyLAogCQkgICAg ICAgYmFzZSArIFJFR19NTVVfUFRfQkFTRV9BRERSKTsKIAlyZXR1cm4gMDsKIH0KZGlmZiAtLWdp dCBhL2RyaXZlcnMvaW9tbXUvcWNvbV9pb21tdS5jIGIvZHJpdmVycy9pb21tdS9xY29tX2lvbW11 LmMKaW5kZXggNjViOWM5OTcwN2Y4Li5iMGY1ZmQ1YjMzYzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv aW9tbXUvcWNvbV9pb21tdS5jCisrKyBiL2RyaXZlcnMvaW9tbXUvcWNvbV9pb21tdS5jCkBAIC0y NTcsMTAgKzI1Nyw5IEBAIHN0YXRpYyBpbnQgcWNvbV9pb21tdV9pbml0X2RvbWFpbihzdHJ1Y3Qg aW9tbXVfZG9tYWluICpkb21haW4sCiAKIAkJLyogVFRCUnMgKi8KIAkJaW9tbXVfd3JpdGVxKGN0 eCwgQVJNX1NNTVVfQ0JfVFRCUjAsCi0JCQkJcGd0YmxfY2ZnLmFybV9scGFlX3MxX2NmZy50dGJy WzBdIHwKKwkJCQlwZ3RibF9jZmcuYXJtX2xwYWVfczFfY2ZnLnR0YnIgfAogCQkJCSgodTY0KWN0 eC0+YXNpZCA8PCBUVEJSbl9BU0lEX1NISUZUKSk7CiAJCWlvbW11X3dyaXRlcShjdHgsIEFSTV9T TU1VX0NCX1RUQlIxLAotCQkJCXBndGJsX2NmZy5hcm1fbHBhZV9zMV9jZmcudHRiclsxXSB8CiAJ CQkJKCh1NjQpY3R4LT5hc2lkIDw8IFRUQlJuX0FTSURfU0hJRlQpKTsKIAogCQkvKiBUVEJDUiAq LwotLSAKMi4xNy4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJl bm8K