From: Paul Durrant Subject: [PATCH] amd-iommu: use correct constants in amd_iommu_get_next_table_from_pte()... Date: Wed, 26 Sep 2018 13:56:04 +0100 Message-ID: <20180926125604.21295-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 1g59MQ-0003KA-CR for xen-devel@lists.xenproject.org; Wed, 26 Sep 2018 12:56:10 +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 Li4uYW5kIGNoYW5nZSB0aGUgbmFtZSB0byBhbWRfaW9tbXVfZ2V0X2FkZHJlc3NfZnJvbV9wdGUo KSBzaW5jZSB0aGUKYWRkcmVzcyByZWFkIGlzIG5vdCBuZWNlc3NhcmlseSBhICduZXh0IGxldmVs JyBwYWdlIHRhYmxlLgoKVGhlIGNvbnN0YW50cyBpbiB1c2UgcHJpb3IgdG8gdGhpcyBwYXRjaCBy ZWxhdGUgdG8gZGV2aWNlIHRhYmxlIGVudHJpZXMKcmF0aGVyIHRoYW4gcGFnZSB0YWJsZSBlbnRy aWVzLiBBbHRob3VnaCB0aGV5IGRvIGhhdmUgdGhlIHNhbWUgdmFsdWUsIGl0Cm1ha2VzIHRoZSBj b2RlIGNvbmZ1c2luZyB0byByZWFkLgoKVGhpcyBwYXRjaCBhbHNvIGNoYW5nZXMgdGhlIFBERS9Q VEUgcG9pbnRlciBhcmd1bWVudCB0byB2b2lkICosIGFuZApyZW1vdmVzIGFueSB1MzIvdWludDMy X3QgY2FzdHMgaW4gdGhlIGNhbGwgc2l0ZXMuIFVubmVjZXNzYXJ5IGNhc3RzCnN1cnJvdW5kaW5n IGNhbGwgc2l0ZXMgYXJlIGFsc28gcmVtb3ZlZC4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKTk9U RTogVGhlIHBhdGNoIGFsc28gYWRkcyBlbWFjcyBib2lsZXJwbGF0ZSB0byBpb21tdV9tYXAuYwoK U2lnbmVkLW9mZi1ieTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KLS0t CkNjOiBTdXJhdmVlIFN1dGhpa3VscGFuaXQgPHN1cmF2ZWUuc3V0aGlrdWxwYW5pdEBhbWQuY29t PgpDYzogQnJpYW4gV29vZHMgPGJyaWFuLndvb2RzQGFtZC5jb20+Ci0tLQogeGVuL2RyaXZlcnMv cGFzc3Rocm91Z2gvYW1kL2lvbW11X21hcC5jICAgICAgIHwgNDAgKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tCiB4ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jICAg fCAxMCArKystLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vYW1kLWlvbW11LXByb3Rv LmggfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFw LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFwLmMKaW5kZXggNzBiNDM0 NWIzNy4uNDEyNDdkOGU5ZiAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1k L2lvbW11X21hcC5jCisrKyBiL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9pb21tdV9tYXAu YwpAQCAtMjg1LDE5ICsyODUsMTggQEAgdm9pZCBpb21tdV9kdGVfc2V0X2d1ZXN0X2NyMyh1MzIg KmR0ZSwgdTE2IGRvbV9pZCwgdTY0IGdjcjMsCiAgICAgZHRlWzFdID0gZW50cnk7CiB9CiAKLXU2 NCBhbWRfaW9tbXVfZ2V0X25leHRfdGFibGVfZnJvbV9wdGUodTMyICplbnRyeSkKK3VpbnQ2NF90 IGFtZF9pb21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZSh2b2lkICpwdGUpCiB7Ci0gICAgdTY0IGFk ZHJfbG8sIGFkZHJfaGksIHB0cjsKKyAgICB1aW50MzJfdCAqZW50cnkgPSBwdGU7CisgICAgdWlu dDY0X3QgYWRkcl9sbywgYWRkcl9oaSwgcHRyOwogCi0gICAgYWRkcl9sbyA9IGdldF9maWVsZF9m cm9tX3JlZ191MzIoCi0gICAgICAgIGVudHJ5WzBdLAotICAgICAgICBJT01NVV9ERVZfVEFCTEVf UEFHRV9UQUJMRV9QVFJfTE9XX01BU0ssCi0gICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdFX1RB QkxFX1BUUl9MT1dfU0hJRlQpOworICAgIGFkZHJfbG8gPSBnZXRfZmllbGRfZnJvbV9yZWdfdTMy KGVudHJ5WzBdLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElPTU1VX1BE RV9BRERSX0xPV19NQVNLLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElP TU1VX1BERV9BRERSX0xPV19TSElGVCk7CiAKLSAgICBhZGRyX2hpID0gZ2V0X2ZpZWxkX2Zyb21f cmVnX3UzMigKLSAgICAgICAgZW50cnlbMV0sCi0gICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdF X1RBQkxFX1BUUl9ISUdIX01BU0ssCi0gICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdFX1RBQkxF X1BUUl9ISUdIX1NISUZUKTsKKyAgICBhZGRyX2hpID0gZ2V0X2ZpZWxkX2Zyb21fcmVnX3UzMihl bnRyeVsxXSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJT01NVV9QREVf QUREUl9ISUdIX01BU0ssCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9N TVVfUERFX0FERFJfSElHSF9TSElGVCk7CiAKICAgICBwdHIgPSAoYWRkcl9oaSA8PCAzMikgfCAo YWRkcl9sbyA8PCBQQUdFX1NISUZUKTsKICAgICByZXR1cm4gcHRyOwpAQCAtMzUwLDExICszNDks MTEgQEAgc3RhdGljIGludCBpb21tdV91cGRhdGVfcGRlX2NvdW50KHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGxvbmcgcHRfbWZuLAogICAgIHBkZSA9IHRhYmxlICsgcGZuX3RvX3BkZV9pZHgo Z2ZuLCBtZXJnZV9sZXZlbCk7CiAKICAgICAvKiBnZXQgcGFnZSB0YWJsZSBvZiBuZXh0IGxldmVs ICovCi0gICAgbnRhYmxlX21hZGRyID0gYW1kX2lvbW11X2dldF9uZXh0X3RhYmxlX2Zyb21fcHRl KCh1MzIqKXBkZSk7CisgICAgbnRhYmxlX21hZGRyID0gYW1kX2lvbW11X2dldF9hZGRyZXNzX2Zy b21fcHRlKHBkZSk7CiAgICAgbnRhYmxlID0gbWFwX2RvbWFpbl9wYWdlKF9tZm4ocGFkZHJfdG9f cGZuKG50YWJsZV9tYWRkcikpKTsKIAogICAgIC8qIGdldCB0aGUgZmlyc3QgbWZuIG9mIG5leHQg bGV2ZWwgKi8KLSAgICBmaXJzdF9tZm4gPSBhbWRfaW9tbXVfZ2V0X25leHRfdGFibGVfZnJvbV9w dGUoKHUzMiopbnRhYmxlKSA+PiBQQUdFX1NISUZUOworICAgIGZpcnN0X21mbiA9IGFtZF9pb21t dV9nZXRfYWRkcmVzc19mcm9tX3B0ZShudGFibGUpID4+IFBBR0VfU0hJRlQ7CiAKICAgICBpZiAo IGZpcnN0X21mbiA9PSAwICkKICAgICAgICAgZ290byBvdXQ7CkBAIC00MDEsNyArNDAwLDcgQEAg c3RhdGljIGludCBpb21tdV9tZXJnZV9wYWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBs b25nIHB0X21mbiwKICAgICBwZGUgPSB0YWJsZSArIHBmbl90b19wZGVfaWR4KGdmbiwgbWVyZ2Vf bGV2ZWwpOwogCiAgICAgLyogZ2V0IGZpcnN0IG1mbiAqLwotICAgIG50YWJsZV9tZm4gPSBhbWRf aW9tbXVfZ2V0X25leHRfdGFibGVfZnJvbV9wdGUoKHUzMiopcGRlKSA+PiBQQUdFX1NISUZUOwor ICAgIG50YWJsZV9tZm4gPSBhbWRfaW9tbXVfZ2V0X2FkZHJlc3NfZnJvbV9wdGUocGRlKSA+PiBQ QUdFX1NISUZUOwogCiAgICAgaWYgKCBudGFibGVfbWZuID09IDAgKQogICAgIHsKQEAgLTQxMCw3 ICs0MDksNyBAQCBzdGF0aWMgaW50IGlvbW11X21lcmdlX3BhZ2VzKHN0cnVjdCBkb21haW4gKmQs IHVuc2lnbmVkIGxvbmcgcHRfbWZuLAogICAgIH0KIAogICAgIG50YWJsZSA9IG1hcF9kb21haW5f cGFnZShfbWZuKG50YWJsZV9tZm4pKTsKLSAgICBmaXJzdF9tZm4gPSBhbWRfaW9tbXVfZ2V0X25l eHRfdGFibGVfZnJvbV9wdGUoKHUzMiopbnRhYmxlKSA+PiBQQUdFX1NISUZUOworICAgIGZpcnN0 X21mbiA9IGFtZF9pb21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZShudGFibGUpID4+IFBBR0VfU0hJ RlQ7CiAKICAgICBpZiAoIGZpcnN0X21mbiA9PSAwICkKICAgICB7CkBAIC00NjgsOCArNDY3LDcg QEAgc3RhdGljIGludCBpb21tdV9wZGVfZnJvbV9nZm4oc3RydWN0IGRvbWFpbiAqZCwgdW5zaWdu ZWQgbG9uZyBwZm4sCiAgICAgICAgIHBkZSA9IG5leHRfdGFibGVfdmFkZHIgKyBwZm5fdG9fcGRl X2lkeChwZm4sIGxldmVsKTsKIAogICAgICAgICAvKiBIZXJlIG1pZ2h0IGJlIGEgc3VwZXIgcGFn ZSBmcmFtZSAqLwotICAgICAgICBuZXh0X3RhYmxlX21mbiA9IGFtZF9pb21tdV9nZXRfbmV4dF90 YWJsZV9mcm9tX3B0ZSgodWludDMyX3QqKXBkZSkgCi0gICAgICAgICAgICAgICAgICAgICAgICAg Pj4gUEFHRV9TSElGVDsKKyAgICAgICAgbmV4dF90YWJsZV9tZm4gPSBhbWRfaW9tbXVfZ2V0X2Fk ZHJlc3NfZnJvbV9wdGUocGRlKSA+PiBQQUdFX1NISUZUOwogCiAgICAgICAgIC8qIFNwbGl0IHN1 cGVyIHBhZ2UgZnJhbWUgaW50byBzbWFsbGVyIHBpZWNlcy4qLwogICAgICAgICBpZiAoIGlvbW11 X2lzX3B0ZV9wcmVzZW50KCh1MzIqKXBkZSkgJiYKQEAgLTgxNSwzICs4MTMsMTMgQEAgdm9pZCBh bWRfaW9tbXVfc2hhcmVfcDJtKHN0cnVjdCBkb21haW4gKmQpCiAgICAgICAgICAgICAgICAgICAg ICAgICBtZm5feChwZ2RfbWZuKSk7CiAgICAgfQogfQorCisvKgorICogTG9jYWwgdmFyaWFibGVz OgorICogbW9kZTogQworICogYy1maWxlLXN0eWxlOiAiQlNEIgorICogYy1iYXNpYy1vZmZzZXQ6 IDQKKyAqIHRhYi13aWR0aDogNAorICogaW5kZW50LXRhYnMtbW9kZTogbmlsCisgKiBFbmQ6Cisg Ki8KZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11 LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jCmluZGV4IDRh NjMzY2E5NDAuLjgwZDlhZTY1NjEgMTAwNjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdo L2FtZC9wY2lfYW1kX2lvbW11LmMKKysrIGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL3Bj aV9hbWRfaW9tbXUuYwpAQCAtNDMwLDExICs0MzAsMTEgQEAgc3RhdGljIHZvaWQgZGVhbGxvY2F0 ZV9wYWdlX3RhYmxlKHN0cnVjdCBwYWdlX2luZm8gKnBnKQogICAgIGZvciAoIGluZGV4ID0gMDsg aW5kZXggPCBQVEVfUEVSX1RBQkxFX1NJWkU7IGluZGV4KysgKQogICAgIHsKICAgICAgICAgcGRl ID0gdGFibGVfdmFkZHIgKyAoaW5kZXggKiBJT01NVV9QQUdFX1RBQkxFX0VOVFJZX1NJWkUpOwot ICAgICAgICBuZXh0X3RhYmxlX21hZGRyID0gYW1kX2lvbW11X2dldF9uZXh0X3RhYmxlX2Zyb21f cHRlKHBkZSk7Ci0gICAgICAgIG5leHRfbGV2ZWwgPSBpb21tdV9uZXh0X2xldmVsKCh1MzIqKXBk ZSk7CisgICAgICAgIG5leHRfdGFibGVfbWFkZHIgPSBhbWRfaW9tbXVfZ2V0X2FkZHJlc3NfZnJv bV9wdGUocGRlKTsKKyAgICAgICAgbmV4dF9sZXZlbCA9IGlvbW11X25leHRfbGV2ZWwocGRlKTsK IAogICAgICAgICBpZiAoIChuZXh0X3RhYmxlX21hZGRyICE9IDApICYmIChuZXh0X2xldmVsICE9 IDApICYmCi0gICAgICAgICAgICAgaW9tbXVfaXNfcHRlX3ByZXNlbnQoKHUzMiopcGRlKSApCisg ICAgICAgICAgICAgaW9tbXVfaXNfcHRlX3ByZXNlbnQocGRlKSApCiAgICAgICAgIHsKICAgICAg ICAgICAgIC8qIFdlIGRvIG5vdCBzdXBwb3J0IHNraXAgbGV2ZWxzIHlldCAqLwogICAgICAgICAg ICAgQVNTRVJUKG5leHRfbGV2ZWwgPT0gbGV2ZWwgLSAxKTsKQEAgLTU1OSw4ICs1NTksOCBAQCBz dGF0aWMgdm9pZCBhbWRfZHVtcF9wMm1fdGFibGVfbGV2ZWwoc3RydWN0IHBhZ2VfaW5mbyogcGcs IGludCBsZXZlbCwKICAgICAgICAgICAgIHByb2Nlc3NfcGVuZGluZ19zb2Z0aXJxcygpOwogCiAg ICAgICAgIHBkZSA9IHRhYmxlX3ZhZGRyICsgKGluZGV4ICogSU9NTVVfUEFHRV9UQUJMRV9FTlRS WV9TSVpFKTsKLSAgICAgICAgbmV4dF90YWJsZV9tYWRkciA9IGFtZF9pb21tdV9nZXRfbmV4dF90 YWJsZV9mcm9tX3B0ZShwZGUpOwotICAgICAgICBlbnRyeSA9ICh1MzIqKXBkZTsKKyAgICAgICAg bmV4dF90YWJsZV9tYWRkciA9IGFtZF9pb21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZShwZGUpOwor ICAgICAgICBlbnRyeSA9IHBkZTsKIAogICAgICAgICBwcmVzZW50ID0gZ2V0X2ZpZWxkX2Zyb21f cmVnX3UzMihlbnRyeVswXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgSU9NTVVfUERFX1BSRVNFTlRfTUFTSywKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14 ODYvaHZtL3N2bS9hbWQtaW9tbXUtcHJvdG8uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2 bS9hbWQtaW9tbXUtcHJvdG8uaAppbmRleCA5OWJjMjFjN2IzLi5hNmJhMDQ0NWRhIDEwMDY0NAot LS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L2h2bS9zdm0vYW1kLWlvbW11LXByb3RvLmgKKysrIGIv eGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vc3ZtL2FtZC1pb21tdS1wcm90by5oCkBAIC01NSw3ICs1 NSw3IEBAIGludCBhbWRfaW9tbXVfdXBkYXRlX2l2cnNfbWFwcGluZ19hY3BpKHZvaWQpOwogaW50 IF9fbXVzdF9jaGVjayBhbWRfaW9tbXVfbWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWdu ZWQgbG9uZyBnZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25l ZCBsb25nIG1mbiwgdW5zaWduZWQgaW50IGZsYWdzKTsKIGludCBfX211c3RfY2hlY2sgYW1kX2lv bW11X3VubWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBnZm4pOwotdTY0 IGFtZF9pb21tdV9nZXRfbmV4dF90YWJsZV9mcm9tX3B0ZSh1MzIgKmVudHJ5KTsKK3VpbnQ2NF90 IGFtZF9pb21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZSh2b2lkICpwdGUpOwogaW50IF9fbXVzdF9j aGVjayBhbWRfaW9tbXVfYWxsb2Nfcm9vdChzdHJ1Y3QgZG9tYWluX2lvbW11ICpoZCk7CiBpbnQg YW1kX2lvbW11X3Jlc2VydmVfZG9tYWluX3VuaXR5X21hcChzdHJ1Y3QgZG9tYWluICpkb21haW4s CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1NjQgcGh5c19hZGRyLCB1 bnNpZ25lZCBsb25nIHNpemUsCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs