From patchwork Mon Nov 23 17:41:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 330681 Delivered-To: patch@linaro.org Received: by 2002:a92:ae0b:0:0:0:0:0 with SMTP id s11csp2204181ilh; Mon, 23 Nov 2020 09:47:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7K3X7d1avHNdBe/ye+mQAFg/ZcCnzsCvfo5hWMkOLztub+8a5VQ+jDuKA2v1QvxXaaxue X-Received: by 2002:a50:e18c:: with SMTP id k12mr340128edl.58.1606153625612; Mon, 23 Nov 2020 09:47:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606153625; cv=none; d=google.com; s=arc-20160816; b=gIE5N1c0hVnZ0KyXBVSfaAZlyoGYaX1m+U4dZOszK/bmeA1r5T3JCNCAY5814NkW5v H13P9JjzoPe+ziE87TWQkY0frnc7haAFf3y5/phBQRkR24lpFt/njdCOluqhIJOF2che ojE4B8/9KSWnBH8Kh/Rzd9ULngtnUZFG9RArT0rqKHYa6KgVvOiTTtaHXMPYzIE5xs09 l4646kQK07Ge1IHE/Dcdlv2iyY8w5Dm6ulTg5r4LKmvPQcRz2jdTPRV7LvpNDZtMzbhR TAVKCcqUo2gSVolHGw/qg5dxLUBWgLeA48yvzzzeMHDbVB5NggbzWIJ0aaDnq7uRVnnt kZ4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=BpB1lMb1z5WnQR5DkTcmAC6vAWaU4ChGB+ozGkwRhzg=; b=rOu7cOaqyN2x29EVDax+eE0VwaB3e/SIHWRS7zPi2sxGhiX4jErl+avTpWroeRL1ta p8NIaQWiwFPLwEfQ1rOBSjLqRIZWtdLJADmdSlL1Usi7Fnmb7FAWQkpOu6lDCQbd9kz/ DqSoHxRlCKZYNR8QIAo9z5CjLunV6DY5Wr5s2O0L2bAptWBzDHwKdKMVY9+kMpNjERXs jEWpKS0Jqnq4aO3m0KVgollQKqVhUO75PcKaUbqtq6E8b9UOimPrHlwhE0hyNY79POut JPwmqvqGF3GTdtysPm9AjA6ZX6T9/obur9NursBgiqaU/aPIUNdPYHnXYQURQLgqY4AV xs/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y4si7189839edv.83.2020.11.23.09.47.05 for ; Mon, 23 Nov 2020 09:47:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732301AbgKWRp3 (ORCPT ); Mon, 23 Nov 2020 12:45:29 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:8573 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730844AbgKWRp3 (ORCPT ); Mon, 23 Nov 2020 12:45:29 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CfvgK26t3zLtJS; Tue, 24 Nov 2020 01:45:01 +0800 (CST) Received: from localhost.localdomain (10.69.192.58) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.487.0; Tue, 24 Nov 2020 01:45:18 +0800 From: John Garry To: , CC: , , , Xiang Chen , John Garry Subject: [PATCH 2/3] scsi: hisi_sas: Fix up probe error handling for v3 hw Date: Tue, 24 Nov 2020 01:41:35 +0800 Message-ID: <1606153296-60088-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1606153296-60088-1-git-send-email-john.garry@huawei.com> References: <1606153296-60088-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: Xiang Chen Fix some rollbacks in function hisi_sas_v3_probe() and interrupt_init_v3_hw(). Fixes: 8d98416a55eb ("scsi: hisi_sas: Switch v3 hw to MQ") Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) -- 2.26.2 diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index db409f6847bb..f6d0aa3a8c11 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -2409,8 +2409,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) DRV_NAME " phy", hisi_hba); if (rc) { dev_err(dev, "could not request phy interrupt, rc=%d\n", rc); - rc = -ENOENT; - goto free_irq_vectors; + return -ENOENT; } rc = devm_request_irq(dev, pci_irq_vector(pdev, 2), @@ -2418,8 +2417,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) DRV_NAME " channel", hisi_hba); if (rc) { dev_err(dev, "could not request chnl interrupt, rc=%d\n", rc); - rc = -ENOENT; - goto free_irq_vectors; + return -ENOENT; } rc = devm_request_irq(dev, pci_irq_vector(pdev, 11), @@ -2427,8 +2425,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) DRV_NAME " fatal", hisi_hba); if (rc) { dev_err(dev, "could not request fatal interrupt, rc=%d\n", rc); - rc = -ENOENT; - goto free_irq_vectors; + return -ENOENT; } if (hisi_sas_intr_conv) @@ -2449,16 +2446,11 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba) if (rc) { dev_err(dev, "could not request cq%d interrupt, rc=%d\n", i, rc); - rc = -ENOENT; - goto free_irq_vectors; + return -ENOENT; } } return 0; - -free_irq_vectors: - pci_free_irq_vectors(pdev); - return rc; } static int hisi_sas_v3_init(struct hisi_hba *hisi_hba) @@ -3311,11 +3303,11 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) rc = interrupt_preinit_v3_hw(hisi_hba); if (rc) - goto err_out_ha; + goto err_out_debugfs; dev_err(dev, "%d hw queues\n", shost->nr_hw_queues); rc = scsi_add_host(shost, dev); if (rc) - goto err_out_ha; + goto err_out_free_irq_vectors; rc = sas_register_ha(sha); if (rc) @@ -3342,8 +3334,12 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id) err_out_register_ha: scsi_remove_host(shost); -err_out_ha: +err_out_free_irq_vectors: + pci_free_irq_vectors(pdev); +err_out_debugfs: hisi_sas_debugfs_exit(hisi_hba); +err_out_ha: + hisi_sas_free(hisi_hba); scsi_host_put(shost); err_out_regions: pci_release_regions(pdev);