From: Sasha Levin Date: Fri, 23 Aug 2024 12:32:34 +0000 (-0400) Subject: Drop serial-pch-don-t-disable-interrupts-while-acquiring-.patch X-Git-Tag: v6.1.107~76 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69bf61ce5ff9a9f5798b9b25b8df848350b16bc4;p=thirdparty%2Fkernel%2Fstable-queue.git Drop serial-pch-don-t-disable-interrupts-while-acquiring-.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-4.19/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index 9eab811f3e2..00000000000 --- a/queue-4.19/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5256e661321670d7aff0456bc2028f8309b6098f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index 4b035d61b280a..99375814be8b9 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1093,11 +1093,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1157,7 +1156,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index ccdb2a7834c..8100fcbdd81 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -31,7 +31,6 @@ scsi-lpfc-initialize-status-local-variable-in-lpfc_s.patch net-sun3_82586-avoid-reading-past-buffer-in-debug-ou.patch md-clean-up-invalid-bug_on-in-md_ioctl.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-change-bug_on-to-assertion-when-checking-for-d.patch diff --git a/queue-5.10/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-5.10/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index 016ea03b46a..00000000000 --- a/queue-5.10/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 77cecb373e969933d6814fe2f1c659e19d372bd7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index cb68a1028090a..ea2a932022698 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1070,11 +1070,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1134,7 +1133,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index d90c35eac4b..d63cd87a735 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -61,7 +61,6 @@ md-clean-up-invalid-bug_on-in-md_ioctl.patch x86-increase-brk-randomness-entropy-for-64-bit-syste.patch memory-stm32-fmc2-ebi-check-regmap_read-return-value.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-change-bug_on-to-assertion-when-checking-for-d.patch diff --git a/queue-5.15/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-5.15/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index df618d8490b..00000000000 --- a/queue-5.15/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 333c74d574bb988fa14d20dc98e5a5abe38d83e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index e783a4225bf04..932e978b5497e 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1066,11 +1066,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1130,7 +1129,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 8f7ee87f538..7a6a1127006 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -82,7 +82,6 @@ md-clean-up-invalid-bug_on-in-md_ioctl.patch x86-increase-brk-randomness-entropy-for-64-bit-syste.patch memory-stm32-fmc2-ebi-check-regmap_read-return-value.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-change-bug_on-to-assertion-when-checking-for-d.patch diff --git a/queue-5.4/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-5.4/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index 37e540dee50..00000000000 --- a/queue-5.4/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 31e0926dc36cbc9c0c3928681e1d15c93fdc262b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index 317067184bfa4..048851d663ca5 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1077,11 +1077,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1141,7 +1140,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index f8a9023cd69..31cdfd5d37f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -53,7 +53,6 @@ virtiofs-forbid-newlines-in-tags.patch md-clean-up-invalid-bug_on-in-md_ioctl.patch x86-increase-brk-randomness-entropy-for-64-bit-syste.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-change-bug_on-to-assertion-when-checking-for-d.patch diff --git a/queue-6.1/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-6.1/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index 4a8457103d3..00000000000 --- a/queue-6.1/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2e7194802a740ab6ef47e19e56bd1b06c03610d3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index abff1c6470f6a..d638e890ef6f0 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1023,11 +1023,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1087,7 +1086,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 523e5fac84e..1bb74371220 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -177,7 +177,6 @@ md-clean-up-invalid-bug_on-in-md_ioctl.patch x86-increase-brk-randomness-entropy-for-64-bit-syste.patch memory-stm32-fmc2-ebi-check-regmap_read-return-value.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-delayed-inode-drop-pointless-bug_on-in-__btrfs.patch diff --git a/queue-6.6/serial-pch-don-t-disable-interrupts-while-acquiring-.patch b/queue-6.6/serial-pch-don-t-disable-interrupts-while-acquiring-.patch deleted file mode 100644 index e8a2daa2038..00000000000 --- a/queue-6.6/serial-pch-don-t-disable-interrupts-while-acquiring-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a6a0bf518d1180c78afa538fec3bf7559e36eb01 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Mar 2024 22:45:28 +0100 -Subject: serial: pch: Don't disable interrupts while acquiring lock in ISR. - -From: Sebastian Andrzej Siewior - -[ Upstream commit f8ff23ebce8c305383c8070e1ea3b08a69eb1e8d ] - -The interrupt service routine is always invoked with disabled -interrupts. - -Remove the _irqsave() from the locking functions in the interrupts -service routine/ pch_uart_interrupt(). - -Signed-off-by: Sebastian Andrzej Siewior -Link: https://lore.kernel.org/r/20240301215246.891055-16-bigeasy@linutronix.de -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/tty/serial/pch_uart.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c -index cc83b772b7ca9..8b56cbdc893d1 100644 ---- a/drivers/tty/serial/pch_uart.c -+++ b/drivers/tty/serial/pch_uart.c -@@ -1019,11 +1019,10 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - u8 lsr; - int ret = 0; - unsigned char iid; -- unsigned long flags; - int next = 1; - u8 msr; - -- spin_lock_irqsave(&priv->lock, flags); -+ spin_lock(&priv->lock); - handled = 0; - while (next) { - iid = pch_uart_hal_get_iid(priv); -@@ -1083,7 +1082,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) - handled |= (unsigned int)ret; - } - -- spin_unlock_irqrestore(&priv->lock, flags); -+ spin_unlock(&priv->lock); - return IRQ_RETVAL(handled); - } - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 1c868a970b3..c4104b41c24 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -180,7 +180,6 @@ memory-stm32-fmc2-ebi-check-regmap_read-return-value.patch parisc-use-irq_enter_rcu-to-fix-warning-at-kernel-co.patch rxrpc-don-t-pick-values-out-of-the-wire-header-when-.patch f2fs-stop-checkpoint-when-get-a-out-of-bounds-segmen.patch -serial-pch-don-t-disable-interrupts-while-acquiring-.patch powerpc-boot-handle-allocation-failure-in-simple_rea.patch powerpc-boot-only-free-if-realloc-succeeds.patch btrfs-delayed-inode-drop-pointless-bug_on-in-__btrfs.patch