disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/scsi/bnx2fc/bnx2fc_tgt.c
..
..
@@ -187,7 +187,7 @@
187
187
 				/* Handle eh_abort timeout */
188
188
 				BNX2FC_IO_DBG(io_req, "eh_abort for IO "
189
189
 					      "cleaned up\n");
190
-				complete(&io_req->tm_done);
190
+				complete(&io_req->abts_done);
191
191
 			}
192
192
 			kref_put(&io_req->refcount,
193
193
 				 bnx2fc_cmd_release); /* drop timer hold */
..
..
@@ -210,8 +210,8 @@
210
210
 		list_del_init(&io_req->link);
211
211
 		io_req->on_tmf_queue = 0;
212
212
 		BNX2FC_IO_DBG(io_req, "tm_queue cleanup\n");
213
-		if (io_req->wait_for_comp)
214
-			complete(&io_req->tm_done);
213
+		if (io_req->wait_for_abts_comp)
214
+			complete(&io_req->abts_done);
215
215
 	}
216
216
 
217
217
 	list_for_each_entry_safe(io_req, tmp, &tgt->els_queue, link) {
..
..
@@ -251,8 +251,8 @@
251
251
 				/* Handle eh_abort timeout */
252
252
 				BNX2FC_IO_DBG(io_req, "eh_abort for IO "
253
253
 					      "in retire_q\n");
254
-				if (io_req->wait_for_comp)
255
-					complete(&io_req->tm_done);
254
+				if (io_req->wait_for_abts_comp)
255
+					complete(&io_req->abts_done);
256
256
 			}
257
257
 			kref_put(&io_req->refcount, bnx2fc_cmd_release);
258
258
 		}
..
..
@@ -431,7 +431,7 @@
431
431
 	return 0;
432
432
 }
433
433
 
434
-/**
434
+/*
435
435
  * This event_callback is called after successful completion of libfc
436
436
  * initiated target login. bnx2fc can proceed with initiating the session
437
437
  * establishment.
..
..
@@ -656,9 +656,8 @@
656
656
 	spin_unlock_bh(&hba->hba_lock);
657
657
 }
658
658
 
659
-/**
660
- *bnx2fc_alloc_session_resc - Allocate qp resources for the session
661
- *
659
+/*
660
+ * bnx2fc_alloc_session_resc - Allocate qp resources for the session
662
661
  */
663
662
 static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
664
663
 					struct bnx2fc_rport *tgt)
..
..
@@ -672,8 +671,8 @@
672
671
 	tgt->sq_mem_size = (tgt->sq_mem_size + (CNIC_PAGE_SIZE - 1)) &
673
672
 			   CNIC_PAGE_MASK;
674
673
 
