From patchwork Fri Nov 18 08:37:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhan X-Patchwork-Id: 22190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp69741wrr; Fri, 18 Nov 2022 00:45:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf51LgzgmbgUrmgmV5vj1qQYFxfiZGcKfZgYXEHvIefXr50BDI4/dsSychpU2AWo/xNnT5EX X-Received: by 2002:a17:90a:f305:b0:20c:9d98:13f4 with SMTP id ca5-20020a17090af30500b0020c9d9813f4mr6661289pjb.87.1668761132129; Fri, 18 Nov 2022 00:45:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668761132; cv=none; d=google.com; s=arc-20160816; b=uKd3yYynhq/jzrdKYMjzDwGJl5dJTT2GVH1MQpdH9obiO3QP75S4+38DCBX3FHF/zp 4Dg+p8ZGaDGyGY6lXrkBii0QeI5gtQpwYi58ylKJA/4czuOorL33hhh4JgZVamNwfmB9 FKtya375IbtGFaqflhaygA5NyuwV/jXGs271al+K2QlVpD4dA0OYPL5zDnWaSWBC8vND kQzdXDSR/fRBU5EZC9BDbmFVcmLqED0SaXtZYbN6jFhJ7K26Ek5uwaMkDretZ8wmOshL V7wWgVzapeIy6dbQdlOwwCmoPgDcWo1ePg/AJ8L/0vH9ZhyY8stTYLUxc4ZBbqNLpuyH jniQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=N9FJ47bFQgFGC3BXcI8ARq7H3gpuwHUyP4Aqy5A2uks=; b=dYHY5TsI3smfjcTxW6mKYPCF7JetKvoXFtqChF72PfqKQXeBTmV4pbwIwfusJ3G7sM 7sUnsWjPF7N96xZpC6i25N0v7jipbfebB77ujFL4sRcoC00h49tTyTrQKqjGpLvI2KO0 ferPwd+LDN/MJb5ygfphELSkg/atZEbvSXq8ocd2hpNB/dYkL4kqwAAicnSa39vLgLwW lzw1Ci/zC71ZxpLqwBfDQ0yno5LiLqVyVRXuGjMbn8slNxt394zPGlKctcfjPprZ/T/1 3kbwBjeOH50VI/bMjF9rWhTL6frrCP66+dU7FBz/yOB55WrI9A7pKVhvyjTMB6zhw3jE TV+g== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw15-20020a056a00450f00b0056d919bf4a8si2914800pfb.270.2022.11.18.00.45.18; Fri, 18 Nov 2022 00:45:32 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240996AbiKRIid (ORCPT + 99 others); Fri, 18 Nov 2022 03:38:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235199AbiKRIi2 (ORCPT ); Fri, 18 Nov 2022 03:38:28 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2A9C6327; Fri, 18 Nov 2022 00:38:26 -0800 (PST) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4ND97Z6QktzqSYc; Fri, 18 Nov 2022 16:34:34 +0800 (CST) Received: from dggpeml500019.china.huawei.com (7.185.36.137) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 18 Nov 2022 16:38:18 +0800 Received: from localhost.localdomain (10.67.165.2) by dggpeml500019.china.huawei.com (7.185.36.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 18 Nov 2022 16:38:18 +0800 From: Jie Zhan To: , CC: , , , , , , , , , , , , Subject: [PATCH for-next 1/5] Revert "scsi: hisi_sas: Drain bcast events in hisi_sas_rescan_topology()" Date: Fri, 18 Nov 2022 16:37:10 +0800 Message-ID: <20221118083714.4034612-2-zhanjie9@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20221118083714.4034612-1-zhanjie9@hisilicon.com> References: <20221118083714.4034612-1-zhanjie9@hisilicon.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500019.china.huawei.com (7.185.36.137) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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?1749822872885953677?= X-GMAIL-MSGID: =?utf-8?q?1749822872885953677?= This reverts commit 11ff0c98fca35df16c84d4eee52008faecaf10a6. Draining or flushing events in hisi_sas_rescan_topology() can hang the driver, typically with phy up or phy down events being processed, i.e. sas_porte_bytes_dmaed() or sas_phye_loss_of_signal(). Signed-off-by: Jie Zhan --- drivers/scsi/hisi_sas/hisi_sas_main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 54860d252466..4527ac266bb6 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1323,7 +1323,6 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state) { - struct sas_ha_struct *sas_ha = &hisi_hba->sha; struct asd_sas_port *_sas_port = NULL; int phy_no; @@ -1352,12 +1351,6 @@ static void hisi_sas_rescan_topology(struct hisi_hba *hisi_hba, u32 state) hisi_sas_phy_down(hisi_hba, phy_no, 0, GFP_KERNEL); } } - /* - * Ensure any bcast events are processed prior to calling async nexus - * reset calls from hisi_sas_clear_nexus_ha() -> - * hisi_sas_async_I_T_nexus_reset() - */ - sas_drain_work(sas_ha); } static void hisi_sas_reset_init_all_devices(struct hisi_hba *hisi_hba)