From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH v2 for-4.7/4.8] x86: Fix "x86: further CPUID
 handling adjustments"
Date: Wed, 16 May 2018 18:27:00 +0100
Message-ID: <1526491620-23172-1-git-send-email-andrew.cooper3@citrix.com>
References: <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: <xen-devel-bounces@lists.xenproject.org>
In-Reply-To: <1526406880-23398-1-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Jan Beulich <JBeulich@suse.com>, Sergey Dyasli <sergey.dyasli@citrix.com>
List-Id: xen-devel@lists.xenproject.org

Yy9zIGY5NjE2ODg0ZSAoYSBiYWNrcG9ydCBvZiBjL3MgMGQ3MDNhNzAxICJ4ODYvZmVhdHVyZTog
RGVmaW5pdGlvbnMgZm9yCkluZGlyZWN0IEJyYW5jaCBDb250cm9scyIpIG1pc3NlZCBhIENQVUlE
IGFkanVzdG1lbnQgd2hlbiBjYWxjdWxhdGluZyB0aGUgcmF3CmZlYXR1cmVzZXQuICBUaGlzIGlt
cGFjdHMgaG9zdCBhZG1pbmlzdHJhdG9yIGRpYWdub3N0aWNzLgoKU2lnbmVkLW9mZi1ieTogU2Vy
Z2V5IER5YXNsaSA8c2VyZ2V5LmR5YXNsaUBjaXRyaXguY29tPgoKYy9zIDYyYjE4Nzk2OSAieDg2
OiBmdXJ0aGVyIENQVUlEIGhhbmRsaW5nIGFkanVzdG1lbnRzIiBtYWtlIHNvbWUgYWRqdXN0bWVu
dHMuCkhvd2V2ZXIsIGl0IGJyZWFrcyBsZXZlbGxpbmcgb2YgZ3Vlc3RzLCBtYWtpbmcgaXQgaW1w
b3NzaWJsZSBmb3IgdGhlIHRvb2xzdGFjawp0byBoaWRlIFNUSUJQIG9yIElCUEIgZnJvbSBndWVz
dHMgb24gaGFyZHdhcmUgd2l0aCB1cC10by1kYXRlIG1pY3JvY29kZS4KClRoZSBkb20wIGlzc3Vl
IHJlZmVyZW5jZWQgaW4gdGhlIGNvbW1pdCBtZXNzYWdlIHdhcyBmaXhlZCBieSB0aGUgaHVuawph
ZGp1c3RpbmcgdGhlIHplcm9pbmcgYWxvbmUuICBTVElCUCBhbmQgSUJQQiBkb24ndCBuZWVkIChh
bmQgaW5kZWVkLCBtdXN0IG5vdApiZSBmb3IgbGV2ZWxsaW5nIHB1cnBvc2VzKSBPUidkIGludG8g
dGhlIGxlYWYuCgpPbmUgZmluYWwgaXRlbSB3aGljaCB3YXMgbWlzc2VkIGluIGJhY2twb3J0IHdh
cyB0aGUgbmVlZCB0byBpZ25vcmUgdGhlCnRvb2xzdGFjayBjaG9pY2Ugb2YgU1RJQlAsIGFuZCBz
ZXQgaXQgZXF1YWwgdG8gSUJSU0IuICBUaGlzIG5lZWRzIGRvaW5nIGFmdGVyCnRoZSBtYXNrIGhh
cyBiZWVuIGFwcGxpZWQuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29v
cGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4K
CnYyOgogKiBVcGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlLCBob3cgSSB1bmRlcnN0YW5kIHRoZSBk
b20wIGFzcGVjdCBvZiB0aGUgcHJldmlvdXMKICAgY29tbWl0IG1lc3NhZ2UuCi0tLQogeGVuL2Fy
Y2gveDg2L2NwdWlkLmMgICB8IDIgKy0KIHhlbi9hcmNoL3g4Ni9odm0vaHZtLmMgfCA4ICsrKysr
LS0tCiB4ZW4vYXJjaC94ODYvdHJhcHMuYyAgIHwgOCArKysrKy0tLQogMyBmaWxlcyBjaGFuZ2Vk
LCAxMSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNo
L3g4Ni9jcHVpZC5jIGIveGVuL2FyY2gveDg2L2NwdWlkLmMKaW5kZXggNDUxOTUyYy4uZmZmY2Vj
ZCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2NwdWlkLmMKKysrIGIveGVuL2FyY2gveDg2L2Nw
dWlkLmMKQEAgLTExMyw3ICsxMTMsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgY2FsY3VsYXRlX3Jh
d19mZWF0dXJlc2V0KHZvaWQpCiAgICAgICAgIGNwdWlkX2NvdW50KDB4NywgMCwgJnRtcCwKICAg
ICAgICAgICAgICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfN2IwXSwKICAgICAg
ICAgICAgICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfN2MwXSwKLSAgICAgICAg
ICAgICAgICAgICAgJnRtcCk7CisgICAgICAgICAgICAgICAgICAgICZyYXdfZmVhdHVyZXNldFtG
RUFUVVJFU0VUXzdkMF0pOwogICAgIGlmICggbWF4ID49IDB4ZCApCiAgICAgICAgIGNwdWlkX2Nv
dW50KDB4ZCwgMSwKICAgICAgICAgICAgICAgICAgICAgJnJhd19mZWF0dXJlc2V0W0ZFQVRVUkVT
RVRfRGExXSwKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vaHZtLmMgYi94ZW4vYXJjaC94
ODYvaHZtL2h2bS5jCmluZGV4IGZmMWM2ZmEuLjBhMWQ0YTkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNo
L3g4Ni9odm0vaHZtLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9odm0uYwpAQCAtMzQ5NiwxMCAr
MzQ5NiwxMyBAQCB2b2lkIGh2bV9jcHVpZCh1bnNpZ25lZCBpbnQgaW5wdXQsIHVuc2lnbmVkIGlu
dCAqZWF4LCB1bnNpZ25lZCBpbnQgKmVieCwKICAgICAgICAgICAgICAgICAgICAgIHNwZWNpYWxf
ZmVhdHVyZXNbRkVBVFVSRVNFVF83YjBdKTsKIAogICAgICAgICAgICAgKmVjeCAmPSBodm1fZmVh
dHVyZXNldFtGRUFUVVJFU0VUXzdjMF07Ci0KLSAgICAgICAgICAgICplZHggfD0gY3B1ZmVhdF9t
YXNrKFg4Nl9GRUFUVVJFX1NUSUJQKTsKICAgICAgICAgICAgICplZHggJj0gaHZtX2ZlYXR1cmVz
ZXRbRkVBVFVSRVNFVF83ZDBdOwogCisgICAgICAgICAgICAvKiBGb3JjZSBTVElCUCBlcXVhbCB0
byBJQlJTQiAqLworICAgICAgICAgICAgKmVkeCAmPSB+Y3B1ZmVhdF9tYXNrKFg4Nl9GRUFUVVJF
X1NUSUJQKTsKKyAgICAgICAgICAgIGlmICggKmVkeCAmIGNwdWZlYXRfbWFzayhYODZfRkVBVFVS
RV9JQlJTQikgKQorICAgICAgICAgICAgICAgICplZHggfD0gY3B1ZmVhdF9tYXNrKFg4Nl9GRUFU
VVJFX1NUSUJQKTsKKwogICAgICAgICAgICAgLyogRG9uJ3QgZXhwb3NlIEhBUC1vbmx5IGZlYXR1
cmVzIHRvIG5vbi1oYXAgZ3Vlc3RzLiAqLwogICAgICAgICAgICAgaWYgKCAhaGFwX2VuYWJsZWQo
ZCkgKQogICAgICAgICAgICAgewpAQCAtMzY1Nyw3ICszNjYwLDYgQEAgdm9pZCBodm1fY3B1aWQo
dW5zaWduZWQgaW50IGlucHV0LCB1bnNpZ25lZCBpbnQgKmVheCwgdW5zaWduZWQgaW50ICplYngs
CiAgICAgICAgIGh2bV9jcHVpZCgweDgwMDAwMDAxLCBOVUxMLCBOVUxMLCBOVUxMLCAmX2VkeCk7
CiAgICAgICAgICplYXggfD0gKF9lZHggJiBjcHVmZWF0X21hc2soWDg2X0ZFQVRVUkVfTE0pID8g
dmFkZHJfYml0cyA6IDMyKSA8PCA4OwogCi0gICAgICAgICplYnggfD0gY3B1ZmVhdF9tYXNrKFg4
Nl9GRUFUVVJFX0lCUEIpOwogICAgICAgICAqZWJ4ICY9IGh2bV9mZWF0dXJlc2V0W0ZFQVRVUkVT
RVRfZThiXTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2
L3RyYXBzLmMgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwppbmRleCAwZjM0YjIxLi5kYTI2NzQ5IDEw
MDY0NAotLS0gYS94ZW4vYXJjaC94ODYvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYvdHJhcHMu
YwpAQCAtMTA4OCwxMCArMTA4OCwxMyBAQCB2b2lkIHB2X2NwdWlkKHN0cnVjdCBjcHVfdXNlcl9y
ZWdzICpyZWdzKQogICAgICAgICAgICAgICAgICAgc3BlY2lhbF9mZWF0dXJlc1tGRUFUVVJFU0VU
XzdiMF0pOwogCiAgICAgICAgICAgICBjICY9IHB2X2ZlYXR1cmVzZXRbRkVBVFVSRVNFVF83YzBd
OwotCi0gICAgICAgICAgICBkIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9TVElCUCk7CiAg
ICAgICAgICAgICBkICY9IHB2X2ZlYXR1cmVzZXRbRkVBVFVSRVNFVF83ZDBdOwogCisgICAgICAg
ICAgICAvKiBGb3JjZSBTVElCUCBlcXVhbCB0byBJQlJTQiAqLworICAgICAgICAgICAgZCAmPSB+
Y3B1ZmVhdF9tYXNrKFg4Nl9GRUFUVVJFX1NUSUJQKTsKKyAgICAgICAgICAgIGlmICggZCAmIGNw
dWZlYXRfbWFzayhYODZfRkVBVFVSRV9JQlJTQikgKQorICAgICAgICAgICAgICAgIGQgfD0gY3B1
ZmVhdF9tYXNrKFg4Nl9GRUFUVVJFX1NUSUJQKTsKKwogICAgICAgICAgICAgaWYgKCAhaXNfcHZo
X2RvbWFpbihjdXJyZCkgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIC8qCkBAIC0x
MTg4LDcgKzExOTEsNiBAQCB2b2lkIHB2X2NwdWlkKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdz
KQogCiAgICAgY2FzZSAweDgwMDAwMDA4OgogICAgICAgICBhID0gcGFkZHJfYml0cyB8ICh2YWRk
cl9iaXRzIDw8IDgpOwotICAgICAgICBiIHw9IGNwdWZlYXRfbWFzayhYODZfRkVBVFVSRV9JQlBC
KTsKICAgICAgICAgYiAmPSBwdl9mZWF0dXJlc2V0W0ZFQVRVUkVTRVRfZThiXTsKICAgICAgICAg
YnJlYWs7CiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJv
amVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hl
bi1kZXZlbA==