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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94A10C63797 for ; Mon, 16 Jan 2023 14:08:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbjAPOH7 (ORCPT ); Mon, 16 Jan 2023 09:07:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232019AbjAPOGx (ORCPT ); Mon, 16 Jan 2023 09:06:53 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 050DF241CD; Mon, 16 Jan 2023 06:03:35 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B36D9B80E93; Mon, 16 Jan 2023 14:03:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A353DC433EF; Mon, 16 Jan 2023 14:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877812; bh=R6yTar/B3Xo9uIeT5EjdvrUIcrwvf1xQl6+iIMitEmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YV0hgZdhc522qjN5DIn2OYnYOwmD5HeQiQzX2uTlMrUOWFd8GYtWhQP4cBwfoKSUS ZTv4uSLI6Q1oFXa3BRwq2pdoGK+/2ie5nPsBrOic9jKOmHwvyIW8WW6FztN51wAJC7 NcKn6s8DfGvmER07fQbB6aMGIPhkSkGgGukaDLUPEXKok0fpn91odB6kMSQhtqRxQx bL86ktaj1lGCoafO/Q+FhHx+lr6os2hHxcaRSnxbXiBYb/Srsb0AMYQ7BsTGV6UrUV 4IWffjxfPd4IfXvPiRvor+igogXB3Il3dTMwvFBdbCY8m0uN+UH9sLwA1Ba1C1QbDC AoZgJZShp5TWw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yihang Li , Xiang Chen , "Martin K . Petersen" , Sasha Levin , jejb@linux.ibm.com, linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 42/53] scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id Date: Mon, 16 Jan 2023 09:01:42 -0500 Message-Id: <20230116140154.114951-42-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116140154.114951-1-sashal@kernel.org> References: <20230116140154.114951-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Yihang Li [ Upstream commit f58c89700630da6554b24fd3df293a24874c10c1 ] Currently the driver sets the port invalid if one phy in the port is not enabled, which may cause issues in expander situation. In directly attached situation, if phy up doesn't occur in time when refreshing port id, the port is incorrectly set to invalid which will also cause disk lost. Therefore set a port invalid only if there are no devices attached to the port. Signed-off-by: Yihang Li Signed-off-by: Xiang Chen Link: https://lore.kernel.org/r/1672805000-141102-3-git-send-email-chenxiang66@hisilicon.com Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 34870b3286ab..02fa3c00dccc 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1334,7 +1334,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) device->linkrate = phy->sas_phy.linkrate; hisi_hba->hw->setup_itct(hisi_hba, sas_dev); - } else + } else if (!port->port_attached) port->id = 0xff; } } -- 2.35.1