* [PATCH v1 0/3] arm64/sysreg: ISR register conversions
@ 2022-12-06 13:11 Mark Brown
2022-12-06 13:11 ` [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Mark Brown @ 2022-12-06 13:11 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Marc Zyngier
Cc: linux-arm-kernel, kvmarm, Mark Brown
This series pulls the generated sysreg updates out of the previously
posted series for NMI support then adds an incremental patch on top of
that using the generated constant for ISR_EL1.A in the KVM entry code
suggested by Marc Zyngier. This should hopefully help these progress
without getting tied up by the more involved NMI rework (and cut down
the size of that series if they do get merged).
Mark Brown (3):
arm64/sysreg: Add definition for ICC_NMIAR1_EL1
arm64/sysreg: Add definition of ISR_EL1
KVM: arm64: Use symbolic definition for ISR_EL1.A
arch/arm64/kvm/hyp/entry.S | 2 +-
arch/arm64/tools/sysreg | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
base-commit: 30a0b95b1335e12efef89dd78518ed3e4a71a763
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-06 13:11 [PATCH v1 0/3] arm64/sysreg: ISR register conversions Mark Brown
@ 2022-12-06 13:11 ` Mark Brown
2022-12-07 11:17 ` Marc Zyngier
2022-12-06 13:11 ` [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1 Mark Brown
2022-12-06 13:11 ` [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A Mark Brown
2 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2022-12-06 13:11 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Marc Zyngier
Cc: linux-arm-kernel, kvmarm, Mark Brown
FEAT_NMI adds a new interrupt status register for NMIs, ICC_NMIAR1_EL1.
Add the definition for this register as per IHI0069H.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/tools/sysreg | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 384757a7eda9..5d0d2498c635 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -1078,3 +1078,8 @@ Field 23:16 LD
Res0 15:8
Field 7:0 LR
EndSysreg
+
+Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
+Res0 63:24
+Field 23:0 INTID
+EndSysreg
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-06 13:11 ` [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
@ 2022-12-07 11:17 ` Marc Zyngier
2022-12-07 14:39 ` Mark Brown
0 siblings, 1 reply; 11+ messages in thread
From: Marc Zyngier @ 2022-12-07 11:17 UTC (permalink / raw)
To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
On Tue, 06 Dec 2022 13:11:42 +0000,
Mark Brown <broonie@kernel.org> wrote:
>
> FEAT_NMI adds a new interrupt status register for NMIs, ICC_NMIAR1_EL1.
> Add the definition for this register as per IHI0069H.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/tools/sysreg | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
> index 384757a7eda9..5d0d2498c635 100644
> --- a/arch/arm64/tools/sysreg
> +++ b/arch/arm64/tools/sysreg
> @@ -1078,3 +1078,8 @@ Field 23:16 LD
> Res0 15:8
> Field 7:0 LR
> EndSysreg
> +
> +Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
> +Res0 63:24
> +Field 23:0 INTID
> +EndSysreg
This patch should stay with the GIC patch adding NMIs, really.
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-07 11:17 ` Marc Zyngier
@ 2022-12-07 14:39 ` Mark Brown
2022-12-07 15:08 ` Marc Zyngier
0 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2022-12-07 14:39 UTC (permalink / raw)
To: Marc Zyngier; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
[-- Attachment #1.1: Type: text/plain, Size: 472 bytes --]
On Wed, Dec 07, 2022 at 11:17:02AM +0000, Marc Zyngier wrote:
> Mark Brown <broonie@kernel.org> wrote:
> > +Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
> > +Res0 63:24
> > +Field 23:0 INTID
> > +EndSysreg
> This patch should stay with the GIC patch adding NMIs, really.
Given the textual conflict with the ISR patch and the fact that the NMI
series needs both anyway it seemed more productive to just carry them
both in the cleanup series even if this one isn't immediately used.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-07 14:39 ` Mark Brown
@ 2022-12-07 15:08 ` Marc Zyngier
2022-12-07 18:16 ` Mark Brown
0 siblings, 1 reply; 11+ messages in thread
From: Marc Zyngier @ 2022-12-07 15:08 UTC (permalink / raw)
To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
On Wed, 07 Dec 2022 14:39:26 +0000,
Mark Brown <broonie@kernel.org> wrote:
>
> On Wed, Dec 07, 2022 at 11:17:02AM +0000, Marc Zyngier wrote:
> > Mark Brown <broonie@kernel.org> wrote:
>
> > > +Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
> > > +Res0 63:24
> > > +Field 23:0 INTID
> > > +EndSysreg
>
> > This patch should stay with the GIC patch adding NMIs, really.
>
> Given the textual conflict with the ISR patch and the fact that the NMI
> series needs both anyway it seemed more productive to just carry them
> both in the cleanup series even if this one isn't immediately used.
I thought the point of this series was to extract stuff that was
otherwise useful, independently of the NMI series.
I must have misunderstood its purpose. This is instead making things
harder to follow. Oh well.
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-07 15:08 ` Marc Zyngier
@ 2022-12-07 18:16 ` Mark Brown
2022-12-07 18:33 ` Marc Zyngier
0 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2022-12-07 18:16 UTC (permalink / raw)
To: Marc Zyngier; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
[-- Attachment #1.1: Type: text/plain, Size: 803 bytes --]
On Wed, Dec 07, 2022 at 03:08:48PM +0000, Marc Zyngier wrote:
> Mark Brown <broonie@kernel.org> wrote:
> > Given the textual conflict with the ISR patch and the fact that the NMI
> > series needs both anyway it seemed more productive to just carry them
> > both in the cleanup series even if this one isn't immediately used.
> I thought the point of this series was to extract stuff that was
> otherwise useful, independently of the NMI series.
I tend to view the system register definitions as just generally useful,
this being system register definitions plus a cleanup that could be done
on top.
> I must have misunderstood its purpose. This is instead making things
> harder to follow. Oh well.
I am hopeful that the extra cognative load of an additional register
definition will be managable.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1
2022-12-07 18:16 ` Mark Brown
@ 2022-12-07 18:33 ` Marc Zyngier
0 siblings, 0 replies; 11+ messages in thread
From: Marc Zyngier @ 2022-12-07 18:33 UTC (permalink / raw)
To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
On Wed, 07 Dec 2022 18:16:10 +0000,
Mark Brown <broonie@kernel.org> wrote:
>
> [1 <text/plain; us-ascii (7bit)>]
> On Wed, Dec 07, 2022 at 03:08:48PM +0000, Marc Zyngier wrote:
> > Mark Brown <broonie@kernel.org> wrote:
>
> > > Given the textual conflict with the ISR patch and the fact that the NMI
> > > series needs both anyway it seemed more productive to just carry them
> > > both in the cleanup series even if this one isn't immediately used.
>
> > I thought the point of this series was to extract stuff that was
> > otherwise useful, independently of the NMI series.
>
> I tend to view the system register definitions as just generally useful,
> this being system register definitions plus a cleanup that could be done
> on top.
I tend to view the *unused* system register definition as pointless
churn. We'll have to agree to disagree on that one.
>
> > I must have misunderstood its purpose. This is instead making things
> > harder to follow. Oh well.
>
> I am hopeful that the extra cognative load of an additional register
> definition will be managable.
You never know.
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1
2022-12-06 13:11 [PATCH v1 0/3] arm64/sysreg: ISR register conversions Mark Brown
2022-12-06 13:11 ` [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
@ 2022-12-06 13:11 ` Mark Brown
2022-12-07 11:17 ` Marc Zyngier
2022-12-06 13:11 ` [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A Mark Brown
2 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2022-12-06 13:11 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Marc Zyngier
Cc: linux-arm-kernel, kvmarm, Mark Brown
Add a definition of ISR_EL1 as per DDI0487I.a. This register was not
previously defined in sysreg.h, no functional changes.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/tools/sysreg | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
index 5d0d2498c635..3660e680b7f5 100644
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@ -1079,6 +1079,16 @@ Res0 15:8
Field 7:0 LR
EndSysreg
+Sysreg ISR_EL1 3 0 12 1 0
+Res0 63:11
+Field 10 IS
+Field 9 FS
+Field 8 A
+Field 7 I
+Field 6 F
+Res0 5:0
+EndSysreg
+
Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
Res0 63:24
Field 23:0 INTID
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1
2022-12-06 13:11 ` [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1 Mark Brown
@ 2022-12-07 11:17 ` Marc Zyngier
0 siblings, 0 replies; 11+ messages in thread
From: Marc Zyngier @ 2022-12-07 11:17 UTC (permalink / raw)
To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
On Tue, 06 Dec 2022 13:11:43 +0000,
Mark Brown <broonie@kernel.org> wrote:
>
> Add a definition of ISR_EL1 as per DDI0487I.a. This register was not
> previously defined in sysreg.h, no functional changes.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/tools/sysreg | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm64/tools/sysreg b/arch/arm64/tools/sysreg
> index 5d0d2498c635..3660e680b7f5 100644
> --- a/arch/arm64/tools/sysreg
> +++ b/arch/arm64/tools/sysreg
> @@ -1079,6 +1079,16 @@ Res0 15:8
> Field 7:0 LR
> EndSysreg
>
> +Sysreg ISR_EL1 3 0 12 1 0
> +Res0 63:11
> +Field 10 IS
> +Field 9 FS
> +Field 8 A
> +Field 7 I
> +Field 6 F
> +Res0 5:0
> +EndSysreg
> +
> Sysreg ICC_NMIAR1_EL1 3 0 12 9 5
> Res0 63:24
> Field 23:0 INTID
Acked-by: Marc Zyngier <maz@kernel.org>
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A
2022-12-06 13:11 [PATCH v1 0/3] arm64/sysreg: ISR register conversions Mark Brown
2022-12-06 13:11 ` [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
2022-12-06 13:11 ` [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1 Mark Brown
@ 2022-12-06 13:11 ` Mark Brown
2022-12-07 11:18 ` Marc Zyngier
2 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2022-12-06 13:11 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Marc Zyngier
Cc: linux-arm-kernel, kvmarm, Mark Brown
Now that we are generating ISR_EL1 we have acquired a constant for
ISR_EL1.A, use it rather than the magic number we had been using in the KVM
entry code.
Suggested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/kvm/hyp/entry.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S
index 435346ea1504..f3aa7738b477 100644
--- a/arch/arm64/kvm/hyp/entry.S
+++ b/arch/arm64/kvm/hyp/entry.S
@@ -171,7 +171,7 @@ alternative_else
dsb sy // Synchronize against in-flight ld/st
isb // Prevent an early read of side-effect free ISR
mrs x2, isr_el1
- tbnz x2, #8, 2f // ISR_EL1.A
+ tbnz x2, #ISR_EL1_A_SHIFT, 2f
ret
nop
2:
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A
2022-12-06 13:11 ` [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A Mark Brown
@ 2022-12-07 11:18 ` Marc Zyngier
0 siblings, 0 replies; 11+ messages in thread
From: Marc Zyngier @ 2022-12-07 11:18 UTC (permalink / raw)
To: Mark Brown; +Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, kvmarm
On Tue, 06 Dec 2022 13:11:44 +0000,
Mark Brown <broonie@kernel.org> wrote:
>
> Now that we are generating ISR_EL1 we have acquired a constant for
> ISR_EL1.A, use it rather than the magic number we had been using in the KVM
> entry code.
>
> Suggested-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> arch/arm64/kvm/hyp/entry.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S
> index 435346ea1504..f3aa7738b477 100644
> --- a/arch/arm64/kvm/hyp/entry.S
> +++ b/arch/arm64/kvm/hyp/entry.S
> @@ -171,7 +171,7 @@ alternative_else
> dsb sy // Synchronize against in-flight ld/st
> isb // Prevent an early read of side-effect free ISR
> mrs x2, isr_el1
> - tbnz x2, #8, 2f // ISR_EL1.A
> + tbnz x2, #ISR_EL1_A_SHIFT, 2f
> ret
> nop
> 2:
Acked-by: Marc Zyngier <maz@kernel.org>
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-12-07 18:36 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 13:11 [PATCH v1 0/3] arm64/sysreg: ISR register conversions Mark Brown
2022-12-06 13:11 ` [PATCH v1 1/3] arm64/sysreg: Add definition for ICC_NMIAR1_EL1 Mark Brown
2022-12-07 11:17 ` Marc Zyngier
2022-12-07 14:39 ` Mark Brown
2022-12-07 15:08 ` Marc Zyngier
2022-12-07 18:16 ` Mark Brown
2022-12-07 18:33 ` Marc Zyngier
2022-12-06 13:11 ` [PATCH v1 2/3] arm64/sysreg: Add definition of ISR_EL1 Mark Brown
2022-12-07 11:17 ` Marc Zyngier
2022-12-06 13:11 ` [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A Mark Brown
2022-12-07 11:18 ` Marc Zyngier
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).