675
-	tgt->sq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->sq_mem_size,
676
-				      &tgt->sq_dma, GFP_KERNEL);
674
+	tgt->sq = dma_alloc_coherent(&hba->pcidev->dev, tgt->sq_mem_size,
675
+				     &tgt->sq_dma, GFP_KERNEL);
677
676
 	if (!tgt->sq) {
678
677
 		printk(KERN_ERR PFX "unable to allocate SQ memory %d\n",
679
678
 			tgt->sq_mem_size);
..
..
@@ -685,8 +684,8 @@
685
684
 	tgt->cq_mem_size = (tgt->cq_mem_size + (CNIC_PAGE_SIZE - 1)) &
686
685
 			   CNIC_PAGE_MASK;
687
686
 
688
-	tgt->cq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->cq_mem_size,
689
-				      &tgt->cq_dma, GFP_KERNEL);
687
+	tgt->cq = dma_alloc_coherent(&hba->pcidev->dev, tgt->cq_mem_size,
688
+				     &tgt->cq_dma, GFP_KERNEL);
690
689
 	if (!tgt->cq) {
691
690
 		printk(KERN_ERR PFX "unable to allocate CQ memory %d\n",
692
691
 			tgt->cq_mem_size);
..
..
@@ -698,8 +697,8 @@
698
697
 	tgt->rq_mem_size = (tgt->rq_mem_size + (CNIC_PAGE_SIZE - 1)) &
699
698
 			   CNIC_PAGE_MASK;
700
699
 
701
-	tgt->rq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->rq_mem_size,
702
-				      &tgt->rq_dma, GFP_KERNEL);
700
+	tgt->rq = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_mem_size,
701
+				     &tgt->rq_dma, GFP_KERNEL);
703
702
 	if (!tgt->rq) {
704
703
 		printk(KERN_ERR PFX "unable to allocate RQ memory %d\n",
705
704
 			tgt->rq_mem_size);
..
..
@@ -710,8 +709,8 @@
710
709
 	tgt->rq_pbl_size = (tgt->rq_pbl_size + (CNIC_PAGE_SIZE - 1)) &
711
710
 			   CNIC_PAGE_MASK;
712
711
 
713
-	tgt->rq_pbl = dma_zalloc_coherent(&hba->pcidev->dev, tgt->rq_pbl_size,
714
-					  &tgt->rq_pbl_dma, GFP_KERNEL);
712
+	tgt->rq_pbl = dma_alloc_coherent(&hba->pcidev->dev, tgt->rq_pbl_size,
713
+					 &tgt->rq_pbl_dma, GFP_KERNEL);
715
714
 	if (!tgt->rq_pbl) {
716
715
 		printk(KERN_ERR PFX "unable to allocate RQ PBL %d\n",
717
716
 			tgt->rq_pbl_size);
..
..
@@ -735,9 +734,9 @@
735
734
 	tgt->xferq_mem_size = (tgt->xferq_mem_size + (CNIC_PAGE_SIZE - 1)) &
736
735
 			       CNIC_PAGE_MASK;
737
736
 
738
-	tgt->xferq = dma_zalloc_coherent(&hba->pcidev->dev,
739
-					 tgt->xferq_mem_size, &tgt->xferq_dma,
740
-					 GFP_KERNEL);
737
+	tgt->xferq = dma_alloc_coherent(&hba->pcidev->dev,
738
+					tgt->xferq_mem_size, &tgt->xferq_dma,
739
+					GFP_KERNEL);
741
740
 	if (!tgt->xferq) {
742
741
 		printk(KERN_ERR PFX "unable to allocate XFERQ %d\n",
743
742
 			tgt->xferq_mem_size);
..
..
@@ -749,9 +748,9 @@
749
748
 	tgt->confq_mem_size = (tgt->confq_mem_size + (CNIC_PAGE_SIZE - 1)) &
750
749
 			       CNIC_PAGE_MASK;
751
750
 
752
-	tgt->confq = dma_zalloc_coherent(&hba->pcidev->dev,
753
-					 tgt->confq_mem_size, &tgt->confq_dma,
754
-					 GFP_KERNEL);
751
+	tgt->confq = dma_alloc_coherent(&hba->pcidev->dev,
752
+					tgt->confq_mem_size, &tgt->confq_dma,
753
+					GFP_KERNEL);
755
754
 	if (!tgt->confq) {
756
755
 		printk(KERN_ERR PFX "unable to allocate CONFQ %d\n",
757
756
 			tgt->confq_mem_size);
..
..
@@ -763,9 +762,9 @@
763
762
 	tgt->confq_pbl_size =
764
763
 		(tgt->confq_pbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
765
764
 
766
-	tgt->confq_pbl = dma_zalloc_coherent(&hba->pcidev->dev,
767
-					     tgt->confq_pbl_size,
768
-					     &tgt->confq_pbl_dma, GFP_KERNEL);
765
+	tgt->confq_pbl = dma_alloc_coherent(&hba->pcidev->dev,
766
+					    tgt->confq_pbl_size,
767
+					    &tgt->confq_pbl_dma, GFP_KERNEL);
769
768
 	if (!tgt->confq_pbl) {
770
769
 		printk(KERN_ERR PFX "unable to allocate CONFQ PBL %d\n",
771
770
 			tgt->confq_pbl_size);
..
..
@@ -787,9 +786,9 @@
787
786
 	/* Allocate and map ConnDB */
788
787
 	tgt->conn_db_mem_size = sizeof(struct fcoe_conn_db);
789
788
 
790
-	tgt->conn_db = dma_zalloc_coherent(&hba->pcidev->dev,
791
-					   tgt->conn_db_mem_size,
792
-					   &tgt->conn_db_dma, GFP_KERNEL);
789
+	tgt->conn_db = dma_alloc_coherent(&hba->pcidev->dev,
790
+					  tgt->conn_db_mem_size,
791
+					  &tgt->conn_db_dma, GFP_KERNEL);
793
792
 	if (!tgt->conn_db) {
794
793
 		printk(KERN_ERR PFX "unable to allocate conn_db %d\n",
795
794
 						tgt->conn_db_mem_size);
..
..
@@ -802,8 +801,8 @@
802
801
 	tgt->lcq_mem_size = (tgt->lcq_mem_size + (CNIC_PAGE_SIZE - 1)) &
803
802
 			     CNIC_PAGE_MASK;
804
803
 
805
-	tgt->lcq = dma_zalloc_coherent(&hba->pcidev->dev, tgt->lcq_mem_size,
806
-				       &tgt->lcq_dma, GFP_KERNEL);
804
+	tgt->lcq = dma_alloc_coherent(&hba->pcidev->dev, tgt->lcq_mem_size,
805
+				      &tgt->lcq_dma, GFP_KERNEL);
807
806
 
808
807
 	if (!tgt->lcq) {
809
808
 		printk(KERN_ERR PFX "unable to allocate lcq %d\n",