From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 5/6] x86/time: Move cpuid_time_leaf() handling into cpuid_hypervisor_leaves() Date: Wed, 16 Nov 2016 12:31:49 +0000 Message-ID: <1479299510-700-6-git-send-email-andrew.cooper3@citrix.com> References: <1479299510-700-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: <1479299510-700-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org VGhpcyByZWR1Y2VzIHRoZSBuZXQgY29tcGxleGl0eSBvZiBDUFVJRCBoYW5kbGluZyBieSBoYXZp bmcgYWxsIGFkanVzdG1lbnRzIGluCmF0IHRoZSBzYW1lIHBsYWNlLgoKU2lnbmVkLW9mZi1ieTog QW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBKYW4gQmV1 bGljaCA8SkJldWxpY2hAc3VzZS5jb20+Ci0tLQogeGVuL2FyY2gveDg2L3RpbWUuYyAgICAgICAg fCAzNiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIHhlbi9hcmNoL3g4Ni90 cmFwcy5jICAgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t LQogeGVuL2luY2x1ZGUvYXNtLXg4Ni90aW1lLmggfCAgMyAtLS0KIDMgZmlsZXMgY2hhbmdlZCwg MzcgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L3RpbWUuYyBiL3hlbi9hcmNoL3g4Ni90aW1lLmMKaW5kZXggZGRhODlkOC4uNzk3MDdkZiAx MDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3RpbWUuYworKysgYi94ZW4vYXJjaC94ODYvdGltZS5j CkBAIC0xOTM4LDQyICsxOTM4LDYgQEAgaW50IGhvc3RfdHNjX2lzX3NhZmUodm9pZCkKICAgICBy ZXR1cm4gYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX1RTQ19SRUxJQUJMRSk7CiB9CiAKLXZvaWQg Y3B1aWRfdGltZV9sZWFmKHVpbnQzMl90IHN1Yl9pZHgsIHVpbnQzMl90ICplYXgsIHVpbnQzMl90 ICplYngsCi0gICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgKmVjeCwgdWludDMyX3QgKmVk eCkKLXsKLSAgICBzdHJ1Y3QgZG9tYWluICpkID0gY3VycmVudC0+ZG9tYWluOwotICAgIHVpbnQ2 NF90IG9mZnNldDsKLQotICAgIHN3aXRjaCAoIHN1Yl9pZHggKQotICAgIHsKLSAgICBjYXNlIDA6 IC8qIGZlYXR1cmVzICovCi0gICAgICAgICplYXggPSAoISFkLT5hcmNoLnZ0c2MgPDwgMCkgfAot ICAgICAgICAgICAgICAgKCEhaG9zdF90c2NfaXNfc2FmZSgpIDw8IDEpIHwKLSAgICAgICAgICAg ICAgICghIWJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9SRFRTQ1ApIDw8IDIpOwotICAgICAgICAq ZWJ4ID0gZC0+YXJjaC50c2NfbW9kZTsKLSAgICAgICAgKmVjeCA9IGQtPmFyY2gudHNjX2toejsK LSAgICAgICAgKmVkeCA9IGQtPmFyY2guaW5jYXJuYXRpb247Ci0gICAgICAgIGJyZWFrOwotICAg IGNhc2UgMTogLyogc2NhbGUgYW5kIG9mZnNldCAqLwotICAgICAgICBpZiAoICFkLT5hcmNoLnZ0 c2MgKQotICAgICAgICAgICAgb2Zmc2V0ID0gZC0+YXJjaC52dHNjX29mZnNldDsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgLyogb2Zmc2V0IGFscmVhZHkgYXBwbGllZCB0byB2YWx1ZSByZXR1 cm5lZCBieSB2aXJ0dWFsIHJkdHNjcCAqLwotICAgICAgICAgICAgb2Zmc2V0ID0gMDsKLSAgICAg ICAgKmVheCA9ICh1aW50MzJfdClvZmZzZXQ7Ci0gICAgICAgICplYnggPSAodWludDMyX3QpKG9m ZnNldCA+PiAzMik7Ci0gICAgICAgICplY3ggPSBkLT5hcmNoLnZ0c2NfdG9fbnMubXVsX2ZyYWM7 Ci0gICAgICAgICplZHggPSAoczgpZC0+YXJjaC52dHNjX3RvX25zLnNoaWZ0OwotICAgICAgICBi cmVhazsKLSAgICBjYXNlIDI6IC8qIHBoeXNpY2FsIGNwdV9raHogKi8KLSAgICAgICAgKmVheCA9 IGNwdV9raHo7Ci0gICAgICAgICplYnggPSAqZWN4ID0gKmVkeCA9IDA7Ci0gICAgICAgIGJyZWFr OwotICAgIGRlZmF1bHQ6Ci0gICAgICAgICplYXggPSAqZWJ4ID0gKmVjeCA9ICplZHggPSAwOwot ICAgIH0KLX0KLQogLyoKICAqIGNhbGxlZCB0byBjb2xsZWN0IHRzYy1yZWxhdGVkIGRhdGEgb25s eSBmb3Igc2F2ZSBmaWxlIG9yIGxpdmUKICAqIG1pZ3JhdGU7IGNhbGxlZCBhZnRlciBsYXN0IHJk dHNjIGlzIGRvbmUgb24gdGhpcyBpbmNhcm5hdGlvbgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2 L3RyYXBzLmMgYi94ZW4vYXJjaC94ODYvdHJhcHMuYwppbmRleCBjZGNlNzJkLi45YmU5ZmUzIDEw MDY0NAotLS0gYS94ZW4vYXJjaC94ODYvdHJhcHMuYworKysgYi94ZW4vYXJjaC94ODYvdHJhcHMu YwpAQCAtOTIyLDkgKzkyMiw0MyBAQCBpbnQgY3B1aWRfaHlwZXJ2aXNvcl9sZWF2ZXMoIHVpbnQz Ml90IGlkeCwgdWludDMyX3Qgc3ViX2lkeCwKICAgICAgICAgICAgICplY3ggfD0gWEVOX0NQVUlE X0ZFQVQxX01NVV9QVF9VUERBVEVfUFJFU0VSVkVfQUQ7CiAgICAgICAgIGJyZWFrOwogCi0gICAg Y2FzZSAzOgotICAgICAgICAqZWF4ID0gKmVieCA9ICplY3ggPSAqZWR4ID0gMDsKLSAgICAgICAg Y3B1aWRfdGltZV9sZWFmKCBzdWJfaWR4LCBlYXgsIGVieCwgZWN4LCBlZHggKTsKKyAgICBjYXNl IDM6IC8qIFRpbWUgbGVhZi4gKi8KKyAgICAgICAgc3dpdGNoICggc3ViX2lkeCApCisgICAgICAg IHsKKyAgICAgICAgY2FzZSAwOiAvKiBmZWF0dXJlcyAqLworICAgICAgICAgICAgKmVheCA9ICgo ISFjdXJyZC0+YXJjaC52dHNjIDw8IDApIHwKKyAgICAgICAgICAgICAgICAgICAgKCEhaG9zdF90 c2NfaXNfc2FmZSgpIDw8IDEpIHwKKyAgICAgICAgICAgICAgICAgICAgKCEhYm9vdF9jcHVfaGFz KFg4Nl9GRUFUVVJFX1JEVFNDUCkgPDwgMikpOworICAgICAgICAgICAgKmVieCA9IGN1cnJkLT5h cmNoLnRzY19tb2RlOworICAgICAgICAgICAgKmVjeCA9IGN1cnJkLT5hcmNoLnRzY19raHo7Cisg ICAgICAgICAgICAqZWR4ID0gY3VycmQtPmFyY2guaW5jYXJuYXRpb247CisgICAgICAgICAgICBi cmVhazsKKworICAgICAgICBjYXNlIDE6IC8qIHNjYWxlIGFuZCBvZmZzZXQgKi8KKyAgICAgICAg eworICAgICAgICAgICAgdWludDY0X3Qgb2Zmc2V0OworCisgICAgICAgICAgICBpZiAoICFjdXJy ZC0+YXJjaC52dHNjICkKKyAgICAgICAgICAgICAgICBvZmZzZXQgPSBjdXJyZC0+YXJjaC52dHNj X29mZnNldDsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAvKiBvZmZzZXQgYWxy ZWFkeSBhcHBsaWVkIHRvIHZhbHVlIHJldHVybmVkIGJ5IHZpcnR1YWwgcmR0c2NwICovCisgICAg ICAgICAgICAgICAgb2Zmc2V0ID0gMDsKKyAgICAgICAgICAgICplYXggPSAodWludDMyX3Qpb2Zm c2V0OworICAgICAgICAgICAgKmVieCA9ICh1aW50MzJfdCkob2Zmc2V0ID4+IDMyKTsKKyAgICAg ICAgICAgICplY3ggPSBjdXJyZC0+YXJjaC52dHNjX3RvX25zLm11bF9mcmFjOworICAgICAgICAg ICAgKmVkeCA9IChzOCljdXJyZC0+YXJjaC52dHNjX3RvX25zLnNoaWZ0OworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBjYXNlIDI6IC8qIHBoeXNpY2FsIGNwdV9raHog Ki8KKyAgICAgICAgICAgICplYXggPSBjcHVfa2h6OworICAgICAgICAgICAgKmVieCA9ICplY3gg PSAqZWR4ID0gMDsKKyAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICAqZWF4ID0gKmVieCA9ICplY3ggPSAqZWR4ID0gMDsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSA0OgpkaWZmIC0tZ2l0IGEv eGVuL2luY2x1ZGUvYXNtLXg4Ni90aW1lLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L3RpbWUuaApp bmRleCA2ZDcwNGI0Li5lZjk4OWE2IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9hc20teDg2L3Rp bWUuaAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3RpbWUuaApAQCAtNzEsOSArNzEsNiBAQCB2 b2lkIGZvcmNlX3VwZGF0ZV92Y3B1X3N5c3RlbV90aW1lKHN0cnVjdCB2Y3B1ICp2KTsKIAogYm9v bCBjbG9ja3NvdXJjZV9pc190c2Modm9pZCk7CiBpbnQgaG9zdF90c2NfaXNfc2FmZSh2b2lkKTsK LXZvaWQgY3B1aWRfdGltZV9sZWFmKHVpbnQzMl90IHN1Yl9pZHgsIHVpbnQzMl90ICplYXgsIHVp bnQzMl90ICplYngsCi0gICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCAqZWN4LCB1aW50MzJf dCAqZWR4KTsKLQogdTY0IHN0aW1lMnRzYyhzX3RpbWVfdCBzdGltZSk7CiAKIHN0cnVjdCB0aW1l X3NjYWxlOwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3Jn Cmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK