From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 249821DE3A0; Mon, 6 Jan 2025 16:00:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736179222; cv=none; b=sLkPpnZHaN2+wLSF5NfMpn92/9Gl3sh67obs3lDEybKx3GtdskaUMT6SuW3YkpCZy76w1qpRIbleqzGeoJOn1q/AeWkeDGEg6VcnJiIaOsmNaLhAe9eEMFY86nnRLv4jlLab7eazwWSap37/2T8Az9dfS2AfUjDDZ8xDkrCbF50= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736179222; c=relaxed/simple; bh=sNnO9kcJIxcPsjJJORSbb96OE6tugsTzH5s7FIl6ods=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jfr9KbPo5bHUgAWFaOwExEJpmlZSavT1h5NvAUgevOPG54gX0shIPk9+Kcg0iduzj9J6vgPUnOzmICuqAPWJ7ii17xA9TeSfBPrMNl1jyFHJxBa5wlaOe1tizrXN2HFk60OoRmc6C4NxkdUqXxpmjUrlpY+SPRY+heIco+fQGI8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=F73Z4sqz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="F73Z4sqz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1B89C4CED2; Mon, 6 Jan 2025 16:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736179222; bh=sNnO9kcJIxcPsjJJORSbb96OE6tugsTzH5s7FIl6ods=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F73Z4sqzGkoNmUzxaCG5Y/LabiKxGUpikKiuTKh0ju9V7UZx8u25lN7XWmJumUSjI XQwj+7xU5fxm4G8HxLkxJzarNC61XU8BNy5MlWNuCLkl98uPT7H73yyzvWoS7QLD+e OvvgCQ3qiMDnytdPI1XvydeLsXoWgG9cL1MQ/nOE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ranjan Kumar , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.4 49/93] scsi: mpt3sas: Diag-Reset when Doorbell-In-Use bit is set during driver load time Date: Mon, 6 Jan 2025 16:17:25 +0100 Message-ID: <20250106151130.553129597@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106151128.686130933@linuxfoundation.org> References: <20250106151128.686130933@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ranjan Kumar [ Upstream commit 3f5eb062e8aa335643181c480e6c590c6cedfd22 ] Issue a Diag-Reset when the "Doorbell-In-Use" bit is set during the driver load/initialization. Signed-off-by: Ranjan Kumar Link: https://lore.kernel.org/r/20241110173341.11595-2-ranjan.kumar@broadcom.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/mpt3sas/mpt3sas_base.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 1bc23e8ee748..69023ddceb59 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -5695,11 +5695,12 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, int i; u8 failed; __le32 *mfp; + int ret_val; /* make sure doorbell is not in use */ if ((ioc->base_readl(&ioc->chip->Doorbell) & MPI2_DOORBELL_USED)) { ioc_err(ioc, "doorbell is in use (line=%d)\n", __LINE__); - return -EFAULT; + goto doorbell_diag_reset; } /* clear pending doorbell interrupts from previous state changes */ @@ -5789,6 +5790,10 @@ _base_handshake_req_reply_wait(struct MPT3SAS_ADAPTER *ioc, int request_bytes, le32_to_cpu(mfp[i])); } return 0; + +doorbell_diag_reset: + ret_val = _base_diag_reset(ioc); + return ret_val; } /** -- 2.39.5