ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Add EFI_NOT_READY return if the CPU can not be enabled if the
processor is already on.
This can occur in normal use if the CPU is still being turned off from
a previous call when this is called again.
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
---
ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c
index f822a9877c..e7f4223513 100644
--- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c
+++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c
@@ -103,7 +103,9 @@ DispatchCpu (
ArmCallSmc (&Args);
- if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) {
+ if (Args.Arg0 == ARM_SMC_PSCI_RET_ALREADY_ON) {
+ Status = EFI_NOT_READY;
+ } else if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) {
DEBUG ((DEBUG_ERROR, "PSCI_CPU_ON call failed: %d\n", Args.Arg0));
Status = EFI_DEVICE_ERROR;
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#106531): https://edk2.groups.io/g/devel/message/106531
Mute This Topic: https://groups.io/mt/99859167/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Rebecca Cran <rebecca@bsdio.com> Looks like this is still waiting to be merged by an ArmPkg maintainer. -- Rebecca Cran On 6/29/23 14:46, Jeff Brasen wrote: > Add EFI_NOT_READY return if the CPU can not be enabled if the > processor is already on. > > This can occur in normal use if the CPU is still being turned off from > a previous call when this is called again. > > Signed-off-by: Jeff Brasen <jbrasen@nvidia.com> > --- > ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > index f822a9877c..e7f4223513 100644 > --- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > +++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > @@ -103,7 +103,9 @@ DispatchCpu ( > > ArmCallSmc (&Args); > > - if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > + if (Args.Arg0 == ARM_SMC_PSCI_RET_ALREADY_ON) { > + Status = EFI_NOT_READY; > + } else if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > DEBUG ((DEBUG_ERROR, "PSCI_CPU_ON call failed: %d\n", Args.Arg0)); > Status = EFI_DEVICE_ERROR; > } -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109659): https://edk2.groups.io/g/devel/message/109659 Mute This Topic: https://groups.io/mt/99859167/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
On Tue, 17 Oct 2023 at 00:55, Rebecca Cran <rebecca@bsdio.com> wrote: > > Reviewed-by: Rebecca Cran <rebecca@bsdio.com> > > > Looks like this is still waiting to be merged by an ArmPkg maintainer. > > Thanks for the reminder Really queued up now > > On 6/29/23 14:46, Jeff Brasen wrote: > > Add EFI_NOT_READY return if the CPU can not be enabled if the > > processor is already on. > > > > This can occur in normal use if the CPU is still being turned off from > > a previous call when this is called again. > > > > Signed-off-by: Jeff Brasen <jbrasen@nvidia.com> > > --- > > ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > index f822a9877c..e7f4223513 100644 > > --- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > +++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > @@ -103,7 +103,9 @@ DispatchCpu ( > > > > ArmCallSmc (&Args); > > > > - if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > > + if (Args.Arg0 == ARM_SMC_PSCI_RET_ALREADY_ON) { > > + Status = EFI_NOT_READY; > > + } else if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > > DEBUG ((DEBUG_ERROR, "PSCI_CPU_ON call failed: %d\n", Args.Arg0)); > > Status = EFI_DEVICE_ERROR; > > } > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109716): https://edk2.groups.io/g/devel/message/109716 Mute This Topic: https://groups.io/mt/99859167/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
On Thu, 29 Jun 2023 at 22:47, Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io> wrote: > > Add EFI_NOT_READY return if the CPU can not be enabled if the > processor is already on. > > This can occur in normal use if the CPU is still being turned off from > a previous call when this is called again. > > Signed-off-by: Jeff Brasen <jbrasen@nvidia.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> I'll queue this up - thanks. > --- > ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > index f822a9877c..e7f4223513 100644 > --- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > +++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > @@ -103,7 +103,9 @@ DispatchCpu ( > > ArmCallSmc (&Args); > > - if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > + if (Args.Arg0 == ARM_SMC_PSCI_RET_ALREADY_ON) { > + Status = EFI_NOT_READY; > + } else if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > DEBUG ((DEBUG_ERROR, "PSCI_CPU_ON call failed: %d\n", Args.Arg0)); > Status = EFI_DEVICE_ERROR; > } > -- > 2.25.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108394): https://edk2.groups.io/g/devel/message/108394 Mute This Topic: https://groups.io/mt/99859167/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Anything else needed on this to get it merged? Thanks, Jeff > -----Original Message----- > From: Ard Biesheuvel <ardb@kernel.org> > Sent: Thursday, September 7, 2023 8:17 AM > To: devel@edk2.groups.io; Jeff Brasen <jbrasen@nvidia.com> > Cc: quic_llindhol@quicinc.com; ardb+tianocore@kernel.org; > rebecca@bsdio.com > Subject: Re: [edk2-devel] [PATCH] ArmPkg/ArmPsciMpServices Add > EFI_NOT_READY return > > External email: Use caution opening links or attachments > > > On Thu, 29 Jun 2023 at 22:47, Jeff Brasen via groups.io > <jbrasen=nvidia.com@groups.io> wrote: > > > > Add EFI_NOT_READY return if the CPU can not be enabled if the > > processor is already on. > > > > This can occur in normal use if the CPU is still being turned off from > > a previous call when this is called again. > > > > Signed-off-by: Jeff Brasen <jbrasen@nvidia.com> > > Acked-by: Ard Biesheuvel <ardb@kernel.org> > > I'll queue this up - thanks. > > > --- > > ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c | 4 > +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git > > a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > index f822a9877c..e7f4223513 100644 > > --- a/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > +++ b/ArmPkg/Drivers/ArmPsciMpServicesDxe/ArmPsciMpServicesDxe.c > > @@ -103,7 +103,9 @@ DispatchCpu ( > > > > ArmCallSmc (&Args); > > > > - if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > > + if (Args.Arg0 == ARM_SMC_PSCI_RET_ALREADY_ON) { > > + Status = EFI_NOT_READY; > > + } else if (Args.Arg0 != ARM_SMC_PSCI_RET_SUCCESS) { > > DEBUG ((DEBUG_ERROR, "PSCI_CPU_ON call failed: %d\n", Args.Arg0)); > > Status = EFI_DEVICE_ERROR; > > } > > -- > > 2.25.1 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109319): https://edk2.groups.io/g/devel/message/109319 Mute This Topic: https://groups.io/mt/99859167/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.