From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id E72EB89301 for ; Mon, 15 Apr 2019 08:59:45 +0000 (UTC) From: Daniel Mrzyglod Date: Mon, 15 Apr 2019 10:59:35 +0200 Message-Id: <20190415085937.5110-4-daniel.t.mrzyglod@intel.com> In-Reply-To: <20190415085937.5110-1-daniel.t.mrzyglod@intel.com> References: <20190415085937.5110-1-daniel.t.mrzyglod@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v3 3/5] lib/intel_mmio: different functions are used for mapping if fd is known. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: aW50ZWxfbW1pb191c2VfcGNpX2JhciBmdW5jdGlvbiBpZiBmZCBpcyBrbm93biBub3cgdXNlIGln dF9kZXZpY2VfbWFwX3BjaV9iYXJfcmVnaW9uLgpvbGQgbWV0aG9kIGZyb20gcGNpYWNjZXNzIGxp YnJhcnkgaXMgbGVmdCBmb3IgbGVnYWN5CmFwcHMgdGhhdCB3b3JrIHdoZW4gZHJpdmVyIGlzIG5v dCBsb2FkZWQuCgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgTXJ6eWdsb2QgPGRhbmllbC50Lm1yenln bG9kQGludGVsLmNvbT4KLS0tCiBsaWIvaW50ZWxfaW8uaCAgICAgICAgICAgIHwgIDIgKy0KIGxp Yi9pbnRlbF9tbWlvLmMgICAgICAgICAgfCAzMiArKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLQogdG9vbHMvaW50ZWxfYXVkaW9fZHVtcC5jICB8ICAyICstCiB0b29scy9pbnRlbF9iYWNr bGlnaHQuYyAgIHwgIDIgKy0KIHRvb2xzL2ludGVsX2dwdV90aW1lLmMgICAgfCAgMiArLQogdG9v bHMvaW50ZWxfbGlkLmMgICAgICAgICB8ICAyICstCiB0b29scy9pbnRlbF9yZWcuYyAgICAgICAg IHwgIDIgKy0KIHRvb2xzL2ludGVsX3JlZ19jaGVja2VyLmMgfCAgMiArLQogOCBmaWxlcyBjaGFu Z2VkLCAzMCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIv aW50ZWxfaW8uaCBiL2xpYi9pbnRlbF9pby5oCmluZGV4IDYwMTRjNDg1Li4wOWZlYTM4NiAxMDA2 NDQKLS0tIGEvbGliL2ludGVsX2lvLmgKKysrIGIvbGliL2ludGVsX2lvLmgKQEAgLTMzLDcgKzMz LDcgQEAKIAogLyogcmVnaXN0ZXIgYWNjZXNzIGhlbHBlcnMgZnJvbSBpbnRlbF9tbWlvLmMgKi8K IGV4dGVybiB2b2lkICppZ3RfZ2xvYmFsX21taW87Ci12b2lkIGludGVsX21taW9fdXNlX3BjaV9i YXIoc3RydWN0IHBjaV9kZXZpY2UgKnBjaV9kZXYpOwordm9pZCBpbnRlbF9tbWlvX3VzZV9wY2lf YmFyKHN0cnVjdCBwY2lfZGV2aWNlICpwY2lfZGV2LCBpbnQgZmQpOwogdm9pZCBpbnRlbF9tbWlv X3VzZV9kdW1wX2ZpbGUoY2hhciAqZmlsZSk7CiAKIGludCBpbnRlbF9yZWdpc3Rlcl9hY2Nlc3Nf aW5pdChzdHJ1Y3QgcGNpX2RldmljZSAqcGNpX2RldiwgaW50IHNhZmUsIGludCBmZCk7CmRpZmYg LS1naXQgYS9saWIvaW50ZWxfbW1pby5jIGIvbGliL2ludGVsX21taW8uYwppbmRleCBhNTQ1OGFl Yi4uZGFjYTFhZDIgMTAwNjQ0Ci0tLSBhL2xpYi9pbnRlbF9tbWlvLmMKKysrIGIvbGliL2ludGVs X21taW8uYwpAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUgImlndF9jb3JlLmgiCiAjaW5jbHVk ZSAiaWd0X2d0LmgiCiAjaW5jbHVkZSAiaW50ZWxfY2hpcHNldC5oIgorI2luY2x1ZGUgImlndF9k ZXZpY2UuaCIKIAogLyoqCiAgKiBTRUNUSU9OOmludGVsX2lvCkBAIC0xMTUsNyArMTE2LDcgQEAg aW50ZWxfbW1pb191c2VfZHVtcF9maWxlKGNoYXIgKmZpbGUpCiAgKiBAcGNpX2RldiBjYW4gYmUg b2J0YWluZWQgZnJvbSBpbnRlbF9nZXRfcGNpX2RldmljZSgpLgogICovCiB2b2lkCi1pbnRlbF9t bWlvX3VzZV9wY2lfYmFyKHN0cnVjdCBwY2lfZGV2aWNlICpwY2lfZGV2KQoraW50ZWxfbW1pb191 c2VfcGNpX2JhcihzdHJ1Y3QgcGNpX2RldmljZSAqcGNpX2RldiwgaW50IGZkKQogewogCXVpbnQz Ml90IGRldmlkLCBnZW47CiAJaW50IG1taW9fYmFyLCBtbWlvX3NpemU7CkBAIC0xMzUsMTQgKzEz NiwyNyBAQCBpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKHN0cnVjdCBwY2lfZGV2aWNlICpwY2lfZGV2 KQogCWVsc2UKIAkJbW1pb19zaXplID0gMioxMDI0KjEwMjQ7CiAKLQllcnJvciA9IHBjaV9kZXZp Y2VfbWFwX3JhbmdlIChwY2lfZGV2LAotCQkJCSAgICAgIHBjaV9kZXYtPnJlZ2lvbnNbbW1pb19i YXJdLmJhc2VfYWRkciwKLQkJCQkgICAgICBtbWlvX3NpemUsCi0JCQkJICAgICAgUENJX0RFVl9N QVBfRkxBR19XUklUQUJMRSwKLQkJCQkgICAgICAmaWd0X2dsb2JhbF9tbWlvKTsKKwkvKiBJdCdz IGZvciBzb21lIGxlZ2FjeSB0b29scyBleGlzdGluZyBpbiB0cmVlIHRoYXQgcmVxdWlyZQorCSAq IHdvcmtpbmcgd2l0aG91dCBkcml2ZXIKKwkgKi8KKworCWlmIChmZCA9PSAtMSkgeworCQllcnJv ciA9IHBjaV9kZXZpY2VfbWFwX3JhbmdlKHBjaV9kZXYsCisJCQkJCSAgICAgcGNpX2Rldi0+cmVn aW9uc1ttbWlvX2Jhcl0uYmFzZV9hZGRyLAorCQkJCQkgICAgIG1taW9fc2l6ZSwKKwkJCQkJICAg ICBQQ0lfREVWX01BUF9GTEFHX1dSSVRBQkxFLAorCQkJCQkgICAgICZpZ3RfZ2xvYmFsX21taW8p OworCisJCWlndF9mYWlsX29uX2YoZXJyb3IgIT0gMCwgIkNvdWxkbid0IG1hcCBNTUlPIHJlZ2lv blxuIik7CisJfSBlbHNlIHsKKwkJLyogVGhpcyBtZXRob2QgaXMgbXVjaCBtb3JlIGNvbnZlbmll bnQgd2hlbiB3ZSBoYXZlIG1hbnkKKwkJICogY29uY3VycmVudCBQQ0kgZGV2aWNlcworCQkgKi8K KwkJaWd0X2dsb2JhbF9tbWlvID0gaWd0X2RldmljZV9tYXBfcGNpX2Jhcl9yZWdpb24oZmQsIG1t aW9fYmFyLAorCQkJCQkJCQltbWlvX3NpemUpOworCX0KIAotCWlndF9mYWlsX29uX2YoZXJyb3Ig IT0gMCwKLQkJICAgICAgIkNvdWxkbid0IG1hcCBNTUlPIHJlZ2lvblxuIik7CisJaWd0X2ZhaWxf b25fZihlcnJvciAhPSAwLCAiQ291bGRuJ3QgbWFwIE1NSU8gcmVnaW9uXG4iKTsKIH0KIAogc3Rh dGljIHZvaWQKQEAgLTE3MSw3ICsxODUsNyBAQCBpbnRlbF9yZWdpc3Rlcl9hY2Nlc3NfaW5pdChz dHJ1Y3QgcGNpX2RldmljZSAqcGNpX2RldiwgaW50IHNhZmUsIGludCBmZCkKIAogCS8qIGFmdGVy IG9sZCBBUEkgaXMgZGVwcmVjYXRlZCwgcmVtb3ZlIHRoaXMgKi8KIAlpZiAoaWd0X2dsb2JhbF9t bWlvID09IE5VTEwpCi0JCWludGVsX21taW9fdXNlX3BjaV9iYXIocGNpX2Rldik7CisJCWludGVs X21taW9fdXNlX3BjaV9iYXIocGNpX2RldiwgZmQpOwogCiAJaWd0X2Fzc2VydChpZ3RfZ2xvYmFs X21taW8gIT0gTlVMTCk7CiAKZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVsX2F1ZGlvX2R1bXAuYyBi L3Rvb2xzL2ludGVsX2F1ZGlvX2R1bXAuYwppbmRleCA5MDI2MGEyZi4uZDk1MmU1NGIgMTAwNjQ0 Ci0tLSBhL3Rvb2xzL2ludGVsX2F1ZGlvX2R1bXAuYworKysgYi90b29scy9pbnRlbF9hdWRpb19k dW1wLmMKQEAgLTI0NzMsNyArMjQ3Myw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJn dikKIAlpZiAoYXJnYyA9PSAyKQogCQlpbnRlbF9tbWlvX3VzZV9kdW1wX2ZpbGUoYXJndlsxXSk7 CiAJZWxzZQotCQlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKHBjaV9kZXYpOworCQlpbnRlbF9tbWlv X3VzZV9wY2lfYmFyKHBjaV9kZXYsIC0xKTsKIAogCXByaW50ZigiJXMgYXVkaW8gcmVnaXN0ZXJz OlxuXG4iLCBpbnRlbF9nZXRfZGV2aWNlX2luZm8oZGV2aWQpLT5jb2RlbmFtZSk7CiAJaWYgKElT X1ZBTExFWVZJRVcoZGV2aWQpKSB7CmRpZmYgLS1naXQgYS90b29scy9pbnRlbF9iYWNrbGlnaHQu YyBiL3Rvb2xzL2ludGVsX2JhY2tsaWdodC5jCmluZGV4IDA2N2ZkNDE4Li5lNDg1MGU4OCAxMDA2 NDQKLS0tIGEvdG9vbHMvaW50ZWxfYmFja2xpZ2h0LmMKKysrIGIvdG9vbHMvaW50ZWxfYmFja2xp Z2h0LmMKQEAgLTQwLDcgKzQwLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQog ewogCXVpbnQzMl90IGN1cnJlbnQsIG1heDsKIAotCWludGVsX21taW9fdXNlX3BjaV9iYXIoaW50 ZWxfZ2V0X3BjaV9kZXZpY2UoKSk7CisJaW50ZWxfbW1pb191c2VfcGNpX2JhcihpbnRlbF9nZXRf cGNpX2RldmljZSgpLCAtMSk7CiAKIAljdXJyZW50ID0gSU5SRUcoQkxDX1BXTV9DUFVfQ1RMKSAm IEJBQ0tMSUdIVF9EVVRZX0NZQ0xFX01BU0s7CiAJbWF4ID0gSU5SRUcoQkxDX1BXTV9QQ0hfQ1RM MikgPj4gMTY7CmRpZmYgLS1naXQgYS90b29scy9pbnRlbF9ncHVfdGltZS5jIGIvdG9vbHMvaW50 ZWxfZ3B1X3RpbWUuYwppbmRleCA1NmQ2NWZlMC4uNGVkNjQzMGUgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2ludGVsX2dwdV90aW1lLmMKKysrIGIvdG9vbHMvaW50ZWxfZ3B1X3RpbWUuYwpAQCAtNjcsNyAr NjcsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJc3RhdGljIHN0cnVjdCBy dXNhZ2UgcnVzYWdlOwogCWludCBzdGF0dXM7CiAKLQlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKGlu dGVsX2dldF9wY2lfZGV2aWNlKCkpOworCWludGVsX21taW9fdXNlX3BjaV9iYXIoaW50ZWxfZ2V0 X3BjaV9kZXZpY2UoKSwgLTEpOwogCiAJaWYgKGFyZ2MgPT0gMSkgewogCQlmcHJpbnRmKHN0ZGVy ciwgInVzYWdlOiAlcyBjbWQgW2FyZ3MuLi5dXG4iLCBhcmd2WzBdKTsKZGlmZiAtLWdpdCBhL3Rv b2xzL2ludGVsX2xpZC5jIGIvdG9vbHMvaW50ZWxfbGlkLmMKaW5kZXggMzdjNmJhNWUuLmY0NTc1 NmUyIDEwMDY0NAotLS0gYS90b29scy9pbnRlbF9saWQuYworKysgYi90b29scy9pbnRlbF9saWQu YwpAQCAtMTE5LDcgKzExOSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIHsK IAlpbnQgc3dmMTQsIGFjcGlfbGlkOwogCi0JaW50ZWxfbW1pb191c2VfcGNpX2JhcihpbnRlbF9n ZXRfcGNpX2RldmljZSgpKTsKKwlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKGludGVsX2dldF9wY2lf ZGV2aWNlKCksIC0xKTsKIAogCXdoaWxlICgxKSB7CiAJCXN3ZjE0ID0gSU5SRUcoU1dGMTQpOwpk aWZmIC0tZ2l0IGEvdG9vbHMvaW50ZWxfcmVnLmMgYi90b29scy9pbnRlbF9yZWcuYwppbmRleCAx MjQ3YjcwYi4uOTQ3ZWMzNzggMTAwNjQ0Ci0tLSBhL3Rvb2xzL2ludGVsX3JlZy5jCisrKyBiL3Rv b2xzL2ludGVsX3JlZy5jCkBAIC02NTAsNyArNjUwLDcgQEAgc3RhdGljIGludCBpbnRlbF9yZWdf c25hcHNob3Qoc3RydWN0IGNvbmZpZyAqY29uZmlnLCBpbnQgYXJnYywgY2hhciAqYXJndltdKQog CQlyZXR1cm4gRVhJVF9GQUlMVVJFOwogCX0KIAotCWludGVsX21taW9fdXNlX3BjaV9iYXIoY29u ZmlnLT5wY2lfZGV2KTsKKwlpbnRlbF9tbWlvX3VzZV9wY2lfYmFyKGNvbmZpZy0+cGNpX2Rldiwg LTEpOwogCiAJLyogWFhYOiBlcnJvciBoYW5kbGluZyAqLwogCWlmICh3cml0ZSgxLCBpZ3RfZ2xv YmFsX21taW8sIGNvbmZpZy0+cGNpX2Rldi0+cmVnaW9uc1ttbWlvX2Jhcl0uc2l6ZSkgPT0gLTEp CmRpZmYgLS1naXQgYS90b29scy9pbnRlbF9yZWdfY2hlY2tlci5jIGIvdG9vbHMvaW50ZWxfcmVn X2NoZWNrZXIuYwppbmRleCA2YmRlNjNlYy4uOTJhODlhZTAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2lu dGVsX3JlZ19jaGVja2VyLmMKKysrIGIvdG9vbHMvaW50ZWxfcmVnX2NoZWNrZXIuYwpAQCAtMzQ1 LDcgKzM0NSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKIAogCWRldiA9IGlu dGVsX2dldF9wY2lfZGV2aWNlKCk7CiAJZGV2aWQgPSBkZXYtPmRldmljZV9pZDsKLQlpbnRlbF9t bWlvX3VzZV9wY2lfYmFyKGRldik7CisJaW50ZWxfbW1pb191c2VfcGNpX2JhcihkZXYsIC0xKTsK IAogCWlmIChJU19HRU43KGRldmlkKSkKIAkJZ2VuID0gNzsKLS0gCjIuMjAuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxp c3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2