summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2020-08-11 16:39:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-26 11:42:20 +0200
commit5c64efd81ffa33eefb75c1215b73e0f329a67e55 (patch)
tree68dae44c233d64a1a0b760bd1d61f0c645b4219e
parenta7e3b128c5de3ee6a711a69cb7339ba92def8634 (diff)
downloadlinux-stable-5c64efd81ffa33eefb75c1215b73e0f329a67e55.tar.gz
linux-stable-5c64efd81ffa33eefb75c1215b73e0f329a67e55.tar.bz2
linux-stable-5c64efd81ffa33eefb75c1215b73e0f329a67e55.zip
scsi: ufs: Fix interrupt error message for shared interrupts
[ Upstream commit 6337f58cec030b34ced435b3d9d7d29d63c96e36 ] The interrupt might be shared, in which case it is not an error for the interrupt handler to be called when the interrupt status is zero, so don't print the message unless there was enabled interrupt status. Link: https://lore.kernel.org/r/20200811133936.19171-1-adrian.hunter@intel.com Fixes: 9333d7757348 ("scsi: ufs: Fix irq return code") Reviewed-by: Avri Altman <avri.altman@wdc.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/scsi/ufs/ufshcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 7298adbcdec8..3b80d692dd2e 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5803,7 +5803,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)
intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
} while (intr_status && --retries);
- if (retval == IRQ_NONE) {
+ if (enabled_intr_status && retval == IRQ_NONE) {
dev_err(hba->dev, "%s: Unhandled interrupt 0x%08x\n",
__func__, intr_status);
ufshcd_dump_regs(hba, 0, UFSHCI_REG_SPACE_SIZE, "host_regs: ");