* [PATCH] arm64: remove a redundancy in sysreg.h @ 2017-06-20 13:30 Stefan Traby 2017-06-20 13:54 ` Marc Zyngier 0 siblings, 1 reply; 5+ messages in thread From: Stefan Traby @ 2017-06-20 13:30 UTC (permalink / raw) To: linux-arm-kernel This is really trivial; there is a dup (1 << 16) in the code Signed-off-by: Stefan Traby <stefan@hello-penguin.com> --- arch/arm64/include/asm/sysreg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 2d3e155b185f..580965129fea 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -139,8 +139,8 @@ #define SCTLR_ELx_M 1 #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ - (1 << 28) | (1 << 29)) + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ + (1 << 29)) #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ SCTLR_ELx_SA | SCTLR_ELx_I) -- 2.11.0 -- ciao - Stefan ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] arm64: remove a redundancy in sysreg.h 2017-06-20 13:30 [PATCH] arm64: remove a redundancy in sysreg.h Stefan Traby @ 2017-06-20 13:54 ` Marc Zyngier 2017-06-20 14:05 ` Will Deacon 0 siblings, 1 reply; 5+ messages in thread From: Marc Zyngier @ 2017-06-20 13:54 UTC (permalink / raw) To: linux-arm-kernel On 20/06/17 14:30, Stefan Traby wrote: > This is really trivial; there is a dup > (1 << 16) in the code > > Signed-off-by: Stefan Traby <stefan@hello-penguin.com> > --- > arch/arm64/include/asm/sysreg.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > index 2d3e155b185f..580965129fea 100644 > --- a/arch/arm64/include/asm/sysreg.h > +++ b/arch/arm64/include/asm/sysreg.h > @@ -139,8 +139,8 @@ > #define SCTLR_ELx_M 1 > > #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ > - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ > - (1 << 28) | (1 << 29)) > + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ > + (1 << 29)) > > #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ > SCTLR_ELx_SA | SCTLR_ELx_I) > Acked-by: Marc Zyngier <marc.zyngier@arm.com> Catalin, Will: do you want to get that through arm64? Alternatively, I get stash it in the KVM tree. Thanks, M. -- Jazz is not dead. It just smells funny... ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: remove a redundancy in sysreg.h 2017-06-20 13:54 ` Marc Zyngier @ 2017-06-20 14:05 ` Will Deacon 2017-06-20 15:43 ` Will Deacon 0 siblings, 1 reply; 5+ messages in thread From: Will Deacon @ 2017-06-20 14:05 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 20, 2017 at 02:54:15PM +0100, Marc Zyngier wrote: > On 20/06/17 14:30, Stefan Traby wrote: > > This is really trivial; there is a dup > > (1 << 16) in the code > > > > Signed-off-by: Stefan Traby <stefan@hello-penguin.com> > > --- > > arch/arm64/include/asm/sysreg.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > > index 2d3e155b185f..580965129fea 100644 > > --- a/arch/arm64/include/asm/sysreg.h > > +++ b/arch/arm64/include/asm/sysreg.h > > @@ -139,8 +139,8 @@ > > #define SCTLR_ELx_M 1 > > > > #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ > > - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ > > - (1 << 28) | (1 << 29)) > > + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ > > + (1 << 29)) > > > > #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ > > SCTLR_ELx_SA | SCTLR_ELx_I) > > > > Acked-by: Marc Zyngier <marc.zyngier@arm.com> > > Catalin, Will: do you want to get that through arm64? Alternatively, I > get stash it in the KVM tree. I can pick it up. Will ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: remove a redundancy in sysreg.h 2017-06-20 14:05 ` Will Deacon @ 2017-06-20 15:43 ` Will Deacon 2017-06-20 16:01 ` Marc Zyngier 0 siblings, 1 reply; 5+ messages in thread From: Will Deacon @ 2017-06-20 15:43 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 20, 2017 at 03:05:39PM +0100, Will Deacon wrote: > On Tue, Jun 20, 2017 at 02:54:15PM +0100, Marc Zyngier wrote: > > On 20/06/17 14:30, Stefan Traby wrote: > > > This is really trivial; there is a dup > > > (1 << 16) in the code > > > > > > Signed-off-by: Stefan Traby <stefan@hello-penguin.com> > > > --- > > > arch/arm64/include/asm/sysreg.h | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > > > index 2d3e155b185f..580965129fea 100644 > > > --- a/arch/arm64/include/asm/sysreg.h > > > +++ b/arch/arm64/include/asm/sysreg.h > > > @@ -139,8 +139,8 @@ > > > #define SCTLR_ELx_M 1 > > > > > > #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ > > > - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ > > > - (1 << 28) | (1 << 29)) > > > + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ > > > + (1 << 29)) > > > > > > #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ > > > SCTLR_ELx_SA | SCTLR_ELx_I) > > > > > > > Acked-by: Marc Zyngier <marc.zyngier@arm.com> > > > > Catalin, Will: do you want to get that through arm64? Alternatively, I > > get stash it in the KVM tree. > > I can pick it up. D'oh, didn't realise that SCTLR_EL2_RES1 was only introduced in -rc5, so I can't easily take this via arm64 for-next/core (which is based on -rc3). I don't think it justifies sending as a fix, so if you could take it via KVM after all, then that would be helpful. Acked-by: Will Deacon <will.deacon@arm.com> Sorry for the confusion, Will ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: remove a redundancy in sysreg.h 2017-06-20 15:43 ` Will Deacon @ 2017-06-20 16:01 ` Marc Zyngier 0 siblings, 0 replies; 5+ messages in thread From: Marc Zyngier @ 2017-06-20 16:01 UTC (permalink / raw) To: linux-arm-kernel On 20/06/17 16:43, Will Deacon wrote: > On Tue, Jun 20, 2017 at 03:05:39PM +0100, Will Deacon wrote: >> On Tue, Jun 20, 2017 at 02:54:15PM +0100, Marc Zyngier wrote: >>> On 20/06/17 14:30, Stefan Traby wrote: >>>> This is really trivial; there is a dup >>>> (1 << 16) in the code >>>> >>>> Signed-off-by: Stefan Traby <stefan@hello-penguin.com> >>>> --- >>>> arch/arm64/include/asm/sysreg.h | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h >>>> index 2d3e155b185f..580965129fea 100644 >>>> --- a/arch/arm64/include/asm/sysreg.h >>>> +++ b/arch/arm64/include/asm/sysreg.h >>>> @@ -139,8 +139,8 @@ >>>> #define SCTLR_ELx_M 1 >>>> >>>> #define SCTLR_EL2_RES1 ((1 << 4) | (1 << 5) | (1 << 11) | (1 << 16) | \ >>>> - (1 << 16) | (1 << 18) | (1 << 22) | (1 << 23) | \ >>>> - (1 << 28) | (1 << 29)) >>>> + (1 << 18) | (1 << 22) | (1 << 23) | (1 << 28) | \ >>>> + (1 << 29)) >>>> >>>> #define SCTLR_ELx_FLAGS (SCTLR_ELx_M | SCTLR_ELx_A | SCTLR_ELx_C | \ >>>> SCTLR_ELx_SA | SCTLR_ELx_I) >>>> >>> >>> Acked-by: Marc Zyngier <marc.zyngier@arm.com> >>> >>> Catalin, Will: do you want to get that through arm64? Alternatively, I >>> get stash it in the KVM tree. >> >> I can pick it up. > > D'oh, didn't realise that SCTLR_EL2_RES1 was only introduced in -rc5, so I > can't easily take this via arm64 for-next/core (which is based on -rc3). I > don't think it justifies sending as a fix, so if you could take it via KVM > after all, then that would be helpful. > > Acked-by: Will Deacon <will.deacon@arm.com> > > Sorry for the confusion, No worries, I'll stash it on our -next branch. Thanks, M. -- Jazz is not dead. It just smells funny... ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-20 16:01 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-06-20 13:30 [PATCH] arm64: remove a redundancy in sysreg.h Stefan Traby 2017-06-20 13:54 ` Marc Zyngier 2017-06-20 14:05 ` Will Deacon 2017-06-20 15:43 ` Will Deacon 2017-06-20 16:01 ` 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).