From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 09/11] x86: Fix merging of new status bits into
 %dr6
Date: Mon, 4 Jun 2018 14:59:13 +0100
Message-ID: <1528120755-17455-10-git-send-email-andrew.cooper3@citrix.com>
References: <1528120755-17455-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: <1528120755-17455-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: Kevin Tian <kevin.tian@intel.com>, Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Jun Nakajima <jun.nakajima@intel.com>, Boris Ostrovsky <boris.ostrovsky@oracle.com>, Brian Woods <brian.woods@amd.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>, =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
List-Id: xen-devel@lists.xenproject.org

VGhlIGN1cnJlbnQgbG9naWMgdXNlZCB0byB1cGRhdGUgJWRyNiB3aGVuIGluamVjdGluZyAjREIg
aXMgYnVnZ3kuICBUaGUKYXJjaGl0ZWN0dXJhbCBiZWhhdmlvdXIgaXMgdG8gb3ZlcndyaXRlIEJ7
MC4uM30gKHJhdGhlciB0aGFuIGFjY3VtdWxhdGUpIGFuZAphY2N1bXVsYXRlIGFsbCBvdGhlciBi
aXRzLgoKSW50cm9kdWNlIGEgbmV3IG1lcmdlX2RyNigpIGhlbHBlciwgd2hpY2ggYWxzbyB0YWtl
cyBjYXJlIG9mIGhhbmRpbmcgUlRNCmNvcnJlY3RseS4KClNpZ25lZC1vZmYtYnk6IEFuZHJldyBD
b29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogSmFuIEJldWxpY2ggPEpC
ZXVsaWNoQHN1c2UuY29tPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KQ0M6IFJv
Z2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpDQzogSnVuIE5ha2FqaW1hIDxq
dW4ubmFrYWppbWFAaW50ZWwuY29tPgpDQzogS2V2aW4gVGlhbiA8a2V2aW4udGlhbkBpbnRlbC5j
b20+CkNDOiBCb3JpcyBPc3Ryb3Zza3kgPGJvcmlzLm9zdHJvdnNreUBvcmFjbGUuY29tPgpDQzog
U3VyYXZlZSBTdXRoaWt1bHBhbml0IDxzdXJhdmVlLnN1dGhpa3VscGFuaXRAYW1kLmNvbT4KQ0M6
IEJyaWFuIFdvb2RzIDxicmlhbi53b29kc0BhbWQuY29tPgotLS0KIHhlbi9hcmNoL3g4Ni9odm0v
c3ZtL3N2bS5jICAgICB8ICAzICsrLQogeGVuL2FyY2gveDg2L2h2bS92bXgvdm14LmMgICAgIHwg
IDMgKystCiB4ZW4vYXJjaC94ODYvcHYvdHJhcHMuYyAgICAgICAgfCAgMyArKy0KIHhlbi9pbmNs
dWRlL2FzbS14ODYvZGVidWdyZWcuaCB8IDI2ICsrKysrKysrKysrKysrKysrKysrKysrKystCiA0
IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0t
Z2l0IGEveGVuL2FyY2gveDg2L2h2bS9zdm0vc3ZtLmMgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS9z
dm0uYwppbmRleCBkZjVmOWVkLi5iMWVmYTVlIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZt
L3N2bS9zdm0uYworKysgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS9zdm0uYwpAQCAtMTQ0Nyw3ICsx
NDQ3LDggQEAgc3RhdGljIHZvaWQgc3ZtX2luamVjdF9ldmVudChjb25zdCBzdHJ1Y3QgeDg2X2V2
ZW50ICpldmVudCkKICAgICAgICAgICogSXRlbSAyIGlzIGRvbmUgYnkgaGFyZHdhcmUgd2hlbiBp
bmplY3RpbmcgYSAjREIgZXhjZXB0aW9uLgogICAgICAgICAgKi8KICAgICAgICAgX19yZXN0b3Jl
X2RlYnVnX3JlZ2lzdGVycyh2bWNiLCBjdXJyKTsKLSAgICAgICAgdm1jYl9zZXRfZHI2KHZtY2Is
IHZtY2JfZ2V0X2RyNih2bWNiKSB8IGV2ZW50LT5wZW5kaW5nX2RiZyk7CisgICAgICAgIHZtY2Jf
c2V0X2RyNih2bWNiLCBtZXJnZV9kcjYodm1jYl9nZXRfZHI2KHZtY2IpLCBldmVudC0+cGVuZGlu
Z19kYmcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vyci0+ZG9tYWlu
LT5hcmNoLmNwdWlkLT5mZWF0LnJ0bSkpOwogCiAgICAgICAgIC8qIGZhbGwgdGhyb3VnaCAqLwog
ICAgIGNhc2UgVFJBUF9pbnQzOgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS92bXgvdm14
LmMgYi94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYwppbmRleCBmNTllZjg4Li44MmVmM2FhIDEw
MDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92bXguYworKysgYi94ZW4vYXJjaC94ODYv
aHZtL3ZteC92bXguYwpAQCAtMTc5MSw3ICsxNzkxLDggQEAgc3RhdGljIHZvaWQgdm14X2luamVj
dF9ldmVudChjb25zdCBzdHJ1Y3QgeDg2X2V2ZW50ICpldmVudCkKICAgICAgICAgICogQWxsIGFj
dGlvbnMgYXJlIGxlZnQgdXAgdG8gdGhlIGh5cGVydmlzb3IgdG8gcGVyZm9ybS4KICAgICAgICAg
ICovCiAgICAgICAgIF9fcmVzdG9yZV9kZWJ1Z19yZWdpc3RlcnMoY3Vycik7Ci0gICAgICAgIHdy
aXRlX2RlYnVncmVnKDYsIHJlYWRfZGVidWdyZWcoNikgfCBldmVudC0+cGVuZGluZ19kYmcpOwor
ICAgICAgICB3cml0ZV9kZWJ1Z3JlZyg2LCBtZXJnZV9kcjYocmVhZF9kZWJ1Z3JlZyg2KSwgZXZl
bnQtPnBlbmRpbmdfZGJnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3Vy
ci0+ZG9tYWluLT5hcmNoLmNwdWlkLT5mZWF0LnJ0bSkpOwogCiAgICAgICAgIGlmICggIW5lc3Rl
ZGh2bV92Y3B1X2luX2d1ZXN0bW9kZShjdXJyKSB8fAogICAgICAgICAgICAgICFudm14X2ludGVy
Y2VwdHNfZXhjZXB0aW9uKGN1cnIsIFRSQVBfZGVidWcsIF9ldmVudC5lcnJvcl9jb2RlKSApCmRp
ZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvcHYvdHJhcHMuYyBiL3hlbi9hcmNoL3g4Ni9wdi90cmFw
cy5jCmluZGV4IDdkNDhkODMuLmMyOTU1ZWEgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9wdi90
cmFwcy5jCisrKyBiL3hlbi9hcmNoL3g4Ni9wdi90cmFwcy5jCkBAIC04Niw3ICs4Niw4IEBAIHZv
aWQgcHZfaW5qZWN0X2V2ZW50KGNvbnN0IHN0cnVjdCB4ODZfZXZlbnQgKmV2ZW50KQogICAgICAg
ICBicmVhazsKIAogICAgIGNhc2UgVFJBUF9kZWJ1ZzoKLSAgICAgICAgY3Vyci0+YXJjaC5kcjYg
fD0gZXZlbnQtPnBlbmRpbmdfZGJnOworICAgICAgICBjdXJyLT5hcmNoLmRyNiA9IG1lcmdlX2Ry
NihjdXJyLT5hcmNoLmRyNiwgZXZlbnQtPnBlbmRpbmdfZGJnLAorICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICBjdXJyLT5kb21haW4tPmFyY2guY3B1aWQtPmZlYXQucnRtKTsKICAg
ICAgICAgLyogRmFsbHRocm91Z2ggKi8KIAogICAgIGRlZmF1bHQ6CmRpZmYgLS1naXQgYS94ZW4v
aW5jbHVkZS9hc20teDg2L2RlYnVncmVnLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2RlYnVncmVn
LmgKaW5kZXggOGRmNTY2Yi4uZjZiMzYxZSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4
Ni9kZWJ1Z3JlZy5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvZGVidWdyZWcuaApAQCAtMjMs
NiArMjMsMTIgQEAKICNkZWZpbmUgWDg2X0RSNl9CVCAgICAgICAgICAgICAgKDF1IDw8IDE1KSAg
LyogVGFzayBzd2l0Y2ggICAgICAgICAgICAgKi8KICNkZWZpbmUgWDg2X0RSNl9SVE0gICAgICAg
ICAgICAgKDF1IDw8IDE2KSAgLyogI0RCLyNCUCBpbiBSVE0gcmVnaW9uICAgKi8KIAorI2RlZmlu
ZSBYODZfRFI2X0JQX01BU0sgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg
KFg4Nl9EUjZfQjAgfCBYODZfRFI2X0IxIHwgWDg2X0RSNl9CMiB8IFg4Nl9EUjZfQjMpCisKKyNk
ZWZpbmUgWDg2X0RSNl9LTk9XTl9NQVNLICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIFwKKyAgICAoWDg2X0RSNl9CUF9NQVNLIHwgWDg2X0RSNl9CRCB8IFg4Nl9E
UjZfQlMgfCBYODZfRFI2X0JUIHwgWDg2X0RSNl9SVE0pCisKICNkZWZpbmUgRFJfVFJBUDAgICAg
ICAgICgweDEpICAgICAgICAgICAvKiBkYjAgKi8KICNkZWZpbmUgRFJfVFJBUDEgICAgICAgICgw
eDIpICAgICAgICAgICAvKiBkYjEgKi8KICNkZWZpbmUgRFJfVFJBUDIgICAgICAgICgweDQpICAg
ICAgICAgICAvKiBkYjIgKi8KQEAgLTMwLDcgKzM2LDYgQEAKICNkZWZpbmUgRFJfU1RFUCAgICAg
ICAgICgweDQwMDApICAgICAgICAvKiBzaW5nbGUtc3RlcCAqLwogI2RlZmluZSBEUl9TV0lUQ0gg
ICAgICAgKDB4ODAwMCkgICAgICAgIC8qIHRhc2sgc3dpdGNoICovCiAjZGVmaW5lIERSX05PVF9S
VE0gICAgICAoMHgxMDAwMCkgICAgICAgLyogY2xlYXI6ICNCUCBpbnNpZGUgUlRNIHJlZ2lvbiAq
LwotI2RlZmluZSBEUl9TVEFUVVNfUkVTRVJWRURfT05FICAweGZmZmYwZmYwdWwgLyogUmVzZXJ2
ZWQsIHJlYWQgYXMgb25lICovCiAKICNkZWZpbmUgWDg2X0RSNl9ERUZBVUxUIDB4ZmZmZjBmZjB1
bCAgICAvKiBEZWZhdWx0ICVkcjYgdmFsdWUuICovCiAKQEAgLTEwMyw2ICsxMDgsMjUgQEAgc3Rh
dGljIGlubGluZSB1bnNpZ25lZCBsb25nIGFkanVzdF9kcjZfcnN2ZCh1bnNpZ25lZCBsb25nIGRy
NiwgYm9vbCBydG0pCiAgICAgcmV0dXJuIGRyNjsKIH0KIAorc3RhdGljIGlubGluZSB1bnNpZ25l
ZCBsb25nIG1lcmdlX2RyNih1bnNpZ25lZCBsb25nIGRyNiwgdW5zaWduZWQgbG9uZyBuZXcsCisg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcnRtKQoreworICAgIC8q
IEZsaXAgZHI2IHRvIGhhdmUgcG9zaXRpdmUgcG9sYXJpdHkuICovCisgICAgZHI2IF49IFg4Nl9E
UjZfREVGQVVMVDsKKworICAgIC8qIFNhbml0eSBjaGVjayB0aGF0IG9ubHkga25vd24gdmFsdWVz
IGFyZSBwYXNzZWQgaW4uICovCisgICAgQVNTRVJUKCEoZHI2ICYgflg4Nl9EUjZfS05PV05fTUFT
SykpOworICAgIEFTU0VSVCghKG5ldyAmIH5YODZfRFI2X0tOT1dOX01BU0spKTsKKworICAgIC8q
IEJyZWFrcG9pbnRzIDAtMyBvdmVycmlkZGVuLiAgQkQsIEJTLCBCVCBhbmQgUlRNIGFjY3VtdWxh
dGUuICovCisgICAgZHI2ID0gKGRyNiAmIH5YODZfRFI2X0JQX01BU0spIHwgbmV3OworCisgICAg
LyogRmxpcCBkcjYgYmFjayB0byBoYXZpbmcgZGVmYXVsdCBwb2xhcml0eS4gKi8KKyAgICBkcjYg
Xj0gWDg2X0RSNl9ERUZBVUxUOworCisgICAgcmV0dXJuIGFkanVzdF9kcjZfcnN2ZChkcjYsIHJ0
bSk7Cit9CisKIHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbG9uZyBhZGp1c3RfZHI3X3JzdmQodW5z
aWduZWQgbG9uZyBkcjcsIGJvb2wgcnRtKQogewogICAgIC8qCi0tIAoyLjEuNAoKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5n
IGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJv
amVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=