.. | .. |
---|
124 | 124 | |
---|
125 | 125 | while (n--) { |
---|
126 | 126 | 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); |
---|
129 | 129 | if (!buf->vaddr) { |
---|
130 | 130 | csio_err(hw, "Could only fill %d buffers!\n", n + 1); |
---|
131 | 131 | return -ENOMEM; |
---|
.. | .. |
---|
233 | 233 | |
---|
234 | 234 | q = wrm->q_arr[free_idx]; |
---|
235 | 235 | |
---|
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); |
---|
237 | 238 | if (!q->vstart) { |
---|
238 | 239 | csio_err(hw, |
---|
239 | 240 | "Failed to allocate DMA memory for " |
---|
.. | .. |
---|
807 | 808 | |
---|
808 | 809 | csio_q_eqid(hw, i) = CSIO_MAX_QID; |
---|
809 | 810 | } |
---|
| 811 | + fallthrough; |
---|
810 | 812 | case CSIO_INGRESS: |
---|
811 | 813 | if (csio_q_iqid(hw, i) != CSIO_MAX_QID) { |
---|
812 | 814 | csio_wr_cleanup_iq_ftr(hw, i); |
---|
.. | .. |
---|
1314 | 1316 | u32 fl_align = clsz < 32 ? 32 : clsz; |
---|
1315 | 1317 | u32 pack_align; |
---|
1316 | 1318 | u32 ingpad, ingpack; |
---|
1317 | | - int pcie_cap; |
---|
1318 | 1319 | |
---|
1319 | 1320 | csio_wr_reg32(hw, HOSTPAGESIZEPF0_V(s_hps) | HOSTPAGESIZEPF1_V(s_hps) | |
---|
1320 | 1321 | HOSTPAGESIZEPF2_V(s_hps) | HOSTPAGESIZEPF3_V(s_hps) | |
---|
.. | .. |
---|
1345 | 1346 | * multiple of the Maximum Payload Size. |
---|
1346 | 1347 | */ |
---|
1347 | 1348 | 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)) { |
---|
1350 | 1350 | u32 mps, mps_log; |
---|
1351 | 1351 | u16 devctl; |
---|
1352 | 1352 | |
---|
.. | .. |
---|
1354 | 1354 | * [bits 7:5] encodes sizes as powers of 2 starting at |
---|
1355 | 1355 | * 128 bytes. |
---|
1356 | 1356 | */ |
---|
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); |
---|
1360 | 1358 | mps_log = ((devctl & PCI_EXP_DEVCTL_PAYLOAD) >> 5) + 7; |
---|
1361 | 1359 | mps = 1 << mps_log; |
---|
1362 | 1360 | if (mps > pack_align) |
---|
.. | .. |
---|
1703 | 1701 | buf = &q->un.fl.bufs[j]; |
---|
1704 | 1702 | if (!buf->vaddr) |
---|
1705 | 1703 | 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); |
---|
1709 | 1707 | } |
---|
1710 | 1708 | kfree(q->un.fl.bufs); |
---|
1711 | 1709 | } |
---|
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); |
---|
1714 | 1712 | } |
---|
1715 | 1713 | kfree(q); |
---|
1716 | 1714 | } |
---|