Skip to content

Commit 099caa9

Browse files
Sinan Kayarafaeljw
authored andcommitted
ACPI: GED: unregister interrupts during shutdown
Some GED interrupts could be pending by the time we are doing a reboot. Even though GED driver uses devm_request_irq() to register the interrupt handler, the handler is not being freed on time during a shutdown since the driver is missing a shutdown callback. If the ACPI handler is no longer available, this causes an interrupt storm and delays shutdown. 1. Don't use devm family of functions for IRQ registration/free 2. Keep track of the events since free_irq() requires the dev_id parameter passed into the request_irq() function. 3. Call free_irq() on both remove and shutdown explicitly. Signed-off-by: Sinan Kaya <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 50c4c4e commit 099caa9

File tree

1 file changed

+41
-6
lines changed

1 file changed

+41
-6
lines changed

drivers/acpi/evged.c

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949

5050
#define MODULE_NAME "acpi-ged"
5151

52+
struct acpi_ged_device {
53+
struct device *dev;
54+
struct list_head event_list;
55+
};
56+
5257
struct acpi_ged_event {
5358
struct list_head node;
5459
struct device *dev;
@@ -76,7 +81,8 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,
7681
unsigned int irq;
7782
unsigned int gsi;
7883
unsigned int irqflags = IRQF_ONESHOT;
79-
struct device *dev = context;
84+
struct acpi_ged_device *geddev = context;
85+
struct device *dev = geddev->dev;
8086
acpi_handle handle = ACPI_HANDLE(dev);
8187
acpi_handle evt_handle;
8288
struct resource r;
@@ -102,8 +108,6 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,
102108
return AE_ERROR;
103109
}
104110

105-
dev_info(dev, "GED listening GSI %u @ IRQ %u\n", gsi, irq);
106-
107111
event = devm_kzalloc(dev, sizeof(*event), GFP_KERNEL);
108112
if (!event)
109113
return AE_ERROR;
@@ -116,36 +120,67 @@ static acpi_status acpi_ged_request_interrupt(struct acpi_resource *ares,
116120
if (r.flags & IORESOURCE_IRQ_SHAREABLE)
117121
irqflags |= IRQF_SHARED;
118122

119-
if (devm_request_threaded_irq(dev, irq, NULL, acpi_ged_irq_handler,
120-
irqflags, "ACPI:Ged", event)) {
123+
if (request_threaded_irq(irq, NULL, acpi_ged_irq_handler,
124+
irqflags, "ACPI:Ged", event)) {
121125
dev_err(dev, "failed to setup event handler for irq %u\n", irq);
122126
return AE_ERROR;
123127
}
124128

129+
dev_dbg(dev, "GED listening GSI %u @ IRQ %u\n", gsi, irq);
130+
list_add_tail(&event->node, &geddev->event_list);
125131
return AE_OK;
126132
}
127133

128134
static int ged_probe(struct platform_device *pdev)
129135
{
136+
struct acpi_ged_device *geddev;
130137
acpi_status acpi_ret;
131138

139+
geddev = devm_kzalloc(&pdev->dev, sizeof(*geddev), GFP_KERNEL);
140+
if (!geddev)
141+
return -ENOMEM;
142+
143+
geddev->dev = &pdev->dev;
144+
INIT_LIST_HEAD(&geddev->event_list);
132145
acpi_ret = acpi_walk_resources(ACPI_HANDLE(&pdev->dev), "_CRS",
133-
acpi_ged_request_interrupt, &pdev->dev);
146+
acpi_ged_request_interrupt, geddev);
134147
if (ACPI_FAILURE(acpi_ret)) {
135148
dev_err(&pdev->dev, "unable to parse the _CRS record\n");
136149
return -EINVAL;
137150
}
151+
platform_set_drvdata(pdev, geddev);
138152

139153
return 0;
140154
}
141155

156+
static void ged_shutdown(struct platform_device *pdev)
157+
{
158+
struct acpi_ged_device *geddev = platform_get_drvdata(pdev);
159+
struct acpi_ged_event *event, *next;
160+
161+
list_for_each_entry_safe(event, next, &geddev->event_list, node) {
162+
free_irq(event->irq, event);
163+
list_del(&event->node);
164+
dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n",
165+
event->gsi, event->irq);
166+
}
167+
}
168+
169+
static int ged_remove(struct platform_device *pdev)
170+
{
171+
ged_shutdown(pdev);
172+
return 0;
173+
}
174+
142175
static const struct acpi_device_id ged_acpi_ids[] = {
143176
{"ACPI0013"},
144177
{},
145178
};
146179

147180
static struct platform_driver ged_driver = {
148181
.probe = ged_probe,
182+
.remove = ged_remove,
183+
.shutdown = ged_shutdown,
149184
.driver = {
150185
.name = MODULE_NAME,
151186
.acpi_match_table = ACPI_PTR(ged_acpi_ids),

0 commit comments

Comments
 (0)