diff options
| author | Chris Packham <chris.packham@alliedtelesis.co.nz> | 2020-09-04 12:28:12 +1200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-07 08:00:07 +0200 |
| commit | 8f72de67c77398d2e3b50e09e82a6c5131841462 (patch) | |
| tree | a3a4811fed2be02d0f5cac0c26692a7af51b5181 | |
| parent | 487882d928cadeea0edd08fa1e659a2e6edf53e8 (diff) | |
| download | linux-stable-8f72de67c77398d2e3b50e09e82a6c5131841462.tar.gz linux-stable-8f72de67c77398d2e3b50e09e82a6c5131841462.tar.bz2 linux-stable-8f72de67c77398d2e3b50e09e82a6c5131841462.zip | |
spi: fsl-espi: Only process interrupts for expected events
[ Upstream commit b867eef4cf548cd9541225aadcdcee644669b9e1 ]
The SPIE register contains counts for the TX FIFO so any time the irq
handler was invoked we would attempt to process the RX/TX fifos. Use the
SPIM value to mask the events so that we only process interrupts that
were expected.
This was a latent issue exposed by commit 3282a3da25bd ("powerpc/64:
Implement soft interrupt replay in C").
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20200904002812.7300-1-chris.packham@alliedtelesis.co.nz
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/spi/spi-fsl-espi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 1e8ff6256079..b8dd75b8518b 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -559,13 +559,14 @@ static void fsl_espi_cpu_irq(struct fsl_espi *espi, u32 events) static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) { struct fsl_espi *espi = context_data; - u32 events; + u32 events, mask; spin_lock(&espi->lock); /* Get interrupt events(tx/rx) */ events = fsl_espi_read_reg(espi, ESPI_SPIE); - if (!events) { + mask = fsl_espi_read_reg(espi, ESPI_SPIM); + if (!(events & mask)) { spin_unlock(&espi->lock); return IRQ_NONE; } |