From patchwork Tue Jun 23 19:54:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 223114 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=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 3D64AC433E0 for ; Tue, 23 Jun 2020 21:32:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EF2F20707 for ; Tue, 23 Jun 2020 21:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947949; bh=hVOkDo9kCSvHWRTp5fRFMZdNwqwL/m0FiPLJSvXuGE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LFWSKrBqhyVmqPPaZlNSbQtMjIbQDW9H1mcFKRDlOHlMtupNY2YAlYFCRwBAWrVT6 I3qRU6RNzpNMCPVcsYv6dfnuNg/M0FMEVQPUAspnuUM5LYYfmvLzwflEgpOu4DpNv1 WWQtrAGD9TYOG9ByEkybhlAkx54x8N4sRrCTF/Zo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388486AbgFWVcY (ORCPT ); Tue, 23 Jun 2020 17:32:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:54068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388972AbgFWUM0 (ORCPT ); Tue, 23 Jun 2020 16:12:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B9D2E206C3; Tue, 23 Jun 2020 20:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943146; bh=hVOkDo9kCSvHWRTp5fRFMZdNwqwL/m0FiPLJSvXuGE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GpMFjxSIPWVK5KKaAp+Gk99sS8YlOngbyILzz3UQpmc3KAIHRpoFNGUry3llxYeCr Y2AHfOd4HIMb+5zEQPGU2kH6J5WhKsaXD6I+p0fMNgC3M/0iNfAutsnECM8msA1C/x edaIJ2xRtyOibuSCZVdB4CKPCMDek7d0TcE7Rctc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bean Huo , Avri Altman , Jeffrey Hugo , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.7 278/477] scsi: ufs-qcom: Fix scheduling while atomic issue Date: Tue, 23 Jun 2020 21:54:35 +0200 Message-Id: <20200623195420.705545448@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeffrey Hugo [ Upstream commit 3be60b564de49875e47974c37fabced893cd0931 ] ufs_qcom_dump_dbg_regs() uses usleep_range, a sleeping function, but can be called from atomic context in the following flow: ufshcd_intr -> ufshcd_sl_intr -> ufshcd_check_errors -> ufshcd_print_host_regs -> ufshcd_vops_dbg_register_dump -> ufs_qcom_dump_dbg_regs This causes a boot crash on the Lenovo Miix 630 when the interrupt is handled on the idle thread. Fix the issue by switching to udelay(). Link: https://lore.kernel.org/r/20200525204125.46171-1-jeffrey.l.hugo@gmail.com Fixes: 9c46b8676271 ("scsi: ufs-qcom: dump additional testbus registers") Reviewed-by: Bean Huo Reviewed-by: Avri Altman Signed-off-by: Jeffrey Hugo Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/ufs/ufs-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index 19aa5c44e0da6..f938867301a05 100644 --- a/drivers/scsi/ufs/ufs-qcom.c +++ b/drivers/scsi/ufs/ufs-qcom.c @@ -1658,11 +1658,11 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) /* sleep a bit intermittently as we are dumping too much data */ ufs_qcom_print_hw_debug_reg_all(hba, NULL, ufs_qcom_dump_regs_wrapper); - usleep_range(1000, 1100); + udelay(1000); ufs_qcom_testbus_read(hba); - usleep_range(1000, 1100); + udelay(1000); ufs_qcom_print_unipro_testbus(hba); - usleep_range(1000, 1100); + udelay(1000); } /**