From: Andrew Jones <drjones@redhat.com> To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, peter.maydell@linaro.org, alex.bennee@linaro.org Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, eric.auger@redhat.com, wei@redhat.com Subject: [kvm-unit-tests PATCH v3 02/10] arm64: fix get_"sysreg32" and make MPIDR 64bit Date: Fri, 15 Jul 2016 15:00:33 +0200 [thread overview] Message-ID: <1468587641-7300-3-git-send-email-drjones@redhat.com> (raw) In-Reply-To: <1468587641-7300-1-git-send-email-drjones@redhat.com> mrs is always 64bit, so we should always use a 64bit register. Sometimes we'll only want to return the lower 32, but not for MPIDR, as that does define fields in the upper 32. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Andrew Jones <drjones@redhat.com> --- lib/arm64/asm/processor.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h index 84d5c7ce752b0..9a208ff729b7e 100644 --- a/lib/arm64/asm/processor.h +++ b/lib/arm64/asm/processor.h @@ -66,14 +66,17 @@ static inline unsigned long current_level(void) return el & 0xc; } -#define DEFINE_GET_SYSREG32(reg) \ -static inline unsigned int get_##reg(void) \ +#define DEFINE_GET_SYSREG(reg, type) \ +static inline type get_##reg(void) \ { \ - unsigned int reg; \ - asm volatile("mrs %0, " #reg "_el1" : "=r" (reg)); \ - return reg; \ + unsigned long r; \ + asm volatile("mrs %0, " #reg "_el1" : "=r" (r)); \ + return (type)r; \ } -DEFINE_GET_SYSREG32(mpidr) +#define DEFINE_GET_SYSREG32(reg) DEFINE_GET_SYSREG(reg, unsigned int) +#define DEFINE_GET_SYSREG64(reg) DEFINE_GET_SYSREG(reg, unsigned long) + +DEFINE_GET_SYSREG64(mpidr) /* Only support Aff0 for now, gicv2 only */ #define mpidr_to_cpu(mpidr) ((int)((mpidr) & 0xff)) -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com> To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, pbonzini@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, peter.maydell@linaro.org, alex.bennee@linaro.org Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, eric.auger@redhat.com, wei@redhat.com Subject: [Qemu-devel] [kvm-unit-tests PATCH v3 02/10] arm64: fix get_"sysreg32" and make MPIDR 64bit Date: Fri, 15 Jul 2016 15:00:33 +0200 [thread overview] Message-ID: <1468587641-7300-3-git-send-email-drjones@redhat.com> (raw) In-Reply-To: <1468587641-7300-1-git-send-email-drjones@redhat.com> mrs is always 64bit, so we should always use a 64bit register. Sometimes we'll only want to return the lower 32, but not for MPIDR, as that does define fields in the upper 32. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Andrew Jones <drjones@redhat.com> --- lib/arm64/asm/processor.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/arm64/asm/processor.h b/lib/arm64/asm/processor.h index 84d5c7ce752b0..9a208ff729b7e 100644 --- a/lib/arm64/asm/processor.h +++ b/lib/arm64/asm/processor.h @@ -66,14 +66,17 @@ static inline unsigned long current_level(void) return el & 0xc; } -#define DEFINE_GET_SYSREG32(reg) \ -static inline unsigned int get_##reg(void) \ +#define DEFINE_GET_SYSREG(reg, type) \ +static inline type get_##reg(void) \ { \ - unsigned int reg; \ - asm volatile("mrs %0, " #reg "_el1" : "=r" (reg)); \ - return reg; \ + unsigned long r; \ + asm volatile("mrs %0, " #reg "_el1" : "=r" (r)); \ + return (type)r; \ } -DEFINE_GET_SYSREG32(mpidr) +#define DEFINE_GET_SYSREG32(reg) DEFINE_GET_SYSREG(reg, unsigned int) +#define DEFINE_GET_SYSREG64(reg) DEFINE_GET_SYSREG(reg, unsigned long) + +DEFINE_GET_SYSREG64(mpidr) /* Only support Aff0 for now, gicv2 only */ #define mpidr_to_cpu(mpidr) ((int)((mpidr) & 0xff)) -- 2.7.4
next prev parent reply other threads:[~2016-07-15 13:00 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-15 13:00 [kvm-unit-tests PATCH v3 00/10] arm/arm64: add gic framework Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 01/10] lib: xstr: allow multiple args Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-08-30 14:28 ` Auger Eric 2016-08-30 14:28 ` Auger Eric 2016-07-15 13:00 ` Andrew Jones [this message] 2016-07-15 13:00 ` [Qemu-devel] [kvm-unit-tests PATCH v3 02/10] arm64: fix get_"sysreg32" and make MPIDR 64bit Andrew Jones 2016-08-30 14:28 ` Auger Eric 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 03/10] arm/arm64: smp: support more than 8 cpus Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-08-30 14:28 ` Auger Eric 2016-08-31 22:01 ` Auger Eric 2016-10-17 12:24 ` Andrew Jones 2016-10-17 12:24 ` Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 04/10] arm/arm64: add some delay routines Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 10:19 ` Auger Eric 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 05/10] arm/arm64: irq enable/disable Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 10:19 ` Auger Eric 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 06/10] arm/arm64: add initial gicv2 support Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 10:20 ` Auger Eric 2016-09-01 10:20 ` Auger Eric 2016-10-17 13:14 ` Andrew Jones 2016-10-17 13:14 ` Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 07/10] arm/arm64: add initial gicv3 support Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 10:19 ` Auger Eric 2016-09-01 10:19 ` Auger Eric 2016-10-17 13:30 ` Andrew Jones 2016-10-20 17:29 ` Andre Przywara 2016-10-20 17:29 ` [Qemu-devel] " Andre Przywara 2016-10-21 12:49 ` Andrew Jones 2016-10-21 12:49 ` Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 08/10] arm/arm64: gicv2: add an IPI test Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 16:42 ` Auger Eric 2016-10-17 19:15 ` Andrew Jones 2016-10-17 19:15 ` Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 09/10] arm/arm64: gicv3: " Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-01 16:42 ` Auger Eric 2016-10-17 13:36 ` Andrew Jones 2016-10-17 13:36 ` Andrew Jones 2016-07-15 13:00 ` [kvm-unit-tests PATCH v3 10/10] arm/arm64: gic: don't just use zero Andrew Jones 2016-07-15 13:00 ` [Qemu-devel] " Andrew Jones 2016-09-02 9:43 ` Auger Eric 2016-10-17 19:53 ` Andrew Jones 2016-10-17 19:53 ` Andrew Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1468587641-7300-3-git-send-email-drjones@redhat.com \ --to=drjones@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=andre.przywara@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=eric.auger@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=marc.zyngier@arm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=wei@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.