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 6279DC07E9D for ; Tue, 27 Sep 2022 02:35:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229689AbiI0Cfc (ORCPT ); Mon, 26 Sep 2022 22:35:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229477AbiI0Cfa (ORCPT ); Mon, 26 Sep 2022 22:35:30 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 997AF25D4; Mon, 26 Sep 2022 19:35:28 -0700 (PDT) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Mc3Wh2RmLzHtfM; Tue, 27 Sep 2022 10:30:40 +0800 (CST) Received: from [10.174.179.14] (10.174.179.14) 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; Tue, 27 Sep 2022 10:35:26 +0800 Subject: Re: [PATCH v3 6/8] scsi: libsas: use sas_phy_match_dev_addr() instead of open coded To: Damien Le Moal , , CC: , , , , , , References: <20220927022941.4029476-1-yanaijie@huawei.com> <20220927022941.4029476-7-yanaijie@huawei.com> <585db20d-8530-d605-ebf2-e8d669e693a8@opensource.wdc.com> From: Jason Yan Message-ID: <6f7983bf-cc68-0477-257c-debdcf664165@huawei.com> Date: Tue, 27 Sep 2022 10:35:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <585db20d-8530-d605-ebf2-e8d669e693a8@opensource.wdc.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.14] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) 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 On 2022/9/27 10:30, Damien Le Moal wrote: > On 9/27/22 11:29, Jason Yan wrote: >> The sas address comparation 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 >> --- >> 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_expander.c >> index df5a64ad902f..b2b5103c3e76 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 *parent, >> phy->phy_state == PHY_NOT_PRESENT) >> continue; >> >> - if (SAS_ADDR(phy->attached_sas_addr) == >> - SAS_ADDR(child->sas_addr)) { >> - >> + if (sas_phy_match_dev_addr(child, phy)) { >> child->min_linkrate = min(parent->min_linkrate, >> phy->linkrate); >> child->max_linkrate = 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) == >> - 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 == 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_device *child) >> parent_phy->phy_state == PHY_NOT_PRESENT) >> continue; >> >> - if (SAS_ADDR(parent_phy->attached_sas_addr) != SAS_ADDR(child->sas_addr)) >> + if (sas_phy_match_dev_addr(child, parent_phy)) > > This changes the test. This should be: > > if (!sas_phy_match_dev_addr(child, parent_phy)) > > No ? Oh yes, my mistake. Thank you so much to point that out. Will fix. Thanks, Jason > >> continue; >> >> child_phy = &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 = &ex_parent->ex_phy[i]; >> >> if ((phy->routing_attr == TABLE_ROUTING) && >> - (SAS_ADDR(phy->attached_sas_addr) == >> - SAS_ADDR(child->sas_addr))) { >> + sas_phy_match_dev_addr(child, phy)) { >> res = sas_configure_phy(parent, i, sas_addr, include); >> if (res) >> return res; >> @@ -1858,8 +1854,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent, >> if (last) { >> list_for_each_entry_safe(child, n, >> &ex_dev->children, siblings) { >> - if (SAS_ADDR(child->sas_addr) == >> - 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) == >> - SAS_ADDR(ex_phy->attached_sas_addr)) { >> + if (sas_phy_match_dev_addr(child, ex_phy)) { >> if (dev_is_expander(child->dev_type)) >> res = sas_discover_bfs_by_root(child); >> break; >