From patchwork Fri May 5 02:57:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yangxingui X-Patchwork-Id: 90282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp108687vqo; Thu, 4 May 2023 20:16:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ77xMdLQJRa0JL4jAQo8ZAHFQOOhzNYqjjSuZOPjuJrN8mN/LVVDWdBIS9p+VbSDfQLRl6Z X-Received: by 2002:a05:6a20:a398:b0:f2:7dd:2753 with SMTP id w24-20020a056a20a39800b000f207dd2753mr3904747pzk.33.1683256604352; Thu, 04 May 2023 20:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683256604; cv=none; d=google.com; s=arc-20160816; b=BIkPzjypSAhAI7Isq+UTKjAH+RTNOlrtdaPfZnnmMuknT+PS6a83vqY7fy+2Mx85pR QcTnIi2Yhq5QqbIjwlWB9rX69rggWCz6f5Ve2m4Se/7IrZfxwJ2ZObFsS4PhKCoGNOwe tcnrxMoWSJZdWvvTjSg7+jFsJwo+ZOjul/0fCzM8agZ+QISFaXjykp1BkpwqdJbilNgU 9ChX86mU9JCb+a1qvPmHRu0Rvxjqqjy9Uv3oazMzNchAwiIbZGuziviHT4O+MH3ZdMKh 5u7J+NRwkIl8Lgbl475TUdhbyAuBkO/5c7WEz8Jacidelj7LMX4HiRM/W1BY/u5vObQv LsDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=lEQNvM9JRdf6YQjeYBJIkMM8JoxCqUq6rmInYvTE3vo=; b=yGghhqAVSCrd8cym3heSHCpwwf8lzUuNZtJ/p2HMhmhm+/n6R8iCJFE4sQ1Ng2hUpk 62wyARSb7AWC/1GWEQ/u2d0iXv1zpRaieLEIg0FQeE94pI4BDtiWauu/I2gsOvlFryr5 XkD7IC4ZyA5oQxA2dbaz98WNbmjKLYRX6iZwRHedCjSkMIv9NrkH9uRVhRQ/jb/XG3/j uhFHUzdp7fC56EJKUMrKA3sHIfTKvkPpcm+GLHBJaLjeTi+EiBmEgY02sVqz1a2zbN7V 029qTSX/VMg+u5cHOpoKEDxMpxvaBUBpSMTdJ/u9UPoM+baOY/PdzPPgJmaBdluoihxP MrKA== 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=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j26-20020a637a5a000000b0050309caf60esi894730pgn.750.2023.05.04.20.16.27; Thu, 04 May 2023 20:16:44 -0700 (PDT) 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=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229939AbjEEDEn (ORCPT + 99 others); Thu, 4 May 2023 23:04:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229768AbjEEDEV (ORCPT ); Thu, 4 May 2023 23:04:21 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BEBB11B7C; Thu, 4 May 2023 20:04:20 -0700 (PDT) Received: from dggpemm500012.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QCFmD5JbfzpV4b; Fri, 5 May 2023 11:00:12 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by dggpemm500012.china.huawei.com (7.185.36.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 5 May 2023 11:04:17 +0800 From: Xingui Yang To: , , , CC: , , , , , Subject: [PATCH v2] ata: libata-scsi: Fix get identity data failed Date: Fri, 5 May 2023 02:57:12 +0000 Message-ID: <20230505025712.19438-1-yangxingui@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.50.163.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500012.china.huawei.com (7.185.36.89) 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,T_SCC_BODY_TEXT_LINE 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?1764970410188155829?= X-GMAIL-MSGID: =?utf-8?q?1765022476965978813?= The function ata_get_identity() uses the helper ata_scsi_find_dev() to get the ata_device structure of a scsi device. However, when the ata device is managed by libsas, ata_scsi_find_dev() returns NULL, turning ata_get_identity() into a nop and always returns -ENOMSG. Fix this by checking whether ATA_FLAG_SAS_HOST is set for ap->flags in ata_scsi_find_dev(), as the flag is only used in libsas. If ATA_FLAG_SAS_HOST is set, use sas_to_ata_dev() to find associated ATA device. Signed-off-by: Xingui Yang --- Changes to v1 - Let ata_scsi_find_dev() return the correct value and don't keep replacing calls to ata_scsi_find_dev(). drivers/ata/libata-scsi.c | 12 ++++++++++-- drivers/ata/libata.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 7bb12deab70c..aa580ea341fa 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -2745,10 +2746,17 @@ static struct ata_device *__ata_scsi_find_dev(struct ata_port *ap, * Associated ATA device, or %NULL if not found. */ struct ata_device * -ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) +ata_scsi_find_dev(struct ata_port *ap, struct scsi_device *scsidev) { - struct ata_device *dev = __ata_scsi_find_dev(ap, scsidev); + struct ata_device *dev; + + if (ap->flags & ATA_FLAG_SAS_HOST) { + struct domain_device *ddev = sdev_to_domain_dev(scsidev); + + return sas_to_ata_dev(ddev); + } + dev = __ata_scsi_find_dev(ap, scsidev); if (unlikely(!dev || !ata_dev_enabled(dev))) return NULL; diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 926d0d33cd29..6d66f46da064 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -109,7 +109,7 @@ static inline void ata_acpi_bind_dev(struct ata_device *dev) {} /* libata-scsi.c */ extern struct ata_device *ata_scsi_find_dev(struct ata_port *ap, - const struct scsi_device *scsidev); + struct scsi_device *scsidev); extern int ata_scsi_add_hosts(struct ata_host *host, const struct scsi_host_template *sht); extern void ata_scsi_scan_host(struct ata_port *ap, int sync);