diff options
Diffstat (limited to 'features/rt/firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch')
-rw-r--r-- | features/rt/firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/features/rt/firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch b/features/rt/firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch new file mode 100644 index 00000000..60edded7 --- /dev/null +++ b/features/rt/firewire-ohci-Use-tasklet_disable_in_atomic-where-re.patch @@ -0,0 +1,60 @@ +From 784277e7d29b56d2fc367068d909e1219c082315 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Tue, 9 Mar 2021 09:42:16 +0100 +Subject: [PATCH 053/191] firewire: ohci: Use tasklet_disable_in_atomic() where + required + +tasklet_disable() is invoked in several places. Some of them are in atomic +context which prevents a conversion of tasklet_disable() to a sleepable +function. + +The atomic callchains are: + + ar_context_tasklet() + ohci_cancel_packet() + tasklet_disable() + + ... + ohci_flush_iso_completions() + tasklet_disable() + +The invocation of tasklet_disable() from at_context_flush() is always in +preemptible context. + +Use tasklet_disable_in_atomic() for the two invocations in +ohci_cancel_packet() and ohci_flush_iso_completions(). + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Cc: Stefan Richter <stefanr@s5r6.in-berlin.de> +Cc: linux1394-devel@lists.sourceforge.net +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + drivers/firewire/ohci.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c +index 9811c40956e5..17c9d825188b 100644 +--- a/drivers/firewire/ohci.c ++++ b/drivers/firewire/ohci.c +@@ -2545,7 +2545,7 @@ static int ohci_cancel_packet(struct fw_card *card, struct fw_packet *packet) + struct driver_data *driver_data = packet->driver_data; + int ret = -ENOENT; + +- tasklet_disable(&ctx->tasklet); ++ tasklet_disable_in_atomic(&ctx->tasklet); + + if (packet->ack != 0) + goto out; +@@ -3465,7 +3465,7 @@ static int ohci_flush_iso_completions(struct fw_iso_context *base) + struct iso_context *ctx = container_of(base, struct iso_context, base); + int ret = 0; + +- tasklet_disable(&ctx->context.tasklet); ++ tasklet_disable_in_atomic(&ctx->context.tasklet); + + if (!test_and_set_bit_lock(0, &ctx->flushing_completions)) { + context_tasklet((unsigned long)&ctx->context); +-- +2.19.1 + |