From patchwork Sat Jan 14 13:48:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 43768 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290838wrn; Sat, 14 Jan 2023 05:50:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXuwhgzpX+MXeHz23Iq9G60oahMAT4UlWupFAc9RYm3UPx66DvGaVu0ItDC95kvFxu3y479s X-Received: by 2002:a17:90b:4397:b0:226:c196:db55 with SMTP id in23-20020a17090b439700b00226c196db55mr14929099pjb.18.1673704202506; Sat, 14 Jan 2023 05:50:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673704202; cv=none; d=google.com; s=arc-20160816; b=00NIf2Lg3lCYiQLqb64zv7qA/d15RuGlRCHlBlOPmEa28ZIogjrC1eHTaYfwQ6fjtO sWC0MCLlJaYdvFa9C5xLjbwQDzIXnaqELA/7KVI5f9zCynCs5rpzHHHRArur11Sds46I NpmuiY6IcvT3S99JgasUBGRRTwnHPk69SQDV2V/x0F8ElIuxSN+WpF6HODCyks52WuU+ nNPEc2FHBHvjhSh+4vER1XdpwK9WYP6zVm5gE38ZMPc50rZIwswl0xG3z2A/7uo0lOR+ VFVyfoNX50rmFJHJevfzSHkqBmhRu8xoZI8HM+cBtoJOX0u1yCyVHlIDMPp/ccP+8AmY YQ3w== 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:date:cc:to:from:subject:message-id:dkim-signature :dkim-signature; bh=BWVB/JYAh6WpMgk/ynoOodlYgkjENEKn5ERZ6wiCexA=; b=oyk9d8Dou7vSZVt4aHH5y6dFRIBEvED0z4ZoI08/N5bh8ukELThktw96Lr0yF5v5EW qrCWTLgnce/SPb8LStbaHJpiJVKNHCQG97Vd/nZOryG/rqe8wS82SMKsUSBaGDGh61wk Hz+6NH9B76ZiOkkKIhS6KgeRtDp1CAVzyn7+oObkvRfHXZcjy5SsWdjcQIL8nteycbvL hXmc1xNpFgI4LZPTGYu6EN0dCHaziTeWtPx47hDftwRBIoUjJDwvTfQiIy/jsXMit1Th baTSICNUAUbrgEmiss5AvxgqFihCFxDPETLEqhXBz7a0KMTAksNtwPxceRmOPESq7S8F bghg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=Qp5jBEc8; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=Qp5jBEc8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hansenpartnership.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j14-20020a63230e000000b0046ec3bd90bbsi24233984pgj.60.2023.01.14.05.49.49; Sat, 14 Jan 2023 05:50:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=Qp5jBEc8; dkim=pass header.i=@hansenpartnership.com header.s=20151216 header.b=Qp5jBEc8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=hansenpartnership.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbjANNs6 (ORCPT + 99 others); Sat, 14 Jan 2023 08:48:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjANNsz (ORCPT ); Sat, 14 Jan 2023 08:48:55 -0500 Received: from bedivere.hansenpartnership.com (bedivere.hansenpartnership.com [IPv6:2607:fcd0:100:8a00::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41DE830C4; Sat, 14 Jan 2023 05:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1673704134; bh=MHib5s2xnggvAckPp9rWBYUxkS6Gf8A8iqIhBu+vGyE=; h=Message-ID:Subject:From:To:Date:From; b=Qp5jBEc8VaYBfFV+FetHQwVRsu9Rk7UUaaKhksuoU6cWcJCrUwSC2jgWdnAouYbom BMpB/MihtDx5PUjVSrVv679u/lhATJheuQW0IQfUZgZNrn9SVhaOfEFXHFAvu+DTX+ 9TDGyZEArMUCNZD7gTUGTmXGbrjbN89MHgqycnmY= Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id 768F91280EA0; Sat, 14 Jan 2023 08:48:54 -0500 (EST) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z4bFrfYNfPCJ; Sat, 14 Jan 2023 08:48:54 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=hansenpartnership.com; s=20151216; t=1673704134; bh=MHib5s2xnggvAckPp9rWBYUxkS6Gf8A8iqIhBu+vGyE=; h=Message-ID:Subject:From:To:Date:From; b=Qp5jBEc8VaYBfFV+FetHQwVRsu9Rk7UUaaKhksuoU6cWcJCrUwSC2jgWdnAouYbom BMpB/MihtDx5PUjVSrVv679u/lhATJheuQW0IQfUZgZNrn9SVhaOfEFXHFAvu+DTX+ 9TDGyZEArMUCNZD7gTUGTmXGbrjbN89MHgqycnmY= Received: from lingrow.int.hansenpartnership.com (unknown [IPv6:2601:5c4:4302:c21::c14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id E2D021280414; Sat, 14 Jan 2023 08:48:53 -0500 (EST) Message-ID: Subject: [GIT PULL] SCSI fixes for 6.1-rc3 From: James Bottomley To: Andrew Morton , Linus Torvalds Cc: linux-scsi , linux-kernel Date: Sat, 14 Jan 2023 08:48:52 -0500 User-Agent: Evolution 3.42.4 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755006058036366628?= X-GMAIL-MSGID: =?utf-8?q?1755006058036366628?= Two minor fixes in the hisi_sas driver which only impact enterprise style multi-expander and shared disk situations and no core changes. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Xingui Yang (1): scsi: hisi_sas: Use abort task set to reset SAS disks when discovered Yihang Li (1): scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id And the diffstat: drivers/scsi/hisi_sas/hisi_sas_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) With full diff below James diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index e9c2d306ed87..8c038ccf1c09 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -704,7 +704,7 @@ static int hisi_sas_init_device(struct domain_device *device) int_to_scsilun(0, &lun); while (retry-- > 0) { - rc = sas_clear_task_set(device, lun.scsi_lun); + rc = sas_abort_task_set(device, lun.scsi_lun); if (rc == TMF_RESP_FUNC_COMPLETE) { hisi_sas_release_task(hisi_hba, device); break; @@ -1316,7 +1316,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; } }