From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 6/6] x86/msr: Clean up the x2APIC MSR constants Date: Tue, 26 Jun 2018 14:18:18 +0100 Message-ID: <1530019098-7058-7-git-send-email-andrew.cooper3@citrix.com> References: <1530019098-7058-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1530019098-7058-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org VGhlIG5hbWUgTVNSX0lBMzJfQVBJQ0JBU0VfTVNSIGRvZXNuJ3QgbG9naWNhbGx5IHJlbGF0ZSB0 byBpdHMgcHVycG9zZS4KUmVuYW1lIGl0IHRvIE1TUl9YMkFQSUNfRklSU1QgYW5kIGludHJvZHVj ZSBhIGNvcnJlc3BvbmRpbmcKTVNSX1gyQVBJQ19MQVNUIHRvIGF2b2lkIG9wZW5jb2RpbmcgdGhl IGxlbmd0aCBvZiB0aGUgeDJBUElDIE1TUiByYW5nZS4KCkZvciB0aGUgc3BlY2lmaWMgcmVnaXN0 ZXJzLCBkcm9wIHRoZSBJQTMyIGluZml4LCBicmVhayB0aGUgQVBJQyBwYXJ0CmF3YXkgZnJvbSB0 aGUgcmVnaXN0ZXIgbmFtZSwgYW5kIGRyb3AgdGhlIE1TUiBzdWZmaXguCgpTaWduZWQtb2ZmLWJ5 OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgpSZXZpZXdlZC1ieTog S2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpC ZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ0M6IFJv Z2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9o dm0vaHZtLmMgICAgICAgICAgfCAgNCArKy0tCiB4ZW4vYXJjaC94ODYvaHZtL3ZsYXBpYy5jICAg ICAgIHwgIDQgKystLQogeGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMgICAgICB8IDIwICsrKysr KysrKystLS0tLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L21zci1pbmRleC5oIHwgMTggKysr KysrKysrKy0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMgYi94ZW4vYXJj aC94ODYvaHZtL2h2bS5jCmluZGV4IDlmYmRkZmEuLjFmNWYxNDQgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9odm0vaHZtLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9odm0uYwpAQCAtMzQ0Nyw3 ICszNDQ3LDcgQEAgaW50IGh2bV9tc3JfcmVhZF9pbnRlcmNlcHQodW5zaWduZWQgaW50IG1zciwg dWludDY0X3QgKm1zcl9jb250ZW50KQogICAgICAgICAqbXNyX2NvbnRlbnQgPSB2Y3B1X3ZsYXBp Yyh2KS0+aHcuYXBpY19iYXNlX21zcjsKICAgICAgICAgYnJlYWs7CiAKLSAgICBjYXNlIE1TUl9J QTMyX0FQSUNCQVNFX01TUiAuLi4gTVNSX0lBMzJfQVBJQ0JBU0VfTVNSICsgMHgzZmY6CisgICAg Y2FzZSBNU1JfWDJBUElDX0ZJUlNUIC4uLiBNU1JfWDJBUElDX0xBU1Q6CiAgICAgICAgIGlmICgg aHZtX3gyYXBpY19tc3JfcmVhZCh2LCBtc3IsIG1zcl9jb250ZW50KSApCiAgICAgICAgICAgICBn b3RvIGdwX2ZhdWx0OwogICAgICAgICBicmVhazsKQEAgLTM2MDYsNyArMzYwNiw3IEBAIGludCBo dm1fbXNyX3dyaXRlX2ludGVyY2VwdCh1bnNpZ25lZCBpbnQgbXNyLCB1aW50NjRfdCBtc3JfY29u dGVudCwKICAgICAgICAgdmxhcGljX3RkdF9tc3Jfc2V0KHZjcHVfdmxhcGljKHYpLCBtc3JfY29u dGVudCk7CiAgICAgICAgIGJyZWFrOwogCi0gICAgY2FzZSBNU1JfSUEzMl9BUElDQkFTRV9NU1Ig Li4uIE1TUl9JQTMyX0FQSUNCQVNFX01TUiArIDB4M2ZmOgorICAgIGNhc2UgTVNSX1gyQVBJQ19G SVJTVCAuLi4gTVNSX1gyQVBJQ19MQVNUOgogICAgICAgICBpZiAoIGh2bV94MmFwaWNfbXNyX3dy aXRlKHYsIG1zciwgbXNyX2NvbnRlbnQpICkKICAgICAgICAgICAgIGdvdG8gZ3BfZmF1bHQ7CiAg ICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92bGFwaWMuYyBiL3hl bi9hcmNoL3g4Ni9odm0vdmxhcGljLmMKaW5kZXggYWEyNTk2Ny4uOTZlZmMwZiAxMDA2NDQKLS0t IGEveGVuL2FyY2gveDg2L2h2bS92bGFwaWMuYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3ZsYXBp Yy5jCkBAIC02ODQsNyArNjg0LDcgQEAgaW50IGh2bV94MmFwaWNfbXNyX3JlYWQoc3RydWN0IHZj cHUgKnYsIHVuc2lnbmVkIGludCBtc3IsIHVpbnQ2NF90ICptc3JfY29udGVudCkKICN1bmRlZiBS RUdCTE9DSwogICAgICAgICB9OwogICAgIGNvbnN0IHN0cnVjdCB2bGFwaWMgKnZsYXBpYyA9IHZj cHVfdmxhcGljKHYpOwotICAgIHVpbnQzMl90IGhpZ2ggPSAwLCByZWcgPSBtc3IgLSBNU1JfSUEz Ml9BUElDQkFTRV9NU1IsIG9mZnNldCA9IHJlZyA8PCA0OworICAgIHVpbnQzMl90IGhpZ2ggPSAw LCByZWcgPSBtc3IgLSBNU1JfWDJBUElDX0ZJUlNULCBvZmZzZXQgPSByZWcgPDwgNDsKIAogICAg IGlmICggIXZsYXBpY194MmFwaWNfbW9kZSh2bGFwaWMpIHx8CiAgICAgICAgICAocmVnID49IHNp emVvZihyZWFkYWJsZSkgKiA4KSB8fCAhdGVzdF9iaXQocmVnLCByZWFkYWJsZSkgKQpAQCAtOTg4 LDcgKzk4OCw3IEBAIGludCB2bGFwaWNfYXBpY3Zfd3JpdGUoc3RydWN0IHZjcHUgKnYsIHVuc2ln bmVkIGludCBvZmZzZXQpCiBpbnQgaHZtX3gyYXBpY19tc3Jfd3JpdGUoc3RydWN0IHZjcHUgKnYs IHVuc2lnbmVkIGludCBtc3IsIHVpbnQ2NF90IG1zcl9jb250ZW50KQogewogICAgIHN0cnVjdCB2 bGFwaWMgKnZsYXBpYyA9IHZjcHVfdmxhcGljKHYpOwotICAgIHVpbnQzMl90IG9mZnNldCA9ICht c3IgLSBNU1JfSUEzMl9BUElDQkFTRV9NU1IpIDw8IDQ7CisgICAgdWludDMyX3Qgb2Zmc2V0ID0g KG1zciAtIE1TUl9YMkFQSUNfRklSU1QpIDw8IDQ7CiAKICAgICBpZiAoICF2bGFwaWNfeDJhcGlj X21vZGUodmxhcGljKSApCiAgICAgICAgIHJldHVybiBYODZFTVVMX1VOSEFORExFQUJMRTsKZGlm ZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vdm14L3ZteC5jIGIveGVuL2FyY2gveDg2L2h2bS92 bXgvdm14LmMKaW5kZXggZDUzMzRjOS4uNDhlMmY4YyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L2h2bS92bXgvdm14LmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMKQEAgLTI5OTUs MTkgKzI5OTUsMTkgQEAgdm9pZCB2bXhfdmxhcGljX21zcl9jaGFuZ2VkKHN0cnVjdCB2Y3B1ICp2 KQogICAgICAgICAgICAgICAgIFNFQ09OREFSWV9FWEVDX1ZJUlRVQUxJWkVfWDJBUElDX01PREU7 CiAgICAgICAgICAgICBpZiAoIGNwdV9oYXNfdm14X2FwaWNfcmVnX3ZpcnQgKQogICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgIGZvciAoIG1zciA9IE1TUl9JQTMyX0FQSUNCQVNFX01TUjsK LSAgICAgICAgICAgICAgICAgICAgICBtc3IgPD0gTVNSX0lBMzJfQVBJQ0JBU0VfTVNSICsgMHhm ZjsgbXNyKysgKQorICAgICAgICAgICAgICAgIGZvciAoIG1zciA9IE1TUl9YMkFQSUNfRklSU1Q7 CisgICAgICAgICAgICAgICAgICAgICAgbXNyIDw9IE1TUl9YMkFQSUNfRklSU1QgKyAweGZmOyBt c3IrKyApCiAgICAgICAgICAgICAgICAgICAgIHZteF9jbGVhcl9tc3JfaW50ZXJjZXB0KHYsIG1z ciwgVk1YX01TUl9SKTsKIAotICAgICAgICAgICAgICAgIHZteF9zZXRfbXNyX2ludGVyY2VwdCh2 LCBNU1JfSUEzMl9BUElDUFBSX01TUiwgVk1YX01TUl9SKTsKLSAgICAgICAgICAgICAgICB2bXhf c2V0X21zcl9pbnRlcmNlcHQodiwgTVNSX0lBMzJfQVBJQ1RNSUNUX01TUiwgVk1YX01TUl9SKTsK LSAgICAgICAgICAgICAgICB2bXhfc2V0X21zcl9pbnRlcmNlcHQodiwgTVNSX0lBMzJfQVBJQ1RN Q0NUX01TUiwgVk1YX01TUl9SKTsKKyAgICAgICAgICAgICAgICB2bXhfc2V0X21zcl9pbnRlcmNl cHQodiwgTVNSX1gyQVBJQ19QUFIsIFZNWF9NU1JfUik7CisgICAgICAgICAgICAgICAgdm14X3Nl dF9tc3JfaW50ZXJjZXB0KHYsIE1TUl9YMkFQSUNfVE1JQ1QsIFZNWF9NU1JfUik7CisgICAgICAg ICAgICAgICAgdm14X3NldF9tc3JfaW50ZXJjZXB0KHYsIE1TUl9YMkFQSUNfVE1DQ1QsIFZNWF9N U1JfUik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAoIGNwdV9oYXNfdm14X3ZpcnR1 YWxfaW50cl9kZWxpdmVyeSApCiAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgdm14X2Ns ZWFyX21zcl9pbnRlcmNlcHQodiwgTVNSX0lBMzJfQVBJQ1RQUl9NU1IsIFZNWF9NU1JfVyk7Ci0g ICAgICAgICAgICAgICAgdm14X2NsZWFyX21zcl9pbnRlcmNlcHQodiwgTVNSX0lBMzJfQVBJQ0VP SV9NU1IsIFZNWF9NU1JfVyk7Ci0gICAgICAgICAgICAgICAgdm14X2NsZWFyX21zcl9pbnRlcmNl cHQodiwgTVNSX0lBMzJfQVBJQ1NFTEZfTVNSLCBWTVhfTVNSX1cpOworICAgICAgICAgICAgICAg IHZteF9jbGVhcl9tc3JfaW50ZXJjZXB0KHYsIE1TUl9YMkFQSUNfVFBSLCBWTVhfTVNSX1cpOwor ICAgICAgICAgICAgICAgIHZteF9jbGVhcl9tc3JfaW50ZXJjZXB0KHYsIE1TUl9YMkFQSUNfRU9J LCBWTVhfTVNSX1cpOworICAgICAgICAgICAgICAgIHZteF9jbGVhcl9tc3JfaW50ZXJjZXB0KHYs IE1TUl9YMkFQSUNfU0VMRiwgVk1YX01TUl9XKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgICAgICBlbHNlCkBAIC0zMDE2LDggKzMwMTYsOCBAQCB2b2lkIHZteF92bGFwaWNfbXNyX2No YW5nZWQoc3RydWN0IHZjcHUgKnYpCiAgICAgfQogICAgIGlmICggISh2LT5hcmNoLmh2bV92bXgu c2Vjb25kYXJ5X2V4ZWNfY29udHJvbCAmCiAgICAgICAgICAgIFNFQ09OREFSWV9FWEVDX1ZJUlRV QUxJWkVfWDJBUElDX01PREUpICkKLSAgICAgICAgZm9yICggbXNyID0gTVNSX0lBMzJfQVBJQ0JB U0VfTVNSOwotICAgICAgICAgICAgICBtc3IgPD0gTVNSX0lBMzJfQVBJQ0JBU0VfTVNSICsgMHhm ZjsgbXNyKysgKQorICAgICAgICBmb3IgKCBtc3IgPSBNU1JfWDJBUElDX0ZJUlNUOworICAgICAg ICAgICAgICBtc3IgPD0gTVNSX1gyQVBJQ19GSVJTVCArIDB4ZmY7IG1zcisrICkKICAgICAgICAg ICAgIHZteF9zZXRfbXNyX2ludGVyY2VwdCh2LCBtc3IsIFZNWF9NU1JfUlcpOwogCiAgICAgdm14 X3VwZGF0ZV9zZWNvbmRhcnlfZXhlY19jb250cm9sKHYpOwpkaWZmIC0tZ2l0IGEveGVuL2luY2x1 ZGUvYXNtLXg4Ni9tc3ItaW5kZXguaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvbXNyLWluZGV4LmgK aW5kZXggY2UyZTg0Ny4uOWQ5NmU5NiAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9t c3ItaW5kZXguaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L21zci1pbmRleC5oCkBAIC00OSw2 ICs0OSwxNiBAQAogI2RlZmluZSBNU1JfTUlTQ19GRUFUVVJFU19FTkFCTEVTICAgICAgIDB4MDAw MDAxNDAKICNkZWZpbmUgTUlTQ19GRUFUVVJFU19DUFVJRF9GQVVMVElORyAgICAoX0FDKDEsIFVM TCkgPDwgIDApCiAKKyNkZWZpbmUgTVNSX1gyQVBJQ19GSVJTVCAgICAgICAgICAgICAgICAweDAw MDAwODAwCisjZGVmaW5lIE1TUl9YMkFQSUNfTEFTVCAgICAgICAgICAgICAgICAgMHgwMDAwMGJm ZgorCisjZGVmaW5lIE1TUl9YMkFQSUNfVFBSICAgICAgICAgICAgICAgICAgMHgwMDAwMDgwOAor I2RlZmluZSBNU1JfWDJBUElDX1BQUiAgICAgICAgICAgICAgICAgIDB4MDAwMDA4MGEKKyNkZWZp bmUgTVNSX1gyQVBJQ19FT0kgICAgICAgICAgICAgICAgICAweDAwMDAwODBiCisjZGVmaW5lIE1T Ul9YMkFQSUNfVE1JQ1QgICAgICAgICAgICAgICAgMHgwMDAwMDgzOAorI2RlZmluZSBNU1JfWDJB UElDX1RNQ0NUICAgICAgICAgICAgICAgIDB4MDAwMDA4MzkKKyNkZWZpbmUgTVNSX1gyQVBJQ19T RUxGICAgICAgICAgICAgICAgICAweDAwMDAwODNmCisKICNkZWZpbmUgTVNSX0VGRVIgICAgICAg ICAgICAgICAgICAgICAgICAweGMwMDAwMDgwIC8qIEV4dGVuZGVkIEZlYXR1cmUgRW5hYmxlIFJl Z2lzdGVyICovCiAjZGVmaW5lIEVGRVJfU0NFICAgICAgICAgICAgICAgICAgICAgICAgKF9BQygx LCBVTEwpIDw8ICAwKSAvKiBTWVNDQUxMIEVuYWJsZSAqLwogI2RlZmluZSBFRkVSX0xNRSAgICAg ICAgICAgICAgICAgICAgICAgIChfQUMoMSwgVUxMKSA8PCAgOCkgLyogTG9uZyBNb2RlIEVuYWJs ZSAqLwpAQCAtMzM2LDE0ICszNDYsNiBAQAogCiAjZGVmaW5lIE1TUl9JQTMyX1RTQ19BREpVU1QJ CTB4MDAwMDAwM2IKIAotI2RlZmluZSBNU1JfSUEzMl9BUElDQkFTRV9NU1IgICAgICAgICAgIDB4 ODAwCi0jZGVmaW5lIE1TUl9JQTMyX0FQSUNUUFJfTVNSICAgICAgICAgICAgMHg4MDgKLSNkZWZp bmUgTVNSX0lBMzJfQVBJQ1BQUl9NU1IgICAgICAgICAgICAweDgwYQotI2RlZmluZSBNU1JfSUEz Ml9BUElDRU9JX01TUiAgICAgICAgICAgIDB4ODBiCi0jZGVmaW5lIE1TUl9JQTMyX0FQSUNUTUlD VF9NU1IgICAgICAgICAgMHg4MzgKLSNkZWZpbmUgTVNSX0lBMzJfQVBJQ1RNQ0NUX01TUiAgICAg ICAgICAweDgzOQotI2RlZmluZSBNU1JfSUEzMl9BUElDU0VMRl9NU1IgICAgICAgICAgIDB4ODNm Ci0KICNkZWZpbmUgTVNSX0lBMzJfVUNPREVfV1JJVEUJCTB4MDAwMDAwNzkKICNkZWZpbmUgTVNS X0lBMzJfVUNPREVfUkVWCQkweDAwMDAwMDhiCiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9y Zy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==