From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/4] x86/cpuid: Drop get_cpu_vendor() completely Date: Thu, 21 Mar 2019 12:21:04 +0000 Message-ID: <1553170866-23812-3-git-send-email-andrew.cooper3@citrix.com> References: <1553170866-23812-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: <1553170866-23812-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 , Sergey Dyasli , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= List-Id: xen-devel@lists.xenproject.org Z2V0X2NwdV92ZW5kb3IoKSB0cmllcyB0byBkbyBhIG51bWJlciBvZiB0aGluZ3MsIGFuZCBlbmRz IHVwIGRvaW5nIG5vbmUgb2YKdGhlbSB3ZWxsLgoKRm9yIGNhbGN1bGF0aW5nIHRoZSB2ZW5kb3Ig aXRzZWxmLCB1c2UgeDg2X2NwdWlkX2xvb2t1cF92ZW5kb3IoKSB3aGljaCBpcwppbXBsZW1lbnRl ZCBpbiBhIGZhciBtb3JlIGVmZmljaWVudCBtYW5uZXIgdGhhbiBsb29waW5nIG92ZXIgY3B1X2Rl dnNbXS4KCkZvciBzZXR0aW5nIHVwIHRoaXNfY3B1LCBzZXQgaXQgdXAgb25jZSBvbiB0aGUgQlNQ IG9ubHksIHJhdGhlciB0aGFuCmxhdGVzdC10YWtlcy1wcmVjaWRlbnQgYWNyb3NzIHRoZSBBUHMu ICBTdWNoIGEgc3lzdGVtIGlzIHByb2JhYmx5IG5vdCBnb2luZyB0bwpib290LCBidXQgdGhpcyBm ZWVscyBsaWtlIGEgbGVzcyBkYW5nZXJvdXMgY291cnNlIG9mIGFjdGlvbi4gIEFkanVzdCB0aGUK cHJpbnRlZCBlcnJvcnMgdG8gYmUgbW9yZSBjbGVhciBpbiB0aGUgbWlzbWF0Y2ggY2FzZS4KClRo aXMgcmVtb3ZlcyB0aGUgb25seSB1c2VyIG9mIGNwdV9kZXYtPmNfaWRlbnRbXSwgc28gZHJvcCB0 aGF0IGZpZWxkIGFzIHdlbGwuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcu Y29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNv bT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBSb2dlciBQYXUgTW9ubsOp IDxyb2dlci5wYXVAY2l0cml4LmNvbT4KQ0M6IFNlcmdleSBEeWFzbGkgPHNlcmdleS5keWFzbGlA Y2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYvY3B1L2FtZC5jICAgICAgICAgIHwgIDEgLQog eGVuL2FyY2gveDg2L2NwdS9jZW50YXVyLmMgICAgICB8ICAxIC0KIHhlbi9hcmNoL3g4Ni9jcHUv Y29tbW9uLmMgICAgICAgfCA0NSArKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogeGVuL2FyY2gveDg2L2NwdS9jcHUuaCAgICAgICAgICB8ICAxIC0KIHhlbi9hcmNoL3g4 Ni9jcHUvaW50ZWwuYyAgICAgICAgfCAgMSAtCiB4ZW4vYXJjaC94ODYvY3B1L3NoYW5naGFpLmMg ICAgIHwgIDEgLQogeGVuL2FyY2gveDg2L2NwdWlkLmMgICAgICAgICAgICB8ICA0ICsrLS0KIHhl bi9pbmNsdWRlL2FzbS14ODYvcHJvY2Vzc29yLmggfCAgNyAtLS0tLS0tCiA4IGZpbGVzIGNoYW5n ZWQsIDE1IGluc2VydGlvbnMoKyksIDQ2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9h cmNoL3g4Ni9jcHUvYW1kLmMgYi94ZW4vYXJjaC94ODYvY3B1L2FtZC5jCmluZGV4IGM3OTA0MTYu LjdhNzNkNjIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9jcHUvYW1kLmMKKysrIGIveGVuL2Fy Y2gveDg2L2NwdS9hbWQuYwpAQCAtNzk0LDcgKzc5NCw2IEBAIHN0YXRpYyB2b2lkIGluaXRfYW1k KHN0cnVjdCBjcHVpbmZvX3g4NiAqYykKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBjcHVfZGV2IGFt ZF9jcHVfZGV2ID0gewogCS5jX3ZlbmRvcgk9ICJBTUQiLAotCS5jX2lkZW50IAk9IHsgIkF1dGhl bnRpY0FNRCIgfSwKIAkuY19lYXJseV9pbml0CT0gZWFybHlfaW5pdF9hbWQsCiAJLmNfaW5pdAkJ PSBpbml0X2FtZCwKIH07CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvY3B1L2NlbnRhdXIuYyBi L3hlbi9hcmNoL3g4Ni9jcHUvY2VudGF1ci5jCmluZGV4IDFjNzYwYmUuLjcxZjY1MDMgMTAwNjQ0 Ci0tLSBhL3hlbi9hcmNoL3g4Ni9jcHUvY2VudGF1ci5jCisrKyBiL3hlbi9hcmNoL3g4Ni9jcHUv Y2VudGF1ci5jCkBAIC01Niw3ICs1Niw2IEBAIHN0YXRpYyB2b2lkIGluaXRfY2VudGF1cihzdHJ1 Y3QgY3B1aW5mb194ODYgKmMpCiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgY3B1X2RldiBjZW50YXVy X2NwdV9kZXYgPSB7CiAJLmNfdmVuZG9yCT0gIkNlbnRhdXIiLAotCS5jX2lkZW50CT0geyAiQ2Vu dGF1ckhhdWxzIiB9LAogCS5jX2luaXQJCT0gaW5pdF9jZW50YXVyLAogfTsKIApkaWZmIC0tZ2l0 IGEveGVuL2FyY2gveDg2L2NwdS9jb21tb24uYyBiL3hlbi9hcmNoL3g4Ni9jcHUvY29tbW9uLmMK aW5kZXggNTNiYjBhOS4uYzY5Yzk5NiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2NwdS9jb21t b24uYworKysgYi94ZW4vYXJjaC94ODYvY3B1L2NvbW1vbi5jCkBAIC0yNDcsMzYgKzI0Nyw2IEBA IHZvaWQgZGlzcGxheV9jYWNoZWluZm8oc3RydWN0IGNwdWluZm9feDg2ICpjKQogCQkgICAgICAg bDJzaXplLCBlY3ggJiAweEZGKTsKIH0KIAotaW50IGdldF9jcHVfdmVuZG9yKHVpbnQzMl90IGIs IHVpbnQzMl90IGMsIHVpbnQzMl90IGQsIGVudW0gZ2V0X2NwdV92ZW5kb3IgbW9kZSkKLXsKLQlp bnQgaTsKLQlzdGF0aWMgaW50IHByaW50ZWQ7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgWDg2X1ZFTkRP Ul9OVU07IGkrKykgewotCQlpZiAoY3B1X2RldnNbaV0pIHsKLQkJCXN0cnVjdCB7Ci0JCQkJdWlu dDMyX3QgYiwgZCwgYzsKLQkJCX0gKnB0ciA9ICh2b2lkICopY3B1X2RldnNbaV0tPmNfaWRlbnQ7 Ci0KLQkJCWlmIChwdHItPmIgPT0gYiAmJiBwdHItPmMgPT0gYyAmJiBwdHItPmQgPT0gZCkgewot CQkJCWlmIChtb2RlID09IGdjdl9ob3N0KQotCQkJCQl0aGlzX2NwdSA9IGNwdV9kZXZzW2ldOwot CQkJCXJldHVybiBpOwotCQkJfQotCQl9Ci0JfQotCWlmIChtb2RlID09IGdjdl9ndWVzdCkKLQkJ cmV0dXJuIFg4Nl9WRU5ET1JfVU5LTk9XTjsKLQlpZiAoIXByaW50ZWQpIHsKLQkJcHJpbnRlZCsr OwotCQlwcmludGsoS0VSTl9FUlIgIkNQVTogVmVuZG9yIHVua25vd24sIHVzaW5nIGdlbmVyaWMg aW5pdC5cbiIpOwotCQlwcmludGsoS0VSTl9FUlIgIkNQVTogWW91ciBzeXN0ZW0gbWF5IGJlIHVu c3RhYmxlLlxuIik7Ci0JfQotCXRoaXNfY3B1ID0gJmRlZmF1bHRfY3B1OwotCi0JcmV0dXJuIFg4 Nl9WRU5ET1JfVU5LTk9XTjsKLX0KLQogc3RhdGljIGlubGluZSB1MzIgX3BoeXNfcGtnX2lkKHUz MiBjcHVpZF9hcGljLCBpbnQgaW5kZXhfbXNiKQogewogCXJldHVybiBjcHVpZF9hcGljID4+IGlu ZGV4X21zYjsKQEAgLTMxMyw3ICsyODMsMTMgQEAgc3RhdGljIHZvaWQgX19pbml0IGVhcmx5X2Nw dV9kZXRlY3Qodm9pZCkKIAkqKHUzMiAqKSZjLT54ODZfdmVuZG9yX2lkWzhdID0gZWN4OwogCSoo dTMyICopJmMtPng4Nl92ZW5kb3JfaWRbNF0gPSBlZHg7CiAKLQljLT54ODZfdmVuZG9yID0gZ2V0 X2NwdV92ZW5kb3IoZWJ4LCBlY3gsIGVkeCwgZ2N2X2hvc3QpOworCWMtPng4Nl92ZW5kb3IgPSB4 ODZfY3B1aWRfbG9va3VwX3ZlbmRvcihlYngsIGVjeCwgZWR4KTsKKwlpZiAoYy0+eDg2X3ZlbmRv ciA8IEFSUkFZX1NJWkUoY3B1X2RldnMpICYmIGNwdV9kZXZzW2MtPng4Nl92ZW5kb3JdKQorCQl0 aGlzX2NwdSA9IGNwdV9kZXZzW2MtPng4Nl92ZW5kb3JdOworCWVsc2UKKwkJcHJpbnRrKFhFTkxP R19FUlIKKwkJICAgICAgICJVbnJlY29nbmlzZWQgb3IgdW5zdXBwb3J0ZWQgQ1BVIHZlbmRvciAn JXMnXG4iLAorCQkgICAgICAgYy0+eDg2X3ZlbmRvcl9pZCk7CiAKIAljcHVpZCgweDAwMDAwMDAx LCAmZWF4LCAmZWJ4LCAmZWN4LCAmZWR4KTsKIAljLT54ODYgPSBnZXRfY3B1X2ZhbWlseShlYXgs ICZjLT54ODZfbW9kZWwsICZjLT54ODZfbWFzayk7CkBAIC0zNjEsNyArMzM3LDEyIEBAIHN0YXRp YyB2b2lkIGdlbmVyaWNfaWRlbnRpZnkoc3RydWN0IGNwdWluZm9feDg2ICpjKQogCSoodTMyICop JmMtPng4Nl92ZW5kb3JfaWRbOF0gPSBlY3g7CiAJKih1MzIgKikmYy0+eDg2X3ZlbmRvcl9pZFs0 XSA9IGVkeDsKIAotCWMtPng4Nl92ZW5kb3IgPSBnZXRfY3B1X3ZlbmRvcihlYngsIGVjeCwgZWR4 LCBnY3ZfaG9zdCk7CisJYy0+eDg2X3ZlbmRvciA9IHg4Nl9jcHVpZF9sb29rdXBfdmVuZG9yKGVi eCwgZWN4LCBlZHgpOworCWlmIChib290X2NwdV9kYXRhLng4Nl92ZW5kb3IgIT0gYy0+eDg2X3Zl bmRvcikKKwkJcHJpbnRrKFhFTkxPR19FUlIgIkNQVSV1IHZlbmRvciAldSBtaXNtYXRjaCBhZ2Fp bnN0IEJTUCAldVxuIiwKKwkJICAgICAgIHNtcF9wcm9jZXNzb3JfaWQoKSwgYy0+eDg2X3ZlbmRv ciwKKwkJICAgICAgIGJvb3RfY3B1X2RhdGEueDg2X3ZlbmRvcik7CisKIAkvKiBJbml0aWFsaXpl IHRoZSBzdGFuZGFyZCBzZXQgb2YgY2FwYWJpbGl0aWVzICovCiAJLyogTm90ZSB0aGF0IHRoZSB2 ZW5kb3Itc3BlY2lmaWMgY29kZSBiZWxvdyBtaWdodCBvdmVycmlkZSAqLwogCmRpZmYgLS1naXQg YS94ZW4vYXJjaC94ODYvY3B1L2NwdS5oIGIveGVuL2FyY2gveDg2L2NwdS9jcHUuaAppbmRleCAy ZmNiOTMxLi5lZGM4OGIxIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvY3B1L2NwdS5oCisrKyBi L3hlbi9hcmNoL3g4Ni9jcHUvY3B1LmgKQEAgLTEsNyArMSw2IEBACiAvKiBhdHRlbXB0IHRvIGNv bnNvbGlkYXRlIGNwdSBhdHRyaWJ1dGVzICovCiBzdHJ1Y3QgY3B1X2RldiB7CiAJY2hhcgljX3Zl bmRvcls4XTsKLQljaGFyCWNfaWRlbnRbMTNdOwogCiAJdm9pZAkJKCpjX2Vhcmx5X2luaXQpKHN0 cnVjdCBjcHVpbmZvX3g4NiAqYyk7CiAJdm9pZAkJKCpjX2luaXQpKHN0cnVjdCBjcHVpbmZvX3g4 NiAqIGMpOwpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2NwdS9pbnRlbC5jIGIveGVuL2FyY2gv eDg2L2NwdS9pbnRlbC5jCmluZGV4IDI5YzZiODcuLmY5YzJlYzQgMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9jcHUvaW50ZWwuYworKysgYi94ZW4vYXJjaC94ODYvY3B1L2ludGVsLmMKQEAgLTM1 MCw3ICszNTAsNiBAQCBzdGF0aWMgdm9pZCBpbml0X2ludGVsKHN0cnVjdCBjcHVpbmZvX3g4NiAq YykKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBjcHVfZGV2IGludGVsX2NwdV9kZXYgPSB7CiAJLmNf dmVuZG9yCT0gIkludGVsIiwKLQkuY19pZGVudCAJPSB7ICJHZW51aW5lSW50ZWwiIH0sCiAJLmNf ZWFybHlfaW5pdAk9IGVhcmx5X2luaXRfaW50ZWwsCiAJLmNfaW5pdAkJPSBpbml0X2ludGVsLAog fTsKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9jcHUvc2hhbmdoYWkuYyBiL3hlbi9hcmNoL3g4 Ni9jcHUvc2hhbmdoYWkuYwppbmRleCA5MTU2Yzg1Li4yNGFmNWM4IDEwMDY0NAotLS0gYS94ZW4v YXJjaC94ODYvY3B1L3NoYW5naGFpLmMKKysrIGIveGVuL2FyY2gveDg2L2NwdS9zaGFuZ2hhaS5j CkBAIC0xNyw3ICsxNyw2IEBAIHN0YXRpYyB2b2lkIGluaXRfc2hhbmdoYWkoc3RydWN0IGNwdWlu Zm9feDg2ICpjKQogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGNwdV9kZXYgc2hhbmdoYWlfY3B1X2Rl diA9IHsKICAgICAuY192ZW5kb3IgICA9ICIgIFNoYW5nIiwKLSAgICAuY19pZGVudCAgICA9IHsi ICBTaGFuZ2hhaSAgIn0sCiAgICAgLmNfaW5pdCAgICAgPSBpbml0X3NoYW5naGFpLAogfTsKIApk aWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2NwdWlkLmMgYi94ZW4vYXJjaC94ODYvY3B1aWQuYwpp bmRleCBhYjBhYWI2Li5iNWViNTg0IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvY3B1aWQuYwor KysgYi94ZW4vYXJjaC94ODYvY3B1aWQuYwpAQCAtNDU5LDggKzQ1OSw4IEBAIHZvaWQgcmVjYWxj dWxhdGVfY3B1aWRfcG9saWN5KHN0cnVjdCBkb21haW4gKmQpCiAgICAgdWludDMyX3QgZnNbRlND QVBJTlRTXSwgbWF4X2ZzW0ZTQ0FQSU5UU107CiAgICAgdW5zaWduZWQgaW50IGk7CiAKLSAgICBw LT54ODZfdmVuZG9yID0gZ2V0X2NwdV92ZW5kb3IocC0+YmFzaWMudmVuZG9yX2VieCwgcC0+YmFz aWMudmVuZG9yX2VjeCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcC0+YmFz aWMudmVuZG9yX2VkeCwgZ2N2X2d1ZXN0KTsKKyAgICBwLT54ODZfdmVuZG9yID0geDg2X2NwdWlk X2xvb2t1cF92ZW5kb3IoCisgICAgICAgIHAtPmJhc2ljLnZlbmRvcl9lYngsIHAtPmJhc2ljLnZl bmRvcl9lY3gsIHAtPmJhc2ljLnZlbmRvcl9lZHgpOwogCiAgICAgcC0+YmFzaWMubWF4X2xlYWYg ICA9IG1pbihwLT5iYXNpYy5tYXhfbGVhZiwgICBtYXgtPmJhc2ljLm1heF9sZWFmKTsKICAgICBw LT5mZWF0Lm1heF9zdWJsZWFmID0gbWluKHAtPmZlYXQubWF4X3N1YmxlYWYsIG1heC0+ZmVhdC5t YXhfc3VibGVhZik7CmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20teDg2L3Byb2Nlc3Nvci5o IGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9wcm9jZXNzb3IuaAppbmRleCBmMzI3NWNhLi5jZWYzZmZi IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3Byb2Nlc3Nvci5oCisrKyBiL3hlbi9p bmNsdWRlL2FzbS14ODYvcHJvY2Vzc29yLmgKQEAgLTU3OSwxMyArNTc5LDYgQEAgaW50IGVhcmx5 X21pY3JvY29kZV9pbml0KHZvaWQpOwogaW50IG1pY3JvY29kZV9pbml0X2ludGVsKHZvaWQpOwog aW50IG1pY3JvY29kZV9pbml0X2FtZCh2b2lkKTsKIAotZW51bSBnZXRfY3B1X3ZlbmRvciB7Ci0g ICAgZ2N2X2hvc3QsCi0gICAgZ2N2X2d1ZXN0LAotfTsKLQotaW50IGdldF9jcHVfdmVuZG9yKHVp bnQzMl90IGIsIHVpbnQzMl90IGMsIHVpbnQzMl90IGQsIGVudW0gZ2V0X2NwdV92ZW5kb3IgbW9k ZSk7Ci0KIHN0YXRpYyBpbmxpbmUgdWludDhfdCBnZXRfY3B1X2ZhbWlseSh1aW50MzJfdCByYXcs IHVpbnQ4X3QgKm1vZGVsLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVp bnQ4X3QgKnN0ZXBwaW5nKQogewotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs