Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2005574pxv; Sat, 10 Jul 2021 23:18:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1ThZ19jqmYVpj+atjvjh5RISVXQG8F/uaQb9i/CKv3aDrU0zq7jRXzZX2UVx/u2Iz9lWA X-Received: by 2002:a17:906:719:: with SMTP id y25mr31588821ejb.82.1625984321337; Sat, 10 Jul 2021 23:18:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625984321; cv=none; d=google.com; s=arc-20160816; b=GMdxMALWJ9c2dw8UERy5XyFuP/vTBm2B4vb24lN+vl8+3vT+yxeVXipid2W8YYTnyb bNaDeEQE934V20g+LT4sEaMN+qrwWTGLsvILPU7iCy02hyCB7fP5XA+412CfSUxCyvjd oy6/1dPRJI7+ZaR4w9HhVfB2UFyrePbsUGR6Q/f2fT2GJjm8xF9912i8E6MvpKcb//kU mPfdgyUZEYVS3dXhGU1K7NSV+9ambY38hrVQPeptUpUTORaVA15cguqkwT3rJGJZ6rd2 OXSp7RObB6YD0k6bR0KH+GEVxBC26460MLU2OD3+OqYw9jLkv0Rgqn0ZqpH0aWwY+hJL hA5g== 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=DPbSTJLN5h/jhsgpzBnpJf7wm3dd2Nx+6sglmRtf+vY=; b=FyM+SzYVGrZICF/droMP8cCjGldWj+/5vYNxMXOs+wkxCJ34+eHHgh/AJLw5e/OIV+ 7SmIWQ1iafLbDcTz8xTjkCZodnE145YHaonccGTxvlF51spy8mHEX3eZ57FZYspQ0dgu YUxyhNyIC2/WI3N+24yljlxs4UGDbaVGB1WzuvtsW0R1PBuQaGKZTf/LsrzrahhUWOY6 8/IIT73ZurSh2CKy4y2ayEVGXXgk03YDkW7TlT6dz6aKpnxrBGm/MjxwXlZsPlFyr7bD 6swUaTvsY6LhnpAOxSbREifmQMNzEG3fQj8BlthtQQJk6z9li/bUsVQEmkoZXjZoLv3S qlmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 mp17si12078304ejc.449.2021.07.10.23.18.18; Sat, 10 Jul 2021 23:18:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231728AbhGKGQV (ORCPT + 99 others); Sun, 11 Jul 2021 02:16:21 -0400 Received: from smtp07.smtpout.orange.fr ([80.12.242.129]:29551 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231444AbhGKGQU (ORCPT ); Sun, 11 Jul 2021 02:16:20 -0400 Received: from localhost.localdomain ([86.243.172.93]) by mwinf5d42 with ME id TiDY2500721Fzsu03iDZm3; Sun, 11 Jul 2021 08:13:33 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sun, 11 Jul 2021 08:13:33 +0200 X-ME-IP: 86.243.172.93 From: Christophe JAILLET To: giovanni.cabiddu@intel.com, herbert@gondor.apana.org.au, davem@davemloft.net, tomaszx.kowalik@intel.com, marco.chiappero@intel.com, andriy.shevchenko@linux.intel.com, fiona.trahe@intel.com, wojciech.ziemba@intel.com, ztong0001@gmail.com, qat-linux@intel.com Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 2/3] crypto: qat - Disable AER if an error occurs in probe functions Date: Sun, 11 Jul 2021 08:13:31 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If an error occurs after a 'adf_enable_aer()' call, it must be undone by a corresponding 'adf_disable_aer()' call, as already done in the remove function. Signed-off-by: Christophe JAILLET --- drivers/crypto/qat/qat_c3xxx/adf_drv.c | 6 ++++-- drivers/crypto/qat/qat_c62x/adf_drv.c | 6 ++++-- drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/qat/qat_c3xxx/adf_drv.c index cc4ed61478a8..aa5078177e5d 100644 --- a/drivers/crypto/qat/qat_c3xxx/adf_drv.c +++ b/drivers/crypto/qat/qat_c3xxx/adf_drv.c @@ -203,12 +203,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_save_state(pdev)) { dev_err(&pdev->dev, "Failed to save pci state\n"); ret = -ENOMEM; - goto out_err_free_reg; + goto out_err_disable_aer; } ret = qat_crypto_dev_config(accel_dev); if (ret) - goto out_err_free_reg; + goto out_err_disable_aer; ret = adf_dev_init(accel_dev); if (ret) @@ -224,6 +224,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adf_dev_stop(accel_dev); out_err_dev_shutdown: adf_dev_shutdown(accel_dev); +out_err_disable_aer: + adf_disable_aer(accel_dev); out_err_free_reg: pci_release_regions(accel_pci_dev->pci_dev); out_err_disable: diff --git a/drivers/crypto/qat/qat_c62x/adf_drv.c b/drivers/crypto/qat/qat_c62x/adf_drv.c index 5e2fc0c1a759..54ab8291be73 100644 --- a/drivers/crypto/qat/qat_c62x/adf_drv.c +++ b/drivers/crypto/qat/qat_c62x/adf_drv.c @@ -203,12 +203,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_save_state(pdev)) { dev_err(&pdev->dev, "Failed to save pci state\n"); ret = -ENOMEM; - goto out_err_free_reg; + goto out_err_disable_aer; } ret = qat_crypto_dev_config(accel_dev); if (ret) - goto out_err_free_reg; + goto out_err_disable_aer; ret = adf_dev_init(accel_dev); if (ret) @@ -224,6 +224,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adf_dev_stop(accel_dev); out_err_dev_shutdown: adf_dev_shutdown(accel_dev); +out_err_disable_aer: + adf_disable_aer(accel_dev); out_err_free_reg: pci_release_regions(accel_pci_dev->pci_dev); out_err_disable: diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c index d0bd18e65104..507663bc5d54 100644 --- a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c +++ b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c @@ -203,12 +203,12 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (pci_save_state(pdev)) { dev_err(&pdev->dev, "Failed to save pci state\n"); ret = -ENOMEM; - goto out_err_free_reg; + goto out_err_disable_aer; } ret = qat_crypto_dev_config(accel_dev); if (ret) - goto out_err_free_reg; + goto out_err_disable_aer; ret = adf_dev_init(accel_dev); if (ret) @@ -224,6 +224,8 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adf_dev_stop(accel_dev); out_err_dev_shutdown: adf_dev_shutdown(accel_dev); +out_err_disable_aer: + adf_disable_aer(accel_dev); out_err_free_reg: pci_release_regions(accel_pci_dev->pci_dev); out_err_disable: -- 2.30.2