* [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq handler
@ 2015-10-22 12:03 Chen Yu
2015-10-24 13:31 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Chen Yu @ 2015-10-22 12:03 UTC (permalink / raw)
To: rjw, lenb
Cc: rui.zhang, lv.zheng, linux-acpi, linux-pm, linux-kernel, Chen Yu, stable
Currently when system is trying to uninstall the acpi irq
handler, it uses the acpi_gbl_FADT.sci_interrupt directly.
But acpi irq handler is actually installed by mapped irq
in acpi_os_install_interrupt_handler, so this patch fixes
this problem by using the mapped irq returned from acpi_gsi_to_irq.
Cc: <stable@vger.kernel.org> # 2.6.39+
Acked-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
drivers/acpi/osl.c | 10 +++++++---
include/linux/acpi.h | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 739a4a6..2e9eccf 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -81,6 +81,7 @@ static struct workqueue_struct *kacpid_wq;
static struct workqueue_struct *kacpi_notify_wq;
static struct workqueue_struct *kacpi_hotplug_wq;
static bool acpi_os_initialized;
+unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;
/*
* This list of permanent mappings is for memory that may be accessed from
@@ -856,17 +857,20 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
acpi_irq_handler = NULL;
return AE_NOT_ACQUIRED;
}
+ acpi_sci_irq = irq;
return AE_OK;
}
-acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
+acpi_status acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler handler)
{
- if (irq != acpi_gbl_FADT.sci_interrupt)
+ if ((gsi != acpi_gbl_FADT.sci_interrupt) ||
+ IS_INVALID_ACPI_IRQ(acpi_sci_irq))
return AE_BAD_PARAMETER;
- free_irq(irq, acpi_irq);
+ free_irq(acpi_sci_irq, acpi_irq);
acpi_irq_handler = NULL;
+ acpi_sci_irq = INVALID_ACPI_IRQ;
return AE_OK;
}
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 43856d1..bad159c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -193,6 +193,9 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base);
void acpi_irq_stats_init(void);
extern u32 acpi_irq_handled;
extern u32 acpi_irq_not_handled;
+extern unsigned int acpi_sci_irq;
+#define INVALID_ACPI_IRQ ((unsigned)-1)
+#define IS_INVALID_ACPI_IRQ(x) unlikely((x) == INVALID_ACPI_IRQ)
extern int sbf_port;
extern unsigned long acpi_realmode_flags;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq handler
2015-10-22 12:03 [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq handler Chen Yu
@ 2015-10-24 13:31 ` Rafael J. Wysocki
2015-10-24 16:04 ` Chen, Yu C
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2015-10-24 13:31 UTC (permalink / raw)
To: Chen Yu
Cc: lenb, rui.zhang, lv.zheng, linux-acpi, linux-pm, linux-kernel, stable
On Thursday, October 22, 2015 08:03:08 PM Chen Yu wrote:
> Currently when system is trying to uninstall the acpi irq
> handler, it uses the acpi_gbl_FADT.sci_interrupt directly.
> But acpi irq handler is actually installed by mapped irq
> in acpi_os_install_interrupt_handler, so this patch fixes
> this problem by using the mapped irq returned from acpi_gsi_to_irq.
>
> Cc: <stable@vger.kernel.org> # 2.6.39+
> Acked-by: Lv Zheng <lv.zheng@intel.com>
> Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> ---
> drivers/acpi/osl.c | 10 +++++++---
> include/linux/acpi.h | 3 +++
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 739a4a6..2e9eccf 100644
> --- a/drivers/acpi/osl.c
> +++ b/drivers/acpi/osl.c
> @@ -81,6 +81,7 @@ static struct workqueue_struct *kacpid_wq;
> static struct workqueue_struct *kacpi_notify_wq;
> static struct workqueue_struct *kacpi_hotplug_wq;
> static bool acpi_os_initialized;
> +unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;
>
> /*
> * This list of permanent mappings is for memory that may be accessed from
> @@ -856,17 +857,20 @@ acpi_os_install_interrupt_handler(u32 gsi, acpi_osd_handler handler,
> acpi_irq_handler = NULL;
> return AE_NOT_ACQUIRED;
> }
> + acpi_sci_irq = irq;
>
> return AE_OK;
> }
>
> -acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
> +acpi_status acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler handler)
> {
> - if (irq != acpi_gbl_FADT.sci_interrupt)
> + if ((gsi != acpi_gbl_FADT.sci_interrupt) ||
> + IS_INVALID_ACPI_IRQ(acpi_sci_irq))
The white space doesn't follow the kernel coding style, should be something
like
if ((gsi != acpi_gbl_FADT.sci_interrupt) ||
IS_INVALID_ACPI_IRQ(acpi_sci_irq))
(spaces instead of the second tab).
Another minor nit is that this probably is the only place you check the
IS_INVALID_ACPI_IRQ(acpi_sci_irq) thing without logical negation and you
only pass acpi_sci_irq to IS_INVALID_ACPI_IRQ() AFAICS.
It would be more straightforward to define something like acpi_sci_irq_valid()
instead (see below) IMO.
> return AE_BAD_PARAMETER;
>
> - free_irq(irq, acpi_irq);
> + free_irq(acpi_sci_irq, acpi_irq);
> acpi_irq_handler = NULL;
> + acpi_sci_irq = INVALID_ACPI_IRQ;
>
> return AE_OK;
> }
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 43856d1..bad159c 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -193,6 +193,9 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base);
> void acpi_irq_stats_init(void);
> extern u32 acpi_irq_handled;
> extern u32 acpi_irq_not_handled;
> +extern unsigned int acpi_sci_irq;
> +#define INVALID_ACPI_IRQ ((unsigned)-1)
#define INVALID_ACPI_IRQ ((unsigned int)-1)
> +#define IS_INVALID_ACPI_IRQ(x) unlikely((x) == INVALID_ACPI_IRQ)
Maybe something like:
static inline bool acpi_sci_irq_valid(void)
{
return acpi_sci_irq != INVALID_ACPI_IRQ;
}
>
> extern int sbf_port;
> extern unsigned long acpi_realmode_flags;
>
Thanks,
Rafael
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq handler
2015-10-24 13:31 ` Rafael J. Wysocki
@ 2015-10-24 16:04 ` Chen, Yu C
0 siblings, 0 replies; 3+ messages in thread
From: Chen, Yu C @ 2015-10-24 16:04 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: lenb, Zhang, Rui, Zheng, Lv, linux-acpi, linux-pm, linux-kernel, stable
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 3830 bytes --]
Hi, Rafael
> -----Original Message-----
> From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> Sent: Saturday, October 24, 2015 9:32 PM
> To: Chen, Yu C
> Cc: lenb@kernel.org; Zhang, Rui; Zheng, Lv; linux-acpi@vger.kernel.org;
> linux-pm@vger.kernel.org; linux-kernel@vger.kernel.org;
> stable@vger.kernel.org
> Subject: Re: [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq
> handler
>
> On Thursday, October 22, 2015 08:03:08 PM Chen Yu wrote:
> > Currently when system is trying to uninstall the acpi irq handler, it
> > uses the acpi_gbl_FADT.sci_interrupt directly.
> > But acpi irq handler is actually installed by mapped irq in
> > acpi_os_install_interrupt_handler, so this patch fixes this problem by
> > using the mapped irq returned from acpi_gsi_to_irq.
> >
> > Cc: <stable@vger.kernel.org> # 2.6.39+
> > Acked-by: Lv Zheng <lv.zheng@intel.com>
> > Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > ---
> > drivers/acpi/osl.c | 10 +++++++---
> > include/linux/acpi.h | 3 +++
> > 2 files changed, 10 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index
> > 739a4a6..2e9eccf 100644
> > --- a/drivers/acpi/osl.c
> > +++ b/drivers/acpi/osl.c
> > @@ -81,6 +81,7 @@ static struct workqueue_struct *kacpid_wq; static
> > struct workqueue_struct *kacpi_notify_wq; static struct
> > workqueue_struct *kacpi_hotplug_wq; static bool acpi_os_initialized;
> > +unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;
> >
> > /*
> > * This list of permanent mappings is for memory that may be accessed
> > from @@ -856,17 +857,20 @@ acpi_os_install_interrupt_handler(u32 gsi,
> acpi_osd_handler handler,
> > acpi_irq_handler = NULL;
> > return AE_NOT_ACQUIRED;
> > }
> > + acpi_sci_irq = irq;
> >
> > return AE_OK;
> > }
> >
> > -acpi_status acpi_os_remove_interrupt_handler(u32 irq,
> > acpi_osd_handler handler)
> > +acpi_status acpi_os_remove_interrupt_handler(u32 gsi,
> > +acpi_osd_handler handler)
> > {
> > - if (irq != acpi_gbl_FADT.sci_interrupt)
> > + if ((gsi != acpi_gbl_FADT.sci_interrupt) ||
> > + IS_INVALID_ACPI_IRQ(acpi_sci_irq))
>
> The white space doesn't follow the kernel coding style, should be something
> like
>
> if ((gsi != acpi_gbl_FADT.sci_interrupt) ||
> IS_INVALID_ACPI_IRQ(acpi_sci_irq))
>
> (spaces instead of the second tab).
>
Ah, got it, thanks.
> Another minor nit is that this probably is the only place you check the
> IS_INVALID_ACPI_IRQ(acpi_sci_irq) thing without logical negation and you
> only pass acpi_sci_irq to IS_INVALID_ACPI_IRQ() AFAICS.
>
> It would be more straightforward to define something like acpi_sci_irq_valid()
> instead (see below) IMO.
>
> > return AE_BAD_PARAMETER;
> >
> > - free_irq(irq, acpi_irq);
> > + free_irq(acpi_sci_irq, acpi_irq);
> > acpi_irq_handler = NULL;
> > + acpi_sci_irq = INVALID_ACPI_IRQ;
> >
> > return AE_OK;
> > }
> > diff --git a/include/linux/acpi.h b/include/linux/acpi.h index
> > 43856d1..bad159c 100644
> > --- a/include/linux/acpi.h
> > +++ b/include/linux/acpi.h
> > @@ -193,6 +193,9 @@ int acpi_ioapic_registered(acpi_handle handle, u32
> > gsi_base); void acpi_irq_stats_init(void); extern u32
> > acpi_irq_handled; extern u32 acpi_irq_not_handled;
> > +extern unsigned int acpi_sci_irq;
> > +#define INVALID_ACPI_IRQ ((unsigned)-1)
>
> #define INVALID_ACPI_IRQ ((unsigned int)-1)
>
> > +#define IS_INVALID_ACPI_IRQ(x) unlikely((x) == INVALID_ACPI_IRQ)
>
> Maybe something like:
>
> static inline bool acpi_sci_irq_valid(void)
> {
> return acpi_sci_irq != INVALID_ACPI_IRQ;
> }
>
OK, will send out a version 2 with both another two patches modified.
Best Regards,
Yu
ÿôèº{.nÇ+·®+%Ëÿ±éݶ\x17¥wÿº{.nÇ+·¥{±þG«éÿ{ayº\x1dÊÚë,j\a¢f£¢·hïêÿêçz_è®\x03(éÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?¨èÚ&£ø§~á¶iOæ¬z·vØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?I¥
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-24 16:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-22 12:03 [PATCH 1/3] ACPI: Using correct irq when uninstalling acpi irq handler Chen Yu
2015-10-24 13:31 ` Rafael J. Wysocki
2015-10-24 16:04 ` Chen, Yu C
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).