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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 98E93C432C3 for ; Sat, 16 Nov 2019 15:50:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68BDD20729 for ; Sat, 16 Nov 2019 15:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919435; bh=8b+zj0+DXJml/xNJPstz9a1AxF/molanvs40WN1AvBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wTalsj+yNiVAfEX/BfougleAYQX94eugMtJpHkJHIIJtOJI3dxLCtGQNvLkw8hjPQ aGcnL4WgraTK/9f8pg1Y+6xtCmAdJG7+wtQ7KwU3RfU498op0DzijjvQsQEWjW8KYU 3rvAh87KkdrAqDc1yKKklirTOTiUZOSWVaCWwYu8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730553AbfKPPue (ORCPT ); Sat, 16 Nov 2019 10:50:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:58672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730492AbfKPPud (ORCPT ); Sat, 16 Nov 2019 10:50:33 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (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 66C0321823; Sat, 16 Nov 2019 15:50:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919432; bh=8b+zj0+DXJml/xNJPstz9a1AxF/molanvs40WN1AvBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iL0g21mLW89stI6Ytw5Ilb77HsU/FVEJt0dfiV1L74nyjDqYWsP2hHzFOTZinbyWj KN3oVwlE6DbcCYEb+BazZAN5rp5YnDYNoLHxJ24tmNfapwL+rFoQ9ImnRBXWvDhUp+ gXce6WmmSDTe2eoKIZvAio4fCWYE4IdMShAgTaVs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shivasharan S , "Martin K . Petersen" , Sasha Levin , megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 130/150] scsi: megaraid_sas: Fix msleep granularity Date: Sat, 16 Nov 2019 10:47:08 -0500 Message-Id: <20191116154729.9573-130-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shivasharan S [ Upstream commit 9155cf30a3c4ef97e225d6daddf9bd4b173267e8 ] In megasas_transition_to_ready() driver waits 180seconds for controller to change FW state. Here we are calling msleep(1) in a loop for this. As explained in timers-howto.txt, msleep(1) will actually sleep longer than 1ms. If a faulty controller is connected, we will end up waiting for much more than 180 seconds causing unnecessary delays during load. Change the granularity of msleep() call from 1ms to 1000ms. Signed-off-by: Shivasharan S Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/megaraid/megaraid_sas_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 8595d83229b77..23a9f0777fa62 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -3823,12 +3823,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr) /* * The cur_state should not last for more than max_wait secs */ - for (i = 0; i < (max_wait * 1000); i++) { + for (i = 0; i < max_wait; i++) { curr_abs_state = instance->instancet-> read_fw_status_reg(instance->reg_set); if (abs_state == curr_abs_state) { - msleep(1); + msleep(1000); } else break; } -- 2.20.1