add ax88772_rst

hc

2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29

 kernel/drivers/net/ethernet/qlogic/qed/qed_vf.c
..
..
@@ -1,33 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
1
2
 /* QLogic qed NIC Driver
2
3
  * Copyright (c) 2015-2017  QLogic Corporation
3
- *
4
- * This software is available to you under a choice of one of two
5
- * licenses.  You may choose to be licensed under the terms of the GNU
6
- * General Public License (GPL) Version 2, available from the file
7
- * COPYING in the main directory of this source tree, or the
8
- * OpenIB.org BSD license below:
9
- *
10
- *     Redistribution and use in source and binary forms, with or
11
- *     without modification, are permitted provided that the following
12
- *     conditions are met:
13
- *
14
- *      - Redistributions of source code must retain the above
15
- *        copyright notice, this list of conditions and the following
16
- *        disclaimer.
17
- *
18
- *      - Redistributions in binary form must reproduce the above
19
- *        copyright notice, this list of conditions and the following
20
- *        disclaimer in the documentation and /or other materials
21
- *        provided with the distribution.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
26
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
27
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
28
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
29
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30
- * SOFTWARE.
4
+ * Copyright (c) 2019-2020 Marvell International Ltd.
31
5
  */
32
6
 
33
7
 #include <linux/crc32.h>
..
..
@@ -244,7 +218,7 @@
244
218
 {
245
219
 	DP_VERBOSE(p_hwfn,
246
220
 		   QED_MSG_IOV,
247
-		   "PF unwilling to fullill resource request: rxq [%02x/%02x] txq [%02x/%02x] sbs [%02x/%02x] mac [%02x/%02x] vlan [%02x/%02x] mc [%02x/%02x] cids [%02x/%02x]. Try PF recommended amount\n",
221
+		   "PF unwilling to fulfill resource request: rxq [%02x/%02x] txq [%02x/%02x] sbs [%02x/%02x] mac [%02x/%02x] vlan [%02x/%02x] mc [%02x/%02x] cids [%02x/%02x]. Try PF recommended amount\n",
248
222
 		   p_req->num_rxqs,
249
223
 		   p_resp->num_rxqs,
250
224
 		   p_req->num_rxqs,
..
..
@@ -539,6 +513,9 @@
539
513
 						    p_iov->bulletin.size,
540
514
 						    &p_iov->bulletin.phys,
541
515
 						    GFP_KERNEL);
516
+	if (!p_iov->bulletin.p_virt)
517
+		goto free_pf2vf_reply;
518
+
542
519
 	DP_VERBOSE(p_hwfn, QED_MSG_IOV,
543
520
 		   "VF's bulletin Board [%p virt 0x%llx phys 0x%08x bytes]\n",
544
521
 		   p_iov->bulletin.p_virt,
..
..
@@ -578,6 +555,10 @@
578
555
 
579
556
 	return rc;
580
557
 
558
+free_pf2vf_reply:
559
+	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
560
+			  sizeof(union pfvf_tlvs),
561
+			  p_iov->pf2vf_reply, p_iov->pf2vf_reply_phys);
581
562
 free_vf2pf_request:
582
563
 	dma_free_coherent(&p_hwfn->cdev->pdev->dev,
583
564
 			  sizeof(union vfpf_tlvs),