From: cdall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 13/27] KVM: arm64: vgic-v3: Add ICV_BPR0_EL1 handler
Date: Fri, 9 Jun 2017 17:29:59 +0200 [thread overview]
Message-ID: <20170609152959.GF11099@cbox> (raw)
In-Reply-To: <20170609114956.25963-14-marc.zyngier@arm.com>
On Fri, Jun 09, 2017 at 12:49:42PM +0100, Marc Zyngier wrote:
> Add a handler for reading/writing the guest's view of the ICC_BPR0_EL1
> register, which is located in the ICH_VMCR_EL2.BPR0 field.
>
> Tested-by: Alexander Graf <agraf@suse.de>
> Acked-by: David Daney <david.daney@cavium.com>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
> ---
> arch/arm64/include/asm/sysreg.h | 1 +
> virt/kvm/arm/hyp/vgic-v3-sr.c | 28 ++++++++++++++++++++++++++++
> 2 files changed, 29 insertions(+)
>
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index bd000686194a..d20be0b28ca4 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -180,6 +180,7 @@
>
> #define SYS_VBAR_EL1 sys_reg(3, 0, 12, 0, 0)
>
> +#define SYS_ICC_BPR0_EL1 sys_reg(3, 0, 12, 8, 3)
> #define SYS_ICC_AP1Rn_EL1(n) sys_reg(3, 0, 12, 9, n)
> #define SYS_ICC_DIR_EL1 sys_reg(3, 0, 12, 11, 1)
> #define SYS_ICC_SGI1R_EL1 sys_reg(3, 0, 12, 11, 5)
> diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c
> index a2a62f030341..f53908cc981c 100644
> --- a/virt/kvm/arm/hyp/vgic-v3-sr.c
> +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c
> @@ -706,11 +706,33 @@ static void __hyp_text __vgic_v3_write_igrpen1(struct kvm_vcpu *vcpu, u32 vmcr,
> __vgic_v3_write_vmcr(vmcr);
> }
>
> +static void __hyp_text __vgic_v3_read_bpr0(struct kvm_vcpu *vcpu, u32 vmcr, int rt)
> +{
> + vcpu_set_reg(vcpu, rt, __vgic_v3_get_bpr0(vmcr));
> +}
> +
> static void __hyp_text __vgic_v3_read_bpr1(struct kvm_vcpu *vcpu, u32 vmcr, int rt)
> {
> vcpu_set_reg(vcpu, rt, __vgic_v3_get_bpr1(vmcr));
> }
>
> +static void __hyp_text __vgic_v3_write_bpr0(struct kvm_vcpu *vcpu, u32 vmcr, int rt)
> +{
> + u64 val = vcpu_get_reg(vcpu, rt);
> + u8 bpr_min = __vgic_v3_bpr_min() - 1;
> +
> + /* Enforce BPR limiting */
> + if (val < bpr_min)
> + val = bpr_min;
> +
> + val <<= ICH_VMCR_BPR0_SHIFT;
> + val &= ICH_VMCR_BPR0_MASK;
> + vmcr &= ~ICH_VMCR_BPR0_MASK;
> + vmcr |= val;
> +
> + __vgic_v3_write_vmcr(vmcr);
> +}
> +
> static void __hyp_text __vgic_v3_write_bpr1(struct kvm_vcpu *vcpu, u32 vmcr, int rt)
> {
> u64 val = vcpu_get_reg(vcpu, rt);
> @@ -888,6 +910,12 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu)
> case SYS_ICC_HPPIR1_EL1:
> fn = __vgic_v3_read_hppir;
> break;
> + case SYS_ICC_BPR0_EL1:
> + if (is_read)
> + fn = __vgic_v3_read_bpr0;
> + else
> + fn = __vgic_v3_write_bpr0;
> + break;
> default:
> return 0;
> }
> --
> 2.11.0
>
next prev parent reply other threads:[~2017-06-09 15:29 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 11:49 [PATCH v3 00/27] arm64: KVM: Mediate access to GICv3 sysregs at EL2 Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 01/27] arm64: Add a facility to turn an ESR syndrome into a sysreg encoding Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 02/27] KVM: arm/arm64: vgic-v3: Add accessors for the ICH_APxRn_EL2 registers Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 03/27] KVM: arm64: Make kvm_condition_valid32() accessible from EL2 Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 04/27] KVM: arm64: vgic-v3: Add hook to handle guest GICv3 sysreg accesses at EL2 Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 05/27] KVM: arm64: vgic-v3: Add ICV_BPR1_EL1 handler Marc Zyngier
2017-06-09 15:23 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 06/27] KVM: arm64: vgic-v3: Add ICV_IGRPEN1_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 07/27] KVM: arm64: vgic-v3: Add ICV_IAR1_EL1 handler Marc Zyngier
2017-06-09 15:26 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 08/27] KVM: arm64: vgic-v3: Add ICV_EOIR1_EL1 handler Marc Zyngier
2017-06-09 15:27 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 09/27] KVM: arm64: vgic-v3: Add ICV_AP1Rn_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 10/27] KVM: arm64: vgic-v3: Add ICV_HPPIR1_EL1 handler Marc Zyngier
2017-06-09 15:28 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 11/27] KVM: arm64: vgic-v3: Enable trapping of Group-1 system registers Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 12/27] KVM: arm64: Enable GICv3 Group-1 sysreg trapping via command-line Marc Zyngier
2017-06-09 15:29 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 13/27] KVM: arm64: vgic-v3: Add ICV_BPR0_EL1 handler Marc Zyngier
2017-06-09 15:29 ` Christoffer Dall [this message]
2017-06-09 11:49 ` [PATCH v3 14/27] KVM: arm64: vgic-v3: Add ICV_IGNREN0_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 15/27] KVM: arm64: vgic-v3: Add misc Group-0 handlers Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 16/27] KVM: arm64: vgic-v3: Enable trapping of Group-0 system registers Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 17/27] KVM: arm64: Enable GICv3 Group-0 sysreg trapping via command-line Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 18/27] arm64: Add MIDR values for Cavium cn83XX SoCs Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 19/27] arm64: Add workaround for Cavium Thunder erratum 30115 Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 20/27] KVM: arm64: vgic-v3: Add ICV_DIR_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 21/27] KVM: arm64: vgic-v3: Add ICV_RPR_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 22/27] KVM: arm64: vgic-v3: Add ICV_CTLR_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 23/27] KVM: arm64: vgic-v3: Add ICV_PMR_EL1 handler Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 24/27] KVM: arm64: Enable GICv3 common sysreg trapping via command-line Marc Zyngier
2017-06-09 15:31 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 25/27] KVM: arm64: vgic-v3: Log which GICv3 system registers are trapped Marc Zyngier
2017-06-09 11:49 ` [PATCH v3 26/27] KVM: arm64: Log an error if trapping a read-from-write-only GICv3 access Marc Zyngier
2017-06-09 15:33 ` Christoffer Dall
2017-06-09 11:49 ` [PATCH v3 27/27] KVM: arm64: Log an error if trapping a write-to-read-only " Marc Zyngier
2017-06-09 15:34 ` Christoffer Dall
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=20170609152959.GF11099@cbox \
--to=cdall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).