From patchwork Wed Mar 26 15:59:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030246 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 224DE18787A; Wed, 26 Mar 2025 16:01:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004906; cv=none; b=R4imIm9ldtP/7OGAyqsNHy/RsoqRf68Nd9hWZ0wcsruunhzx+HqxA0C+dV0bG+Gxr/8arFlsEtetUgubffCsRB/T4zYclBuTvfTbvXXH9nFcq3E3B4hKolFmL+12tnPM5kH+YBqVd7GnuKyOuvE2RvN26BlQ32GNGv3EjKMCrco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004906; c=relaxed/simple; bh=bdWjwa5u3HTrtNyZty3mgIxOEecazwdacNFDIQUoG5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DBWlFsNZG+Z+gKP0TAKrjFSJ634YO7LCIjQd3ss3hXClWJ3cNcS6TieZ5zPz8cEEZrpMmWx0273cqC5Mepogn4TVu5Pv4yqvPV3g/K2h2fTAimSIonuf9IevJQd37GIghuR7riDTTQFcgwXwFicLRDez6Nb0HFcD33diYeNNphU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=NNtziHu3; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="NNtziHu3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004905; x=1774540905; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bdWjwa5u3HTrtNyZty3mgIxOEecazwdacNFDIQUoG5s=; b=NNtziHu32yEdPFBLxfNPDyImvk/O+R/LvmlX4yV34OYUI7HsFYIM/pXc jlkNU+PuCVS5by25cEv8LM1YSG+u69m0zSj5VD1+rs1aDJe6AM0q9Tsgf OwOaU3p3MQhKXX25G3ZTt7QbbZR3k0K/vAwz1+vRAMf3JYNJ/C7AjxfYX j5SLEFUxHDKoFHYV5rqkpzySY+4JY4OkHcsvxUmwjXG93bseXEZYZxp8G IywPQbWijTPLjDkUBqGX32Yn+RHf8KYaxutURNExYlrlr0LfcugUW7A+y EJh8ds6RubmgJZZvhspttjZUPyKCOm4z5Osw/rcMg5TPAPGIvHT3g9F9S Q==; X-CSE-ConnectionGUID: 7/A1/lYtQC6/4bdZ8OhehQ== X-CSE-MsgGUID: GLW28MaETSG7uXGoX+uORA== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823868" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823868" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:44 -0700 X-CSE-ConnectionGUID: mzYASLVeRbm0/5jO0F4KLQ== X-CSE-MsgGUID: hIBASr0pQeymAsf7lCSIiQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928558" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:42 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , stable@vger.kernel.org, Randy Wright , Ahsan Atta , Andy Shevchenko Subject: [PATCH 1/8] crypto: qat - add shutdown handler to qat_4xxx Date: Wed, 26 Mar 2025 15:59:46 +0000 Message-ID: <20250326160116.102699-3-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland During a warm reset via kexec, the system bypasses the driver removal sequence, meaning that the remove() callback is not invoked. If a QAT device is not shutdown properly, the device driver will fail to load in a newly rebooted kernel. This might result in output like the following after the kexec reboot: 4xxx 0000:01:00.0: Failed to power up the device 4xxx 0000:01:00.0: Failed to initialize device 4xxx 0000:01:00.0: Resetting device qat_dev0 4xxx 0000:01:00.0: probe with driver 4xxx failed with error -14 Implement the shutdown() handler that hooks into the reboot notifier list. This brings down the QAT device and ensures it is shut down properly. Cc: Fixes: 8c8268166e83 ("crypto: qat - add qat_4xxx driver") Link: https://lore.kernel.org/all/Z-DGQrhRj9niR9iZ@gondor.apana.org.au/ Reported-by: Randy Wright Closes: https://issues.redhat.com/browse/RHEL-84366 Reviewed-by: Ahsan Atta Reviewed-by: Andy Shevchenko Signed-off-by: Giovanni Cabiddu --- drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c index 5537a9991e4e..1ac415ef3c31 100644 --- a/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_4xxx/adf_drv.c @@ -188,11 +188,19 @@ static void adf_remove(struct pci_dev *pdev) adf_cleanup_accel(accel_dev); } +static void adf_shutdown(struct pci_dev *pdev) +{ + struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); + + adf_dev_down(accel_dev); +} + static struct pci_driver adf_driver = { .id_table = adf_pci_tbl, .name = ADF_4XXX_DEVICE_NAME, .probe = adf_probe, .remove = adf_remove, + .shutdown = adf_shutdown, .sriov_configure = adf_sriov_configure, .err_handler = &adf_err_handler, }; From patchwork Wed Mar 26 15:59:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030247 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 874651F463C; Wed, 26 Mar 2025 16:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004908; cv=none; b=DBVlA4VbDtQfe5oLEAiogwnyENbvIm5HqTkLPqymmXBFhp3IW4z6R5B7PQts1TCbMXA2FbNaM5HH8RM8nLvNijpHR8wUiC5jQOPX9iIjR5LkcPJhklWLQU5K26N4bKidnhVR3N4xuOmhfrvDbx3wACm0k0bvIS3A2THscF/mExk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004908; c=relaxed/simple; bh=ae2T/3dzG5CLlJUyV0wbM2VVjM+75FqgogkpMameZMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KYoz3oyjkjGhBuW7GYeyisNkCPjQjyuHFtFyTC/BTNzfPy1RbZqriLAIrkYVaCmTsjXvRQVekRO35yGF+1aiyS6N2upL7Q/eQsK5XrXTAIAGmCkhbOsKW0ejphH5UpL/Xi0O7aw4PwB+6WgJsI3a1Dhus4RFrvEHDd3Fsxbi4+E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=IKsYc/G9; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="IKsYc/G9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004907; x=1774540907; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ae2T/3dzG5CLlJUyV0wbM2VVjM+75FqgogkpMameZMM=; b=IKsYc/G9VKw8YBQFO9hTVokDLVYUuHeFx7T19bvs3vUKoPgKTtGEr1Kx ICMZo8h893PT6VLYAfHTdt5u/s01FaqGU6IKmd5TglyxabKoYtah/8m+X o0sDfX2gsoJEJjsgnXYRAxh29Hp/lkNTDGbAjmHGFwyF/Dnlph69KpUBS /kQVv3MNXW7JqrciQjgpjAWfhcRYgMz7Y18eu9WFaEfqYkRyPKRdSXYga CJJSWDs28rUHLJOr5rql7BLC+PepufS4qri7/r5e87TBB7d8BpVpzcXrO qCjC4SP5SMGX6T7M2b0eZ9df3VuUVrpt/XFdpZIH72D0HlB4PqnC3PrI/ Q==; X-CSE-ConnectionGUID: DtAVP+KhSFmrFE90nT+8fA== X-CSE-MsgGUID: FnmF8J11T5mWh/hzqeY74Q== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823876" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823876" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:46 -0700 X-CSE-ConnectionGUID: BhVnVSUNSryP1/Yr8AM90g== X-CSE-MsgGUID: n9hobIxQTTiRTsnaHwwQsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928567" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:44 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , stable@vger.kernel.org, Ahsan Atta , Andy Shevchenko Subject: [PATCH 2/8] crypto: qat - add shutdown handler to qat_420xx Date: Wed, 26 Mar 2025 15:59:47 +0000 Message-ID: <20250326160116.102699-4-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland During a warm reset via kexec, the system bypasses the driver removal sequence, meaning that the remove() callback is not invoked. If a QAT device is not shutdown properly, the device driver will fail to load in a newly rebooted kernel. This might result in output like the following after the kexec reboot: 420xx 0000:01:00.0: Failed to power up the device 420xx 0000:01:00.0: Failed to initialize device 420xx 0000:01:00.0: Resetting device qat_dev0 420xx 0000:01:00.0: probe with driver 420xx failed with error -14 Implement the shutdown() handler that hooks into the reboot notifier list. This brings down the QAT device and ensures it is shut down properly. Cc: Fixes: fcf60f4bcf54 ("crypto: qat - add support for 420xx devices") Reviewed-by: Ahsan Atta Reviewed-by: Andy Shevchenko Signed-off-by: Giovanni Cabiddu --- drivers/crypto/intel/qat/qat_420xx/adf_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c index 8084aa0f7f41..b4731f02deb8 100644 --- a/drivers/crypto/intel/qat/qat_420xx/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_420xx/adf_drv.c @@ -186,11 +186,19 @@ static void adf_remove(struct pci_dev *pdev) adf_cleanup_accel(accel_dev); } +static void adf_shutdown(struct pci_dev *pdev) +{ + struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); + + adf_dev_down(accel_dev); +} + static struct pci_driver adf_driver = { .id_table = adf_pci_tbl, .name = ADF_420XX_DEVICE_NAME, .probe = adf_probe, .remove = adf_remove, + .shutdown = adf_shutdown, .sriov_configure = adf_sriov_configure, .err_handler = &adf_err_handler, }; From patchwork Wed Mar 26 15:59:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030248 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32E291F5402 for ; Wed, 26 Mar 2025 16:01:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004909; cv=none; b=uV5kv3LKHi5zPMwrHlYNLZXntQNWJefsOCGL/NxyErKU1fA9iV4z5eFiayCpUnTPpoLJ66F9Tm3qDNod23pPo9nsACGm68SGMjuS2h/QqnxJrBtIU6MXSKwqpVPfRGIiNAbWkQNm4vsMUNAJJWV3wdIsI061gGalJ+XDoQaWI0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004909; c=relaxed/simple; bh=0+b/cIBTDXTFDRK35uVzbq6vrAkuaVyshKTCzsyGe0A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XnLb+tPpdc/pMl0JlKJfVeis77Rihv3BntFif+OrV7fl5dTO1PuXenPbnqRrQ2mwudyVQ+FvohhUS425esIoy/7fYpzhmzml2yMqbjrJEn+x/ajB1u35HeCfgS8VSlz0W054UJwqr4ooGtfX08obPrpgQ7SA9PceqbIujSoKAo0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=U5h+RP8Y; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="U5h+RP8Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004908; x=1774540908; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0+b/cIBTDXTFDRK35uVzbq6vrAkuaVyshKTCzsyGe0A=; b=U5h+RP8YYaZ68uP3wKomVETMXjLDTBL7W93kTLOGr/AxtbUASjHtKSyx SndrDBgAmbQrGoPh3oOuhUE5hpB4PDAyoPx+qlNctJUGC1FLj8v8RmXnu nauTMn8Tmg5v+sq63tvIe7A2gr5x3cukegnb7396yxGgop60RTy29p1UG W/CJ9/H3HhrTDRa4P8D0snuAbCicwn3pBOn35B+YLcEzPIvmWfrOMCgIg fKvycN9lhRE5iETDU5l7m4Rpq2ocuC94t/NQLBdzE2tEL3ZV2APY5HFML u3/fS/P6pswIA65RpdRncs4BSF/3IQImsQIGu4Z+FX4yM1iEi0kulJ+Ml A==; X-CSE-ConnectionGUID: PFwI3VPGQ3e93drFa3XpfQ== X-CSE-MsgGUID: 1bp4EPJuR6WMGaneBU3PRw== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823886" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823886" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:48 -0700 X-CSE-ConnectionGUID: DUBc0tt8SiywPlrhXe4RTw== X-CSE-MsgGUID: 6SCksalBSumUNI/TKNdTRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928572" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:46 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , Andy Shevchenko Subject: [PATCH 3/8] crypto: qat - remove redundant prototypes in qat_dh895xcc Date: Wed, 26 Mar 2025 15:59:48 +0000 Message-ID: <20250326160116.102699-5-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland Move the definition of the adf_driver structure and remove the redundant prototypes for the functions adf_probe() and adf_remove() in the qat_dh895xxcc driver. Also move the pci_device_id table close to where it is used and drop the inner comma as it is not required. This does not introduce any functional change. Signed-off-by: Giovanni Cabiddu Reviewed-by: Andy Shevchenko --- .../crypto/intel/qat/qat_dh895xcc/adf_drv.c | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c index 07e9d7e52861..730147404ceb 100644 --- a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c @@ -19,24 +19,6 @@ #include #include "adf_dh895xcc_hw_data.h" -static const struct pci_device_id adf_pci_tbl[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_DH895XCC), }, - { } -}; -MODULE_DEVICE_TABLE(pci, adf_pci_tbl); - -static int adf_probe(struct pci_dev *dev, const struct pci_device_id *ent); -static void adf_remove(struct pci_dev *dev); - -static struct pci_driver adf_driver = { - .id_table = adf_pci_tbl, - .name = ADF_DH895XCC_DEVICE_NAME, - .probe = adf_probe, - .remove = adf_remove, - .sriov_configure = adf_sriov_configure, - .err_handler = &adf_err_handler, -}; - static void adf_cleanup_pci_dev(struct adf_accel_dev *accel_dev) { pci_release_regions(accel_dev->accel_pci_dev.pci_dev); @@ -227,6 +209,21 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static const struct pci_device_id adf_pci_tbl[] = { + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_DH895XCC) }, + { } +}; +MODULE_DEVICE_TABLE(pci, adf_pci_tbl); + +static struct pci_driver adf_driver = { + .id_table = adf_pci_tbl, + .name = ADF_DH895XCC_DEVICE_NAME, + .probe = adf_probe, + .remove = adf_remove, + .sriov_configure = adf_sriov_configure, + .err_handler = &adf_err_handler, +}; + static int __init adfdrv_init(void) { request_module("intel_qat"); From patchwork Wed Mar 26 15:59:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030249 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 585151F5402; Wed, 26 Mar 2025 16:01:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004911; cv=none; b=OXcCj+qiziOBCM22Lxx9AySILui0lA+azS3UiesmxZixfyJzodQjnMpcsSvWOljhHyRGCmwc2J/l0VcbEbJrsY/E5l4CWh3yyFVdDTFsVZ4W+J/SgTCrpRqBBYaXHc6SrEpdd0AhKcbDfmqqR9uWTsQaV44MYnZcukRpbTBVVks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004911; c=relaxed/simple; bh=W2HVQ8BEyML65PSTZrKfO0xXPcysyzh4Hk5b82bfqRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VHhrBt/WVo2AX+vkmLM+9GoBcUYE8MFc2iSKmaGwfX7u8C17S84qS+MtkjLcEYNDqAXfldYZwN6MA6yjtoVCc6rwy9WwBc5L1z8D8+JIQqHqH8iOXgZi0w6xVDR/vqRNuBhmzSmsn2N/qn4dR8z3SvH9FfnRak6WOP54E1zUVyI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=g4xMvjbH; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="g4xMvjbH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004910; x=1774540910; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W2HVQ8BEyML65PSTZrKfO0xXPcysyzh4Hk5b82bfqRY=; b=g4xMvjbHbzJbZ7KZKa2Km6dlcmvXfHRA1168ChE0Tkg+R4Tp0hYOD2VO WOBfxJaL15QXrHfnao3XRyFXG+WFlWTJv42NB2Fbq3+Dd6nWTN5ty7oTi VS/Y4UZ3+E+wAiTfyXO4XYQMd96D0ji7MahSBdxcaN+Oz27X3m374zNpR zU7yNVnobBiha/6syf4pAs+FQzRLvXoeLmxJ+7hyv7NjOnlITfeb433c8 5m4VPygS0awwZcP9cC5WsZaRyVXL3Q7oFFUXBZ8bMO4xDM1bVnlzq2+/e Ih/AF1/GtWB++sS50aRrI4SxjCAWEg0nToC/oOnET8hKH3OfcWWUlrD32 A==; X-CSE-ConnectionGUID: jhaDyXO2S1+jUkfZ2FgC3A== X-CSE-MsgGUID: vVaveV7xSLqgyYu7cSNMJg== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823893" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823893" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:50 -0700 X-CSE-ConnectionGUID: Qg7S4ycaROizp+tLbZ4LKw== X-CSE-MsgGUID: ZfjPEkCaQfeOVW///m1NZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928576" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:48 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , stable@vger.kernel.org, Ahsan Atta , Andy Shevchenko Subject: [PATCH 4/8] crypto: qat - add shutdown handler to qat_dh895xcc Date: Wed, 26 Mar 2025 15:59:49 +0000 Message-ID: <20250326160116.102699-6-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland During a warm reset via kexec, the system bypasses the driver removal sequence, meaning that the remove() callback is not invoked. If a QAT device is not shutdown properly, the device driver will fail to load in a newly rebooted kernel. This might result in output like the following after the kexec reboot: QAT: AE0 is inactive!! QAT: failed to get device out of reset dh895xcc 0000:3f:00.0: qat_hal_clr_reset error dh895xcc 0000:3f:00.0: Failed to init the AEs dh895xcc 0000:3f:00.0: Failed to initialise Acceleration Engine dh895xcc 0000:3f:00.0: Resetting device qat_dev0 dh895xcc 0000:3f:00.0: probe with driver dh895xcc failed with error -14 Implement the shutdown() handler that hooks into the reboot notifier list. This brings down the QAT device and ensures it is shut down properly. Cc: Fixes: 7afa232e76ce ("crypto: qat - Intel(R) QAT DH895xcc accelerator") Reviewed-by: Ahsan Atta Reviewed-by: Andy Shevchenko Signed-off-by: Giovanni Cabiddu --- drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c index 730147404ceb..b59e0cc49e52 100644 --- a/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c @@ -209,6 +209,13 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static void adf_shutdown(struct pci_dev *pdev) +{ + struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); + + adf_dev_down(accel_dev); +} + static const struct pci_device_id adf_pci_tbl[] = { { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_DH895XCC) }, { } @@ -220,6 +227,7 @@ static struct pci_driver adf_driver = { .name = ADF_DH895XCC_DEVICE_NAME, .probe = adf_probe, .remove = adf_remove, + .shutdown = adf_shutdown, .sriov_configure = adf_sriov_configure, .err_handler = &adf_err_handler, }; From patchwork Wed Mar 26 15:59:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030250 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56CEC1F55FF for ; Wed, 26 Mar 2025 16:01:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004913; cv=none; b=Xpuewlh5v7yHwIXLghAgPErVYO0kFY102U3iUuuo9v7axeGC5dsYghNmCPPaQCt+x9VjCOY/VFVp7KO7Th6kkqfLr9cAuQVGhyreg139bhpPsMGrHScfL2t9Lqi5JJ28yiDNUK0VbqvJagI7e+mcxDrOQ9ka+Q6hYEVHeIyZwRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004913; c=relaxed/simple; bh=44zmwuI8YQm/iXiTLWjgJElktkIiKu8XNi6wl2TdTF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lkTMV4PMi4829dgkIIKMKbbmHVGPH/OATKPCZHOi1vzNZRKw93ZpfB2MCX0ZftH+2O4/IW7npOXOFbwz50He7BguwMBhqGufrFtL6HsjaWpoGMEKFOJk+yukEHAW/KYAVjJalKEa04CgsrZvFFZR+7hvGyCVef31vjHDbUvKI3Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JwNbib7F; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JwNbib7F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004912; x=1774540912; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=44zmwuI8YQm/iXiTLWjgJElktkIiKu8XNi6wl2TdTF0=; b=JwNbib7FNcqZbXjdwbHFIFNZOAoLhlBglEVousz3CuQVXiy6EP7LnlCj QgwzmJmBZ5FurEO1So4k4BWF2FF9gqtD892gZu2QOBK40/Vv6heXeOnOu pRffyPpRLqn7ejI8/2HzwdG6sdp0gJe6KOUBZqzmj8R79XEMDUlU/3/mF ctMjSa2MuaGn5KahoNAme/q6nyS4MYC2lsw+JdPz3tYtKjDA7aivWGrzQ equPfsfCclp2NGpQIg4ZUtHBKw6iBi+GmKAdo0okuYvuF0FgxLKk/TAPG K1+8lKx8eo7v6FtAbhQ2w758cvSjAa8PMZU+0CAhKjwnxie/Rg3EumpI4 Q==; X-CSE-ConnectionGUID: T1OjyjkcSgGv7f7p67ucHg== X-CSE-MsgGUID: 3vcN5TNOS1OrK+CqsU35Sg== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823900" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823900" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:52 -0700 X-CSE-ConnectionGUID: 86s4DZIhQGC1nR0MhjdQ4Q== X-CSE-MsgGUID: oujgEghNRFKqzs5Rn/VrEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928582" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:50 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , Andy Shevchenko Subject: [PATCH 5/8] crypto: qat - remove redundant prototypes in qat_c62x Date: Wed, 26 Mar 2025 15:59:50 +0000 Message-ID: <20250326160116.102699-7-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland Move the definition of the adf_driver structure and remove the redundant prototypes for the functions adf_probe() and adf_remove() in the qat_c62x driver. Also move the pci_device_id table close to where it is used and drop the inner comma as it is not required. This does not introduce any functional change. Signed-off-by: Giovanni Cabiddu Reviewed-by: Andy Shevchenko --- drivers/crypto/intel/qat/qat_c62x/adf_drv.c | 33 ++++++++++----------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c index 8a7bdec358d6..0bac717e88d9 100644 --- a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c @@ -19,24 +19,6 @@ #include #include "adf_c62x_hw_data.h" -static const struct pci_device_id adf_pci_tbl[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X), }, - { } -}; -MODULE_DEVICE_TABLE(pci, adf_pci_tbl); - -static int adf_probe(struct pci_dev *dev, const struct pci_device_id *ent); -static void adf_remove(struct pci_dev *dev); - -static struct pci_driver adf_driver = { - .id_table = adf_pci_tbl, - .name = ADF_C62X_DEVICE_NAME, - .probe = adf_probe, - .remove = adf_remove, - .sriov_configure = adf_sriov_configure, - .err_handler = &adf_err_handler, -}; - static void adf_cleanup_pci_dev(struct adf_accel_dev *accel_dev) { pci_release_regions(accel_dev->accel_pci_dev.pci_dev); @@ -227,6 +209,21 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static const struct pci_device_id adf_pci_tbl[] = { + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X) }, + { } +}; +MODULE_DEVICE_TABLE(pci, adf_pci_tbl); + +static struct pci_driver adf_driver = { + .id_table = adf_pci_tbl, + .name = ADF_C62X_DEVICE_NAME, + .probe = adf_probe, + .remove = adf_remove, + .sriov_configure = adf_sriov_configure, + .err_handler = &adf_err_handler, +}; + static int __init adfdrv_init(void) { request_module("intel_qat"); From patchwork Wed Mar 26 15:59:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030251 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1B641F4E49; Wed, 26 Mar 2025 16:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004915; cv=none; b=r6WFIZGaEblfnMtY3l84W+QrlkqOJKdEiuF7/gSBvYIg0s4a5gupGm2KQQGJg/3KDQY0Thb3KO3/VYDgpjfldaxUoUmqweu8T1n3PkADKfZeKRkX5D9CEq2Fwumbwb/ikLELKPcOFtGGDpg7ZYcMt2Wm9KnOLwi15USQwofYJ4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004915; c=relaxed/simple; bh=Mj/VTbe66eASpSeZ3Hz/jkyeHZMhBS+kttR++8h91Lo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D9gGM6NvcNk67Yv6EfjR78yJ4EJ3uvJW5udSklkjVc3GjFlpor1I9n14udIOcXXTPC3dWC+MZ3npUih7jpIA1/CTNneIR1giQJZy+7kqccOtn+On77fnQJ9zpJeTy+qcrseVg8QuYsx6top9rpjs9awplLM6xSzV4HofZaEvGAY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HXqm6kFa; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HXqm6kFa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004914; x=1774540914; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mj/VTbe66eASpSeZ3Hz/jkyeHZMhBS+kttR++8h91Lo=; b=HXqm6kFab8GoNbEK5XgYgnbS5ZktV5kE7NdCnWPzX2JIuaJSglTWqCPX CfbghuWtt6WK5ZTYvVfpH8Wt4+T7kDBCE3K7JpC64TKEuZiJf11QzI6Xk bUPO14izgGpg0mhyAilzg6xh30nAGNOIVZIpmsUFgI6kc+mdWuzUwMJsG 2KJxKEt+ifyxEHMK/a96Y1TosfKDLA+WVxskviE0mOIIxR9RRmQqofXEs LePjHMzfSP12uyIklJgTmww7Kilmr9wPh9g2mvLbYP0S8nzcogmiLTi9q fHtUn9ate0SicO5WyVt111AEAdLxpXV+68ths0lIQyvB8q4urML3qLueO w==; X-CSE-ConnectionGUID: Zx0fzYMPTKeYPsAGMqmThA== X-CSE-MsgGUID: YqNDcqN8QJ2Mde0J+aHoWw== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823906" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823906" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:53 -0700 X-CSE-ConnectionGUID: 81M9C0C8TuqBMEk2MJvAQA== X-CSE-MsgGUID: bdaozIS7Q2GE7NoqU+M/fw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928591" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:51 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , stable@vger.kernel.org, Ahsan Atta , Andy Shevchenko Subject: [PATCH 6/8] crypto: qat - add shutdown handler to qat_c62x Date: Wed, 26 Mar 2025 15:59:51 +0000 Message-ID: <20250326160116.102699-8-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland During a warm reset via kexec, the system bypasses the driver removal sequence, meaning that the remove() callback is not invoked. If a QAT device is not shutdown properly, the device driver will fail to load in a newly rebooted kernel. This might result in output like the following after the kexec reboot: QAT: AE0 is inactive!! QAT: failed to get device out of reset c6xx 0000:3f:00.0: qat_hal_clr_reset error c6xx 0000:3f:00.0: Failed to init the AEs c6xx 0000:3f:00.0: Failed to initialise Acceleration Engine c6xx 0000:3f:00.0: Resetting device qat_dev0 c6xx 0000:3f:00.0: probe with driver c6xx failed with error -14 Implement the shutdown() handler that hooks into the reboot notifier list. This brings down the QAT device and ensures it is shut down properly. Cc: Fixes: a6dabee6c8ba ("crypto: qat - add support for c62x accel type") Reviewed-by: Ahsan Atta Reviewed-by: Andy Shevchenko Signed-off-by: Giovanni Cabiddu --- drivers/crypto/intel/qat/qat_c62x/adf_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c index 0bac717e88d9..23ccb72b6ea2 100644 --- a/drivers/crypto/intel/qat/qat_c62x/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_c62x/adf_drv.c @@ -209,6 +209,13 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static void adf_shutdown(struct pci_dev *pdev) +{ + struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); + + adf_dev_down(accel_dev); +} + static const struct pci_device_id adf_pci_tbl[] = { { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C62X) }, { } @@ -220,6 +227,7 @@ static struct pci_driver adf_driver = { .name = ADF_C62X_DEVICE_NAME, .probe = adf_probe, .remove = adf_remove, + .shutdown = adf_shutdown, .sriov_configure = adf_sriov_configure, .err_handler = &adf_err_handler, }; From patchwork Wed Mar 26 15:59:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030252 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 534871F4E5F for ; Wed, 26 Mar 2025 16:01:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004916; cv=none; b=hYobjAuF5vMYgZaYxrL+cylC73ePyqr2wj2QH9yYVKJQcq0b0GDyW/eU0t7pP8mIZXHJfDaAKRIXNWIWe+h3JN52U9f7NYHJl7jC/pwWyduK2TZ12jvUcSGq3a3NgIhxnCVPcGI2j+ZfSHoWfb37RzzOtz2EOQYBcfE8Nv4jzAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004916; c=relaxed/simple; bh=eGo7xeBJzyh1fmwqEBuHctInfryYD1Pcr94GRXHnuZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PMVMazy1HRjVkDmG2HWLRNN2f8rQ7KRtcjCxUP6N9VUGSUp59R3wH0FbpMw6PiBESG0wZesHqBMkOdGFBg+VXm1+3wzFEBDuv9nDGYqWGIYfYCNbasWANnA54q2xHZumpxNByXeAB4EC0qflp6Swe0ndD80XSXQGeQXydv094vg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=l8n5pPPI; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="l8n5pPPI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004915; x=1774540915; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eGo7xeBJzyh1fmwqEBuHctInfryYD1Pcr94GRXHnuZY=; b=l8n5pPPIhEbqk4baaWlCie/xho7h02XkALwCnS8XkaKGwqdCgliBUzuE DC+QCMRiQ2s73ltkE2NGRJRyyc41Z1WykNBrx+oJDGMEyc5zbXWagF/UK PoSit2/EKyRONjn1iT10bE/rm0ChVXqgsaNuQWuzDmBJYHp5SWBy+ErAu pVe5N7YlbaIn4LSgKCULsFpp/FTPy8JDlaSsS6gwPS386Bg1G9JWnqwGD v8eSP5bLSTPrQTuzwks+k4x2vCDsaQWhGN+xziKHifY5Xkep3/pJ4d4Qh N2vocdRP2tYmhjrSCKyQcDrvF8V8IBQP4YF8xJe6x1tPHHCPUnbOD2ZKC w==; X-CSE-ConnectionGUID: GPIT45OwQ1GwEOFzkCCINQ== X-CSE-MsgGUID: U/NgVi5LTnyGNcV8zCiXNA== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823920" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823920" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:55 -0700 X-CSE-ConnectionGUID: vRzVSEzGQHW2i5NQyQYLBw== X-CSE-MsgGUID: NI35G9bKSea/BTMQBIiPXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928595" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:53 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , Andy Shevchenko Subject: [PATCH 7/8] crypto: qat - remove redundant prototypes in qat_c3xxx Date: Wed, 26 Mar 2025 15:59:52 +0000 Message-ID: <20250326160116.102699-9-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland Move the definition of the adf_driver structure and remove the redundant prototypes for the functions adf_probe() and adf_remove() in the qat_c3xxx driver. Also move the pci_device_id table close to where it is used and drop the inner comma as it is not required. This does not introduce any functional change. Signed-off-by: Giovanni Cabiddu Reviewed-by: Andy Shevchenko --- drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c | 33 +++++++++----------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c index b825b35ab4bf..260f34d0d541 100644 --- a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c @@ -19,24 +19,6 @@ #include #include "adf_c3xxx_hw_data.h" -static const struct pci_device_id adf_pci_tbl[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C3XXX), }, - { } -}; -MODULE_DEVICE_TABLE(pci, adf_pci_tbl); - -static int adf_probe(struct pci_dev *dev, const struct pci_device_id *ent); -static void adf_remove(struct pci_dev *dev); - -static struct pci_driver adf_driver = { - .id_table = adf_pci_tbl, - .name = ADF_C3XXX_DEVICE_NAME, - .probe = adf_probe, - .remove = adf_remove, - .sriov_configure = adf_sriov_configure, - .err_handler = &adf_err_handler, -}; - static void adf_cleanup_pci_dev(struct adf_accel_dev *accel_dev) { pci_release_regions(accel_dev->accel_pci_dev.pci_dev); @@ -227,6 +209,21 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static const struct pci_device_id adf_pci_tbl[] = { + { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C3XXX) }, + { } +}; +MODULE_DEVICE_TABLE(pci, adf_pci_tbl); + +static struct pci_driver adf_driver = { + .id_table = adf_pci_tbl, + .name = ADF_C3XXX_DEVICE_NAME, + .probe = adf_probe, + .remove = adf_remove, + .sriov_configure = adf_sriov_configure, + .err_handler = &adf_err_handler, +}; + static int __init adfdrv_init(void) { request_module("intel_qat"); From patchwork Wed Mar 26 15:59:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giovanni Cabiddu X-Patchwork-Id: 14030253 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F0681F463C; Wed, 26 Mar 2025 16:01:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004920; cv=none; b=F1nt6gKP4hAx59x7B0yqoUz5NY7ZXXAx11qfcrfCX8lqisg2+1akWNki1f/QKaY8/ohMmFOVVKb8GA3c3TWxIesnC37eLrlG6yjGHQ+gl64Yx/a0qVts0UGCHAd9GzmjtiRQhL0WAy0tUwJfOW6nC3gmrPh2+4Ha0RThdNNRbJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743004920; c=relaxed/simple; bh=QurFjRZCv2GrztKeXNUsyNxUzz0eOgFMneJ6h2Ttw1o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i2FxmLBULqmIX/E6WxWUZXysflkNGDOF9TSxUMC7YFl65KswjN9UKz/Beql2GrEr/jHCFUDvDVXz/dqkl/WlYKams8vBLWkCwzdPuIVpx5dCBBIgcbOjx7UILGqiQVZ/1Ed5I1uWqqmQ3EHr4HJqLAGLnBmsemE4ilIfZ9a5bbs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=QWCerAUb; arc=none smtp.client-ip=192.198.163.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="QWCerAUb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743004919; x=1774540919; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QurFjRZCv2GrztKeXNUsyNxUzz0eOgFMneJ6h2Ttw1o=; b=QWCerAUbsjotbzyTVfsZmhdY6eaGfQLMhY5/Pw2OzMztJnnyyXopMxJT lg/rG4JdwaqJ26tmfx/iJ+Yagbpd/In4d/zgLzZ1NCnpiNib6r5oo5a4N pt8RCyBOQxrhVUm0XeFGOR/0p6oXTmMZs66xGo7ZYLa8DGyUB65K7Xfbx f5U2+BU4fUtTKG8IfkFll9suVju9paOTxR1soL/1rwY4h8V2rwTfX9cj7 4DJLs8LuobbRSbpzBNk0Kg34etgwRoZk66hZm+lk/I+50A/Rz9abqMnIw rvZOm6WXp3Y2EB20xcr7CMl9VfvmR9FGSVn7yhaAW2dgxvQ/E9JNNnQUk g==; X-CSE-ConnectionGUID: geElCuyVT4WoVTNVJt98TQ== X-CSE-MsgGUID: OQ5vPv4hRZaoGP28Bo6VNA== X-IronPort-AV: E=McAfee;i="6700,10204,11385"; a="61823924" X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="61823924" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 09:01:57 -0700 X-CSE-ConnectionGUID: rGJy8HmQTvOp1VQL7mvKSQ== X-CSE-MsgGUID: klKu7p60RfaC4KywTfrC7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,278,1736841600"; d="scan'208";a="129928600" Received: from silpixa00400314.ir.intel.com (HELO silpixa00400314.ger.corp.intel.com) ([10.237.223.204]) by fmviesa004.fm.intel.com with ESMTP; 26 Mar 2025 09:01:55 -0700 From: Giovanni Cabiddu To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org, andriy.shevchenko@intel.com, qat-linux@intel.com, Giovanni Cabiddu , stable@vger.kernel.org, Ahsan Atta , Andy Shevchenko Subject: [PATCH 8/8] crypto: qat - add shutdown handler to qat_c3xxx Date: Wed, 26 Mar 2025 15:59:53 +0000 Message-ID: <20250326160116.102699-10-giovanni.cabiddu@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326160116.102699-2-giovanni.cabiddu@intel.com> References: <20250326160116.102699-2-giovanni.cabiddu@intel.com> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Research and Development Ireland Ltd - Co. Reg. #308263 - Collinstown Industrial Park, Leixlip, County Kildare - Ireland During a warm reset via kexec, the system bypasses the driver removal sequence, meaning that the remove() callback is not invoked. If a QAT device is not shutdown properly, the device driver will fail to load in a newly rebooted kernel. This might result in output like the following after the kexec reboot: QAT: AE0 is inactive!! QAT: failed to get device out of reset c3xxx 0000:3f:00.0: qat_hal_clr_reset error c3xxx 0000:3f:00.0: Failed to init the AEs c3xxx 0000:3f:00.0: Failed to initialise Acceleration Engine c3xxx 0000:3f:00.0: Resetting device qat_dev0 c3xxx 0000:3f:00.0: probe with driver c3xxx failed with error -14 Implement the shutdown() handler that hooks into the reboot notifier list. This brings down the QAT device and ensures it is shut down properly. Cc: Fixes: 890c55f4dc0e ("crypto: qat - add support for c3xxx accel type") Reviewed-by: Ahsan Atta Reviewed-by: Andy Shevchenko Signed-off-by: Giovanni Cabiddu --- drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c index 260f34d0d541..bceb5dd8b148 100644 --- a/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c +++ b/drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c @@ -209,6 +209,13 @@ static void adf_remove(struct pci_dev *pdev) kfree(accel_dev); } +static void adf_shutdown(struct pci_dev *pdev) +{ + struct adf_accel_dev *accel_dev = adf_devmgr_pci_to_accel_dev(pdev); + + adf_dev_down(accel_dev); +} + static const struct pci_device_id adf_pci_tbl[] = { { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_QAT_C3XXX) }, { } @@ -220,6 +227,7 @@ static struct pci_driver adf_driver = { .name = ADF_C3XXX_DEVICE_NAME, .probe = adf_probe, .remove = adf_remove, + .shutdown = adf_shutdown, .sriov_configure = adf_sriov_configure, .err_handler = &adf_err_handler, };