From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A31E6F560 for ; Thu, 22 Oct 2020 09:59:37 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= Date: Thu, 22 Oct 2020 11:58:56 +0200 Message-Id: <20201022095907.34225-14-zbigniew.kempczynski@intel.com> In-Reply-To: <20201022095907.34225-1-zbigniew.kempczynski@intel.com> References: <20201022095907.34225-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 13/24] lib/intel_aux_pgtable: Get addresses for aux table from an allocator 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 Cc: Chris Wilson List-ID: VXNlIGludGVsX2J1ZiB3aGljaCBub3cgYWxsb3dzIHBhc3NpbmcgZXhwZWN0ZWQgYWxpZ25tZW50 IHJlcXVpcmVkCmZvciBhdXggdGFibGUgYW5kIGFjcXVpcmUgYXBwcm9wcmlhdGUgYWRkcmVzcyBm cm9tIGFuIGFsbG9jYXRvci4KCldpdGggc2ltcGxlIGFsbG9jYXRvciB3ZSB0cnkgdG8gdXNlIGhp Z2ggb2Zmc2V0cyBmcm9tIGRlZmF1bHQKdG8gZXhlcmNpc2UgY2Fub25pemluZy9kZWNhbm9uaXpp bmcgaXMgd29ya2luZyBwcm9wZXJseS4KQWx0ZXIgcGd0YWJsZSB0byBhbGxvdyBwcm9wZXIgY2Fs Y3VsYXRpb24gb24gc3VjaCBvZmZzZXRzLgoKU2lnbmVkLW9mZi1ieTogWmJpZ25pZXcgS2VtcGN6 ecWEc2tpIDx6Ymlnbmlldy5rZW1wY3p5bnNraUBpbnRlbC5jb20+CkNjOiBEb21pbmlrIEdyemVn b3J6ZWsgPGRvbWluaWsuZ3J6ZWdvcnpla0BpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBsaWIvaW50ZWxfYXV4X3BndGFibGUuYyB8IDQ1 ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lu dGVsX2F1eF9wZ3RhYmxlLmMgYi9saWIvaW50ZWxfYXV4X3BndGFibGUuYwppbmRleCBlZjZhOWZl Zi4uYTk3MGI3MDggMTAwNjQ0Ci0tLSBhL2xpYi9pbnRlbF9hdXhfcGd0YWJsZS5jCisrKyBiL2xp Yi9pbnRlbF9hdXhfcGd0YWJsZS5jCkBAIC02OCw3ICs2OCw3IEBAIHN0YXRpYyB1aW50NjRfdCBs YXN0X2J1Zl9zdXJmYWNlX2VuZChzdHJ1Y3QgaW50ZWxfYnVmICpidWYpCiAJaW50IGk7CiAKIAlm b3IgKGkgPSAwOyBpIDwgbnVtX3N1cmZhY2VzOyBpKyspIHsKLQkJdWludDY0X3Qgc3VyZmFjZV9l bmQgPSBidWYtPnN1cmZhY2VbaV0ub2Zmc2V0ICsKKwkJdWludDY0X3Qgc3VyZmFjZV9lbmQgPSBE RUNBTk9OSUNBTChidWYtPnN1cmZhY2VbaV0ub2Zmc2V0KSArCiAJCQkJICAgICAgIGJ1Zi0+c3Vy ZmFjZVtpXS5zaXplOwogCiAJCWlmIChzdXJmYWNlX2VuZCA+IGVuZF9vZmZzZXQpCkBAIC04OSwx OCArODksMjAgQEAgcGd0X3RhYmxlX2NvdW50KGludCBhZGRyZXNzX2JpdHMsIHN0cnVjdCBpbnRl bF9idWYgKipidWZzLCBpbnQgYnVmX2NvdW50KQogCWVuZCA9IDA7CiAJZm9yIChpID0gMDsgaSA8 IGJ1Zl9jb3VudDsgaSsrKSB7CiAJCXN0cnVjdCBpbnRlbF9idWYgKmJ1ZiA9IGJ1ZnNbaV07Ci0J CXVpbnQ2NF90IHN0YXJ0OworCQl1aW50NjRfdCBzdGFydCwgb2Zmc2V0OworCisJCW9mZnNldCA9 IERFQ0FOT05JQ0FMKGJ1Zi0+YWRkci5vZmZzZXQpOwogCiAJCS8qIFdlIHJlcXVpcmUgYnVmcyB0 byBiZSBzb3J0ZWQuICovCiAJCWlndF9hc3NlcnQoaSA9PSAwIHx8Ci0JCQkgICBidWYtPmFkZHIu b2Zmc2V0ID49IGJ1ZnNbaSAtIDFdLT5hZGRyLm9mZnNldCArCi0JCQkJCSAgICAgICBpbnRlbF9i dWZfYm9fc2l6ZShidWZzW2kgLSAxXSkpOworCQkJICAgb2Zmc2V0ID49IERFQ0FOT05JQ0FMKGJ1 ZnNbaSAtIDFdLT5hZGRyLm9mZnNldCkgKworCQkJCWludGVsX2J1Zl9ib19zaXplKGJ1ZnNbaSAt IDFdKSk7CisJCXN0YXJ0ID0gQUxJR05fRE9XTihvZmZzZXQsIDFVTCA8PCBhZGRyZXNzX2JpdHMp OwogCi0JCXN0YXJ0ID0gQUxJR05fRE9XTihidWYtPmFkZHIub2Zmc2V0LCAxVUwgPDwgYWRkcmVz c19iaXRzKTsKIAkJLyogQXZvaWQgZG91YmxlIGNvdW50aW5nIGZvciBvdmVybGFwcGluZyBhbGln bmVkIGJ1ZnMuICovCiAJCXN0YXJ0ID0gbWF4KHN0YXJ0LCBlbmQpOwogCi0JCWVuZCA9IEFMSUdO KGJ1Zi0+YWRkci5vZmZzZXQgKyBsYXN0X2J1Zl9zdXJmYWNlX2VuZChidWYpLAorCQllbmQgPSBB TElHTihvZmZzZXQgKyBsYXN0X2J1Zl9zdXJmYWNlX2VuZChidWYpLAogCQkJICAgIDFVTCA8PCBh ZGRyZXNzX2JpdHMpOwogCQlpZ3RfYXNzZXJ0KGVuZCA+PSBzdGFydCk7CiAKQEAgLTE4MCwxMSAr MTgyLDExIEBAIHBndF9nZXRfY2hpbGRfdGFibGUoc3RydWN0IHBndGFibGUgKnBndCwgdWludDY0 X3QgcGFyZW50X3RhYmxlLAogCQl1aW50MzJfdCBvZmZzZXQ7CiAKIAkJY2hpbGRfdGFibGUgPSBw Z3RfYWxsb2NfdGFibGUocGd0LCBsZXZlbCAtIDEpOwotCQlpZ3RfYXNzZXJ0KCEoKGNoaWxkX3Rh YmxlICsgcGd0LT5idWYtPmFkZHIub2Zmc2V0KSAmCisJCWlndF9hc3NlcnQoISgoY2hpbGRfdGFi bGUgKyBERUNBTk9OSUNBTChwZ3QtPmJ1Zi0+YWRkci5vZmZzZXQpKSAmCiAJCQkgICAgIH5wdHJf bWFzayhwZ3QsIGxldmVsKSkpOwogCiAJCXB0ZSA9IGNoaWxkX3RhYmxlIHwgZmxhZ3M7Ci0JCSpj aGlsZF9lbnRyeV9wdHIgPSBwZ3QtPmJ1Zi0+YWRkci5vZmZzZXQgKyBwdGU7CisJCSpjaGlsZF9l bnRyeV9wdHIgPSBERUNBTk9OSUNBTChwZ3QtPmJ1Zi0+YWRkci5vZmZzZXQpICsgcHRlOwogCiAJ CWlndF9hc3NlcnQocHRlIDw9IElOVDMyX01BWCk7CiAKQEAgLTE5Nyw3ICsxOTksNyBAQCBwZ3Rf Z2V0X2NoaWxkX3RhYmxlKHN0cnVjdCBwZ3RhYmxlICpwZ3QsIHVpbnQ2NF90IHBhcmVudF90YWJs ZSwKIAkJCQkJCXBndC0+YnVmLT5hZGRyLm9mZnNldCk7CiAJfSBlbHNlIHsKIAkJY2hpbGRfdGFi bGUgPSAoKmNoaWxkX2VudHJ5X3B0ciAmIHB0cl9tYXNrKHBndCwgbGV2ZWwpKSAtCi0JCQkgICAg ICBwZ3QtPmJ1Zi0+YWRkci5vZmZzZXQ7CisJCQkgICAgICBERUNBTk9OSUNBTChwZ3QtPmJ1Zi0+ YWRkci5vZmZzZXQpOwogCX0KIAogCXJldHVybiBjaGlsZF90YWJsZTsKQEAgLTM0NiwxMSArMzQ4 LDExIEBAIHBndF9wb3B1bGF0ZV9lbnRyaWVzX2Zvcl9idWYoc3RydWN0IHBndGFibGUgKnBndCwK IAkJCSAgICAgdWludDY0X3QgdG9wX3RhYmxlLAogCQkJICAgICBpbnQgc3VyZmFjZV9pZHgpCiB7 Ci0JdWludDY0X3Qgc3VyZmFjZV9hZGRyID0gYnVmLT5hZGRyLm9mZnNldCArCisJdWludDY0X3Qg c3VyZmFjZV9hZGRyID0gREVDQU5PTklDQUwoYnVmLT5hZGRyLm9mZnNldCkgKwogCQkJCWJ1Zi0+ c3VyZmFjZVtzdXJmYWNlX2lkeF0ub2Zmc2V0OwogCXVpbnQ2NF90IHN1cmZhY2VfZW5kID0gc3Vy ZmFjZV9hZGRyICsKIAkJCSAgICAgICBidWYtPnN1cmZhY2Vbc3VyZmFjZV9pZHhdLnNpemU7Ci0J dWludDY0X3QgYXV4X2FkZHIgPSBidWYtPmFkZHIub2Zmc2V0ICsgYnVmLT5jY3Nbc3VyZmFjZV9p ZHhdLm9mZnNldDsKKwl1aW50NjRfdCBhdXhfYWRkciA9IERFQ0FOT05JQ0FMKGJ1Zi0+YWRkci5v ZmZzZXQpICsgYnVmLT5jY3Nbc3VyZmFjZV9pZHhdLm9mZnNldDsKIAl1aW50NjRfdCBsMV9mbGFn cyA9IHBndF9nZXRfbDFfZmxhZ3MoYnVmLCBzdXJmYWNlX2lkeCk7CiAJdWludDY0X3QgbHhfZmxh Z3MgPSBwZ3RfZ2V0X2x4X2ZsYWdzKCk7CiAKQEAgLTQ0MSw3ICs0NDMsNiBAQCBzdHJ1Y3QgaW50 ZWxfYnVmICoKIGludGVsX2F1eF9wZ3RhYmxlX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfYmIgKmliYiwK IAkJCSBzdHJ1Y3QgaW50ZWxfYnVmICoqYnVmcywgaW50IGJ1Zl9jb3VudCkKIHsKLQlzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiAqb2JqOwogCXN0YXRpYyBjb25zdCBzdHJ1Y3QgcGd0 YWJsZV9sZXZlbF9kZXNjIGxldmVsX2Rlc2NbXSA9IHsKIAkJewogCQkJLmlkeF9zaGlmdCA9IDE2 LApAQCAtNDY1LDcgKzQ2Niw2IEBAIGludGVsX2F1eF9wZ3RhYmxlX2NyZWF0ZShzdHJ1Y3QgaW50 ZWxfYmIgKmliYiwKIAlzdHJ1Y3QgcGd0YWJsZSAqcGd0OwogCXN0cnVjdCBidWZfb3BzICpib3Bz OwogCXN0cnVjdCBpbnRlbF9idWYgKmJ1ZjsKLQl1aW50NjRfdCBwcmV2X2FsaWdubWVudDsKIAog CWlndF9hc3NlcnQoYnVmX2NvdW50KTsKIAlib3BzID0gYnVmc1swXS0+Ym9wczsKQEAgLTQ3Niwx MSArNDc2LDggQEAgaW50ZWxfYXV4X3BndGFibGVfY3JlYXRlKHN0cnVjdCBpbnRlbF9iYiAqaWJi LAogCQkJCSAgICBJOTE1X0NPTVBSRVNTSU9OX05PTkUpOwogCiAJLyogV2UgbmVlZCB0byB1c2Ug cGd0LT5tYXhfYWxpZ24gZm9yIGF1eCB0YWJsZSAqLwotCXByZXZfYWxpZ25tZW50ID0gaW50ZWxf YmJfc2V0X2RlZmF1bHRfb2JqZWN0X2FsaWdubWVudChpYmIsCi0JCQkJCQkJICAgICAgIHBndC0+ bWF4X2FsaWduKTsKLQlvYmogPSBpbnRlbF9iYl9hZGRfaW50ZWxfYnVmKGliYiwgcGd0LT5idWYs IGZhbHNlKTsKLQlpbnRlbF9iYl9zZXRfZGVmYXVsdF9vYmplY3RfYWxpZ25tZW50KGliYiwgcHJl dl9hbGlnbm1lbnQpOwotCW9iai0+YWxpZ25tZW50ID0gcGd0LT5tYXhfYWxpZ247CisJaW50ZWxf YmJfYWRkX2ludGVsX2J1Zl93aXRoX2FsaWdubWVudChpYmIsIHBndC0+YnVmLAorCQkJCQkgICAg ICBwZ3QtPm1heF9hbGlnbiwgZmFsc2UpOwogCiAJcGd0X21hcChpYmItPmk5MTUsIHBndCk7CiAJ cGd0X3BvcHVsYXRlX2VudHJpZXMocGd0LCBidWZzLCBidWZfY291bnQpOwpAQCAtNDk2LDExICs0 OTMsMTUgQEAgc3RhdGljIHZvaWQKIGF1eF9wZ3RhYmxlX3Jlc2VydmVfYnVmX3Nsb3Qoc3RydWN0 IGludGVsX2J1ZiAqKmJ1ZnMsIGludCBidWZfY291bnQsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9i dWYgKm5ld19idWYpCiB7CisJdWludDY0X3QgY3VyciwgbmV3b25lOwogCWludCBpOwogCi0JZm9y IChpID0gMDsgaSA8IGJ1Zl9jb3VudDsgaSsrKQotCQlpZiAoYnVmc1tpXS0+YWRkci5vZmZzZXQg PiBuZXdfYnVmLT5hZGRyLm9mZnNldCkKKwlmb3IgKGkgPSAwOyBpIDwgYnVmX2NvdW50OyBpKysp IHsKKwkJY3VyciA9IERFQ0FOT05JQ0FMKGJ1ZnNbaV0tPmFkZHIub2Zmc2V0KTsKKwkJbmV3b25l ID0gREVDQU5PTklDQUwobmV3X2J1Zi0+YWRkci5vZmZzZXQpOworCQlpZiAoY3VyciA+IG5ld29u ZSkKIAkJCWJyZWFrOworCX0KIAogCW1lbW1vdmUoJmJ1ZnNbaSArIDFdLCAmYnVmc1tpXSwgc2l6 ZW9mKGJ1ZnNbMF0pICogKGJ1Zl9jb3VudCAtIGkpKTsKIApAQCAtNTkxLDggKzU5MiwxMCBAQCBn ZW4xMl9hdXhfcGd0YWJsZV9jbGVhbnVwKHN0cnVjdCBpbnRlbF9iYiAqaWJiLCBzdHJ1Y3QgYXV4 X3BndGFibGVfaW5mbyAqaW5mbykKIAkJaWd0X2Fzc2VydF9lcV91NjQoYWRkciwgaW5mby0+YnVm X3Bpbl9vZmZzZXRzW2ldKTsKIAl9CiAKLQlpZiAoaW5mby0+cGd0YWJsZV9idWYpCisJaWYgKGlu Zm8tPnBndGFibGVfYnVmKSB7CisJCWludGVsX2JiX3JlbW92ZV9pbnRlbF9idWYoaWJiLCBpbmZv LT5wZ3RhYmxlX2J1Zik7CiAJCWludGVsX2J1Zl9kZXN0cm95KGluZm8tPnBndGFibGVfYnVmKTsK Kwl9CiB9CiAKIHVpbnQzMl90Ci0tIAoyLjI2LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaWd0LWRldgo=