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=-9.8 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,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 920D0C432C3 for ; Wed, 27 Nov 2019 21:44:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 615C320869 for ; Wed, 27 Nov 2019 21:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574891076; bh=6KyFAcSvoN6cDs6QRqCUbq0QmDU347rw7jYBKRa41zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=a57QpryJPvNICfA7HW+gTMvvdgjhHFJ6/iBKq4g7HMJkbSEQ0uXNXqg3lO3xAYvm/ Sw8YIQiuXaDi/KxXzDnOi5Ea5F3r69IpDMeVGyhx/4hL9A1NIEumAddKU07v2VPObv jaADp07EaXPl7yQPcKJeNSKhoe525pzI3bEj2L7I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728537AbfK0UhR (ORCPT ); Wed, 27 Nov 2019 15:37:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:40170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728534AbfK0UhR (ORCPT ); Wed, 27 Nov 2019 15:37:17 -0500 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 C6D2F20862; Wed, 27 Nov 2019 20:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887036; bh=6KyFAcSvoN6cDs6QRqCUbq0QmDU347rw7jYBKRa41zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eP82VkG81guYD1yhqeLVJd//BisyEXss3CcDLRAmKOrsQxiRWRky9HRnYdqGPwvnS lea8bdaltOyVdEIACUMxLVXqXk6bUbsQz3mafwM5SOtDRghw5E9Z9aFPNnpiGeZxDI B/f2iQRWuUsyjL0OL7DLOlgofUQEWIwUYpfW/5L8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shivasharan S , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 4.4 088/132] scsi: megaraid_sas: Fix msleep granularity Date: Wed, 27 Nov 2019 21:31:19 +0100 Message-Id: <20191127203016.942508135@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202857.270233486@linuxfoundation.org> References: <20191127202857.270233486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 5e0bac8de6381..7be968f60b590 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -3585,12 +3585,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