From: Paul Durrant Subject: [PATCH v2] amd-iommu: use correct constants in amd_iommu_get_next_table_from_pte()... Date: Wed, 26 Sep 2018 14:44:07 +0100 Message-ID: <20180926134407.29963-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 1g5A6v-0007Ys-MU for xen-devel@lists.xenproject.org; Wed, 26 Sep 2018 13:44:13 +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 KSBzaW5jZSB0aGUKYWRkcmVzcyByZWFkIGlzIG5vdCBuZWNlc3NhcmlseSB0aGUgYWRkcmVzcyBv ZiBhIG5leHQgbGV2ZWwgcGFnZSB0YWJsZS4KKElmIHRoZSAnbmV4dCBsZXZlbCcgZmllbGQgaXMg bm90IDEgLSA2IHRoZW4gdGhlIGFkZHJlc3MgaXMgYSBwYWdlCmFkZHJlc3MpLgoKVGhlIGNvbnN0 YW50cyBpbiB1c2UgcHJpb3IgdG8gdGhpcyBwYXRjaCByZWxhdGUgdG8gZGV2aWNlIHRhYmxlIGVu dHJpZXMKcmF0aGVyIHRoYW4gcGFnZSB0YWJsZSBlbnRyaWVzLiBBbHRob3VnaCB0aGV5IGRvIGhh dmUgdGhlIHNhbWUgdmFsdWUsIGl0Cm1ha2VzIHRoZSBjb2RlIGNvbmZ1c2luZyB0byByZWFkLgoK VGhpcyBwYXRjaCBhbHNvIGNoYW5nZXMgdGhlIFBERS9QVEUgcG9pbnRlciBhcmd1bWVudCB0byB2 b2lkICosIGFuZApyZW1vdmVzIGFueSB1MzIvdWludDMyX3QgY2FzdHMgaW4gdGhlIGNhbGwgc2l0 ZXMuIFVubmVjZXNzYXJ5IGNhc3RzCnN1cnJvdW5kaW5nIGNhbGwgc2l0ZXMgYXJlIGFsc28gcmVt b3ZlZC4KCk5vIGZ1bmN0aW9uYWwgY2hhbmdlLgoKTk9URTogVGhlIHBhdGNoIGFsc28gYWRkcyBl bWFjcyBib2lsZXJwbGF0ZSB0byBpb21tdV9tYXAuYwoKU2lnbmVkLW9mZi1ieTogUGF1bCBEdXJy YW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KLS0tCkNjOiBTdXJhdmVlIFN1dGhpa3VscGFu aXQgPHN1cmF2ZWUuc3V0aGlrdWxwYW5pdEBhbWQuY29tPgpDYzogQnJpYW4gV29vZHMgPGJyaWFu Lndvb2RzQGFtZC5jb20+Ci0tLQogeGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL2lvbW11X21h cC5jICAgICAgIHwgNDAgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiB4ZW4vZHJpdmVycy9w YXNzdGhyb3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jICAgfCAxMCArKystLS0tCiB4ZW4vaW5jbHVk ZS9hc20teDg2L2h2bS9zdm0vYW1kLWlvbW11LXByb3RvLmggfCAgMiArLQogMyBmaWxlcyBjaGFu Z2VkLCAzMCBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4v ZHJpdmVycy9wYXNzdGhyb3VnaC9hbWQvaW9tbXVfbWFwLmMgYi94ZW4vZHJpdmVycy9wYXNzdGhy b3VnaC9hbWQvaW9tbXVfbWFwLmMKaW5kZXggNzBiNDM0NWIzNy4uOWZhNWNkM2JkMyAxMDA2NDQK LS0tIGEveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL2lvbW11X21hcC5jCisrKyBiL3hlbi9k cml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9pb21tdV9tYXAuYwpAQCAtMjg1LDE5ICsyODUsMTggQEAg dm9pZCBpb21tdV9kdGVfc2V0X2d1ZXN0X2NyMyh1MzIgKmR0ZSwgdTE2IGRvbV9pZCwgdTY0IGdj cjMsCiAgICAgZHRlWzFdID0gZW50cnk7CiB9CiAKLXU2NCBhbWRfaW9tbXVfZ2V0X25leHRfdGFi bGVfZnJvbV9wdGUodTMyICplbnRyeSkKK3VpbnQ2NF90IGFtZF9pb21tdV9nZXRfYWRkcmVzc19m cm9tX3B0ZSh2b2lkICpwdGUpCiB7Ci0gICAgdTY0IGFkZHJfbG8sIGFkZHJfaGksIHB0cjsKKyAg ICB1aW50MzJfdCAqZW50cnkgPSBwdGU7CisgICAgdWludDY0X3QgYWRkcl9sbywgYWRkcl9oaSwg cHRyOwogCi0gICAgYWRkcl9sbyA9IGdldF9maWVsZF9mcm9tX3JlZ191MzIoCi0gICAgICAgIGVu dHJ5WzBdLAotICAgICAgICBJT01NVV9ERVZfVEFCTEVfUEFHRV9UQUJMRV9QVFJfTE9XX01BU0ss Ci0gICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdFX1RBQkxFX1BUUl9MT1dfU0hJRlQpOworICAg IGFkZHJfbG8gPSBnZXRfZmllbGRfZnJvbV9yZWdfdTMyKGVudHJ5WzBdLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIElPTU1VX1BURV9BRERSX0xPV19NQVNLLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElPTU1VX1BURV9BRERSX0xPV19TSElGVCk7 CiAKLSAgICBhZGRyX2hpID0gZ2V0X2ZpZWxkX2Zyb21fcmVnX3UzMigKLSAgICAgICAgZW50cnlb MV0sCi0gICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdFX1RBQkxFX1BUUl9ISUdIX01BU0ssCi0g ICAgICAgIElPTU1VX0RFVl9UQUJMRV9QQUdFX1RBQkxFX1BUUl9ISUdIX1NISUZUKTsKKyAgICBh ZGRyX2hpID0gZ2V0X2ZpZWxkX2Zyb21fcmVnX3UzMihlbnRyeVsxXSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBJT01NVV9QVEVfQUREUl9ISUdIX01BU0ssCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9NTVVfUFRFX0FERFJfSElHSF9TSElGVCk7 CiAKICAgICBwdHIgPSAoYWRkcl9oaSA8PCAzMikgfCAoYWRkcl9sbyA8PCBQQUdFX1NISUZUKTsK ICAgICByZXR1cm4gcHRyOwpAQCAtMzUwLDExICszNDksMTEgQEAgc3RhdGljIGludCBpb21tdV91 cGRhdGVfcGRlX2NvdW50KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgcHRfbWZuLAog ICAgIHBkZSA9IHRhYmxlICsgcGZuX3RvX3BkZV9pZHgoZ2ZuLCBtZXJnZV9sZXZlbCk7CiAKICAg ICAvKiBnZXQgcGFnZSB0YWJsZSBvZiBuZXh0IGxldmVsICovCi0gICAgbnRhYmxlX21hZGRyID0g YW1kX2lvbW11X2dldF9uZXh0X3RhYmxlX2Zyb21fcHRlKCh1MzIqKXBkZSk7CisgICAgbnRhYmxl X21hZGRyID0gYW1kX2lvbW11X2dldF9hZGRyZXNzX2Zyb21fcHRlKHBkZSk7CiAgICAgbnRhYmxl ID0gbWFwX2RvbWFpbl9wYWdlKF9tZm4ocGFkZHJfdG9fcGZuKG50YWJsZV9tYWRkcikpKTsKIAog ICAgIC8qIGdldCB0aGUgZmlyc3QgbWZuIG9mIG5leHQgbGV2ZWwgKi8KLSAgICBmaXJzdF9tZm4g PSBhbWRfaW9tbXVfZ2V0X25leHRfdGFibGVfZnJvbV9wdGUoKHUzMiopbnRhYmxlKSA+PiBQQUdF X1NISUZUOworICAgIGZpcnN0X21mbiA9IGFtZF9pb21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZShu dGFibGUpID4+IFBBR0VfU0hJRlQ7CiAKICAgICBpZiAoIGZpcnN0X21mbiA9PSAwICkKICAgICAg ICAgZ290byBvdXQ7CkBAIC00MDEsNyArNDAwLDcgQEAgc3RhdGljIGludCBpb21tdV9tZXJnZV9w YWdlcyhzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIHB0X21mbiwKICAgICBwZGUgPSB0 YWJsZSArIHBmbl90b19wZGVfaWR4KGdmbiwgbWVyZ2VfbGV2ZWwpOwogCiAgICAgLyogZ2V0IGZp cnN0IG1mbiAqLwotICAgIG50YWJsZV9tZm4gPSBhbWRfaW9tbXVfZ2V0X25leHRfdGFibGVfZnJv bV9wdGUoKHUzMiopcGRlKSA+PiBQQUdFX1NISUZUOworICAgIG50YWJsZV9tZm4gPSBhbWRfaW9t bXVfZ2V0X2FkZHJlc3NfZnJvbV9wdGUocGRlKSA+PiBQQUdFX1NISUZUOwogCiAgICAgaWYgKCBu dGFibGVfbWZuID09IDAgKQogICAgIHsKQEAgLTQxMCw3ICs0MDksNyBAQCBzdGF0aWMgaW50IGlv bW11X21lcmdlX3BhZ2VzKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGxvbmcgcHRfbWZuLAog ICAgIH0KIAogICAgIG50YWJsZSA9IG1hcF9kb21haW5fcGFnZShfbWZuKG50YWJsZV9tZm4pKTsK LSAgICBmaXJzdF9tZm4gPSBhbWRfaW9tbXVfZ2V0X25leHRfdGFibGVfZnJvbV9wdGUoKHUzMiop bnRhYmxlKSA+PiBQQUdFX1NISUZUOworICAgIGZpcnN0X21mbiA9IGFtZF9pb21tdV9nZXRfYWRk cmVzc19mcm9tX3B0ZShudGFibGUpID4+IFBBR0VfU0hJRlQ7CiAKICAgICBpZiAoIGZpcnN0X21m biA9PSAwICkKICAgICB7CkBAIC00NjgsOCArNDY3LDcgQEAgc3RhdGljIGludCBpb21tdV9wZGVf ZnJvbV9nZm4oc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBwZm4sCiAgICAgICAgIHBk ZSA9IG5leHRfdGFibGVfdmFkZHIgKyBwZm5fdG9fcGRlX2lkeChwZm4sIGxldmVsKTsKIAogICAg ICAgICAvKiBIZXJlIG1pZ2h0IGJlIGEgc3VwZXIgcGFnZSBmcmFtZSAqLwotICAgICAgICBuZXh0 X3RhYmxlX21mbiA9IGFtZF9pb21tdV9nZXRfbmV4dF90YWJsZV9mcm9tX3B0ZSgodWludDMyX3Qq KXBkZSkgCi0gICAgICAgICAgICAgICAgICAgICAgICAgPj4gUEFHRV9TSElGVDsKKyAgICAgICAg bmV4dF90YWJsZV9tZm4gPSBhbWRfaW9tbXVfZ2V0X2FkZHJlc3NfZnJvbV9wdGUocGRlKSA+PiBQ QUdFX1NISUZUOwogCiAgICAgICAgIC8qIFNwbGl0IHN1cGVyIHBhZ2UgZnJhbWUgaW50byBzbWFs bGVyIHBpZWNlcy4qLwogICAgICAgICBpZiAoIGlvbW11X2lzX3B0ZV9wcmVzZW50KCh1MzIqKXBk ZSkgJiYKQEAgLTgxNSwzICs4MTMsMTMgQEAgdm9pZCBhbWRfaW9tbXVfc2hhcmVfcDJtKHN0cnVj dCBkb21haW4gKmQpCiAgICAgICAgICAgICAgICAgICAgICAgICBtZm5feChwZ2RfbWZuKSk7CiAg ICAgfQogfQorCisvKgorICogTG9jYWwgdmFyaWFibGVzOgorICogbW9kZTogQworICogYy1maWxl LXN0eWxlOiAiQlNEIgorICogYy1iYXNpYy1vZmZzZXQ6IDQKKyAqIHRhYi13aWR0aDogNAorICog aW5kZW50LXRhYnMtbW9kZTogbmlsCisgKiBFbmQ6CisgKi8KZGlmZiAtLWdpdCBhL3hlbi9kcml2 ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11LmMgYi94ZW4vZHJpdmVycy9wYXNzdGhy b3VnaC9hbWQvcGNpX2FtZF9pb21tdS5jCmluZGV4IDRhNjMzY2E5NDAuLjgwZDlhZTY1NjEgMTAw NjQ0Ci0tLSBhL3hlbi9kcml2ZXJzL3Bhc3N0aHJvdWdoL2FtZC9wY2lfYW1kX2lvbW11LmMKKysr IGIveGVuL2RyaXZlcnMvcGFzc3Rocm91Z2gvYW1kL3BjaV9hbWRfaW9tbXUuYwpAQCAtNDMwLDEx ICs0MzAsMTEgQEAgc3RhdGljIHZvaWQgZGVhbGxvY2F0ZV9wYWdlX3RhYmxlKHN0cnVjdCBwYWdl X2luZm8gKnBnKQogICAgIGZvciAoIGluZGV4ID0gMDsgaW5kZXggPCBQVEVfUEVSX1RBQkxFX1NJ WkU7IGluZGV4KysgKQogICAgIHsKICAgICAgICAgcGRlID0gdGFibGVfdmFkZHIgKyAoaW5kZXgg KiBJT01NVV9QQUdFX1RBQkxFX0VOVFJZX1NJWkUpOwotICAgICAgICBuZXh0X3RhYmxlX21hZGRy ID0gYW1kX2lvbW11X2dldF9uZXh0X3RhYmxlX2Zyb21fcHRlKHBkZSk7Ci0gICAgICAgIG5leHRf bGV2ZWwgPSBpb21tdV9uZXh0X2xldmVsKCh1MzIqKXBkZSk7CisgICAgICAgIG5leHRfdGFibGVf bWFkZHIgPSBhbWRfaW9tbXVfZ2V0X2FkZHJlc3NfZnJvbV9wdGUocGRlKTsKKyAgICAgICAgbmV4 dF9sZXZlbCA9IGlvbW11X25leHRfbGV2ZWwocGRlKTsKIAogICAgICAgICBpZiAoIChuZXh0X3Rh YmxlX21hZGRyICE9IDApICYmIChuZXh0X2xldmVsICE9IDApICYmCi0gICAgICAgICAgICAgaW9t bXVfaXNfcHRlX3ByZXNlbnQoKHUzMiopcGRlKSApCisgICAgICAgICAgICAgaW9tbXVfaXNfcHRl X3ByZXNlbnQocGRlKSApCiAgICAgICAgIHsKICAgICAgICAgICAgIC8qIFdlIGRvIG5vdCBzdXBw b3J0IHNraXAgbGV2ZWxzIHlldCAqLwogICAgICAgICAgICAgQVNTRVJUKG5leHRfbGV2ZWwgPT0g bGV2ZWwgLSAxKTsKQEAgLTU1OSw4ICs1NTksOCBAQCBzdGF0aWMgdm9pZCBhbWRfZHVtcF9wMm1f dGFibGVfbGV2ZWwoc3RydWN0IHBhZ2VfaW5mbyogcGcsIGludCBsZXZlbCwKICAgICAgICAgICAg IHByb2Nlc3NfcGVuZGluZ19zb2Z0aXJxcygpOwogCiAgICAgICAgIHBkZSA9IHRhYmxlX3ZhZGRy ICsgKGluZGV4ICogSU9NTVVfUEFHRV9UQUJMRV9FTlRSWV9TSVpFKTsKLSAgICAgICAgbmV4dF90 YWJsZV9tYWRkciA9IGFtZF9pb21tdV9nZXRfbmV4dF90YWJsZV9mcm9tX3B0ZShwZGUpOwotICAg ICAgICBlbnRyeSA9ICh1MzIqKXBkZTsKKyAgICAgICAgbmV4dF90YWJsZV9tYWRkciA9IGFtZF9p b21tdV9nZXRfYWRkcmVzc19mcm9tX3B0ZShwZGUpOworICAgICAgICBlbnRyeSA9IHBkZTsKIAog ICAgICAgICBwcmVzZW50ID0gZ2V0X2ZpZWxkX2Zyb21fcmVnX3UzMihlbnRyeVswXSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU9NTVVfUERFX1BSRVNFTlRfTUFT SywKZGlmZiAtLWdpdCBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2bS9hbWQtaW9tbXUtcHJv dG8uaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3N2bS9hbWQtaW9tbXUtcHJvdG8uaAppbmRl eCA5OWJjMjFjN2IzLi5hNmJhMDQ0NWRhIDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2 L2h2bS9zdm0vYW1kLWlvbW11LXByb3RvLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0v c3ZtL2FtZC1pb21tdS1wcm90by5oCkBAIC01NSw3ICs1NSw3IEBAIGludCBhbWRfaW9tbXVfdXBk YXRlX2l2cnNfbWFwcGluZ19hY3BpKHZvaWQpOwogaW50IF9fbXVzdF9jaGVjayBhbWRfaW9tbXVf bWFwX3BhZ2Uoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgbG9uZyBnZm4sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIG1mbiwgdW5zaWduZWQgaW50 IGZsYWdzKTsKIGludCBfX211c3RfY2hlY2sgYW1kX2lvbW11X3VubWFwX3BhZ2Uoc3RydWN0IGRv bWFpbiAqZCwgdW5zaWduZWQgbG9uZyBnZm4pOwotdTY0IGFtZF9pb21tdV9nZXRfbmV4dF90YWJs ZV9mcm9tX3B0ZSh1MzIgKmVudHJ5KTsKK3VpbnQ2NF90IGFtZF9pb21tdV9nZXRfYWRkcmVzc19m cm9tX3B0ZSh2b2lkICpwdGUpOwogaW50IF9fbXVzdF9jaGVjayBhbWRfaW9tbXVfYWxsb2Nfcm9v dChzdHJ1Y3QgZG9tYWluX2lvbW11ICpoZCk7CiBpbnQgYW1kX2lvbW11X3Jlc2VydmVfZG9tYWlu X3VuaXR5X21hcChzdHJ1Y3QgZG9tYWluICpkb21haW4sCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1NjQgcGh5c19hZGRyLCB1bnNpZ25lZCBsb25nIHNpemUsCi0tIAoy LjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpY ZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRw czovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs