forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/drivers/crypto/qat/qat_common/adf_aer.c
....@@ -1,49 +1,5 @@
1
-/*
2
-  This file is provided under a dual BSD/GPLv2 license.  When using or
3
-  redistributing this file, you may do so under either license.
4
-
5
-  GPL LICENSE SUMMARY
6
-  Copyright(c) 2014 Intel Corporation.
7
-  This program is free software; you can redistribute it and/or modify
8
-  it under the terms of version 2 of the GNU General Public License as
9
-  published by the Free Software Foundation.
10
-
11
-  This program is distributed in the hope that it will be useful, but
12
-  WITHOUT ANY WARRANTY; without even the implied warranty of
13
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
-  General Public License for more details.
15
-
16
-  Contact Information:
17
-  qat-linux@intel.com
18
-
19
-  BSD LICENSE
20
-  Copyright(c) 2014 Intel Corporation.
21
-  Redistribution and use in source and binary forms, with or without
22
-  modification, are permitted provided that the following conditions
23
-  are met:
24
-
25
-    * Redistributions of source code must retain the above copyright
26
-      notice, this list of conditions and the following disclaimer.
27
-    * Redistributions in binary form must reproduce the above copyright
28
-      notice, this list of conditions and the following disclaimer in
29
-      the documentation and/or other materials provided with the
30
-      distribution.
31
-    * Neither the name of Intel Corporation nor the names of its
32
-      contributors may be used to endorse or promote products derived
33
-      from this software without specific prior written permission.
34
-
35
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
36
-  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
37
-  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
38
-  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
39
-  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
40
-  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
41
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
42
-  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
43
-  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
44
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
45
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
46
-*/
1
+// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
2
+/* Copyright(c) 2014 - 2020 Intel Corporation */
473 #include <linux/kernel.h>
484 #include <linux/pci.h>
495 #include <linux/aer.h>
....@@ -86,7 +42,7 @@
8642 {
8743 	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);
8844 	struct pci_dev *parent = pdev->bus->self;
89
-	uint16_t bridge_ctl = 0;
45
+	u16 bridge_ctl = 0;
9046 
9147 	if (!parent)
9248 		parent = pdev;
....@@ -198,7 +154,6 @@
198154 		pr_err("QAT: Can't find acceleration device\n");
199155 		return PCI_ERS_RESULT_DISCONNECT;
200156 	}
201
-	pci_cleanup_aer_uncorrect_error_status(pdev);
202157 	if (adf_dev_aer_schedule_reset(accel_dev, ADF_DEV_RESET_SYNC))
203158 		return PCI_ERS_RESULT_DISCONNECT;
204159 
....@@ -220,7 +175,6 @@
220175 /**
221176  * adf_enable_aer() - Enable Advance Error Reporting for acceleration device
222177  * @accel_dev:  Pointer to acceleration device.
223
- * @adf:        PCI device driver owning the given acceleration device.
224178  *
225179  * Function enables PCI Advance Error Reporting for the
226180  * QAT acceleration device accel_dev.
....@@ -228,11 +182,12 @@
228182  *
229183  * Return: 0 on success, error code otherwise.
230184  */
231
-int adf_enable_aer(struct adf_accel_dev *accel_dev, struct pci_driver *adf)
185
+int adf_enable_aer(struct adf_accel_dev *accel_dev)
232186 {
233187 	struct pci_dev *pdev = accel_to_pci_dev(accel_dev);
188
+	struct pci_driver *pdrv = pdev->driver;
234189 
235
-	adf->err_handler = &adf_err_handler;
190
+	pdrv->err_handler = &adf_err_handler;
236191 	pci_enable_pcie_error_reporting(pdev);
237192 	return 0;
238193 }