From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joao Martins Subject: [PATCH v3 4/6] x86/time: refactor read_platform_stime() Date: Wed, 24 Aug 2016 13:43:50 +0100 Message-ID: <1472042632-12883-5-git-send-email-joao.m.martins@oracle.com> References: <1472042632-12883-1-git-send-email-joao.m.martins@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bcXW7-00009I-1U for xen-devel@lists.xenproject.org; Wed, 24 Aug 2016 12:42:51 +0000 In-Reply-To: <1472042632-12883-1-git-send-email-joao.m.martins@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org VG8gZmV0Y2ggdGhlIGxhc3QgcmVhZCBmcm9tIHRoZSBjbG9ja3NvdXJjZSB3aGljaCB3YXMgdXNl ZCB0bwpjYWxjdWxhdGUgc3lzdGVtX3RpbWUuIEluIHRoZSBjYXNlIG9mIGNsb2Nrc291cmNlPXRz YyB3ZSB3aWxsCnVzZSBpdCB0byBzZXQgdHNjX3RpbWVzdGFtcC4KClNpZ25lZC1vZmYtYnk6IEpv YW8gTWFydGlucyA8am9hby5tLm1hcnRpbnNAb3JhY2xlLmNvbT4KLS0tCkNjOiBKYW4gQmV1bGlj aCA8amJldWxpY2hAc3VzZS5jb20+CkNjOiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgoKQ2hhbmdlcyBzaW5jZSB2MjoKIC0gcy9wbHRfc3RhbXBfY291bnRlci9wbHRf Y291bnRlci9nCiAtIE1vdmUgY29uZGl0aW9uYWwgd3JpdGUgb2Ygc3RhbXAgb3V0IG9mIHRoZSBs b2NrZWQgcmVnaW9uLgoKQ2hhbmdlcyBzaW5jZSB2MToKIC0gQWRkIG1pc3Npbmcgc3BhY2VzIGJl dHdlZW4gYnJhY2tldHMKIC0gTW92ZSBwbHRfc3RhbXBfY291bnRlciB0byByZWFkX3BsYXRmb3Jt X3N0aW1lKCkKIC0gQWRkIHNpZ25hdHVyZSBjaGFuZ2UgaW4gdGltZV9jYWxpYnJhdGlvbl9zdGRf cmVuZGV6dm91cygpCi0tLQogeGVuL2FyY2gveDg2L3RpbWUuYyB8IDIyICsrKysrKysrKysrKyst LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni90aW1lLmMgYi94ZW4vYXJjaC94ODYvdGltZS5j CmluZGV4IGEwMzEyN2UuLjU3YzFiNDcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni90aW1lLmMK KysrIGIveGVuL2FyY2gveDg2L3RpbWUuYwpAQCAtNTc1LDE4ICs1NzUsMjIgQEAgc3RhdGljIHZv aWQgcGx0X292ZXJmbG93KHZvaWQgKnVudXNlZCkKICAgICBzZXRfdGltZXIoJnBsdF9vdmVyZmxv d190aW1lciwgTk9XKCkgKyBwbHRfb3ZlcmZsb3dfcGVyaW9kKTsKIH0KIAotc3RhdGljIHNfdGlt ZV90IHJlYWRfcGxhdGZvcm1fc3RpbWUodm9pZCkKK3N0YXRpYyBzX3RpbWVfdCByZWFkX3BsYXRm b3JtX3N0aW1lKHU2NCAqc3RhbXApCiB7Ci0gICAgdTY0IGNvdW50OworICAgIHU2NCBwbHRfY291 bnRlciwgY291bnQ7CiAgICAgc190aW1lX3Qgc3RpbWU7CiAKICAgICBBU1NFUlQoIWxvY2FsX2ly cV9pc19lbmFibGVkKCkpOwogCiAgICAgc3Bpbl9sb2NrKCZwbGF0Zm9ybV90aW1lcl9sb2NrKTsK LSAgICBjb3VudCA9IHBsdF9zdGFtcDY0ICsgKChwbHRfc3JjLnJlYWRfY291bnRlcigpIC0gcGx0 X3N0YW1wKSAmIHBsdF9tYXNrKTsKKyAgICBwbHRfY291bnRlciA9IHBsdF9zcmMucmVhZF9jb3Vu dGVyKCk7CisgICAgY291bnQgPSBwbHRfc3RhbXA2NCArICgocGx0X2NvdW50ZXIgLSBwbHRfc3Rh bXApICYgcGx0X21hc2spOwogICAgIHN0aW1lID0gX19yZWFkX3BsYXRmb3JtX3N0aW1lKGNvdW50 KTsKICAgICBzcGluX3VubG9jaygmcGxhdGZvcm1fdGltZXJfbG9jayk7CiAKKyAgICBpZiAoIHN0 YW1wICkKKyAgICAgICAgKnN0YW1wID0gcGx0X2NvdW50ZXI7CisKICAgICByZXR1cm4gc3RpbWU7 CiB9CiAKQEAgLTczMSw3ICs3MzUsNyBAQCB2b2lkIGNzdGF0ZV9yZXN0b3JlX3RzYyh2b2lkKQog ICAgIGlmICggYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX05PTlNUT1BfVFNDKSApCiAgICAgICAg IHJldHVybjsKIAotICAgIHdyaXRlX3RzYyhzdGltZTJ0c2MocmVhZF9wbGF0Zm9ybV9zdGltZSgp KSk7CisgICAgd3JpdGVfdHNjKHN0aW1lMnRzYyhyZWFkX3BsYXRmb3JtX3N0aW1lKE5VTEwpKSk7 CiB9CiAKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioKQEAgLTEwNTAsNyArMTA1NCw3IEBAIGludCBjcHVf ZnJlcXVlbmN5X2NoYW5nZSh1NjQgZnJlcSkKIAogICAgIGxvY2FsX2lycV9kaXNhYmxlKCk7CiAg ICAgLyogUGxhdGZvcm0gdGltZSAvZmlyc3QvLCBhcyB3ZSBtYXkgYmUgZGVsYXllZCBieSBwbGF0 Zm9ybV90aW1lcl9sb2NrLiAqLwotICAgIHQtPnN0YW1wLm1hc3Rlcl9zdGltZSA9IHJlYWRfcGxh dGZvcm1fc3RpbWUoKTsKKyAgICB0LT5zdGFtcC5tYXN0ZXJfc3RpbWUgPSByZWFkX3BsYXRmb3Jt X3N0aW1lKE5VTEwpOwogICAgIGN1cnJfdHNjID0gcmR0c2Nfb3JkZXJlZCgpOwogICAgIC8qIFRT Qy1leHRyYXBvbGF0ZWQgdGltZSBtYXkgYmUgYm9ndXMgYWZ0ZXIgZnJlcXVlbmN5IGNoYW5nZS4g Ki8KICAgICAvKnQtPnN0YW1wLmxvY2FsX3N0aW1lID0gZ2V0X3NfdGltZV9maXhlZChjdXJyX3Rz Yyk7Ki8KQEAgLTEzNTUsNyArMTM1OSw3IEBAIHN0YXRpYyB2b2lkIHRpbWVfY2FsaWJyYXRpb25f dHNjX3JlbmRlenZvdXModm9pZCAqX3IpCiAKICAgICAgICAgICAgIGlmICggci0+bWFzdGVyX3N0 aW1lID09IDAgKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHItPm1hc3Rlcl9zdGlt ZSA9IHJlYWRfcGxhdGZvcm1fc3RpbWUoKTsKKyAgICAgICAgICAgICAgICByLT5tYXN0ZXJfc3Rp bWUgPSByZWFkX3BsYXRmb3JtX3N0aW1lKE5VTEwpOwogICAgICAgICAgICAgICAgIHItPm1hc3Rl cl90c2Nfc3RhbXAgPSByZHRzY19vcmRlcmVkKCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBhdG9taWNfaW5jKCZyLT5zZW1hcGhvcmUpOwpAQCAtMTM5NSw3ICsxMzk5LDcgQEAgc3RhdGlj IHZvaWQgdGltZV9jYWxpYnJhdGlvbl9zdGRfcmVuZGV6dm91cyh2b2lkICpfcikKICAgICB7CiAg ICAgICAgIHdoaWxlICggYXRvbWljX3JlYWQoJnItPnNlbWFwaG9yZSkgIT0gKHRvdGFsX2NwdXMg LSAxKSApCiAgICAgICAgICAgICBjcHVfcmVsYXgoKTsKLSAgICAgICAgci0+bWFzdGVyX3N0aW1l ID0gcmVhZF9wbGF0Zm9ybV9zdGltZSgpOworICAgICAgICByLT5tYXN0ZXJfc3RpbWUgPSByZWFk X3BsYXRmb3JtX3N0aW1lKE5VTEwpOwogICAgICAgICBzbXBfd21iKCk7IC8qIHdyaXRlIHItPm1h c3Rlcl9zdGltZSAvdGhlbi8gc2lnbmFsICovCiAgICAgICAgIGF0b21pY19pbmMoJnItPnNlbWFw aG9yZSk7CiAgICAgfQpAQCAtMTQzNCw3ICsxNDM4LDcgQEAgdm9pZCB0aW1lX2xhdGNoX3N0YW1w cyh2b2lkKQogICAgIHVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAKICAgICBsb2NhbF9pcnFfc2F2ZShm bGFncyk7Ci0gICAgYXBfYnJpbmd1cF9yZWYubWFzdGVyX3N0aW1lID0gcmVhZF9wbGF0Zm9ybV9z dGltZSgpOworICAgIGFwX2JyaW5ndXBfcmVmLm1hc3Rlcl9zdGltZSA9IHJlYWRfcGxhdGZvcm1f c3RpbWUoTlVMTCk7CiAgICAgYXBfYnJpbmd1cF9yZWYubG9jYWxfdHNjID0gcmR0c2Nfb3JkZXJl ZCgpOwogICAgIGxvY2FsX2lycV9yZXN0b3JlKGZsYWdzKTsKIApAQCAtMTQ1Miw3ICsxNDU2LDcg QEAgdm9pZCBpbml0X3BlcmNwdV90aW1lKHZvaWQpCiAgICAgdC0+dHNjX3NjYWxlID0gcGVyX2Nw dShjcHVfdGltZSwgMCkudHNjX3NjYWxlOwogCiAgICAgbG9jYWxfaXJxX3NhdmUoZmxhZ3MpOwot ICAgIG5vdyA9IHJlYWRfcGxhdGZvcm1fc3RpbWUoKTsKKyAgICBub3cgPSByZWFkX3BsYXRmb3Jt X3N0aW1lKE5VTEwpOwogICAgIHRzYyA9IHJkdHNjX29yZGVyZWQoKTsKICAgICBsb2NhbF9pcnFf cmVzdG9yZShmbGFncyk7CiAKLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz dHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==