hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/scsi/bnx2fc/bnx2fc_tgt.c
....@@ -187,7 +187,7 @@
187187 /* Handle eh_abort timeout */
188188 BNX2FC_IO_DBG(io_req, "eh_abort for IO "
189189 "cleaned up\n");
190
- complete(&io_req->tm_done);
190
+ complete(&io_req->abts_done);
191191 }
192192 kref_put(&io_req->refcount,
193193 bnx2fc_cmd_release); /* drop timer hold */
....@@ -210,8 +210,8 @@
210210 list_del_init(&io_req->link);
211211 io_req->on_tmf_queue = 0;
212212 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);
215215 }
216216
217217 list_for_each_entry_safe(io_req, tmp, &tgt->els_queue, link) {
....@@ -251,8 +251,8 @@
251251 /* Handle eh_abort timeout */
252252 BNX2FC_IO_DBG(io_req, "eh_abort for IO "
253253 "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);
256256 }
257257 kref_put(&io_req->refcount, bnx2fc_cmd_release);
258258 }
....@@ -431,7 +431,7 @@
431431 return 0;
432432 }
433433
434
-/**
434
+/*
435435 * This event_callback is called after successful completion of libfc
436436 * initiated target login. bnx2fc can proceed with initiating the session
437437 * establishment.
....@@ -656,9 +656,8 @@
656656 spin_unlock_bh(&hba->hba_lock);
657657 }
658658
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
662661 */
663662 static int bnx2fc_alloc_session_resc(struct bnx2fc_hba *hba,
664663 struct bnx2fc_rport *tgt)
....@@ -672,8 +671,8 @@
672671 tgt->sq_mem_size = (tgt->sq_mem_size + (CNIC_PAGE_SIZE - 1)) &
673672 CNIC_PAGE_MASK;
674673
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);
677676 if (!tgt->sq) {
678677 printk(KERN_ERR PFX "unable to allocate SQ memory %d\n",
679678 tgt->sq_mem_size);
....@@ -685,8 +684,8 @@
685684 tgt->cq_mem_size = (tgt->cq_mem_size + (CNIC_PAGE_SIZE - 1)) &
686685 CNIC_PAGE_MASK;
687686
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);
690689 if (!tgt->cq) {
691690 printk(KERN_ERR PFX "unable to allocate CQ memory %d\n",
692691 tgt->cq_mem_size);
....@@ -698,8 +697,8 @@
698697 tgt->rq_mem_size = (tgt->rq_mem_size + (CNIC_PAGE_SIZE - 1)) &
699698 CNIC_PAGE_MASK;
700699
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);
703702 if (!tgt->rq) {
704703 printk(KERN_ERR PFX "unable to allocate RQ memory %d\n",
705704 tgt->rq_mem_size);
....@@ -710,8 +709,8 @@
710709 tgt->rq_pbl_size = (tgt->rq_pbl_size + (CNIC_PAGE_SIZE - 1)) &
711710 CNIC_PAGE_MASK;
712711
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);
715714 if (!tgt->rq_pbl) {
716715 printk(KERN_ERR PFX "unable to allocate RQ PBL %d\n",
717716 tgt->rq_pbl_size);
....@@ -735,9 +734,9 @@
735734 tgt->xferq_mem_size = (tgt->xferq_mem_size + (CNIC_PAGE_SIZE - 1)) &
736735 CNIC_PAGE_MASK;
737736
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);
741740 if (!tgt->xferq) {
742741 printk(KERN_ERR PFX "unable to allocate XFERQ %d\n",
743742 tgt->xferq_mem_size);
....@@ -749,9 +748,9 @@
749748 tgt->confq_mem_size = (tgt->confq_mem_size + (CNIC_PAGE_SIZE - 1)) &
750749 CNIC_PAGE_MASK;
751750
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);
755754 if (!tgt->confq) {
756755 printk(KERN_ERR PFX "unable to allocate CONFQ %d\n",
757756 tgt->confq_mem_size);
....@@ -763,9 +762,9 @@
763762 tgt->confq_pbl_size =
764763 (tgt->confq_pbl_size + (CNIC_PAGE_SIZE - 1)) & CNIC_PAGE_MASK;
765764
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);
769768 if (!tgt->confq_pbl) {
770769 printk(KERN_ERR PFX "unable to allocate CONFQ PBL %d\n",
771770 tgt->confq_pbl_size);
....@@ -787,9 +786,9 @@
787786 /* Allocate and map ConnDB */
788787 tgt->conn_db_mem_size = sizeof(struct fcoe_conn_db);
789788
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);
793792 if (!tgt->conn_db) {
794793 printk(KERN_ERR PFX "unable to allocate conn_db %d\n",
795794 tgt->conn_db_mem_size);
....@@ -802,8 +801,8 @@
802801 tgt->lcq_mem_size = (tgt->lcq_mem_size + (CNIC_PAGE_SIZE - 1)) &
803802 CNIC_PAGE_MASK;
804803
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);
807806
808807 if (!tgt->lcq) {
809808 printk(KERN_ERR PFX "unable to allocate lcq %d\n",