* [GIT PULL 0/1] KVM/arm updates for 4.19-rc8
@ 2018-10-09 12:26 ` Marc Zyngier
0 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2018-10-09 12:26 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář
Cc: kvm, Florian Fainelli, linux-arm-kernel, kvmarm
Paolo, Radim,
This is hopefully the last 4.19 update for KVM/arm. A single patch,
but one that fixes a rather silly 32bit bug (which I thought I had
fixed before sending the original 4.19 PR, but obviously didn't).
Please pull,
M.
The following changes since commit 7876320f88802b22d4e2daf7eb027dd14175a0f8:
Linux 4.19-rc4 (2018-09-16 11:52:37 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-for-4.19-2
for you to fetch changes up to ec876f4b252c4084acad259ce3e65ad97f44f040:
ARM: KVM: Correctly order SGI register entries in the cp15 array (2018-10-09 11:55:47 +0100)
----------------------------------------------------------------
KVM/arm fixes for 4.19, take #2
- Correctly order GICv3 SGI registers in the cp15 array
----------------------------------------------------------------
Marc Zyngier (1):
ARM: KVM: Correctly order SGI register entries in the cp15 array
arch/arm/kvm/coproc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL 0/1] KVM/arm updates for 4.19-rc8
@ 2018-10-09 12:26 ` Marc Zyngier
0 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2018-10-09 12:26 UTC (permalink / raw)
To: linux-arm-kernel
Paolo, Radim,
This is hopefully the last 4.19 update for KVM/arm. A single patch,
but one that fixes a rather silly 32bit bug (which I thought I had
fixed before sending the original 4.19 PR, but obviously didn't).
Please pull,
M.
The following changes since commit 7876320f88802b22d4e2daf7eb027dd14175a0f8:
Linux 4.19-rc4 (2018-09-16 11:52:37 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-for-4.19-2
for you to fetch changes up to ec876f4b252c4084acad259ce3e65ad97f44f040:
ARM: KVM: Correctly order SGI register entries in the cp15 array (2018-10-09 11:55:47 +0100)
----------------------------------------------------------------
KVM/arm fixes for 4.19, take #2
- Correctly order GICv3 SGI registers in the cp15 array
----------------------------------------------------------------
Marc Zyngier (1):
ARM: KVM: Correctly order SGI register entries in the cp15 array
arch/arm/kvm/coproc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] ARM: KVM: Correctly order SGI register entries in the cp15 array
2018-10-09 12:26 ` Marc Zyngier
@ 2018-10-09 12:26 ` Marc Zyngier
-1 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2018-10-09 12:26 UTC (permalink / raw)
To: Paolo Bonzini, Radim Krčmář
Cc: kvm, Florian Fainelli, linux-arm-kernel, kvmarm
The ICC_ASGI1R and ICC_SGI0R register entries in the cp15 array
are not correctly ordered, leading to a BUG() at boot time.
Move them to their natural location.
Fixes: 3e8a8a50c7ef ("KVM: arm: vgic-v3: Add support for ICC_SGI0R and ICC_ASGI1R accesses")
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/coproc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 450c7a4fbc8a..cb094e55dc5f 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -478,15 +478,15 @@ static const struct coproc_reg cp15_regs[] = {
/* ICC_SGI1R */
{ CRm64(12), Op1( 0), is64, access_gic_sgi},
- /* ICC_ASGI1R */
- { CRm64(12), Op1( 1), is64, access_gic_sgi},
- /* ICC_SGI0R */
- { CRm64(12), Op1( 2), is64, access_gic_sgi},
/* VBAR: swapped by interrupt.S. */
{ CRn(12), CRm( 0), Op1( 0), Op2( 0), is32,
NULL, reset_val, c12_VBAR, 0x00000000 },
+ /* ICC_ASGI1R */
+ { CRm64(12), Op1( 1), is64, access_gic_sgi},
+ /* ICC_SGI0R */
+ { CRm64(12), Op1( 2), is64, access_gic_sgi},
/* ICC_SRE */
{ CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre },
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/1] ARM: KVM: Correctly order SGI register entries in the cp15 array
@ 2018-10-09 12:26 ` Marc Zyngier
0 siblings, 0 replies; 4+ messages in thread
From: Marc Zyngier @ 2018-10-09 12:26 UTC (permalink / raw)
To: linux-arm-kernel
The ICC_ASGI1R and ICC_SGI0R register entries in the cp15 array
are not correctly ordered, leading to a BUG() at boot time.
Move them to their natural location.
Fixes: 3e8a8a50c7ef ("KVM: arm: vgic-v3: Add support for ICC_SGI0R and ICC_ASGI1R accesses")
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/kvm/coproc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c
index 450c7a4fbc8a..cb094e55dc5f 100644
--- a/arch/arm/kvm/coproc.c
+++ b/arch/arm/kvm/coproc.c
@@ -478,15 +478,15 @@ static const struct coproc_reg cp15_regs[] = {
/* ICC_SGI1R */
{ CRm64(12), Op1( 0), is64, access_gic_sgi},
- /* ICC_ASGI1R */
- { CRm64(12), Op1( 1), is64, access_gic_sgi},
- /* ICC_SGI0R */
- { CRm64(12), Op1( 2), is64, access_gic_sgi},
/* VBAR: swapped by interrupt.S. */
{ CRn(12), CRm( 0), Op1( 0), Op2( 0), is32,
NULL, reset_val, c12_VBAR, 0x00000000 },
+ /* ICC_ASGI1R */
+ { CRm64(12), Op1( 1), is64, access_gic_sgi},
+ /* ICC_SGI0R */
+ { CRm64(12), Op1( 2), is64, access_gic_sgi},
/* ICC_SRE */
{ CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre },
--
2.19.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-09 12:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-09 12:26 [GIT PULL 0/1] KVM/arm updates for 4.19-rc8 Marc Zyngier
2018-10-09 12:26 ` Marc Zyngier
2018-10-09 12:26 ` [PATCH 1/1] ARM: KVM: Correctly order SGI register entries in the cp15 array Marc Zyngier
2018-10-09 12:26 ` Marc Zyngier
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.