From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 598D4C433DF for ; Mon, 24 Aug 2020 16:43:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B0A62067C for ; Mon, 24 Aug 2020 16:43:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598287427; bh=q56wfRmaDrgii/pM7r4PIxb7sgaRtEybihrss19LnZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=s1qgnVExDMvJmMe31E9wRgyWAlSOdElB3w+MuFK1uKofTWsWumd2tKh4GoHcTzwqS wqjYvkDVKO0Ttfypl+Zy73Y+i2jkjypJtJri2uJQAD7p/Fe5v43tGvnbdtoBzY6hOF 49wXRmvm5C1/2e27SYRp9xkPFORPgiVI99Z4v3nI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728765AbgHXQnn (ORCPT ); Mon, 24 Aug 2020 12:43:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:47694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728602AbgHXQjk (ORCPT ); Mon, 24 Aug 2020 12:39:40 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F33122BED; Mon, 24 Aug 2020 16:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598287180; bh=q56wfRmaDrgii/pM7r4PIxb7sgaRtEybihrss19LnZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=spWqHx4MmSM6JQC1MW4Q/Vx2HCbRU0x9HZHzZeTHEiaIz2CWllLJVFYOWlr6gLHuF ts+SWZohtPw/1uxSRrPj0nAF33VOFam7HDuDwdZiqr4jrlBOSLi4Q/ebPdRJYfz4TM EKHsSs5iyHry9Wt1a8lgJLMu9J3xMuarUFPvt63A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Adrian Hunter , Avri Altman , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 6/8] scsi: ufs: Improve interrupt handling for shared interrupts Date: Mon, 24 Aug 2020 12:39:29 -0400 Message-Id: <20200824163931.607291-6-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200824163931.607291-1-sashal@kernel.org> References: <20200824163931.607291-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adrian Hunter [ Upstream commit 127d5f7c4b653b8be5eb3b2c7bbe13728f9003ff ] For shared interrupts, the interrupt status might be zero, so check that first. Link: https://lore.kernel.org/r/20200811133936.19171-2-adrian.hunter@intel.com Reviewed-by: Avri Altman Signed-off-by: Adrian Hunter Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufshcd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 1eee82b18be4e..b0841a3fab522 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4398,7 +4398,7 @@ static void ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status) */ static irqreturn_t ufshcd_intr(int irq, void *__hba) { - u32 intr_status, enabled_intr_status; + u32 intr_status, enabled_intr_status = 0; irqreturn_t retval = IRQ_NONE; struct ufs_hba *hba = __hba; int retries = hba->nutrs; @@ -4412,7 +4412,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) * read, make sure we handle them by checking the interrupt status * again in a loop until we process all of the reqs before returning. */ - do { + while (intr_status && retries--) { enabled_intr_status = intr_status & ufshcd_readl(hba, REG_INTERRUPT_ENABLE); if (intr_status) @@ -4423,7 +4423,7 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba) } intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS); - } while (intr_status && --retries); + } spin_unlock(hba->host->host_lock); return retval; -- 2.25.1