qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spi: qup: replace spin_lock_irqsave by spin_lock in hard IRQ 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2071848
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2122415

commit fa0f3db49e10ac61774e1c90167ec79429d6fd56
Author: Xingbang Liu <liu.airalert@gmail.com>
Date: Wed, 2 Mar 2022 15:15:21 +0800

    The code has been in a irq-disabled context since it is hard IRQ. There
    is no necessity to do it again.

    Signed-off-by: Xingbang Liu <liu.airalert@gmail.com>
    Link: https://lore.kernel.org/r/20220302071521.6638-1-liu.airalert@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>

Signed-off-by: Mark Salter <msalter@redhat.com>
This commit is contained in:
Mark Salter 2023-01-25 12:32:02 -05:00
parent e1a97f43da
commit 97731429cc
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/spi/spi-qup.c
View File

@ -593,7 +593,6 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
{ {
struct spi_qup *controller = dev_id; struct spi_qup *controller = dev_id;
u32 opflags, qup_err, spi_err; u32 opflags, qup_err, spi_err;
unsigned long flags;
int error = 0; int error = 0;
qup_err = readl_relaxed(controller->base + QUP_ERROR_FLAGS); qup_err = readl_relaxed(controller->base + QUP_ERROR_FLAGS);
@ -625,10 +624,10 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
error = -EIO; error = -EIO;
} }
spin_lock_irqsave(&controller->lock, flags); spin_lock(&controller->lock);
if (!controller->error) if (!controller->error)
controller->error = error; controller->error = error;
spin_unlock_irqrestore(&controller->lock, flags); spin_unlock(&controller->lock);
if (spi_qup_is_dma_xfer(controller->mode)) { if (spi_qup_is_dma_xfer(controller->mode)) {
writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); writel_relaxed(opflags, controller->base + QUP_OPERATIONAL);