From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [PATCH kvm-unit-tests v8 03/10] arm/arm64: add some delay routines Date: Tue, 13 Dec 2016 16:41:57 +0000 Message-ID: <8760mnu6ga.fsf@linaro.org> References: <20161208175030.12269-1-drjones@redhat.com> <20161208175030.12269-4-drjones@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E03AE40284 for ; Tue, 13 Dec 2016 11:40:54 -0500 (EST) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cBa-hvn9H9jr for ; Tue, 13 Dec 2016 11:40:52 -0500 (EST) Received: from mail-wj0-f182.google.com (mail-wj0-f182.google.com [209.85.210.182]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 54798401C7 for ; Tue, 13 Dec 2016 11:40:52 -0500 (EST) Received: by mail-wj0-f182.google.com with SMTP id xy5so105655478wjc.0 for ; Tue, 13 Dec 2016 08:41:59 -0800 (PST) In-reply-to: <20161208175030.12269-4-drjones@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Andrew Jones Cc: kvm@vger.kernel.org, marc.zyngier@arm.com, andre.przywara@arm.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, pbonzini@redhat.com, kvmarm@lists.cs.columbia.edu List-Id: kvmarm@lists.cs.columbia.edu CkFuZHJldyBKb25lcyA8ZHJqb25lc0ByZWRoYXQuY29tPiB3cml0ZXM6Cgo+IEFsbG93IGEgdGhy ZWFkIHRvIHdhaXQgc29tZSBzcGVjaWZpZWQgYW1vdW50IG9mIHRpbWUuIENhbgo+IHNwZWNpZnkg aW4gY3ljbGVzLCB1c2VjcywgYW5kIG1zZWNzLgo+Cj4gU2lnbmVkLW9mZi1ieTogQW5kcmV3IEpv bmVzIDxkcmpvbmVzQHJlZGhhdC5jb20+Cj4KPiAtLS0KPiB2ODogcmV3cm90ZSBiYXNpbmcgb24g bmV3IHN5c3JlZyBmcmFtZXdvcmsuIEFsc28gZGVjaWRlZCBkZWxheQo+ICAgICBmdW5jdGlvbnMg d2FycmFudCB0aGVpciBvd24gZmlsZXMgKGRlbGF5LltjaF0pCj4gLS0tCj4gIGFybS9NYWtlZmls ZS5jb21tb24gICAgICAgfCAgMSArCj4gIGxpYi9hcm0vYXNtL2RlbGF5LmggICAgICAgfCAxNCAr KysrKysrKysrKysrKwo+ICBsaWIvYXJtL2FzbS9wcm9jZXNzb3IuaCAgIHwgMTUgKysrKysrKysr KysrKysrCj4gIGxpYi9hcm02NC9hc20vZGVsYXkuaCAgICAgfCAgMSArCj4gIGxpYi9hcm02NC9h c20vcHJvY2Vzc29yLmggfCAxMiArKysrKysrKysrKysKPiAgbGliL2FybS9kZWxheS5jICAgICAg ICAgICB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gIDYgZmlsZXMgY2hhbmdl ZCwgNzIgaW5zZXJ0aW9ucygrKQo+ICBjcmVhdGUgbW9kZSAxMDA2NDQgbGliL2FybS9hc20vZGVs YXkuaAo+ICBjcmVhdGUgbW9kZSAxMDA2NDQgbGliL2FybTY0L2FzbS9kZWxheS5oCj4gIGNyZWF0 ZSBtb2RlIDEwMDY0NCBsaWIvYXJtL2RlbGF5LmMKPgo+IGRpZmYgLS1naXQgYS9hcm0vTWFrZWZp bGUuY29tbW9uIGIvYXJtL01ha2VmaWxlLmNvbW1vbgo+IGluZGV4IGIyYzBmYzhhMmZkYy4uODlm ZTNmNjllYjQ0IDEwMDY0NAo+IC0tLSBhL2FybS9NYWtlZmlsZS5jb21tb24KPiArKysgYi9hcm0v TWFrZWZpbGUuY29tbW9uCj4gQEAgLTQ4LDYgKzQ4LDcgQEAgY2ZsYXRvYmpzICs9IGxpYi9hcm0v bW11Lm8KPiAgY2ZsYXRvYmpzICs9IGxpYi9hcm0vYml0b3BzLm8KPiAgY2ZsYXRvYmpzICs9IGxp Yi9hcm0vcHNjaS5vCj4gIGNmbGF0b2JqcyArPSBsaWIvYXJtL3NtcC5vCj4gK2NmbGF0b2JqcyAr PSBsaWIvYXJtL2RlbGF5Lm8KPgo+ICBsaWJlYWJpID0gbGliL2FybS9saWJlYWJpLmEKPiAgZWFi aW9ianMgPSBsaWIvYXJtL2VhYmlfY29tcGF0Lm8KPiBkaWZmIC0tZ2l0IGEvbGliL2FybS9hc20v ZGVsYXkuaCBiL2xpYi9hcm0vYXNtL2RlbGF5LmgKPiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+IGlu ZGV4IDAwMDAwMDAwMDAwMC4uMjQzNmIyOGM3N2FlCj4gLS0tIC9kZXYvbnVsbAo+ICsrKyBiL2xp Yi9hcm0vYXNtL2RlbGF5LmgKPiBAQCAtMCwwICsxLDE0IEBACj4gKyNpZm5kZWYgX0FTTUFSTV9E RUxBWV9IXwo+ICsjZGVmaW5lIF9BU01BUk1fREVMQVlfSF8KPiArLyoKPiArICogQ29weXJpZ2h0 IChDKSAyMDE2LCBSZWQgSGF0IEluYywgQW5kcmV3IEpvbmVzIDxkcmpvbmVzQHJlZGhhdC5jb20+ Cj4gKyAqCj4gKyAqIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciB0aGUgdGVybXMgb2YgdGhl IEdOVSBMR1BMLCB2ZXJzaW9uIDIuCj4gKyAqLwo+ICsjaW5jbHVkZSA8bGliY2ZsYXQuaD4KPiAr Cj4gK2V4dGVybiB2b2lkIGRlbGF5KHU2NCBjeWNsZXMpOwo+ICtleHRlcm4gdm9pZCB1ZGVsYXko dW5zaWduZWQgbG9uZyB1c2Vjcyk7Cj4gK2V4dGVybiB2b2lkIG1kZWxheSh1bnNpZ25lZCBsb25n IG1zZWNzKTsKPiArCj4gKyNlbmRpZiAvKiBfQVNNQVJNX0RFTEFZX0hfICovCj4gZGlmZiAtLWdp dCBhL2xpYi9hcm0vYXNtL3Byb2Nlc3Nvci5oIGIvbGliL2FybS9hc20vcHJvY2Vzc29yLmgKPiBp bmRleCA2YjBkMzZiODc4MTcuLjg1N2JkZDk2YTNjYyAxMDA2NDQKPiAtLS0gYS9saWIvYXJtL2Fz bS9wcm9jZXNzb3IuaAo+ICsrKyBiL2xpYi9hcm0vYXNtL3Byb2Nlc3Nvci5oCj4gQEAgLTcsNiAr Nyw3IEBACj4gICAqLwo+ICAjaW5jbHVkZSA8YXNtL3B0cmFjZS5oPgo+ICAjaW5jbHVkZSA8YXNt L3N5c3JlZy5oPgo+ICsjaW5jbHVkZSA8YXNtL2JhcnJpZXIuaD4KCkhtbSB0aGlzIGZhaWxzIHRv IGFwcGx5IGNsZWFubHkgdG8gbWFzdGVyIGFuZCBkb2Vzbid0IGJ1aWxkIGFzIHN5c3JlZy5oCmlz bid0IGluIG15IHRyZWUuIFdoYXQgaGFwcGVuZWQgdG8gaXQ/Cgo+Cj4gIGVudW0gdmVjdG9yIHsK PiAgCUVYQ1BUTl9SU1QsCj4gQEAgLTUxLDQgKzUyLDE4IEBAIGV4dGVybiBpbnQgbXBpZHJfdG9f Y3B1KHVpbnQ2NF90IG1waWRyKTsKPiAgZXh0ZXJuIHZvaWQgc3RhcnRfdXNyKHZvaWQgKCpmdW5j KSh2b2lkICphcmcpLCB2b2lkICphcmcsIHVuc2lnbmVkIGxvbmcgc3BfdXNyKTsKPiAgZXh0ZXJu IGJvb2wgaXNfdXNlcih2b2lkKTsKPgo+ICsjZGVmaW5lIENOVFZDVAkJX19BQ0NFU1NfQ1AxNV82 NCgxLCBjMTQpCj4gKyNkZWZpbmUgQ05URlJRCQlfX0FDQ0VTU19DUDE1KGMxNCwgMCwgYzAsIDAp Cj4gKwo+ICtzdGF0aWMgaW5saW5lIHU2NCBnZXRfY250dmN0KHZvaWQpCj4gK3sKPiArCWlzYigp Owo+ICsJcmV0dXJuIHJlYWRfc3lzcmVnKENOVFZDVCk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxp bmUgdTMyIGdldF9jbnRmcnEodm9pZCkKPiArewo+ICsJcmV0dXJuIHJlYWRfc3lzcmVnKENOVEZS USk7Cj4gK30KPiArCj4gICNlbmRpZiAvKiBfQVNNQVJNX1BST0NFU1NPUl9IXyAqLwo+IGRpZmYg LS1naXQgYS9saWIvYXJtNjQvYXNtL2RlbGF5LmggYi9saWIvYXJtNjQvYXNtL2RlbGF5LmgKPiBu ZXcgZmlsZSBtb2RlIDEwMDY0NAo+IGluZGV4IDAwMDAwMDAwMDAwMC4uMjg4ZTRiM2ZlNjEwCj4g LS0tIC9kZXYvbnVsbAo+ICsrKyBiL2xpYi9hcm02NC9hc20vZGVsYXkuaAo+IEBAIC0wLDAgKzEg QEAKPiArI2luY2x1ZGUgIi4uLy4uL2FybS9hc20vZGVsYXkuaCIKPiBkaWZmIC0tZ2l0IGEvbGli L2FybTY0L2FzbS9wcm9jZXNzb3IuaCBiL2xpYi9hcm02NC9hc20vcHJvY2Vzc29yLmgKPiBpbmRl eCA0OGFiZjJjOWUzNTguLjA4OThkODlmOTc2MSAxMDA2NDQKPiAtLS0gYS9saWIvYXJtNjQvYXNt L3Byb2Nlc3Nvci5oCj4gKysrIGIvbGliL2FybTY0L2FzbS9wcm9jZXNzb3IuaAo+IEBAIC0yMCw2 ICsyMCw3IEBACj4gICNpbmNsdWRlIDxhc20vcHRyYWNlLmg+Cj4gICNpbmNsdWRlIDxhc20vZXNy Lmg+Cj4gICNpbmNsdWRlIDxhc20vc3lzcmVnLmg+Cj4gKyNpbmNsdWRlIDxhc20vYmFycmllci5o Pgo+Cj4gIGVudW0gdmVjdG9yIHsKPiAgCUVMMVRfU1lOQywKPiBAQCAtODMsNSArODQsMTYgQEAg ZXh0ZXJuIGludCBtcGlkcl90b19jcHUodWludDY0X3QgbXBpZHIpOwo+ICBleHRlcm4gdm9pZCBz dGFydF91c3Iodm9pZCAoKmZ1bmMpKHZvaWQgKmFyZyksIHZvaWQgKmFyZywgdW5zaWduZWQgbG9u ZyBzcF91c3IpOwo+ICBleHRlcm4gYm9vbCBpc191c2VyKHZvaWQpOwo+Cj4gK3N0YXRpYyBpbmxp bmUgdTY0IGdldF9jbnR2Y3Qodm9pZCkKPiArewo+ICsJaXNiKCk7Cj4gKwlyZXR1cm4gcmVhZF9z eXNyZWcoY250dmN0X2VsMCk7Cj4gK30KPiArCj4gK3N0YXRpYyBpbmxpbmUgdTMyIGdldF9jbnRm cnEodm9pZCkKPiArewo+ICsJcmV0dXJuIHJlYWRfc3lzcmVnKGNudGZycV9lbDApOwo+ICt9Cj4g Kwo+ICAjZW5kaWYgLyogIV9fQVNTRU1CTFlfXyAqLwo+ICAjZW5kaWYgLyogX0FTTUFSTTY0X1BS T0NFU1NPUl9IXyAqLwo+IGRpZmYgLS1naXQgYS9saWIvYXJtL2RlbGF5LmMgYi9saWIvYXJtL2Rl bGF5LmMKPiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+IGluZGV4IDAwMDAwMDAwMDAwMC4uZmE2NWUy ZGM5ZTM1Cj4gLS0tIC9kZXYvbnVsbAo+ICsrKyBiL2xpYi9hcm0vZGVsYXkuYwo+IEBAIC0wLDAg KzEsMjkgQEAKPiArLyoKPiArICogRGVsYXkgbG9vcHMKPiArICoKPiArICogQ29weXJpZ2h0IChD KSAyMDE2LCBSZWQgSGF0IEluYywgQW5kcmV3IEpvbmVzIDxkcmpvbmVzQHJlZGhhdC5jb20+Cj4g KyAqCj4gKyAqIFRoaXMgd29yayBpcyBsaWNlbnNlZCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdO VSBMR1BMLCB2ZXJzaW9uIDIuCj4gKyAqLwo+ICsjaW5jbHVkZSA8bGliY2ZsYXQuaD4KPiArI2lu Y2x1ZGUgPGFzbS9wcm9jZXNzb3IuaD4KPiArI2luY2x1ZGUgPGFzbS9iYXJyaWVyLmg+Cj4gKwo+ ICt2b2lkIGRlbGF5KHU2NCBjeWNsZXMpCj4gK3sKPiArCXU2NCBzdGFydCA9IGdldF9jbnR2Y3Qo KTsKPiArCj4gKwl3aGlsZSAoKGdldF9jbnR2Y3QoKSAtIHN0YXJ0KSA8IGN5Y2xlcykKPiArCQlj cHVfcmVsYXgoKTsKPiArfQo+ICsKPiArdm9pZCB1ZGVsYXkodW5zaWduZWQgbG9uZyB1c2VjKQo+ ICt7Cj4gKwlkZWxheSgodTY0KXVzZWMgKiBnZXRfY250ZnJxKCkgLyAxMDAwMDAwKTsKPiArfQo+ ICsKPiArdm9pZCBtZGVsYXkodW5zaWduZWQgbG9uZyBtc2VjcykKPiArewo+ICsJd2hpbGUgKG1z ZWNzLS0pCj4gKwkJdWRlbGF5KDEwMDApOwo+ICt9CgoKLS0KQWxleCBCZW5uw6llCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmt2bWFybSBtYWlsaW5nIGxp c3QKa3ZtYXJtQGxpc3RzLmNzLmNvbHVtYmlhLmVkdQpodHRwczovL2xpc3RzLmNzLmNvbHVtYmlh LmVkdS9tYWlsbWFuL2xpc3RpbmZvL2t2bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id js10sm63017242wjb.19.2016.12.13.08.41.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2016 08:41:57 -0800 (PST) Received: from zen (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTPS id 0EF4E3E0C52; Tue, 13 Dec 2016 16:41:57 +0000 (GMT) References: <20161208175030.12269-1-drjones@redhat.com> <20161208175030.12269-4-drjones@redhat.com> User-agent: mu4e 0.9.19; emacs 25.1.90.4 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: Andrew Jones Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, marc.zyngier@arm.com, andre.przywara@arm.com, eric.auger@redhat.com, pbonzini@redhat.com, christoffer.dall@linaro.org Subject: Re: [PATCH kvm-unit-tests v8 03/10] arm/arm64: add some delay routines In-reply-to: <20161208175030.12269-4-drjones@redhat.com> Date: Tue, 13 Dec 2016 16:41:57 +0000 Message-ID: <8760mnu6ga.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-TUID: 3PGAyaMK+y4q Andrew Jones writes: > Allow a thread to wait some specified amount of time. Can > specify in cycles, usecs, and msecs. > > Signed-off-by: Andrew Jones > > --- > v8: rewrote basing on new sysreg framework. Also decided delay > functions warrant their own files (delay.[ch]) > --- > arm/Makefile.common | 1 + > lib/arm/asm/delay.h | 14 ++++++++++++++ > lib/arm/asm/processor.h | 15 +++++++++++++++ > lib/arm64/asm/delay.h | 1 + > lib/arm64/asm/processor.h | 12 ++++++++++++ > lib/arm/delay.c | 29 +++++++++++++++++++++++++++++ > 6 files changed, 72 insertions(+) > create mode 100644 lib/arm/asm/delay.h > create mode 100644 lib/arm64/asm/delay.h > create mode 100644 lib/arm/delay.c > > diff --git a/arm/Makefile.common b/arm/Makefile.common > index b2c0fc8a2fdc..89fe3f69eb44 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -48,6 +48,7 @@ cflatobjs += lib/arm/mmu.o > cflatobjs += lib/arm/bitops.o > cflatobjs += lib/arm/psci.o > cflatobjs += lib/arm/smp.o > +cflatobjs += lib/arm/delay.o > > libeabi = lib/arm/libeabi.a > eabiobjs = lib/arm/eabi_compat.o > diff --git a/lib/arm/asm/delay.h b/lib/arm/asm/delay.h > new file mode 100644 > index 000000000000..2436b28c77ae > --- /dev/null > +++ b/lib/arm/asm/delay.h > @@ -0,0 +1,14 @@ > +#ifndef _ASMARM_DELAY_H_ > +#define _ASMARM_DELAY_H_ > +/* > + * Copyright (C) 2016, Red Hat Inc, Andrew Jones > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include > + > +extern void delay(u64 cycles); > +extern void udelay(unsigned long usecs); > +extern void mdelay(unsigned long msecs); > + > +#endif /* _ASMARM_DELAY_H_ */ > diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h > index 6b0d36b87817..857bdd96a3cc 100644 > --- a/lib/arm/asm/processor.h > +++ b/lib/arm/asm/processor.h > @@ -7,6 +7,7 @@ > */ > #include > #include > +#include Hmm this fails to apply cleanly to master and doesn't build as sysreg.h isn't in my tree. What happened to it? > > enum vector { > EXCPTN_RST, > @@ -51,4 +52,18 @@ extern int mpidr_to_cpu(uint64_t mpidr); > extern void start_usr(void (*func)(void *arg), void *arg, unsigned long sp_usr); > extern bool is_user(void); > > +#define CNTVCT __ACCESS_CP15_64(1, c14) > +#define CNTFRQ __ACCESS_CP15(c14, 0, c0, 0) > + > +static inline u64 get_cntvct(void) > +{ > + isb(); > + return read_sysreg(CNTVCT); > +} > + > +static inline u32 get_cntfrq(void) > +{ > + return read_sysreg(CNTFRQ); > +} > + > #endif /* _ASMARM_PROCESSOR_H_ */ > diff --git a/lib/arm64/asm/delay.h b/lib/arm64/asm/delay.h > new file mode 100644 > index 000000000000..288e4b3fe610 > --- /dev/null > +++ b/lib/arm64/asm/delay.h > @@ -0,0 +1 @@ > +#include "../../arm/asm/delay.h" > diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h > index 48abf2c9e358..0898d89f9761 100644 > --- a/lib/arm64/asm/processor.h > +++ b/lib/arm64/asm/processor.h > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > enum vector { > EL1T_SYNC, > @@ -83,5 +84,16 @@ extern int mpidr_to_cpu(uint64_t mpidr); > extern void start_usr(void (*func)(void *arg), void *arg, unsigned long sp_usr); > extern bool is_user(void); > > +static inline u64 get_cntvct(void) > +{ > + isb(); > + return read_sysreg(cntvct_el0); > +} > + > +static inline u32 get_cntfrq(void) > +{ > + return read_sysreg(cntfrq_el0); > +} > + > #endif /* !__ASSEMBLY__ */ > #endif /* _ASMARM64_PROCESSOR_H_ */ > diff --git a/lib/arm/delay.c b/lib/arm/delay.c > new file mode 100644 > index 000000000000..fa65e2dc9e35 > --- /dev/null > +++ b/lib/arm/delay.c > @@ -0,0 +1,29 @@ > +/* > + * Delay loops > + * > + * Copyright (C) 2016, Red Hat Inc, Andrew Jones > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include > +#include > +#include > + > +void delay(u64 cycles) > +{ > + u64 start = get_cntvct(); > + > + while ((get_cntvct() - start) < cycles) > + cpu_relax(); > +} > + > +void udelay(unsigned long usec) > +{ > + delay((u64)usec * get_cntfrq() / 1000000); > +} > + > +void mdelay(unsigned long msecs) > +{ > + while (msecs--) > + udelay(1000); > +} -- Alex Bennée From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGqAS-0005yu-1Q for qemu-devel@nongnu.org; Tue, 13 Dec 2016 11:43:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGqAO-00006Y-9b for qemu-devel@nongnu.org; Tue, 13 Dec 2016 11:43:03 -0500 Received: from mail-wj0-f170.google.com ([209.85.210.170]:36140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGqAO-000069-2d for qemu-devel@nongnu.org; Tue, 13 Dec 2016 11:43:00 -0500 Received: by mail-wj0-f170.google.com with SMTP id tk12so105705253wjb.3 for ; Tue, 13 Dec 2016 08:42:59 -0800 (PST) References: <20161208175030.12269-1-drjones@redhat.com> <20161208175030.12269-4-drjones@redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20161208175030.12269-4-drjones@redhat.com> Date: Tue, 13 Dec 2016 16:41:57 +0000 Message-ID: <8760mnu6ga.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH kvm-unit-tests v8 03/10] arm/arm64: add some delay routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Jones Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, marc.zyngier@arm.com, andre.przywara@arm.com, eric.auger@redhat.com, pbonzini@redhat.com, christoffer.dall@linaro.org Andrew Jones writes: > Allow a thread to wait some specified amount of time. Can > specify in cycles, usecs, and msecs. > > Signed-off-by: Andrew Jones > > --- > v8: rewrote basing on new sysreg framework. Also decided delay > functions warrant their own files (delay.[ch]) > --- > arm/Makefile.common | 1 + > lib/arm/asm/delay.h | 14 ++++++++++++++ > lib/arm/asm/processor.h | 15 +++++++++++++++ > lib/arm64/asm/delay.h | 1 + > lib/arm64/asm/processor.h | 12 ++++++++++++ > lib/arm/delay.c | 29 +++++++++++++++++++++++++++++ > 6 files changed, 72 insertions(+) > create mode 100644 lib/arm/asm/delay.h > create mode 100644 lib/arm64/asm/delay.h > create mode 100644 lib/arm/delay.c > > diff --git a/arm/Makefile.common b/arm/Makefile.common > index b2c0fc8a2fdc..89fe3f69eb44 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -48,6 +48,7 @@ cflatobjs += lib/arm/mmu.o > cflatobjs += lib/arm/bitops.o > cflatobjs += lib/arm/psci.o > cflatobjs += lib/arm/smp.o > +cflatobjs += lib/arm/delay.o > > libeabi = lib/arm/libeabi.a > eabiobjs = lib/arm/eabi_compat.o > diff --git a/lib/arm/asm/delay.h b/lib/arm/asm/delay.h > new file mode 100644 > index 000000000000..2436b28c77ae > --- /dev/null > +++ b/lib/arm/asm/delay.h > @@ -0,0 +1,14 @@ > +#ifndef _ASMARM_DELAY_H_ > +#define _ASMARM_DELAY_H_ > +/* > + * Copyright (C) 2016, Red Hat Inc, Andrew Jones > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include > + > +extern void delay(u64 cycles); > +extern void udelay(unsigned long usecs); > +extern void mdelay(unsigned long msecs); > + > +#endif /* _ASMARM_DELAY_H_ */ > diff --git a/lib/arm/asm/processor.h b/lib/arm/asm/processor.h > index 6b0d36b87817..857bdd96a3cc 100644 > --- a/lib/arm/asm/processor.h > +++ b/lib/arm/asm/processor.h > @@ -7,6 +7,7 @@ > */ > #include > #include > +#include Hmm this fails to apply cleanly to master and doesn't build as sysreg.h isn't in my tree. What happened to it? > > enum vector { > EXCPTN_RST, > @@ -51,4 +52,18 @@ extern int mpidr_to_cpu(uint64_t mpidr); > extern void start_usr(void (*func)(void *arg), void *arg, unsigned long sp_usr); > extern bool is_user(void); > > +#define CNTVCT __ACCESS_CP15_64(1, c14) > +#define CNTFRQ __ACCESS_CP15(c14, 0, c0, 0) > + > +static inline u64 get_cntvct(void) > +{ > + isb(); > + return read_sysreg(CNTVCT); > +} > + > +static inline u32 get_cntfrq(void) > +{ > + return read_sysreg(CNTFRQ); > +} > + > #endif /* _ASMARM_PROCESSOR_H_ */ > diff --git a/lib/arm64/asm/delay.h b/lib/arm64/asm/delay.h > new file mode 100644 > index 000000000000..288e4b3fe610 > --- /dev/null > +++ b/lib/arm64/asm/delay.h > @@ -0,0 +1 @@ > +#include "../../arm/asm/delay.h" > diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h > index 48abf2c9e358..0898d89f9761 100644 > --- a/lib/arm64/asm/processor.h > +++ b/lib/arm64/asm/processor.h > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > > enum vector { > EL1T_SYNC, > @@ -83,5 +84,16 @@ extern int mpidr_to_cpu(uint64_t mpidr); > extern void start_usr(void (*func)(void *arg), void *arg, unsigned long sp_usr); > extern bool is_user(void); > > +static inline u64 get_cntvct(void) > +{ > + isb(); > + return read_sysreg(cntvct_el0); > +} > + > +static inline u32 get_cntfrq(void) > +{ > + return read_sysreg(cntfrq_el0); > +} > + > #endif /* !__ASSEMBLY__ */ > #endif /* _ASMARM64_PROCESSOR_H_ */ > diff --git a/lib/arm/delay.c b/lib/arm/delay.c > new file mode 100644 > index 000000000000..fa65e2dc9e35 > --- /dev/null > +++ b/lib/arm/delay.c > @@ -0,0 +1,29 @@ > +/* > + * Delay loops > + * > + * Copyright (C) 2016, Red Hat Inc, Andrew Jones > + * > + * This work is licensed under the terms of the GNU LGPL, version 2. > + */ > +#include > +#include > +#include > + > +void delay(u64 cycles) > +{ > + u64 start = get_cntvct(); > + > + while ((get_cntvct() - start) < cycles) > + cpu_relax(); > +} > + > +void udelay(unsigned long usec) > +{ > + delay((u64)usec * get_cntfrq() / 1000000); > +} > + > +void mdelay(unsigned long msecs) > +{ > + while (msecs--) > + udelay(1000); > +} -- Alex Bennée