From nobody Mon Apr 6 11:53:03 2026 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 83356C04A95 for ; Wed, 28 Sep 2022 06:39:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233105AbiI1Gjm (ORCPT ); Wed, 28 Sep 2022 02:39:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229567AbiI1Gjh (ORCPT ); Wed, 28 Sep 2022 02:39:37 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3385C1ED212; Tue, 27 Sep 2022 23:39:29 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mcmww0nW2zpStd; Wed, 28 Sep 2022 14:36:32 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:27 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan Subject: [PATCH v6 1/8] scsi: libsas: introduce sas address comparison helpers Date: Wed, 28 Sep 2022 15:01:23 +0800 Message-ID: <20220928070130.3657183-2-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Sas address comparison is widely used in libsas. However they are all opencoded and to avoid the line spill over 80 columns, are mostly split into multi-lines. Introduce some helpers to prepare some refactor. Signed-off-by: Jason Yan Reviewed-by: Damien Le Moal Reviewed-by: John Garry Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_internal.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_i= nternal.h index 8d0ad3abc7b5..3384429b7eb0 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -111,6 +111,23 @@ static inline void sas_smp_host_handler(struct bsg_job= *job, } #endif =20 +static inline bool sas_phy_match_dev_addr(struct domain_device *dev, + struct ex_phy *phy) +{ + return SAS_ADDR(dev->sas_addr) =3D=3D SAS_ADDR(phy->attached_sas_addr); +} + +static inline bool sas_phy_match_port_addr(struct asd_sas_port *port, + struct ex_phy *phy) +{ + return SAS_ADDR(port->sas_addr) =3D=3D SAS_ADDR(phy->attached_sas_addr); +} + +static inline bool sas_phy_addr_match(struct ex_phy *p1, struct ex_phy *p2) +{ + return SAS_ADDR(p1->attached_sas_addr) =3D=3D SAS_ADDR(p2->attached_sas_= addr); +} + static inline void sas_fail_probe(struct domain_device *dev, const char *f= unc, int err) { pr_warn("%s: for %s device %016llx returned %d\n", --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 59442C04A95 for ; Wed, 28 Sep 2022 06:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232906AbiI1Gjq (ORCPT ); Wed, 28 Sep 2022 02:39:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbiI1Gji (ORCPT ); Wed, 28 Sep 2022 02:39:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB0F41EC9AA; Tue, 27 Sep 2022 23:39:30 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mcmvb0KVnzWgxN; Wed, 28 Sep 2022 14:35:23 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:28 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan , Jack Wang Subject: [PATCH v6 2/8] scsi: libsas: introduce sas_find_attached_phy_id() helper Date: Wed, 28 Sep 2022 15:01:24 +0800 Message-ID: <20220928070130.3657183-3-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" LLDDs are implementing their own attached phy id finding code repeatedly. Factor it out to libsas. Signed-off-by: Jason Yan Reviewed-by: Jack Wang Reviewed-by: Damien Le Moal Reviewed-by: John Garry Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_expander.c | 16 ++++++++++++++++ include/scsi/libsas.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_e= xpander.c index fa2209080cc2..2caf366b9f74 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -2107,6 +2107,22 @@ int sas_ex_revalidate_domain(struct domain_device *p= ort_dev) return res; } =20 +int sas_find_attached_phy_id(struct expander_device *ex_dev, + struct domain_device *dev) +{ + struct ex_phy *phy; + int phy_id; + + for (phy_id =3D 0; phy_id < ex_dev->num_phys; phy_id++) { + phy =3D &ex_dev->ex_phy[phy_id]; + if (sas_phy_match_dev_addr(dev, phy)) + return phy_id; + } + + return -ENODEV; +} +EXPORT_SYMBOL_GPL(sas_find_attached_phy_id); + void sas_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, struct sas_rphy *rphy) { diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 2dbead74a2af..ec08008b919c 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -750,6 +750,8 @@ int sas_clear_task_set(struct domain_device *dev, u8 *l= un); int sas_lu_reset(struct domain_device *dev, u8 *lun); int sas_query_task(struct sas_task *task, u16 tag); int sas_abort_task(struct sas_task *task, u16 tag); +int sas_find_attached_phy_id(struct expander_device *ex_dev, + struct domain_device *dev); =20 void sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event, gfp_t gfp_flags); --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 C723EC6FA82 for ; Wed, 28 Sep 2022 06:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233148AbiI1Gju (ORCPT ); Wed, 28 Sep 2022 02:39:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233015AbiI1Gji (ORCPT ); Wed, 28 Sep 2022 02:39:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B2D31ED204; Tue, 27 Sep 2022 23:39:31 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mcmvb4t7szWgy6; Wed, 28 Sep 2022 14:35:23 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:28 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan , Jack Wang Subject: [PATCH v6 3/8] scsi: pm8001: use sas_find_attached_phy_id() instead of open coded Date: Wed, 28 Sep 2022 15:01:25 +0800 Message-ID: <20220928070130.3657183-4-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The attached phy id finding is open coded. Now we can replace it with sas_find_attached_phy_id(). To keep consistent, the return value of pm8001_dev_found_notify() is also changed to -ENODEV after calling sas_find_attathed_phy_id() failed. Signed-off-by: Jason Yan Reviewed-by: Jack Wang Reviewed-by: Damien Le Moal Reviewed-by: Johannes Thumshirn --- drivers/scsi/pm8001/pm8001_sas.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_= sas.c index 8e3f2f9ddaac..b4007c4f157d 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -645,22 +645,16 @@ static int pm8001_dev_found_notify(struct domain_devi= ce *dev) pm8001_device->dcompletion =3D &completion; if (parent_dev && dev_is_expander(parent_dev->dev_type)) { int phy_id; - struct ex_phy *phy; - for (phy_id =3D 0; phy_id < parent_dev->ex_dev.num_phys; - phy_id++) { - phy =3D &parent_dev->ex_dev.ex_phy[phy_id]; - if (SAS_ADDR(phy->attached_sas_addr) - =3D=3D SAS_ADDR(dev->sas_addr)) { - pm8001_device->attached_phy =3D phy_id; - break; - } - } - if (phy_id =3D=3D parent_dev->ex_dev.num_phys) { + + phy_id =3D sas_find_attached_phy_id(&parent_dev->ex_dev, dev); + if (phy_id < 0) { pm8001_dbg(pm8001_ha, FAIL, "Error: no attached dev:%016llx at ex:%016llx.\n", SAS_ADDR(dev->sas_addr), SAS_ADDR(parent_dev->sas_addr)); - res =3D -1; + res =3D phy_id; + } else { + pm8001_device->attached_phy =3D phy_id; } } else { if (dev->dev_type =3D=3D SAS_SATA_DEV) { --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 992C5C32771 for ; Wed, 28 Sep 2022 06:39:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233171AbiI1Gjz (ORCPT ); Wed, 28 Sep 2022 02:39:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233046AbiI1Gji (ORCPT ); Wed, 28 Sep 2022 02:39:38 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B15FE3F; Tue, 27 Sep 2022 23:39:32 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Mcmxj22JGzHqK8; Wed, 28 Sep 2022 14:37:13 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:29 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan , Jack Wang Subject: [PATCH v6 4/8] scsi: mvsas: use sas_find_attached_phy_id() instead of open coded Date: Wed, 28 Sep 2022 15:01:26 +0800 Message-ID: <20220928070130.3657183-5-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The attached phy finding is open coded. Now we can replace it with sas_find_attached_phy_id(). To keep consistent, the return value of mvs_dev_found_notify() is also changed to -ENODEV after calling sas_find_attathed_phy_id() failed. Signed-off-by: Jason Yan Reviewed-by: Jack Wang Reviewed-by: Damien Le Moal Reviewed-by: Johannes Thumshirn --- drivers/scsi/mvsas/mv_sas.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index a6867dae0e7c..bf7d4995b257 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -1190,23 +1190,16 @@ static int mvs_dev_found_notify(struct domain_devic= e *dev, int lock) mvi_device->sas_device =3D dev; if (parent_dev && dev_is_expander(parent_dev->dev_type)) { int phy_id; - u8 phy_num =3D parent_dev->ex_dev.num_phys; - struct ex_phy *phy; - for (phy_id =3D 0; phy_id < phy_num; phy_id++) { - phy =3D &parent_dev->ex_dev.ex_phy[phy_id]; - if (SAS_ADDR(phy->attached_sas_addr) =3D=3D - SAS_ADDR(dev->sas_addr)) { - mvi_device->attached_phy =3D phy_id; - break; - } - } =20 - if (phy_id =3D=3D phy_num) { + phy_id =3D sas_find_attached_phy_id(&parent_dev->ex_dev, dev); + if (phy_id < 0) { mv_printk("Error: no attached dev:%016llx" "at ex:%016llx.\n", SAS_ADDR(dev->sas_addr), SAS_ADDR(parent_dev->sas_addr)); - res =3D -1; + res =3D phy_id; + } else { + mvi_device->attached_phy =3D phy_id; } } =20 --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 E7D55C32771 for ; Wed, 28 Sep 2022 06:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233159AbiI1Gjx (ORCPT ); Wed, 28 Sep 2022 02:39:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233049AbiI1Gji (ORCPT ); Wed, 28 Sep 2022 02:39:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D80FE1F; Tue, 27 Sep 2022 23:39:32 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mcmvd0CY2zWgyd; Wed, 28 Sep 2022 14:35:25 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:30 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan , Jack Wang Subject: [PATCH v6 5/8] scsi: hisi_sas: use sas_find_attathed_phy_id() instead of open coded Date: Wed, 28 Sep 2022 15:01:27 +0800 Message-ID: <20220928070130.3657183-6-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The attached phy finding is open coded. Now we can replace it with sas_find_attached_phy_id(). To keep consistent, the return value of hisi_sas_dev_found() is also changed to -ENODEV after calling sas_find_attathed_phy_id() failed. Signed-off-by: Jason Yan Reviewed-by: Jack Wang Reviewed-by: Damien Le Moal Acked-by: John Garry Reviewed-by: Johannes Thumshirn --- drivers/scsi/hisi_sas/hisi_sas_main.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/= hisi_sas_main.c index 33af5b8dede2..13415cfd3575 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -792,22 +792,14 @@ static int hisi_sas_dev_found(struct domain_device *d= evice) =20 if (parent_dev && dev_is_expander(parent_dev->dev_type)) { int phy_no; - u8 phy_num =3D parent_dev->ex_dev.num_phys; - struct ex_phy *phy; =20 - for (phy_no =3D 0; phy_no < phy_num; phy_no++) { - phy =3D &parent_dev->ex_dev.ex_phy[phy_no]; - if (SAS_ADDR(phy->attached_sas_addr) =3D=3D - SAS_ADDR(device->sas_addr)) - break; - } - - if (phy_no =3D=3D phy_num) { + phy_no =3D sas_find_attached_phy_id(&parent_dev->ex_dev, device); + if (phy_no < 0) { dev_info(dev, "dev found: no attached " "dev:%016llx at ex:%016llx\n", SAS_ADDR(device->sas_addr), SAS_ADDR(parent_dev->sas_addr)); - rc =3D -EINVAL; + rc =3D phy_no; goto err_out; } } --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 20BEDC04A95 for ; Wed, 28 Sep 2022 06:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233195AbiI1GkH (ORCPT ); Wed, 28 Sep 2022 02:40:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232750AbiI1Gjk (ORCPT ); Wed, 28 Sep 2022 02:39:40 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DF5526F3; Tue, 27 Sep 2022 23:39:33 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mcmwz2pD4zpVKG; Wed, 28 Sep 2022 14:36:35 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:30 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan Subject: [PATCH v6 6/8] scsi: libsas: use sas_phy_match_dev_addr() instead of open coded Date: Wed, 28 Sep 2022 15:01:28 +0800 Message-ID: <20220928070130.3657183-7-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The sas address comparison of domain device and expander phy is open coded. Now we can replace it with sas_phy_match_dev_addr(). Signed-off-by: Jason Yan Reviewed-by: Damien Le Moal Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_expander.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_e= xpander.c index 2caf366b9f74..9393ab83358c 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -738,9 +738,7 @@ static void sas_ex_get_linkrate(struct domain_device *p= arent, phy->phy_state =3D=3D PHY_NOT_PRESENT) continue; =20 - if (SAS_ADDR(phy->attached_sas_addr) =3D=3D - SAS_ADDR(child->sas_addr)) { - + if (sas_phy_match_dev_addr(child, phy)) { child->min_linkrate =3D min(parent->min_linkrate, phy->linkrate); child->max_linkrate =3D max(parent->max_linkrate, @@ -1012,8 +1010,7 @@ static int sas_ex_discover_dev(struct domain_device *= dev, int phy_id) sas_add_parent_port(dev, phy_id); return 0; } - if (dev->parent && (SAS_ADDR(ex_phy->attached_sas_addr) =3D=3D - SAS_ADDR(dev->parent->sas_addr))) { + if (dev->parent && sas_phy_match_dev_addr(dev->parent, ex_phy)) { sas_add_parent_port(dev, phy_id); if (ex_phy->routing_attr =3D=3D TABLE_ROUTING) sas_configure_phy(dev, phy_id, dev->port->sas_addr, 1); @@ -1312,7 +1309,7 @@ static int sas_check_parent_topology(struct domain_de= vice *child) parent_phy->phy_state =3D=3D PHY_NOT_PRESENT) continue; =20 - if (SAS_ADDR(parent_phy->attached_sas_addr) !=3D SAS_ADDR(child->sas_add= r)) + if (!sas_phy_match_dev_addr(child, parent_phy)) continue; =20 child_phy =3D &child_ex->ex_phy[parent_phy->attached_phy_id]; @@ -1522,8 +1519,7 @@ static int sas_configure_parent(struct domain_device = *parent, struct ex_phy *phy =3D &ex_parent->ex_phy[i]; =20 if ((phy->routing_attr =3D=3D TABLE_ROUTING) && - (SAS_ADDR(phy->attached_sas_addr) =3D=3D - SAS_ADDR(child->sas_addr))) { + sas_phy_match_dev_addr(child, phy)) { res =3D sas_configure_phy(parent, i, sas_addr, include); if (res) return res; @@ -1858,8 +1854,7 @@ static void sas_unregister_devs_sas_addr(struct domai= n_device *parent, if (last) { list_for_each_entry_safe(child, n, &ex_dev->children, siblings) { - if (SAS_ADDR(child->sas_addr) =3D=3D - SAS_ADDR(phy->attached_sas_addr)) { + if (sas_phy_match_dev_addr(child, phy)) { set_bit(SAS_DEV_GONE, &child->state); if (dev_is_expander(child->dev_type)) sas_unregister_ex_tree(parent->port, child); @@ -1941,8 +1936,7 @@ static int sas_discover_new(struct domain_device *dev= , int phy_id) if (res) return res; list_for_each_entry(child, &dev->ex_dev.children, siblings) { - if (SAS_ADDR(child->sas_addr) =3D=3D - SAS_ADDR(ex_phy->attached_sas_addr)) { + if (sas_phy_match_dev_addr(child, ex_phy)) { if (dev_is_expander(child->dev_type)) res =3D sas_discover_bfs_by_root(child); break; --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 A3010C32771 for ; Wed, 28 Sep 2022 06:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233178AbiI1GkD (ORCPT ); Wed, 28 Sep 2022 02:40:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233051AbiI1Gjk (ORCPT ); Wed, 28 Sep 2022 02:39:40 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1A06558C; Tue, 27 Sep 2022 23:39:33 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Mcmxl1dkWzHqKr; Wed, 28 Sep 2022 14:37:15 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:31 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan Subject: [PATCH v6 7/8] scsi: libsas: use sas_phy_addr_match() instead of open coded Date: Wed, 28 Sep 2022 15:01:29 +0800 Message-ID: <20220928070130.3657183-8-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The sas address comparison of expander phys is open coded. Now we can replace it with sas_phy_addr_match(). Signed-off-by: Jason Yan Reviewed-by: Damien Le Moal Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_expander.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_e= xpander.c index 9393ab83358c..38ed42b14fa0 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -2058,8 +2058,7 @@ static int sas_rediscover(struct domain_device *dev, = const int phy_id) =20 if (i =3D=3D phy_id) continue; - if (SAS_ADDR(phy->attached_sas_addr) =3D=3D - SAS_ADDR(changed_phy->attached_sas_addr)) { + if (sas_phy_addr_match(phy, changed_phy)) { last =3D false; break; } --=20 2.31.1 From nobody Mon Apr 6 11:53:03 2026 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 D8B1CC04A95 for ; Wed, 28 Sep 2022 06:40:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233212AbiI1GkL (ORCPT ); Wed, 28 Sep 2022 02:40:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233066AbiI1Gjk (ORCPT ); Wed, 28 Sep 2022 02:39:40 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77E6C60C7; Tue, 27 Sep 2022 23:39:34 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Mcmxl637GzHqMl; Wed, 28 Sep 2022 14:37:15 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 28 Sep 2022 14:39:32 +0800 From: Jason Yan To: , CC: , , , , , , , , Jason Yan Subject: [PATCH v6 8/8] scsi: libsas: use sas_phy_match_port_addr() instead of open coded Date: Wed, 28 Sep 2022 15:01:30 +0800 Message-ID: <20220928070130.3657183-9-yanaijie@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220928070130.3657183-1-yanaijie@huawei.com> References: <20220928070130.3657183-1-yanaijie@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The sas address comparison of asd_sas_port and expander phy is open coded. Now we can replace it with sas_phy_match_port_addr(). Signed-off-by: Jason Yan Reviewed-by: Damien Le Moal Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_expander.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_e= xpander.c index 38ed42b14fa0..b358a1cd9a68 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1005,8 +1005,7 @@ static int sas_ex_discover_dev(struct domain_device *= dev, int phy_id) } =20 /* Parent and domain coherency */ - if (!dev->parent && (SAS_ADDR(ex_phy->attached_sas_addr) =3D=3D - SAS_ADDR(dev->port->sas_addr))) { + if (!dev->parent && sas_phy_match_port_addr(dev->port, ex_phy)) { sas_add_parent_port(dev, phy_id); return 0; } --=20 2.31.1