Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4153875pxb; Mon, 27 Sep 2021 10:29:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0RsHL/IbXfNQzORMu8irfSRRKCOiiCtDCQVEltUXoS2wJ7uvxu+8rBOInMck502L1S1Qv X-Received: by 2002:a17:90a:8d82:: with SMTP id d2mr269432pjo.31.1632763755307; Mon, 27 Sep 2021 10:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632763755; cv=none; d=google.com; s=arc-20160816; b=lX7/TvNZOrOVw0sCScz0WhQwfqXrsebAs6nXZQnK6tqlCKRZNjk/Fmcd+hW5x4MFP5 CZZIg2LAk0BDfuic2b2OEZ50CrpStberuD8pFNdnO7Gr2LDyP2X0NmZLp865uVTVzRg7 b7exkJ7pd/47Uedq3Jta6JytfBe6xAlDiXFdgR7m0DgcNYx4f8b9u+Uy0ujnBbELj5Zu 6wBN7dkuhiwx9SilegKH6ASZnYSPFZmEo+lyqW8fy+QEky0/GRcER+Je0N+7oFoyhSQZ Q74sN9vWSGbC2wJJBA04uIkvmShCCL/6S3DqehfQ1R9fUtuvcvuP8aWGX8dmAgM3ZDCY Vt/Q== 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=/JZMzFS2TDU8nprncyoNp5vCy6IbnwzDRr2RfSxE4Tw=; b=pTwsPHcodP2iu7Sk/zcp9Yx+bKU3cr2nNfhtAxtWv2gfzUQkQI8MwLV3OudEEZ6LOa tdq/myvn4086ZFbtvu1wKb4zQMCk2GtXLEkEM4YGyK/7qMpc2XsD1uLLoH7Bp7IFzozd OzCDp4IfDQIXOrPMDtLe1YL7lQ96DCW1o/Y62eVdbJ/Yw+QjQpe2YQ6Xt8ulBHxueR0/ bqwtJ7Yqd/O5Ek3Gl+PscFxLTyhjy9bd/p6gFnVTZNe5IsSjXpZQxtBknHAkMG5XZZqi susCpCSHThefD/WZVvEHYfqQS9GZRgnxJOQXqOEgVUOUTUrj+WaZObsW4k/wSpUVtEP8 2hUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="i/ALWg2j"; 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 z12si21886058pfg.273.2021.09.27.10.29.01; Mon, 27 Sep 2021 10:29:15 -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="i/ALWg2j"; 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 S237322AbhI0R1o (ORCPT + 99 others); Mon, 27 Sep 2021 13:27:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:40804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238013AbhI0RYL (ORCPT ); Mon, 27 Sep 2021 13:24:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C02B6613CF; Mon, 27 Sep 2021 17:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762933; bh=ba5EEh/I08Xl0pCyRsGryz+inYCK3L39IttSecK1Px8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/ALWg2jeFGzPoh9XYuIlLKOtUNv+zTaZcWOtVh1b306lVaSXdPVvuKbKN/pCxBTT mCchHmhtmxwufuiV8nOW1cgtvXfT5pY4d4IEmEikEvoYtpGVUB7sOJ5NijOMMoWaoG Q8FeSDyHWFmijNfbwrd3H44xJ6Tkka4Tnc1brPJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Himanshu Madhani , Dmitry Bogdanov , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.14 106/162] scsi: qla2xxx: Restore initiator in dual mode Date: Mon, 27 Sep 2021 19:02:32 +0200 Message-Id: <20210927170237.111569177@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170233.453060397@linuxfoundation.org> References: <20210927170233.453060397@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: Dmitry Bogdanov [ Upstream commit 5f8579038842d77e6ce05e1df6bf9dd493b0e3ef ] In dual mode in case of disabling the target, the whole port goes offline and initiator is turned off too. Fix restoring initiator mode after disabling target in dual mode. Link: https://lore.kernel.org/r/20210915153239.8035-1-d.bogdanov@yadro.com Fixes: 0645cb8350cd ("scsi: qla2xxx: Add mode control for each physical port") Reviewed-by: Himanshu Madhani Signed-off-by: Dmitry Bogdanov Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index f8f471157109..70b507d177f1 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -7014,7 +7014,8 @@ qla2x00_abort_isp(scsi_qla_host_t *vha) return 0; break; case QLA2XXX_INI_MODE_DUAL: - if (!qla_dual_mode_enabled(vha)) + if (!qla_dual_mode_enabled(vha) && + !qla_ini_mode_enabled(vha)) return 0; break; case QLA2XXX_INI_MODE_ENABLED: -- 2.33.0