From: Joonas Lahtinen Subject: [PATCH] x86/early-quirks: Extend Intel graphics stolen memory placement to 64bit Date: Fri, 24 Nov 2017 09:30:17 +0200 Message-ID: <20171124073017.22212-1-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB0BC6E067 for ; Fri, 24 Nov 2017 07:30:43 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Intel graphics driver community testing & development Cc: x86@kernel.org, Paulo Zanoni , Matthew Auld , "H . Peter Anvin" , Ingo Molnar List-Id: intel-gfx@lists.freedesktop.org SW4gcHJlcGFyYXRpb24gZm9yIHVwY29taW5nIFNLVXMsIGFsbG93IG1vcmUgZnJlZWRvbSBpbiBw bGFjZW1lbnQKb2YgdGhlIEludGVsIGdyYXBoaWNzIHN0b2xlbiBtZW1vcnkgYnkgQklPUyB0byBm dWxsIDY0Yml0IHJhbmdlLgoKU2lnbmVkLW9mZi1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMu bGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRA aW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNj OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IEluZ28gTW9sbmFy IDxtaW5nb0BrZXJuZWwub3JnPgpDYzogSC4gUGV0ZXIgQW52aW4gPGhwYUB6eXRvci5jb20+CkNj OiB4ODZAa2VybmVsLm9yZwotLS0KIGFyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYyB8IDc1 ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDM4IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gv eDg2L2tlcm5lbC9lYXJseS1xdWlya3MuYyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwppbmRleCAxZTgyZjc4N2MxNjAuLjdiNzc1ZjlhZmExNiAxMDA2NDQKLS0tIGEvYXJjaC94ODYv a2VybmVsL2Vhcmx5LXF1aXJrcy5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9lYXJseS1xdWlya3Mu YwpAQCAtMjQzLDcgKzI0Myw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBpbnRlbF9yZW1hcHBpbmdf Y2hlY2soaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKQogI2RlZmluZSBLQih4KQkoKHgpICog MTAyNFVMKQogI2RlZmluZSBNQih4KQkoS0IgKEtCICh4KSkpCiAKLXN0YXRpYyBzaXplX3QgX19p bml0IGk4MzBfdHNlZ19zaXplKHZvaWQpCitzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBp ODMwX3RzZWdfc2l6ZSh2b2lkKQogewogCXU4IGVzbXJhbWMgPSByZWFkX3BjaV9jb25maWdfYnl0 ZSgwLCAwLCAwLCBJODMwX0VTTVJBTUMpOwogCkBAIC0yNTYsNyArMjU2LDcgQEAgc3RhdGljIHNp emVfdCBfX2luaXQgaTgzMF90c2VnX3NpemUodm9pZCkKIAkJcmV0dXJuIEtCKDUxMik7CiB9CiAK LXN0YXRpYyBzaXplX3QgX19pbml0IGk4NDVfdHNlZ19zaXplKHZvaWQpCitzdGF0aWMgcmVzb3Vy Y2Vfc2l6ZV90IF9faW5pdCBpODQ1X3RzZWdfc2l6ZSh2b2lkKQogewogCXU4IGVzbXJhbWMgPSBy ZWFkX3BjaV9jb25maWdfYnl0ZSgwLCAwLCAwLCBJODQ1X0VTTVJBTUMpOwogCXU4IHRzZWdfc2l6 ZSA9IGVzbXJhbWMgJiBJODQ1X1RTRUdfU0laRV9NQVNLOwpAQCAtMjczLDcgKzI3Myw3IEBAIHN0 YXRpYyBzaXplX3QgX19pbml0IGk4NDVfdHNlZ19zaXplKHZvaWQpCiAJcmV0dXJuIDA7CiB9CiAK LXN0YXRpYyBzaXplX3QgX19pbml0IGk4NXhfdHNlZ19zaXplKHZvaWQpCitzdGF0aWMgcmVzb3Vy Y2Vfc2l6ZV90IF9faW5pdCBpODV4X3RzZWdfc2l6ZSh2b2lkKQogewogCXU4IGVzbXJhbWMgPSBy ZWFkX3BjaV9jb25maWdfYnl0ZSgwLCAwLCAwLCBJODVYX0VTTVJBTUMpOwogCkBAIC0yODMsMTIg KzI4MywxMiBAQCBzdGF0aWMgc2l6ZV90IF9faW5pdCBpODV4X3RzZWdfc2l6ZSh2b2lkKQogCXJl dHVybiBNQigxKTsKIH0KIAotc3RhdGljIHNpemVfdCBfX2luaXQgaTgzMF9tZW1fc2l6ZSh2b2lk KQorc3RhdGljIHJlc291cmNlX3NpemVfdCBfX2luaXQgaTgzMF9tZW1fc2l6ZSh2b2lkKQogewog CXJldHVybiByZWFkX3BjaV9jb25maWdfYnl0ZSgwLCAwLCAwLCBJODMwX0RSQjMpICogTUIoMzIp OwogfQogCi1zdGF0aWMgc2l6ZV90IF9faW5pdCBpODV4X21lbV9zaXplKHZvaWQpCitzdGF0aWMg cmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBpODV4X21lbV9zaXplKHZvaWQpCiB7CiAJcmV0dXJuIHJl YWRfcGNpX2NvbmZpZ19ieXRlKDAsIDAsIDEsIEk4NVhfRFJCMykgKiBNQigzMik7CiB9CkBAIC0y OTcsMzYgKzI5NywzNiBAQCBzdGF0aWMgc2l6ZV90IF9faW5pdCBpODV4X21lbV9zaXplKHZvaWQp CiAgKiBPbiA4MzAvODQ1Lzg1eCB0aGUgc3RvbGVuIG1lbW9yeSBiYXNlIGlzbid0IGF2YWlsYWJs ZSBpbiBhbnkKICAqIHJlZ2lzdGVyLiBXZSBuZWVkIHRvIGNhbGN1bGF0ZSBpdCBhcyBUT00tVFNF R19TSVpFLXN0b2xlbl9zaXplLgogICovCi1zdGF0aWMgcGh5c19hZGRyX3QgX19pbml0IGk4MzBf c3RvbGVuX2Jhc2UoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAotCQkJCQkgICBzaXplX3Qg c3RvbGVuX3NpemUpCitzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBpODMwX3N0b2xlbl9i YXNlKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywKKwkJCQkJICAgICAgIHJlc291cmNlX3Np emVfdCBzdG9sZW5fc2l6ZSkKIHsKLQlyZXR1cm4gKHBoeXNfYWRkcl90KWk4MzBfbWVtX3NpemUo KSAtIGk4MzBfdHNlZ19zaXplKCkgLSBzdG9sZW5fc2l6ZTsKKwlyZXR1cm4gaTgzMF9tZW1fc2l6 ZSgpIC0gaTgzMF90c2VnX3NpemUoKSAtIHN0b2xlbl9zaXplOwogfQogCi1zdGF0aWMgcGh5c19h ZGRyX3QgX19pbml0IGk4NDVfc3RvbGVuX2Jhc2UoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5j LAotCQkJCQkgICBzaXplX3Qgc3RvbGVuX3NpemUpCitzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90IF9f aW5pdCBpODQ1X3N0b2xlbl9iYXNlKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywKKwkJCQkJ ICAgICAgIHJlc291cmNlX3NpemVfdCBzdG9sZW5fc2l6ZSkKIHsKLQlyZXR1cm4gKHBoeXNfYWRk cl90KWk4MzBfbWVtX3NpemUoKSAtIGk4NDVfdHNlZ19zaXplKCkgLSBzdG9sZW5fc2l6ZTsKKwly ZXR1cm4gaTgzMF9tZW1fc2l6ZSgpIC0gaTg0NV90c2VnX3NpemUoKSAtIHN0b2xlbl9zaXplOwog fQogCi1zdGF0aWMgcGh5c19hZGRyX3QgX19pbml0IGk4NXhfc3RvbGVuX2Jhc2UoaW50IG51bSwg aW50IHNsb3QsIGludCBmdW5jLAotCQkJCQkgICBzaXplX3Qgc3RvbGVuX3NpemUpCitzdGF0aWMg cmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBpODV4X3N0b2xlbl9iYXNlKGludCBudW0sIGludCBzbG90 LCBpbnQgZnVuYywKKwkJCQkJICAgICAgIHJlc291cmNlX3NpemVfdCBzdG9sZW5fc2l6ZSkKIHsK LQlyZXR1cm4gKHBoeXNfYWRkcl90KWk4NXhfbWVtX3NpemUoKSAtIGk4NXhfdHNlZ19zaXplKCkg LSBzdG9sZW5fc2l6ZTsKKwlyZXR1cm4gaTg1eF9tZW1fc2l6ZSgpIC0gaTg1eF90c2VnX3NpemUo KSAtIHN0b2xlbl9zaXplOwogfQogCi1zdGF0aWMgcGh5c19hZGRyX3QgX19pbml0IGk4NjVfc3Rv bGVuX2Jhc2UoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAotCQkJCQkgICBzaXplX3Qgc3Rv bGVuX3NpemUpCitzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90IF9faW5pdCBpODY1X3N0b2xlbl9iYXNl KGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywKKwkJCQkJICAgICAgIHJlc291cmNlX3NpemVf dCBzdG9sZW5fc2l6ZSkKIHsKIAl1MTYgdG91ZCA9IDA7CiAKIAl0b3VkID0gcmVhZF9wY2lfY29u ZmlnXzE2KDAsIDAsIDAsIEk4NjVfVE9VRCk7CiAKLQlyZXR1cm4gKHBoeXNfYWRkcl90KSh0b3Vk IDw8IDE2KSArIGk4NDVfdHNlZ19zaXplKCk7CisJcmV0dXJuICh0b3VkIDw8IDE2KSArIGk4NDVf dHNlZ19zaXplKCk7CiB9CiAKLXN0YXRpYyBwaHlzX2FkZHJfdCBfX2luaXQgZ2VuM19zdG9sZW5f YmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMsCi0JCQkJCSAgIHNpemVfdCBzdG9sZW5f c2l6ZSkKK3N0YXRpYyByZXNvdXJjZV9zaXplX3QgX19pbml0IGdlbjNfc3RvbGVuX2Jhc2UoaW50 IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAorCQkJCQkgICAgICAgcmVzb3VyY2Vfc2l6ZV90IHN0 b2xlbl9zaXplKQogewogCXUzMiBic207CiAKQEAgLTMzNywxMCArMzM3LDEwIEBAIHN0YXRpYyBw aHlzX2FkZHJfdCBfX2luaXQgZ2VuM19zdG9sZW5fYmFzZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50 IGZ1bmMsCiAJICovCiAJYnNtID0gcmVhZF9wY2lfY29uZmlnKG51bSwgc2xvdCwgZnVuYywgSU5U RUxfQlNNKTsKIAotCXJldHVybiAocGh5c19hZGRyX3QpYnNtICYgSU5URUxfQlNNX01BU0s7CisJ cmV0dXJuIGJzbSAmIElOVEVMX0JTTV9NQVNLOwogfQogCi1zdGF0aWMgc2l6ZV90IF9faW5pdCBp ODMwX3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKK3N0YXRpYyByZXNv dXJjZV9zaXplX3QgX19pbml0IGk4MzBfc3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNsb3QsIGlu dCBmdW5jKQogewogCXUxNiBnbWNoX2N0cmw7CiAJdTE2IGdtczsKQEAgLTM2MSw3ICszNjEsNyBA QCBzdGF0aWMgc2l6ZV90IF9faW5pdCBpODMwX3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90 LCBpbnQgZnVuYykKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIHNpemVfdCBfX2luaXQgZ2VuM19z dG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpCitzdGF0aWMgcmVzb3VyY2Vf c2l6ZV90IF9faW5pdCBnZW4zX3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVu YykKIHsKIAl1MTYgZ21jaF9jdHJsOwogCXUxNiBnbXM7CkBAIC0zOTAsNyArMzkwLDcgQEAgc3Rh dGljIHNpemVfdCBfX2luaXQgZ2VuM19zdG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50 IGZ1bmMpCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBzaXplX3QgX19pbml0IGdlbjZfc3RvbGVu X3NpemUoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKQorc3RhdGljIHJlc291cmNlX3NpemVf dCBfX2luaXQgZ2VuNl9zdG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpCiB7 CiAJdTE2IGdtY2hfY3RybDsKIAl1MTYgZ21zOwpAQCAtMzk4LDEwICszOTgsMTAgQEAgc3RhdGlj IHNpemVfdCBfX2luaXQgZ2VuNl9zdG9sZW5fc2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1 bmMpCiAJZ21jaF9jdHJsID0gcmVhZF9wY2lfY29uZmlnXzE2KG51bSwgc2xvdCwgZnVuYywgU05C X0dNQ0hfQ1RSTCk7CiAJZ21zID0gKGdtY2hfY3RybCA+PiBTTkJfR01DSF9HTVNfU0hJRlQpICYg U05CX0dNQ0hfR01TX01BU0s7CiAKLQlyZXR1cm4gKHNpemVfdClnbXMgKiBNQigzMik7CisJcmV0 dXJuIGdtcyAqIE1CKDMyKTsKIH0KIAotc3RhdGljIHNpemVfdCBfX2luaXQgZ2VuOF9zdG9sZW5f c2l6ZShpbnQgbnVtLCBpbnQgc2xvdCwgaW50IGZ1bmMpCitzdGF0aWMgcmVzb3VyY2Vfc2l6ZV90 IF9faW5pdCBnZW44X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsK IAl1MTYgZ21jaF9jdHJsOwogCXUxNiBnbXM7CkBAIC00MDksMTAgKzQwOSwxMCBAQCBzdGF0aWMg c2l6ZV90IF9faW5pdCBnZW44X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVu YykKIAlnbWNoX2N0cmwgPSByZWFkX3BjaV9jb25maWdfMTYobnVtLCBzbG90LCBmdW5jLCBTTkJf R01DSF9DVFJMKTsKIAlnbXMgPSAoZ21jaF9jdHJsID4+IEJEV19HTUNIX0dNU19TSElGVCkgJiBC RFdfR01DSF9HTVNfTUFTSzsKIAotCXJldHVybiAoc2l6ZV90KWdtcyAqIE1CKDMyKTsKKwlyZXR1 cm4gZ21zICogTUIoMzIpOwogfQogCi1zdGF0aWMgc2l6ZV90IF9faW5pdCBjaHZfc3RvbGVuX3Np emUoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKQorc3RhdGljIHJlc291cmNlX3NpemVfdCBf X2luaXQgY2h2X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKIHsKIAl1 MTYgZ21jaF9jdHJsOwogCXUxNiBnbXM7CkBAIC00MjYsMTQgKzQyNiwxNCBAQCBzdGF0aWMgc2l6 ZV90IF9faW5pdCBjaHZfc3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jKQog CSAqIDB4MTcgdG8gMHgxZDogNE1CIGluY3JlbWVudHMgc3RhcnQgYXQgMzZNQgogCSAqLwogCWlm IChnbXMgPCAweDExKQotCQlyZXR1cm4gKHNpemVfdClnbXMgKiBNQigzMik7CisJCXJldHVybiBn bXMgKiBNQigzMik7CiAJZWxzZSBpZiAoZ21zIDwgMHgxNykKLQkJcmV0dXJuIChzaXplX3QpKGdt cyAtIDB4MTEgKyAyKSAqIE1CKDQpOworCQlyZXR1cm4gKGdtcyAtIDB4MTEgKyAyKSAqIE1CKDQp OwogCWVsc2UKLQkJcmV0dXJuIChzaXplX3QpKGdtcyAtIDB4MTcgKyA5KSAqIE1CKDQpOworCQly ZXR1cm4gKGdtcyAtIDB4MTcgKyA5KSAqIE1CKDQpOwogfQogCi1zdGF0aWMgc2l6ZV90IF9faW5p dCBnZW45X3N0b2xlbl9zaXplKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYykKK3N0YXRpYyBy ZXNvdXJjZV9zaXplX3QgX19pbml0IGdlbjlfc3RvbGVuX3NpemUoaW50IG51bSwgaW50IHNsb3Qs IGludCBmdW5jKQogewogCXUxNiBnbWNoX2N0cmw7CiAJdTE2IGdtczsKQEAgLTQ0NCwxNCArNDQ0 LDE1IEBAIHN0YXRpYyBzaXplX3QgX19pbml0IGdlbjlfc3RvbGVuX3NpemUoaW50IG51bSwgaW50 IHNsb3QsIGludCBmdW5jKQogCS8qIDB4MCAgdG8gMHhlZjogMzJNQiBpbmNyZW1lbnRzIHN0YXJ0 aW5nIGF0IDBNQiAqLwogCS8qIDB4ZjAgdG8gMHhmZTogNE1CIGluY3JlbWVudHMgc3RhcnRpbmcg YXQgNE1CICovCiAJaWYgKGdtcyA8IDB4ZjApCi0JCXJldHVybiAoc2l6ZV90KWdtcyAqIE1CKDMy KTsKKwkJcmV0dXJuIGdtcyAqIE1CKDMyKTsKIAllbHNlCi0JCXJldHVybiAoc2l6ZV90KShnbXMg LSAweGYwICsgMSkgKiBNQig0KTsKKwkJcmV0dXJuIChnbXMgLSAweGYwICsgMSkgKiBNQig0KTsK IH0KIAogc3RydWN0IGludGVsX2Vhcmx5X29wcyB7Ci0Jc2l6ZV90ICgqc3RvbGVuX3NpemUpKGlu dCBudW0sIGludCBzbG90LCBpbnQgZnVuYyk7Ci0JcGh5c19hZGRyX3QgKCpzdG9sZW5fYmFzZSko aW50IG51bSwgaW50IHNsb3QsIGludCBmdW5jLCBzaXplX3Qgc2l6ZSk7CisJcmVzb3VyY2Vfc2l6 ZV90ICgqc3RvbGVuX3NpemUpKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYyk7CisJcmVzb3Vy Y2Vfc2l6ZV90ICgqc3RvbGVuX2Jhc2UpKGludCBudW0sIGludCBzbG90LCBpbnQgZnVuYywKKwkJ CQkgICAgICAgcmVzb3VyY2Vfc2l6ZV90IHNpemUpOwogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVj dCBpbnRlbF9lYXJseV9vcHMgaTgzMF9lYXJseV9vcHMgX19pbml0Y29uc3QgPSB7CkBAIC01MzUs OCArNTM2LDggQEAgc3RhdGljIHZvaWQgX19pbml0CiBpbnRlbF9ncmFwaGljc19zdG9sZW4oaW50 IG51bSwgaW50IHNsb3QsIGludCBmdW5jLAogCQkgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfZWFy bHlfb3BzICplYXJseV9vcHMpCiB7Ci0JcGh5c19hZGRyX3QgYmFzZSwgZW5kOwotCXNpemVfdCBz aXplOworCXJlc291cmNlX3NpemVfdCBiYXNlLCBzaXplOworCXJlc291cmNlX3NpemVfdCBlbmQ7 CiAKIAlzaXplID0gZWFybHlfb3BzLT5zdG9sZW5fc2l6ZShudW0sIHNsb3QsIGZ1bmMpOwogCWJh c2UgPSBlYXJseV9vcHMtPnN0b2xlbl9iYXNlKG51bSwgc2xvdCwgZnVuYywgc2l6ZSk7Ci0tIAoy LjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=