From: Paul Durrant Subject: [PATCH] amd-iommu: get rid of pointless IOMMU_PAGING_MODE_LEVEL_X definitions Date: Thu, 27 Sep 2018 13:46:01 +0100 Message-ID: <20180927124601.24455-1-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g5VgG-0004HU-Kz for xen-devel@lists.xenproject.org; Thu, 27 Sep 2018 12:46:08 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Paul Durrant , Brian Woods , Suravee Suthikulpanit List-Id: xen-devel@lists.xenproject.org VGhlIGxldmVscyBhcmUgYWJzb2x1dGUgbnVtYmVycyBzdWNoIHRoYXQgSU9NTVVfUEFHSU5HX01P REVfTEVWRUxfWApldmFsdWF0ZXMgdG8gWCAoZm9yIHRoZSB2YWxpZCByYW5nZSBvZiAwIC0gNykg c28gc2ltcGx5IHVzZSBudW1iZXJzIGluCnRoZSBjb2RlLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2Uu CgpOT1RFOiBUaGlzIHBhdGNoIGFsc28gYWRkcyBlbWFjcyBib2lsZXJwbGF0ZSB0byBhbWQtaW9t bXUtZGVmcy5oCgpTaWduZWQtb2ZmLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwuZHVycmFudEBjaXRy aXguY29tPgotLS0KQ2M6IFN1cmF2ZWUgU3V0aGlrdWxwYW5pdCA8c3VyYXZlZS5zdXRoaWt1bHBh bml0QGFtZC5jb20+CkNjOiBCcmlhbiBXb29kcyA8YnJpYW4ud29vZHNAYW1kLmNvbT4KLS0tCiB4 ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFwLmMgICAgICB8IDI2ICsrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiB4ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvcGNpX2FtZF9p b21tdS5jICB8ICA0ICstLS0KIHhlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2bS9hbWQtaW9tbXUt ZGVmcy5oIHwgMjEgKysrKysrKysrKystLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDIzIGlu c2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bh c3N0aHJvdWdoL2FtZC9pb21tdV9tYXAuYyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9p b21tdV9tYXAuYwppbmRleCA5ZmE1Y2QzYmQzLi5lY2Q1NWQwNTczIDEwMDY0NAotLS0gYS94ZW4v ZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFwLmMKKysrIGIveGVuL2RyaXZlcnMvcGFz c3Rocm91Z2gvYW1kL2lvbW11X21hcC5jCkBAIC00MCw3ICs0MCw3IEBAIHZvaWQgY2xlYXJfaW9t bXVfcHRlX3ByZXNlbnQodW5zaWduZWQgbG9uZyBsMV9tZm4sIHVuc2lnbmVkIGxvbmcgZ2ZuKQog ICAgIHU2NCAqdGFibGUsICpwdGU7CiAKICAgICB0YWJsZSA9IG1hcF9kb21haW5fcGFnZShfbWZu KGwxX21mbikpOwotICAgIHB0ZSA9IHRhYmxlICsgcGZuX3RvX3BkZV9pZHgoZ2ZuLCBJT01NVV9Q QUdJTkdfTU9ERV9MRVZFTF8xKTsKKyAgICBwdGUgPSB0YWJsZSArIHBmbl90b19wZGVfaWR4KGdm biwgMSk7CiAgICAgKnB0ZSA9IDA7CiAgICAgdW5tYXBfZG9tYWluX3BhZ2UodGFibGUpOwogfQpA QCAtODQsNyArODQsNyBAQCBzdGF0aWMgYm9vbF90IHNldF9pb21tdV9wZGVfcHJlc2VudCh1MzIg KnBkZSwgdW5zaWduZWQgbG9uZyBuZXh0X21mbiwKICAgICAvKiBGQyBiaXQgc2hvdWxkIGJlIGVu YWJsZWQgaW4gUFRFLCB0aGlzIGhlbHBzIHRvIHNvbHZlIHBvdGVudGlhbAogICAgICAqIGlzc3Vl cyB3aXRoIEFUUyBkZXZpY2VzCiAgICAgICovCi0gICAgaWYgKCBuZXh0X2xldmVsID09IElPTU1V X1BBR0lOR19NT0RFX0xFVkVMXzAgKQorICAgIGlmICggbmV4dF9sZXZlbCA9PSAwICkKICAgICAg ICAgc2V0X2ZpZWxkX2luX3JlZ191MzIoSU9NTVVfQ09OVFJPTF9FTkFCTEVELCBlbnRyeSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9NTVVfUFRFX0ZDX01BU0ssIElPTU1VX1BURV9G Q19TSElGVCwgJmVudHJ5KTsKICAgICBwZGVbMV0gPSBlbnRyeTsKQEAgLTExNiw4ICsxMTYsNyBA QCBzdGF0aWMgYm9vbF90IHNldF9pb21tdV9wdGVfcHJlc2VudCh1bnNpZ25lZCBsb25nIHB0X21m biwgdW5zaWduZWQgbG9uZyBnZm4sCiAKICAgICBwZGUgPSAodTMyKikodGFibGUgKyBwZm5fdG9f cGRlX2lkeChnZm4sIHBkZV9sZXZlbCkpOwogCi0gICAgbmVlZF9mbHVzaCA9IHNldF9pb21tdV9w ZGVfcHJlc2VudChwZGUsIG5leHRfbWZuLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIElPTU1VX1BBR0lOR19NT0RFX0xFVkVMXzAsIGl3LCBpcik7CisgICAgbmVlZF9m bHVzaCA9IHNldF9pb21tdV9wZGVfcHJlc2VudChwZGUsIG5leHRfbWZuLCAwLCBpdywgaXIpOwog ICAgIHVubWFwX2RvbWFpbl9wYWdlKHRhYmxlKTsKICAgICByZXR1cm4gbmVlZF9mbHVzaDsKIH0K QEAgLTQxOSw4ICs0MTgsNyBAQCBzdGF0aWMgaW50IGlvbW11X21lcmdlX3BhZ2VzKHN0cnVjdCBk b21haW4gKmQsIHVuc2lnbmVkIGxvbmcgcHRfbWZuLAogICAgIH0KIAogICAgIC8qIHNldHVwIHN1 cGVyIHBhZ2UgbWFwcGluZywgbmV4dCBsZXZlbCA9IDAgKi8KLSAgICBzZXRfaW9tbXVfcGRlX3By ZXNlbnQoKHUzMiopcGRlLCBmaXJzdF9tZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgIElP TU1VX1BBR0lOR19NT0RFX0xFVkVMXzAsCisgICAgc2V0X2lvbW11X3BkZV9wcmVzZW50KCh1MzIq KXBkZSwgZmlyc3RfbWZuLCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAhIShmbGFncyAm IElPTU1VRl93cml0YWJsZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICEhKGZsYWdzICYg SU9NTVVGX3JlYWRhYmxlKSk7CiAKQEAgLTQ0NywxOCArNDQ1LDE3IEBAIHN0YXRpYyBpbnQgaW9t bXVfcGRlX2Zyb21fZ2ZuKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgcGZuLAogICAg IHRhYmxlID0gaGQtPmFyY2gucm9vdF90YWJsZTsKICAgICBsZXZlbCA9IGhkLT5hcmNoLnBhZ2lu Z19tb2RlOwogCi0gICAgQlVHX09OKCB0YWJsZSA9PSBOVUxMIHx8IGxldmVsIDwgSU9NTVVfUEFH SU5HX01PREVfTEVWRUxfMSB8fCAKLSAgICAgICAgICAgIGxldmVsID4gSU9NTVVfUEFHSU5HX01P REVfTEVWRUxfNiApOworICAgIEJVR19PTiggdGFibGUgPT0gTlVMTCB8fCBsZXZlbCA8IDEgfHwg bGV2ZWwgPiA2ICk7CiAKICAgICBuZXh0X3RhYmxlX21mbiA9IG1mbl94KHBhZ2VfdG9fbWZuKHRh YmxlKSk7CiAKLSAgICBpZiAoIGxldmVsID09IElPTU1VX1BBR0lOR19NT0RFX0xFVkVMXzEgKQor ICAgIGlmICggbGV2ZWwgPT0gMSApCiAgICAgewogICAgICAgICBwdF9tZm5bbGV2ZWxdID0gbmV4 dF90YWJsZV9tZm47CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KIAotICAgIHdoaWxlICggbGV2 ZWwgPiBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF8xICkKKyAgICB3aGlsZSAoIGxldmVsID4gMSAp CiAgICAgewogICAgICAgICB1bnNpZ25lZCBpbnQgbmV4dF9sZXZlbCA9IGxldmVsIC0gMTsKICAg ICAgICAgcHRfbWZuW2xldmVsXSA9IG5leHRfdGFibGVfbWZuOwpAQCAtNjc2LDggKzY3Myw3IEBA IGludCBhbWRfaW9tbXVfbWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBn Zm4sIHVuc2lnbmVkIGxvbmcgbWZuLAogICAgIH0KIAogICAgIC8qIEluc3RhbGwgNGsgbWFwcGlu ZyBmaXJzdCAqLwotICAgIG5lZWRfZmx1c2ggPSBzZXRfaW9tbXVfcHRlX3ByZXNlbnQocHRfbWZu WzFdLCBnZm4sIG1mbiwgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJ T01NVV9QQUdJTkdfTU9ERV9MRVZFTF8xLAorICAgIG5lZWRfZmx1c2ggPSBzZXRfaW9tbXVfcHRl X3ByZXNlbnQocHRfbWZuWzFdLCBnZm4sIG1mbiwgMSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICEhKGZsYWdzICYgSU9NTVVGX3dyaXRhYmxlKSwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICEhKGZsYWdzICYgSU9NTVVGX3JlYWRhYmxlKSk7 CiAKQEAgLTY5MCw4ICs2ODYsOCBAQCBpbnQgYW1kX2lvbW11X21hcF9wYWdlKHN0cnVjdCBkb21h aW4gKmQsIHVuc2lnbmVkIGxvbmcgZ2ZuLCB1bnNpZ25lZCBsb25nIG1mbiwKICAgICBpZiAoIGlz X2h2bV9kb21haW4oZCkgKQogICAgICAgICBhbWRfaW9tbXVfZmx1c2hfcGFnZXMoZCwgZ2ZuLCAw KTsKIAotICAgIGZvciAoIG1lcmdlX2xldmVsID0gSU9NTVVfUEFHSU5HX01PREVfTEVWRUxfMjsK LSAgICAgICAgICBtZXJnZV9sZXZlbCA8PSBoZC0+YXJjaC5wYWdpbmdfbW9kZTsgbWVyZ2VfbGV2 ZWwrKyApCisgICAgZm9yICggbWVyZ2VfbGV2ZWwgPSAyOyBtZXJnZV9sZXZlbCA8PSBoZC0+YXJj aC5wYWdpbmdfbW9kZTsKKyAgICAgICAgICBtZXJnZV9sZXZlbCsrICkKICAgICB7CiAgICAgICAg IGlmICggcHRfbWZuW21lcmdlX2xldmVsXSA9PSAwICkKICAgICAgICAgICAgIGJyZWFrOwpAQCAt ODA4LDcgKzgwNCw3IEBAIHZvaWQgYW1kX2lvbW11X3NoYXJlX3AybShzdHJ1Y3QgZG9tYWluICpk KQogICAgICAgICBoZC0+YXJjaC5yb290X3RhYmxlID0gcDJtX3RhYmxlOwogCiAgICAgICAgIC8q IFdoZW4gc2hhcmluZyBwMm0gd2l0aCBpb21tdSwgcGFnaW5nIG1vZGUgPSA0ICovCi0gICAgICAg IGhkLT5hcmNoLnBhZ2luZ19tb2RlID0gSU9NTVVfUEFHSU5HX01PREVfTEVWRUxfNDsKKyAgICAg ICAgaGQtPmFyY2gucGFnaW5nX21vZGUgPSA0OwogICAgICAgICBBTURfSU9NTVVfREVCVUcoIlNo YXJlIHAybSB0YWJsZSB3aXRoIGlvbW11OiBwMm0gdGFibGUgPSAlI2x4XG4iLAogICAgICAgICAg ICAgICAgICAgICAgICAgbWZuX3gocGdkX21mbikpOwogICAgIH0KZGlmZiAtLWdpdCBhL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11LmMgYi94ZW4vZHJpdmVycy9wYXNz dGhyb3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jCmluZGV4IDgwZDlhZTY1NjEuLjAzMGRlYmI3NzUg MTAwNjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11LmMK KysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL3BjaV9hbWRfaW9tbXUuYwpAQCAtMjQw LDkgKzI0MCw3IEBAIHN0YXRpYyBpbnQgYW1kX2lvbW11X2RvbWFpbl9pbml0KHN0cnVjdCBkb21h aW4gKmQpCiAKICAgICAvKiBGb3IgcHYgYW5kIGRvbTAsIHN0aWNrIHdpdGggZ2V0X3BhZ2luZ19t b2RlKG1heF9wYWdlKQogICAgICAqIEZvciBIVk0gZG9tMCwgdXNlIDIgbGV2ZWwgcGFnZSB0YWJs ZSBhdCBmaXJzdCAqLwotICAgIGhkLT5hcmNoLnBhZ2luZ19tb2RlID0gaXNfaHZtX2RvbWFpbihk KSA/Ci0gICAgICAgICAgICAgICAgICAgICAgSU9NTVVfUEFHSU5HX01PREVfTEVWRUxfMiA6Ci0g ICAgICAgICAgICAgICAgICAgICAgZ2V0X3BhZ2luZ19tb2RlKG1heF9wYWdlKTsKKyAgICBoZC0+ YXJjaC5wYWdpbmdfbW9kZSA9IGlzX2h2bV9kb21haW4oZCkgPyAyIDogZ2V0X3BhZ2luZ19tb2Rl KG1heF9wYWdlKTsKICAgICByZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUv YXNtLXg4Ni9odm0vc3ZtL2FtZC1pb21tdS1kZWZzLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2h2 bS9zdm0vYW1kLWlvbW11LWRlZnMuaAppbmRleCBjNDc5ZjBiYjAyLi42YjM1ZGJmZDMyIDEwMDY0 NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vYW1kLWlvbW11LWRlZnMuaAorKysg Yi94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vYW1kLWlvbW11LWRlZnMuaApAQCAtMzgsOCAr MzgsNyBAQAogCVBBR0VfU0laRSAqIChQVEVfUEVSX1RBQkxFX0FMSUdOKGVudHJpZXMpID4+IFBU RV9QRVJfVEFCTEVfU0hJRlQpCiAKICNkZWZpbmUgYW1kX29mZnNldF9sZXZlbF9hZGRyZXNzKG9m ZnNldCwgbGV2ZWwpIFwKLSAgICAgIAkoKHU2NCkob2Zmc2V0KSA8PCAoMTIgKyAoUFRFX1BFUl9U QUJMRV9TSElGVCAqIFwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxldmVsIC0g SU9NTVVfUEFHSU5HX01PREVfTEVWRUxfMSkpKSkKKyAgICAgICAgKCh1aW50NjRfdCkob2Zmc2V0 KSA8PCAoMTIgKyAoUFRFX1BFUl9UQUJMRV9TSElGVCAqICgobGV2ZWwpIC0gMSkpKSkKIAogI2Rl ZmluZSBQQ0lfTUlOX0NBUF9PRkZTRVQJMHg0MAogI2RlZmluZSBQQ0lfTUFYX0NBUF9CTE9DS1MJ NDgKQEAgLTQ1MCwxNCArNDQ5LDYgQEAKIAogLyogUGFnaW5nIG1vZGVzICovCiAjZGVmaW5lIElP TU1VX1BBR0lOR19NT0RFX0RJU0FCTEVECTB4MAotI2RlZmluZSBJT01NVV9QQUdJTkdfTU9ERV9M RVZFTF8wCTB4MAotI2RlZmluZSBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF8xCTB4MQotI2RlZmlu ZSBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF8yCTB4MgotI2RlZmluZSBJT01NVV9QQUdJTkdfTU9E RV9MRVZFTF8zCTB4MwotI2RlZmluZSBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF80CTB4NAotI2Rl ZmluZSBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF81CTB4NQotI2RlZmluZSBJT01NVV9QQUdJTkdf TU9ERV9MRVZFTF82CTB4NgotI2RlZmluZSBJT01NVV9QQUdJTkdfTU9ERV9MRVZFTF83CTB4Nwog CiAvKiBGbGFncyAqLwogI2RlZmluZSBJT01NVV9DT05UUk9MX0RJU0FCTEVECTAKQEAgLTQ5OCwz ICs0ODksMTMgQEAKICNkZWZpbmUgSU9NTVVfUkVHX0JBU0VfQUREUl9ISUdIX1NISUZUICAgICAg ICAgICAgICAwCiAKICNlbmRpZiAvKiBfQVNNX1g4Nl82NF9BTURfSU9NTVVfREVGU19IICovCisK Ky8qCisgKiBMb2NhbCB2YXJpYWJsZXM6CisgKiBtb2RlOiBDCisgKiBjLWZpbGUtc3R5bGU6ICJC U0QiCisgKiBjLWJhc2ljLW9mZnNldDogNAorICogdGFiLXdpZHRoOiA0CisgKiBpbmRlbnQtdGFi cy1tb2RlOiBuaWwKKyAqIEVuZDoKKyAqLwotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4t ZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9t YWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==