diff options
| author | Vitaly Bordug <vbordug@ru.mvista.com> | 2006-04-25 20:26:46 +0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-28 21:11:33 +1000 |
| commit | 09b03b6c29638eb5c79b02e585cb1b20d91a8ea0 (patch) | |
| tree | c6348427c9b785a90db7f87d55903c6b75804170 /drivers/serial/cpm_uart/cpm_uart_cpm2.c | |
| parent | 4427d6bf966379304f77b7cc8c92421e6bb95483 (diff) | |
| download | linux-09b03b6c29638eb5c79b02e585cb1b20d91a8ea0.tar.gz linux-09b03b6c29638eb5c79b02e585cb1b20d91a8ea0.tar.bz2 linux-09b03b6c29638eb5c79b02e585cb1b20d91a8ea0.zip | |
[PATCH] ppc32 CPM_UART: Fixed odd address translations
Current address translation methods can produce wrong results, because
virt_to_bus and vice versa may not produce correct offsets on dma-allocated
memory. The right way is, while tracking both phys and virt address of the
window that has been allocated for boffer descriptors, and use those
numbers to compute the offset and make translation properly.
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_cpm2.c')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index c9c3b1d8810b..7c6b07aeea92 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c @@ -209,8 +209,10 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) + L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize); - if (is_con) + if (is_con) { mem_addr = alloc_bootmem(memsz); + dma_addr = mem_addr; + } else mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, GFP_KERNEL); @@ -225,6 +227,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) pinfo->dp_addr = dp_offset; pinfo->mem_addr = mem_addr; pinfo->dma_addr = dma_addr; + pinfo->mem_size = memsz; pinfo->rx_buf = mem_addr; pinfo->tx_buf = pinfo->rx_buf + L1_CACHE_ALIGN(pinfo->rx_nrfifos |