* [PATCH] ACPI: irq: Fix the incorrect return value in acpi_register_gsi()
@ 2023-10-16 17:09 Sunil V L
2023-10-18 11:13 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Sunil V L @ 2023-10-16 17:09 UTC (permalink / raw)
To: linux-acpi, linux-kernel
Cc: Rafael J . Wysocki, Len Brown, Lorenzo Pieralisi,
Agustin Vega-Frias, Hanjun Guo, Marc Zyngier, Anup Patel,
Sunil V L
acpi_register_gsi() should return negative value in case of failure.
Currently, it returns the return value from irq_create_fwspec_mapping().
However, irq_create_fwspec_mapping() returns 0 for failure. Fix the issue
by returning -EINVAL if irq_create_fwspec_mapping() returns zero.
Fixes: d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping")
Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
---
drivers/acpi/irq.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index c2c786eb95ab..403f33df66af 100644
--- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c
@@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
int polarity)
{
struct irq_fwspec fwspec;
+ unsigned int rc;
fwspec.fwnode = acpi_get_gsi_domain_id(gsi);
if (WARN_ON(!fwspec.fwnode)) {
@@ -68,7 +69,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
fwspec.param_count = 2;
- return irq_create_fwspec_mapping(&fwspec);
+ rc = irq_create_fwspec_mapping(&fwspec);
+ if (!rc)
+ return -EINVAL;
+
+ return rc;
}
EXPORT_SYMBOL_GPL(acpi_register_gsi);
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ACPI: irq: Fix the incorrect return value in acpi_register_gsi()
2023-10-16 17:09 [PATCH] ACPI: irq: Fix the incorrect return value in acpi_register_gsi() Sunil V L
@ 2023-10-18 11:13 ` Rafael J. Wysocki
2023-10-18 11:31 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2023-10-18 11:13 UTC (permalink / raw)
To: Sunil V L
Cc: linux-acpi, linux-kernel, Rafael J . Wysocki, Len Brown,
Lorenzo Pieralisi, Agustin Vega-Frias, Hanjun Guo, Marc Zyngier,
Anup Patel
On Mon, Oct 16, 2023 at 7:09 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> acpi_register_gsi() should return negative value in case of failure.
> Currently, it returns the return value from irq_create_fwspec_mapping().
> However, irq_create_fwspec_mapping() returns 0 for failure. Fix the issue
> by returning -EINVAL if irq_create_fwspec_mapping() returns zero.
>
> Fixes: d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping")
> Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> ---
> drivers/acpi/irq.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
> index c2c786eb95ab..403f33df66af 100644
> --- a/drivers/acpi/irq.c
> +++ b/drivers/acpi/irq.c
> @@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
> int polarity)
> {
> struct irq_fwspec fwspec;
> + unsigned int rc;
>
> fwspec.fwnode = acpi_get_gsi_domain_id(gsi);
> if (WARN_ON(!fwspec.fwnode)) {
> @@ -68,7 +69,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
> fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
> fwspec.param_count = 2;
>
> - return irq_create_fwspec_mapping(&fwspec);
> + rc = irq_create_fwspec_mapping(&fwspec);
> + if (!rc)
> + return -EINVAL;
> +
> + return rc;
> }
> EXPORT_SYMBOL_GPL(acpi_register_gsi);
>
> --
Good catch!
Applied as 6.7 material, but I renamed the new rc local variable to irq.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ACPI: irq: Fix the incorrect return value in acpi_register_gsi()
2023-10-18 11:13 ` Rafael J. Wysocki
@ 2023-10-18 11:31 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2023-10-18 11:31 UTC (permalink / raw)
To: Sunil V L
Cc: linux-acpi, linux-kernel, Rafael J . Wysocki, Len Brown,
Lorenzo Pieralisi, Hanjun Guo, Marc Zyngier, Anup Patel
On Wed, Oct 18, 2023 at 1:13 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Mon, Oct 16, 2023 at 7:09 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >
> > acpi_register_gsi() should return negative value in case of failure.
> > Currently, it returns the return value from irq_create_fwspec_mapping().
> > However, irq_create_fwspec_mapping() returns 0 for failure. Fix the issue
> > by returning -EINVAL if irq_create_fwspec_mapping() returns zero.
> >
> > Fixes: d44fa3d46079 ("ACPI: Add support for ResourceSource/IRQ domain mapping")
> > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com>
> > ---
> > drivers/acpi/irq.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
> > index c2c786eb95ab..403f33df66af 100644
> > --- a/drivers/acpi/irq.c
> > +++ b/drivers/acpi/irq.c
> > @@ -57,6 +57,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
> > int polarity)
> > {
> > struct irq_fwspec fwspec;
> > + unsigned int rc;
> >
> > fwspec.fwnode = acpi_get_gsi_domain_id(gsi);
> > if (WARN_ON(!fwspec.fwnode)) {
> > @@ -68,7 +69,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
> > fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
> > fwspec.param_count = 2;
> >
> > - return irq_create_fwspec_mapping(&fwspec);
> > + rc = irq_create_fwspec_mapping(&fwspec);
> > + if (!rc)
> > + return -EINVAL;
> > +
> > + return rc;
> > }
> > EXPORT_SYMBOL_GPL(acpi_register_gsi);
> >
> > --
>
> Good catch!
>
> Applied as 6.7 material, but I renamed the new rc local variable to irq.
>
> Thanks!
Actually, I'm going to push this for -rc7.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-18 11:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-16 17:09 [PATCH] ACPI: irq: Fix the incorrect return value in acpi_register_gsi() Sunil V L
2023-10-18 11:13 ` Rafael J. Wysocki
2023-10-18 11:31 ` Rafael J. Wysocki
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).