From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.7/4.8] x86: Fix "x86: further CPUID handling adjustments" Date: Tue, 15 May 2018 18:54:40 +0100 Message-ID: <1526406880-23398-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: 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 , Jan Beulich , Sergey Dyasli List-Id: xen-devel@lists.xenproject.org Yy9zIGY5NjE2ODg0ZSAoYSBiYWNrcG9ydCBvZiBjL3MgMGQ3MDNhNzAxICJ4ODYvZmVhdHVyZTog RGVmaW5pdGlvbnMgZm9yCkluZGlyZWN0IEJyYW5jaCBDb250cm9scyIpIG1pc3NlZCBhIENQVUlE IGFkanVzdG1lbnQgd2hlbiBjYWxjdWxhdGluZyB0aGUgcmF3CmZlYXR1cmVzZXQuICBUaGlzIGlt cGFjdHMgaG9zdCBhZG1pbmlzdHJhdG9yIGRpYWdub3N0aWNzLgoKU2lnbmVkLW9mZi1ieTogU2Vy Z2V5IER5YXNsaSA8c2VyZ2V5LmR5YXNsaUBjaXRyaXguY29tPgoKYy9zIDYyYjE4Nzk2OSAieDg2 OiBmdXJ0aGVyIENQVUlEIGhhbmRsaW5nIGFkanVzdG1lbnRzIiBtYWtlIHNvbWUgYWRqdXN0bWVu dHMuCkhvd2V2ZXIsIGl0IGJyZWFrcyBsZXZlbGxpbmcgb2YgZ3Vlc3RzLCBtYWtpbmcgaXQgaW1w b3NzaWJsZSBmb3IgdGhlIHRvb2xzdGFjawp0byBoaWRlIFNUSUJQIG9yIElCUEIgZnJvbSBndWVz dHMgb24gaGFyZHdhcmUgd2l0aCB1cC10by1kYXRlIG1pY3JvY29kZS4KCkFsc28sIEkgZG9uJ3Qg c2VlIGFueSBsaW5rIGJldHdlZW4gdGhlIGNoYW5nZSBhbmQgdGhlIGNvbW1pdCBtZXNzYWdlLiAg V2l0aAp0aGUgbWljcm9jb2RlIGluc3RhbGxlZCwgU1RJQlAgYW5kIElCUEIgYXJlIGFscmVhZHkg dmlzaWJsZSB0byBkb20wLgoKVGhlIG9ubHkgcmVxdWlyZWQgYWRqdXN0bWVudCBpcyB0byBmb3Jj ZSBTVElCUCA9PSBJQlJTQiwgd2hpY2ggbXVzdCBiZSBkb25lCmFmdGVyIGFwcGx5aW5nIHRoZSBw dl9mZWF0dXJlc2V0W10gbWFzayB0byB0aGUgdG9vbHN0YWNrJ3MgY2hvaWNlIG9mIHZhbHVlLgoK U2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4K LS0tCkNDOiBKYW4gQmV1bGljaCA8SkJldWxpY2hAc3VzZS5jb20+Ci0tLQogeGVuL2FyY2gveDg2 L2NwdWlkLmMgICB8IDIgKy0KIHhlbi9hcmNoL3g4Ni9odm0vaHZtLmMgfCA4ICsrKysrLS0tCiB4 ZW4vYXJjaC94ODYvdHJhcHMuYyAgIHwgOCArKysrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCAxMSBp bnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9j cHVpZC5jIGIveGVuL2FyY2gveDg2L2NwdWlkLmMKaW5kZXggNDUxOTUyYy4uZmZmY2VjZCAxMDA2 NDQKLS0tIGEveGVuL2FyY2gveDg2L2NwdWlkLmMKKysrIGIveGVuL2FyY2gveDg2L2NwdWlkLmMK QEAgLTExMyw3ICsxMTMsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgY2FsY3VsYXRlX3Jhd19mZWF0 dXJlc2V0KHZvaWQpCiAgICAgICAgIGNwdWlkX2NvdW50KDB4NywgMCwgJnRtcCwKICAgICAgICAg ICAgICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfN2IwXSwKICAgICAgICAgICAg ICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfN2MwXSwKLSAgICAgICAgICAgICAg ICAgICAgJnRtcCk7CisgICAgICAgICAgICAgICAgICAgICZyYXdfZmVhdHVyZXNldFtGRUFUVVJF U0VUXzdkMF0pOwogICAgIGlmICggbWF4ID49IDB4ZCApCiAgICAgICAgIGNwdWlkX2NvdW50KDB4 ZCwgMSwKICAgICAgICAgICAgICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfRGEx XSwKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMgYi94ZW4vYXJjaC94ODYvaHZt L2h2bS5jCmluZGV4IGZmMWM2ZmEuLjBhMWQ0YTkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9o dm0vaHZtLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9odm0uYwpAQCAtMzQ5NiwxMCArMzQ5Niwx MyBAQCB2b2lkIGh2bV9jcHVpZCh1bnNpZ25lZCBpbnQgaW5wdXQsIHVuc2lnbmVkIGludCAqZWF4 LCB1bnNpZ25lZCBpbnQgKmVieCwKICAgICAgICAgICAgICAgICAgICAgIHNwZWNpYWxfZmVhdHVy ZXNbRkVBVFVSRVNFVF83YjBdKTsKIAogICAgICAgICAgICAgKmVjeCAmPSBodm1fZmVhdHVyZXNl dFtGRUFUVVJFU0VUXzdjMF07Ci0KLSAgICAgICAgICAgICplZHggfD0gY3B1ZmVhdF9tYXNrKFg4 Nl9GRUFUVVJFX1NUSUJQKTsKICAgICAgICAgICAgICplZHggJj0gaHZtX2ZlYXR1cmVzZXRbRkVB VFVSRVNFVF83ZDBdOwogCisgICAgICAgICAgICAvKiBGb3JjZSBTVElCUCBlcXVhbCB0byBJQlJT QiAqLworICAgICAgICAgICAgKmVkeCAmPSB+Y3B1ZmVhdF9tYXNrKFg4Nl9GRUFUVVJFX1NUSUJQ KTsKKyAgICAgICAgICAgIGlmICggKmVkeCAmIGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9JQlJT QikgKQorICAgICAgICAgICAgICAgICplZHggfD0gY3B1ZmVhdF9tYXNrKFg4Nl9GRUFUVVJFX1NU SUJQKTsKKwogICAgICAgICAgICAgLyogRG9uJ3QgZXhwb3NlIEhBUC1vbmx5IGZlYXR1cmVzIHRv IG5vbi1oYXAgZ3Vlc3RzLiAqLwogICAgICAgICAgICAgaWYgKCAhaGFwX2VuYWJsZWQoZCkgKQog ICAgICAgICAgICAgewpAQCAtMzY1Nyw3ICszNjYwLDYgQEAgdm9pZCBodm1fY3B1aWQodW5zaWdu ZWQgaW50IGlucHV0LCB1bnNpZ25lZCBpbnQgKmVheCwgdW5zaWduZWQgaW50ICplYngsCiAgICAg ICAgIGh2bV9jcHVpZCgweDgwMDAwMDAxLCBOVUxMLCBOVUxMLCBOVUxMLCAmX2VkeCk7CiAgICAg ICAgICplYXggfD0gKF9lZHggJiBjcHVmZWF0X21hc2soWDg2X0ZFQVRVUkVfTE0pID8gdmFkZHJf Yml0cyA6IDMyKSA8PCA4OwogCi0gICAgICAgICplYnggfD0gY3B1ZmVhdF9tYXNrKFg4Nl9GRUFU VVJFX0lCUEIpOwogICAgICAgICAqZWJ4ICY9IGh2bV9mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfZThi XTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L3RyYXBz LmMgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwppbmRleCAwZjM0YjIxLi5kYTI2NzQ5IDEwMDY0NAot LS0gYS94ZW4vYXJjaC94ODYvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwpAQCAt MTA4OCwxMCArMTA4OCwxMyBAQCB2b2lkIHB2X2NwdWlkKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpy ZWdzKQogICAgICAgICAgICAgICAgICAgc3BlY2lhbF9mZWF0dXJlc1tGRUFUVVJFU0VUXzdiMF0p OwogCiAgICAgICAgICAgICBjICY9IHB2X2ZlYXR1cmVzZXRbRkVBVFVSRVNFVF83YzBdOwotCi0g ICAgICAgICAgICBkIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9TVElCUCk7CiAgICAgICAg ICAgICBkICY9IHB2X2ZlYXR1cmVzZXRbRkVBVFVSRVNFVF83ZDBdOwogCisgICAgICAgICAgICAv KiBGb3JjZSBTVElCUCBlcXVhbCB0byBJQlJTQiAqLworICAgICAgICAgICAgZCAmPSB+Y3B1ZmVh dF9tYXNrKFg4Nl9GRUFUVVJFX1NUSUJQKTsKKyAgICAgICAgICAgIGlmICggZCAmIGNwdWZlYXRf bWFzayhYODZfRkVBVFVSRV9JQlJTQikgKQorICAgICAgICAgICAgICAgIGQgfD0gY3B1ZmVhdF9t YXNrKFg4Nl9GRUFUVVJFX1NUSUJQKTsKKwogICAgICAgICAgICAgaWYgKCAhaXNfcHZoX2RvbWFp bihjdXJyZCkgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIC8qCkBAIC0xMTg4LDcg KzExOTEsNiBAQCB2b2lkIHB2X2NwdWlkKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQogCiAg ICAgY2FzZSAweDgwMDAwMDA4OgogICAgICAgICBhID0gcGFkZHJfYml0cyB8ICh2YWRkcl9iaXRz IDw8IDgpOwotICAgICAgICBiIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9JQlBCKTsKICAg ICAgICAgYiAmPSBwdl9mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfZThiXTsKICAgICAgICAgYnJlYWs7 CiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA==