linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
@ 2022-11-25 10:18 Will Deacon
  2023-01-05 15:49 ` Marc Zyngier
  2023-01-06 17:50 ` Will Deacon
  0 siblings, 2 replies; 5+ messages in thread
From: Will Deacon @ 2022-11-25 10:18 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Will Deacon, Dmitry Baryshkov, Mark Rutland, Lorenzo Pieralisi,
	Arnd Bergmann

PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
call using function identifier 20.

Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
the PSCI UAPI header.

Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")
Signed-off-by: Will Deacon <will@kernel.org>
---
 include/uapi/linux/psci.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
index 3511095c2702..42a40ad3fb62 100644
--- a/include/uapi/linux/psci.h
+++ b/include/uapi/linux/psci.h
@@ -58,7 +58,7 @@
 
 #define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)
 #define PSCI_1_1_FN_MEM_PROTECT			PSCI_0_2_FN(19)
-#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(19)
+#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(20)
 
 #define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND	PSCI_0_2_FN64(12)
 #define PSCI_1_0_FN64_NODE_HW_STATE		PSCI_0_2_FN64(13)
@@ -67,7 +67,7 @@
 #define PSCI_1_0_FN64_STAT_COUNT		PSCI_0_2_FN64(17)
 
 #define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)
-#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(19)
+#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(20)
 
 /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
 #define PSCI_0_2_POWER_STATE_ID_MASK		0xffff
-- 
2.38.1.584.g0f3c55d4c2-goog


_______________________________________________
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] 5+ messages in thread

