forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/net/ethernet/mellanox/mlx4/icm.c
....@@ -57,8 +57,8 @@
5757 int i;
5858
5959 if (chunk->nsg > 0)
60
- pci_unmap_sg(dev->persist->pdev, chunk->sg, chunk->npages,
61
- PCI_DMA_BIDIRECTIONAL);
60
+ dma_unmap_sg(&dev->persist->pdev->dev, chunk->sg, chunk->npages,
61
+ DMA_BIDIRECTIONAL);
6262
6363 for (i = 0; i < chunk->npages; ++i)
6464 __free_pages(sg_page(&chunk->sg[i]),
....@@ -204,9 +204,9 @@
204204 if (coherent)
205205 ++chunk->nsg;
206206 else if (chunk->npages == MLX4_ICM_CHUNK_LEN) {
207
- chunk->nsg = pci_map_sg(dev->persist->pdev, chunk->sg,
208
- chunk->npages,
209
- PCI_DMA_BIDIRECTIONAL);
207
+ chunk->nsg = dma_map_sg(&dev->persist->pdev->dev,
208
+ chunk->sg, chunk->npages,
209
+ DMA_BIDIRECTIONAL);
210210
211211 if (chunk->nsg <= 0)
212212 goto fail;
....@@ -219,9 +219,8 @@
219219 }
220220
221221 if (!coherent && chunk) {
222
- chunk->nsg = pci_map_sg(dev->persist->pdev, chunk->sg,
223
- chunk->npages,
224
- PCI_DMA_BIDIRECTIONAL);
222
+ chunk->nsg = dma_map_sg(&dev->persist->pdev->dev, chunk->sg,
223
+ chunk->npages, DMA_BIDIRECTIONAL);
225224
226225 if (chunk->nsg <= 0)
227226 goto fail;
....@@ -426,7 +425,7 @@
426425 obj_per_chunk = MLX4_TABLE_CHUNK_SIZE / obj_size;
427426 if (WARN_ON(!obj_per_chunk))
428427 return -EINVAL;
429
- num_icm = (nobj + obj_per_chunk - 1) / obj_per_chunk;
428
+ num_icm = DIV_ROUND_UP(nobj, obj_per_chunk);
430429
431430 table->icm = kvcalloc(num_icm, sizeof(*table->icm), GFP_KERNEL);
432431 if (!table->icm)