forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/scsi/csiostor/csio_wr.c
....@@ -124,8 +124,8 @@
124124
125125 while (n--) {
126126 buf->len = sge->sge_fl_buf_size[sreg];
127
- buf->vaddr = pci_alloc_consistent(hw->pdev, buf->len,
128
- &buf->paddr);
127
+ buf->vaddr = dma_alloc_coherent(&hw->pdev->dev, buf->len,
128
+ &buf->paddr, GFP_KERNEL);
129129 if (!buf->vaddr) {
130130 csio_err(hw, "Could only fill %d buffers!\n", n + 1);
131131 return -ENOMEM;
....@@ -233,7 +233,8 @@
233233
234234 q = wrm->q_arr[free_idx];
235235
236
- q->vstart = pci_zalloc_consistent(hw->pdev, qsz, &q->pstart);
236
+ q->vstart = dma_alloc_coherent(&hw->pdev->dev, qsz, &q->pstart,
237
+ GFP_KERNEL);
237238 if (!q->vstart) {
238239 csio_err(hw,
239240 "Failed to allocate DMA memory for "
....@@ -807,6 +808,7 @@
807808
808809 csio_q_eqid(hw, i) = CSIO_MAX_QID;
809810 }
811
+ fallthrough;
810812 case CSIO_INGRESS:
811813 if (csio_q_iqid(hw, i) != CSIO_MAX_QID) {
812814 csio_wr_cleanup_iq_ftr(hw, i);
....@@ -1314,7 +1316,6 @@
13141316 u32 fl_align = clsz < 32 ? 32 : clsz;
13151317 u32 pack_align;
13161318 u32 ingpad, ingpack;
1317
- int pcie_cap;
13181319
13191320 csio_wr_reg32(hw, HOSTPAGESIZEPF0_V(s_hps) | HOSTPAGESIZEPF1_V(s_hps) |
13201321 HOSTPAGESIZEPF2_V(s_hps) | HOSTPAGESIZEPF3_V(s_hps) |
....@@ -1345,8 +1346,7 @@
13451346 * multiple of the Maximum Payload Size.
13461347 */
13471348 pack_align = fl_align;
1348
- pcie_cap = pci_find_capability(hw->pdev, PCI_CAP_ID_EXP);
1349
- if (pcie_cap) {
1349
+ if (pci_is_pcie(hw->pdev)) {
13501350 u32 mps, mps_log;
13511351 u16 devctl;
13521352
....@@ -1354,9 +1354,7 @@
13541354 * [bits 7:5] encodes sizes as powers of 2 starting at
13551355 * 128 bytes.
13561356 */
1357
- pci_read_config_word(hw->pdev,
1358
- pcie_cap + PCI_EXP_DEVCTL,
1359
- &devctl);
1357
+ pcie_capability_read_word(hw->pdev, PCI_EXP_DEVCTL, &devctl);
13601358 mps_log = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5) + 7;
13611359 mps = 1 << mps_log;
13621360 if (mps > pack_align)
....@@ -1703,14 +1701,14 @@
17031701 buf = &q->un.fl.bufs[j];
17041702 if (!buf->vaddr)
17051703 continue;
1706
- pci_free_consistent(hw->pdev, buf->len,
1707
- buf->vaddr,
1708
- buf->paddr);
1704
+ dma_free_coherent(&hw->pdev->dev,
1705
+ buf->len, buf->vaddr,
1706
+ buf->paddr);
17091707 }
17101708 kfree(q->un.fl.bufs);
17111709 }
1712
- pci_free_consistent(hw->pdev, q->size,
1713
- q->vstart, q->pstart);
1710
+ dma_free_coherent(&hw->pdev->dev, q->size,
1711
+ q->vstart, q->pstart);
17141712 }
17151713 kfree(q);
17161714 }