* Re: [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
  2022-11-25 10:18 [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers Will Deacon
@ 2023-01-05 15:49 ` Marc Zyngier
  2023-01-05 15:53   ` Mark Rutland
  2023-01-06 17:50 ` Will Deacon
  1 sibling, 1 reply; 5+ messages in thread
From: Marc Zyngier @ 2023-01-05 15:49 UTC (permalink / raw)
  To: Will Deacon
  Cc: linux-arm-kernel, Dmitry Baryshkov, Mark Rutland,
	Lorenzo Pieralisi, Arnd Bergmann

On Fri, 25 Nov 2022 10:18:26 +0000,
Will Deacon <will@kernel.org> wrote:
> 
> PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
> call using function identifier 20.
> 
> Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
> the PSCI UAPI header.
> 
> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
>  include/uapi/linux/psci.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
> index 3511095c2702..42a40ad3fb62 100644
> --- a/include/uapi/linux/psci.h
> +++ b/include/uapi/linux/psci.h
> @@ -58,7 +58,7 @@
>  
>  #define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)
>  #define PSCI_1_1_FN_MEM_PROTECT			PSCI_0_2_FN(19)
> -#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(19)
> +#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(20)
>  
>  #define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND	PSCI_0_2_FN64(12)
>  #define PSCI_1_0_FN64_NODE_HW_STATE		PSCI_0_2_FN64(13)
> @@ -67,7 +67,7 @@
>  #define PSCI_1_0_FN64_STAT_COUNT		PSCI_0_2_FN64(17)
>  
>  #define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)
> -#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(19)
> +#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(20)
>  
>  /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
>  #define PSCI_0_2_POWER_STATE_ID_MASK		0xffff

Acked-by: Marc Zyngier <maz@kernel.org>

Should this be taken via the arm64 tree, together with [1]?

Thanks,

	M.

[1] https://lore.kernel.org/r/20230105090834.630238-1-maz@kernel.org

-- 
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] 5+ messages in thread

* Re: [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
  2023-01-05 15:49 ` Marc Zyngier
@ 2023-01-05 15:53   ` Mark Rutland
  2023-01-06 17:10     ` Will Deacon
  0 siblings, 1 reply; 5+ messages in thread
From: Mark Rutland @ 2023-01-05 15:53 UTC (permalink / raw)
  To: Marc Zyngier
  Cc: Will Deacon, linux-arm-kernel, Dmitry Baryshkov,
	Lorenzo Pieralisi, Arnd Bergmann

On Thu, Jan 05, 2023 at 03:49:47PM +0000, Marc Zyngier wrote:
> On Fri, 25 Nov 2022 10:18:26 +0000,
> Will Deacon <will@kernel.org> wrote:
> > 
> > PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
> > call using function identifier 20.
> > 
> > Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
> > the PSCI UAPI header.
> > 
> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> > Cc: Arnd Bergmann <arnd@arndb.de>
> > Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")
> > Signed-off-by: Will Deacon <will@kernel.org>
> > ---
> >  include/uapi/linux/psci.h | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
> > index 3511095c2702..42a40ad3fb62 100644
> > --- a/include/uapi/linux/psci.h
> > +++ b/include/uapi/linux/psci.h
> > @@ -58,7 +58,7 @@
> >  
> >  #define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)
> >  #define PSCI_1_1_FN_MEM_PROTECT			PSCI_0_2_FN(19)
> > -#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(19)
> > +#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(20)
> >  
> >  #define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND	PSCI_0_2_FN64(12)
> >  #define PSCI_1_0_FN64_NODE_HW_STATE		PSCI_0_2_FN64(13)
> > @@ -67,7 +67,7 @@
> >  #define PSCI_1_0_FN64_STAT_COUNT		PSCI_0_2_FN64(17)
> >  
> >  #define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)
> > -#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(19)
> > +#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(20)
> >  
> >  /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
> >  #define PSCI_0_2_POWER_STATE_ID_MASK		0xffff
> 
> Acked-by: Marc Zyngier <maz@kernel.org>

Likewise:

  Acked-by: Mark Rutland <mark.rutland@arm.com>

> Should this be taken via the arm64 tree, together with [1]?

Yes please to both being queued via the arm64 tree.

Sorry for droppnig the ball here.

Going forward I'll try to be explicit w.r.t. how to queue PSCI bits; I'd be
happy to route them through arm64 generally if that arm64 maintainers are happy
with that.

Thanks,
Mark.

> 
> Thanks,
> 
> 	M.
> 
> [1] https://lore.kernel.org/r/20230105090834.630238-1-maz@kernel.org
> 
> -- 
> 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] 5+ messages in thread

* Re: [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
  2023-01-05 15:53   ` Mark Rutland
@ 2023-01-06 17:10     ` Will Deacon
  0 siblings, 0 replies; 5+ messages in thread
From: Will Deacon @ 2023-01-06 17:10 UTC (permalink / raw)
  To: Mark Rutland
  Cc: Marc Zyngier, linux-arm-kernel, Dmitry Baryshkov,
	Lorenzo Pieralisi, Arnd Bergmann

On Thu, Jan 05, 2023 at 03:53:48PM +0000, Mark Rutland wrote:
> On Thu, Jan 05, 2023 at 03:49:47PM +0000, Marc Zyngier wrote:
> > On Fri, 25 Nov 2022 10:18:26 +0000,
> > Will Deacon <will@kernel.org> wrote:
> > > 
> > > PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
> > > call using function identifier 20.
> > > 
> > > Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
> > > the PSCI UAPI header.
> > > 
> > > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > > Cc: Mark Rutland <mark.rutland@arm.com>
> > > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> > > Cc: Arnd Bergmann <arnd@arndb.de>
> > > Fixes: 3137f2e60098 ("firmware/psci: Add debugfs support to ease debugging")
> > > Signed-off-by: Will Deacon <will@kernel.org>
> > > ---
> > >  include/uapi/linux/psci.h | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h
> > > index 3511095c2702..42a40ad3fb62 100644
> > > --- a/include/uapi/linux/psci.h
> > > +++ b/include/uapi/linux/psci.h
> > > @@ -58,7 +58,7 @@
> > >  
> > >  #define PSCI_1_1_FN_SYSTEM_RESET2		PSCI_0_2_FN(18)
> > >  #define PSCI_1_1_FN_MEM_PROTECT			PSCI_0_2_FN(19)
> > > -#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(19)
> > > +#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN(20)
> > >  
> > >  #define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND	PSCI_0_2_FN64(12)
> > >  #define PSCI_1_0_FN64_NODE_HW_STATE		PSCI_0_2_FN64(13)
> > > @@ -67,7 +67,7 @@
> > >  #define PSCI_1_0_FN64_STAT_COUNT		PSCI_0_2_FN64(17)
> > >  
> > >  #define PSCI_1_1_FN64_SYSTEM_RESET2		PSCI_0_2_FN64(18)
> > > -#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(19)
> > > +#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE	PSCI_0_2_FN64(20)
> > >  
> > >  /* PSCI v0.2 power state encoding for CPU_SUSPEND function */
> > >  #define PSCI_0_2_POWER_STATE_ID_MASK		0xffff
> > 
> > Acked-by: Marc Zyngier <maz@kernel.org>
> 
> Likewise:
> 
>   Acked-by: Mark Rutland <mark.rutland@arm.com>
> 
> > Should this be taken via the arm64 tree, together with [1]?
> 
> Yes please to both being queued via the arm64 tree.
> 
> Sorry for droppnig the ball here.
> 
> Going forward I'll try to be explicit w.r.t. how to queue PSCI bits; I'd be
> happy to route them through arm64 generally if that arm64 maintainers are happy
> with that.

Thanks, I'll sweep these two up as fixes, since I already have a few
pending.

Will

_______________________________________________
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] 5+ messages in thread

* Re: [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
  2022-11-25 10:18 [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers Will Deacon
  2023-01-05 15:49 ` Marc Zyngier
@ 2023-01-06 17:50 ` Will Deacon
  1 sibling, 0 replies; 5+ messages in thread
From: Will Deacon @ 2023-01-06 17:50 UTC (permalink / raw)
  To: linux-arm-kernel, Will Deacon
  Cc: catalin.marinas, kernel-team, Dmitry Baryshkov,
	Lorenzo Pieralisi, Mark Rutland, Arnd Bergmann

On Fri, 25 Nov 2022 10:18:26 +0000, Will Deacon wrote:
> PSCI v1.1 offers 32-bit and 64-bit variants of the MEM_PROTECT_RANGE
> call using function identifier 20.
> 
> Fix the incorrect definitions of the MEM_PROTECT_CHECK_RANGE calls in
> the PSCI UAPI header.
> 
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] firmware/psci: Fix MEM_PROTECT_RANGE function numbers
      https://git.kernel.org/arm64/c/f3dc61cde80d

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

_______________________________________________
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] 5+ messages in thread

end of thread, other threads:[~2023-01-06 17:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-25 10:18 [PATCH] firmware/psci: Fix MEM_PROTECT_RANGE function numbers Will Deacon
2023-01-05 15:49 ` Marc Zyngier
2023-01-05 15:53   ` Mark Rutland
2023-01-06 17:10     ` Will Deacon
2023-01-06 17:50 ` Will Deacon

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).