Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3783185pxt; Tue, 10 Aug 2021 11:12:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVDXsfaIuK6SPLtj3NVgAY1YXkOhpdOvgLR77X+VIvKHacGuDtjEdurFNwmxID/+G/QfJI X-Received: by 2002:a17:906:3a88:: with SMTP id y8mr6166405ejd.223.1628619154566; Tue, 10 Aug 2021 11:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628619154; cv=none; d=google.com; s=arc-20160816; b=SRY/bYdQnYeLqCMc2c9rzp/YaW2xGA/jTUTvsF7WveZxKRdTdNCIFQoM13h1szdzWT a6HilmOGIdzHvtjlG0KQAAYyT8iOBSfDN3bXoX8fa7TAHSpRpOvI69H19u4YserTEfGI dnKdHb+0j6tTFOQe1zqLaGYS3NOc+K4Jv8mZdTfvL5qWEEzBaGHS2cidMrMxTuCvHUBV DKUnXqd0/6pUs5K8Z3n9v9veasdjtHX0zPMJS8l4ghMJBYdVSDQU9pjvtYeNZKXGVfcP O0wI2bWU137GIdACAl1UBn9MbEec8wrDAmfn7xQ3DPlAGo2y6B/Ekf5+olYsGv86XVC7 RyEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fZ2g5D1+dcVoBq4wI1HTn3lOWHDvvJ6LQtYoz8jREcA=; b=dnYkBLlW2fyZxL4CWNfN+n51NQ8qCh90quU8sXW+OlRqCMtMtjAFcX00HnYPDRQcdu SG7Kjvsslm3IKla4jHQ4BpSXAjChJYiFenHqhW3ousJ9u7razBmcJwKgmEe5I7ziJQIF bYulbWWqJiIpLP875xeSM0ESHYCMIu1Nbkfk1eWoBHaBBz6iVAIoGoVOwk10Ce3WZzXd u+nheYPZCuaks/mtQEe9gFLGsjKAbXPmd4czEHo1WpeMzhW/DCFidIGg2kfwhKoJ6FfV hXQt0bfdlm8gYwEaQE3ITzjLu/GkUMyHZxFKRXuZXbDgmIxAdqgIjpwiyh7OvuIq2Moi TmLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XO2IFRF2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h20si10179281edv.453.2021.08.10.11.12.04; Tue, 10 Aug 2021 11:12:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XO2IFRF2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234167AbhHJSIK (ORCPT + 99 others); Tue, 10 Aug 2021 14:08:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:39398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238999AbhHJSEk (ORCPT ); Tue, 10 Aug 2021 14:04:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B406161411; Tue, 10 Aug 2021 17:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617709; bh=btAsWNFwkIaXSn8TsKrBntDZORAVNEY1cv5+S42XIlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XO2IFRF2dMewkyBMAD1jzwVL261jNrI/UT6noJd+4pH4x9WvbkFVI2kEQYgaXQCqM lT6ffu0eHEnswM4oWjnjYYCCX+fd6S4LTpvYkym7MdGrTpEhTZaq7dF4lSzXD5TzGY YGvA7gBfk2SzSPoqhis6oyOpFDUGADZxtSwOio0A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Letu Ren , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 171/175] net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset Date: Tue, 10 Aug 2021 19:31:19 +0200 Message-Id: <20210810173006.579743625@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Letu Ren [ Upstream commit 92766c4628ea349c8ddab0cd7bd0488f36e5c4ce ] When calling the 'ql_wait_for_drvr_lock' and 'ql_adapter_reset', the driver has already acquired the spin lock, so the driver should not call 'ssleep' in atomic context. This bug can be fixed by using 'mdelay' instead of 'ssleep'. Reported-by: Letu Ren Signed-off-by: Letu Ren Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 2376b2729633..c00ad57575ea 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -154,7 +154,7 @@ static int ql_wait_for_drvr_lock(struct ql3_adapter *qdev) "driver lock acquired\n"); return 1; } - ssleep(1); + mdelay(1000); } while (++i < 10); netdev_err(qdev->ndev, "Timed out waiting for driver lock...\n"); @@ -3274,7 +3274,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) if ((value & ISP_CONTROL_SR) == 0) break; - ssleep(1); + mdelay(1000); } while ((--max_wait_time)); /* @@ -3310,7 +3310,7 @@ static int ql_adapter_reset(struct ql3_adapter *qdev) ispControlStatus); if ((value & ISP_CONTROL_FSR) == 0) break; - ssleep(1); + mdelay(1000); } while ((--max_wait_time)); } if (max_wait_time == 0) -- 2.30.2