forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87
kernel/drivers/net/fddi/defxx.c
....@@ -627,7 +627,7 @@
627627
628628 /* Set up I/O base address. */
629629 if (dfx_use_mmio) {
630
- bp->base.mem = ioremap_nocache(bar_start[0], bar_len[0]);
630
+ bp->base.mem = ioremap(bar_start[0], bar_len[0]);
631631 if (!bp->base.mem) {
632632 printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);
633633 err = -ENOMEM;
....@@ -1152,9 +1152,9 @@
11521152 #endif
11531153 sizeof(PI_CONSUMER_BLOCK) +
11541154 (PI_ALIGN_K_DESC_BLK - 1);
1155
- bp->kmalloced = top_v = dma_zalloc_coherent(bp->bus_dev, alloc_size,
1156
- &bp->kmalloced_dma,
1157
- GFP_ATOMIC);
1155
+ bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size,
1156
+ &bp->kmalloced_dma,
1157
+ GFP_ATOMIC);
11581158 if (top_v == NULL)
11591159 return DFX_K_FAILURE;
11601160
....@@ -3525,7 +3525,7 @@
35253525 bp->descr_block_virt->xmt_data[comp].long_1,
35263526 p_xmt_drv_descr->p_skb->len,
35273527 DMA_TO_DEVICE);
3528
- dev_kfree_skb_irq(p_xmt_drv_descr->p_skb);
3528
+ dev_consume_skb_irq(p_xmt_drv_descr->p_skb);
35293529
35303530 /*
35313531 * Move to start of next packet by updating completion index