mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
dma-mapping: fix the prototype of dma_unmap_single()
dma_unmap_single() takes the dma address, not virtual address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
c22c0dbd7d
commit
950c596867
|
@ -42,11 +42,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
|
|||
return addr;
|
||||
}
|
||||
|
||||
static inline void dma_unmap_single(volatile void *vaddr, size_t len,
|
||||
static inline void dma_unmap_single(dma_addr_t addr, size_t len,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
unsigned long addr = (unsigned long)vaddr;
|
||||
|
||||
len = ALIGN(len, ARCH_DMA_MINALIGN);
|
||||
|
||||
if (dir != DMA_TO_DEVICE)
|
||||
|
|
|
@ -34,11 +34,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
|
|||
return addr;
|
||||
}
|
||||
|
||||
static inline void dma_unmap_single(volatile void *vaddr, size_t len,
|
||||
static inline void dma_unmap_single(dma_addr_t addr, size_t len,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
unsigned long addr = (unsigned long)vaddr;
|
||||
|
||||
len = ALIGN(len, ARCH_DMA_MINALIGN);
|
||||
|
||||
if (dir != DMA_TO_DEVICE)
|
||||
|
|
|
@ -44,11 +44,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
|
|||
return addr;
|
||||
}
|
||||
|
||||
static inline void dma_unmap_single(volatile void *vaddr, size_t len,
|
||||
static inline void dma_unmap_single(dma_addr_t addr, size_t len,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
unsigned long addr = (unsigned long)vaddr;
|
||||
|
||||
len = ALIGN(len, ARCH_DMA_MINALIGN);
|
||||
|
||||
if (dir != DMA_TO_DEVICE)
|
||||
|
|
|
@ -42,11 +42,9 @@ static inline dma_addr_t dma_map_single(void *vaddr, size_t len,
|
|||
return addr;
|
||||
}
|
||||
|
||||
static inline void dma_unmap_single(volatile void *vaddr, size_t len,
|
||||
static inline void dma_unmap_single(dma_addr_t addr, size_t len,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
unsigned long addr = (unsigned long)vaddr;
|
||||
|
||||
len = ALIGN(len, ARCH_DMA_MINALIGN);
|
||||
|
||||
if (dir != DMA_TO_DEVICE)
|
||||
|
|
|
@ -353,7 +353,7 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data)
|
|||
if (poll_flag == TMIO_SD_DMA_INFO1_END_RD)
|
||||
udelay(1);
|
||||
|
||||
dma_unmap_single(buf, len, dir);
|
||||
dma_unmap_single(dma_addr, len, dir);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -581,7 +581,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
|
|||
|
||||
iowrite32(0, denali->reg + DMA_ENABLE);
|
||||
|
||||
dma_unmap_single(buf, size, dir);
|
||||
dma_unmap_single(dma_addr, size, dir);
|
||||
|
||||
if (irq_status & INTR__ERASED_PAGE)
|
||||
memset(buf, 0xff, size);
|
||||
|
|
|
@ -342,7 +342,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet,
|
|||
udelay(1);
|
||||
}
|
||||
|
||||
dma_unmap_single(packet, length, DMA_TO_DEVICE);
|
||||
dma_unmap_single(paddr, length, DMA_TO_DEVICE);
|
||||
|
||||
if (i <= MACB_TX_TIMEOUT) {
|
||||
if (ctrl & MACB_BIT(TX_UNDERRUN))
|
||||
|
|
|
@ -288,8 +288,8 @@ static int dwc3_setup_scratch_buffers(struct dwc3 *dwc)
|
|||
return 0;
|
||||
|
||||
err1:
|
||||
dma_unmap_single((void *)(uintptr_t)dwc->scratch_addr, dwc->nr_scratch *
|
||||
DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
|
||||
dma_unmap_single(scratch_addr, dwc->nr_scratch * DWC3_SCRATCHBUF_SIZE,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
err0:
|
||||
return ret;
|
||||
|
@ -303,7 +303,7 @@ static void dwc3_free_scratch_buffers(struct dwc3 *dwc)
|
|||
if (!dwc->nr_scratch)
|
||||
return;
|
||||
|
||||
dma_unmap_single((void *)(uintptr_t)dwc->scratch_addr, dwc->nr_scratch *
|
||||
dma_unmap_single(dwc->scratch_addr, dwc->nr_scratch *
|
||||
DWC3_SCRATCHBUF_SIZE, DMA_BIDIRECTIONAL);
|
||||
kfree(dwc->scratchbuf);
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ void usb_gadget_unmap_request(struct usb_gadget *gadget,
|
|||
if (req->length == 0)
|
||||
return;
|
||||
|
||||
dma_unmap_single((void *)(uintptr_t)req->dma, req->length,
|
||||
dma_unmap_single(req->dma, req->length,
|
||||
is_in ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usb_gadget_unmap_request);
|
||||
|
|
Loading…
Reference in New Issue
Block a user