2017-07-11 16:46:01

by Mark Salter

[permalink] [raw]
Subject: [PATCH] acpi: Fix proper return code for function acpi_gsi_to_irq

The function acpi_gsi_to_irq must return 0 on success as the caller
ghes_probe expects an 0 for success. This change also matches x86
implementation.

This patch was submitted around 4.5 timeframe but wasn't pushed because
it didn't fix a real problem. Now that RAS/GHES patches are in kernel,
this fixes an error seen on a Mustang (arm64) platform:

GHES: Failed to map GSI to IRQ for generic hardware error source: 2
GHES: probe of GHES.2 failed with error 81

Signed-off-by: Tuan Phan <[email protected]>
Signed-off-by: Loc Ho <[email protected]>
[rebased to v4.12-rc]
Signed-off-by: Mark Salter <[email protected]>
---
drivers/acpi/irq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index 830299a..7c352cb 100644
--- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c
@@ -24,7 +24,7 @@ static struct fwnode_handle *acpi_gsi_domain_id;
*
* irq location updated with irq value [>0 on success, 0 on failure]
*
- * Returns: linux IRQ number on success (>0)
+ * Returns: 0 on success
* -EINVAL on failure
*/
int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
@@ -37,7 +37,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
* *irq == 0 means no mapping, that should
* be reported as a failure
*/
- return (*irq > 0) ? *irq : -EINVAL;
+ return (*irq > 0) ? 0 : -EINVAL;
}
EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);

--
2.9.4


2017-07-11 17:23:18

by Marc Zyngier

[permalink] [raw]
Subject: Re: [PATCH] acpi: Fix proper return code for function acpi_gsi_to_irq

+ Lorenzo, since he deals with ACPI on arm64.

On 11/07/17 17:45, Mark Salter wrote:
> The function acpi_gsi_to_irq must return 0 on success as the caller
> ghes_probe expects an 0 for success. This change also matches x86
> implementation.
>
> This patch was submitted around 4.5 timeframe but wasn't pushed because
> it didn't fix a real problem. Now that RAS/GHES patches are in kernel,
> this fixes an error seen on a Mustang (arm64) platform:
>
> GHES: Failed to map GSI to IRQ for generic hardware error source: 2
> GHES: probe of GHES.2 failed with error 81
>
> Signed-off-by: Tuan Phan <[email protected]>
> Signed-off-by: Loc Ho <[email protected]>
> [rebased to v4.12-rc]
> Signed-off-by: Mark Salter <[email protected]>
> ---
> drivers/acpi/irq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
> index 830299a..7c352cb 100644
> --- a/drivers/acpi/irq.c
> +++ b/drivers/acpi/irq.c
> @@ -24,7 +24,7 @@ static struct fwnode_handle *acpi_gsi_domain_id;
> *
> * irq location updated with irq value [>0 on success, 0 on failure]
> *
> - * Returns: linux IRQ number on success (>0)
> + * Returns: 0 on success
> * -EINVAL on failure
> */
> int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
> @@ -37,7 +37,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
> * *irq == 0 means no mapping, that should
> * be reported as a failure
> */
> - return (*irq > 0) ? *irq : -EINVAL;
> + return (*irq > 0) ? 0 : -EINVAL;
> }
> EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
>
>


--
Jazz is not dead. It just smells funny...

2017-07-11 17:44:58

by Lorenzo Pieralisi

[permalink] [raw]
Subject: Re: [PATCH] acpi: Fix proper return code for function acpi_gsi_to_irq

On Tue, Jul 11, 2017 at 12:45:43PM -0400, Mark Salter wrote:
> The function acpi_gsi_to_irq must return 0 on success as the caller
> ghes_probe expects an 0 for success. This change also matches x86
> implementation.
>
> This patch was submitted around 4.5 timeframe but wasn't pushed because
> it didn't fix a real problem. Now that RAS/GHES patches are in kernel,
> this fixes an error seen on a Mustang (arm64) platform:

Nit: I think you can rephrase the log, ie it is a bug and you are fixing
it, that's it.

> GHES: Failed to map GSI to IRQ for generic hardware error source: 2
> GHES: probe of GHES.2 failed with error 81
>
> Signed-off-by: Tuan Phan <[email protected]>
> Signed-off-by: Loc Ho <[email protected]>
> [rebased to v4.12-rc]
> Signed-off-by: Mark Salter <[email protected]>
> ---
> drivers/acpi/irq.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by: Lorenzo Pieralisi <[email protected]>

> diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
> index 830299a..7c352cb 100644
> --- a/drivers/acpi/irq.c
> +++ b/drivers/acpi/irq.c
> @@ -24,7 +24,7 @@ static struct fwnode_handle *acpi_gsi_domain_id;
> *
> * irq location updated with irq value [>0 on success, 0 on failure]
> *
> - * Returns: linux IRQ number on success (>0)
> + * Returns: 0 on success
> * -EINVAL on failure
> */
> int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
> @@ -37,7 +37,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
> * *irq == 0 means no mapping, that should
> * be reported as a failure
> */
> - return (*irq > 0) ? *irq : -EINVAL;
> + return (*irq > 0) ? 0 : -EINVAL;
> }
> EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
>
> --
> 2.9.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2017-07-12 21:26:58

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH] acpi: Fix proper return code for function acpi_gsi_to_irq

On Tuesday, July 11, 2017 12:45:43 PM Mark Salter wrote:
> The function acpi_gsi_to_irq must return 0 on success as the caller
> ghes_probe expects an 0 for success. This change also matches x86
> implementation.
>
> This patch was submitted around 4.5 timeframe but wasn't pushed because
> it didn't fix a real problem. Now that RAS/GHES patches are in kernel,
> this fixes an error seen on a Mustang (arm64) platform:
>
> GHES: Failed to map GSI to IRQ for generic hardware error source: 2
> GHES: probe of GHES.2 failed with error 81
>
> Signed-off-by: Tuan Phan <[email protected]>
> Signed-off-by: Loc Ho <[email protected]>
> [rebased to v4.12-rc]
> Signed-off-by: Mark Salter <[email protected]>

Applied with the Lorenzo's ACK.

Thanks,
Rafael