From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Bryan O'Donoghue" <pure.logic@nexus-software.ie>,
Peter Hurley <peter@hurleysoftware.com>,
linux-serial@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
ismo.puustinen@intel.com,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 06/11] serial: 8250_dma: adjust DMA address of the UART
Date: Mon, 11 Apr 2016 15:51:06 +0300 [thread overview]
Message-ID: <1460379071-132591-7-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1460379071-132591-1-git-send-email-andriy.shevchenko@linux.intel.com>
Some UARTs, e.g. one is used in Intel Quark, have a different address base for
DMA operations. Introduce an additional field (per RX and TX DMA channels) in
struct uart_8250_dma to cover those cases.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serial/8250/8250.h | 5 +++++
drivers/tty/serial/8250/8250_dma.c | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 047a7ba..526ed3e 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -31,6 +31,11 @@ struct uart_8250_dma {
struct dma_chan *rxchan;
struct dma_chan *txchan;
+ /* Device address base for DMA operations */
+ phys_addr_t rx_dma_addr;
+ phys_addr_t tx_dma_addr;
+
+ /* DMA address of the buffer in memory */
dma_addr_t rx_addr;
dma_addr_t tx_addr;
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 9d80bb1..1553181 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -157,16 +157,20 @@ int serial8250_rx_dma(struct uart_8250_port *p, unsigned int iir)
int serial8250_request_dma(struct uart_8250_port *p)
{
struct uart_8250_dma *dma = p->dma;
+ phys_addr_t rx_dma_addr = dma->rx_dma_addr ?
+ dma->rx_dma_addr : p->port.mapbase;
+ phys_addr_t tx_dma_addr = dma->tx_dma_addr ?
+ dma->tx_dma_addr : p->port.mapbase;
dma_cap_mask_t mask;
/* Default slave configuration parameters */
dma->rxconf.direction = DMA_DEV_TO_MEM;
dma->rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
- dma->rxconf.src_addr = p->port.mapbase + UART_RX;
+ dma->rxconf.src_addr = rx_dma_addr + UART_RX;
dma->txconf.direction = DMA_MEM_TO_DEV;
dma->txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
- dma->txconf.dst_addr = p->port.mapbase + UART_TX;
+ dma->txconf.dst_addr = tx_dma_addr + UART_TX;
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
--
2.8.0.rc3
next prev parent reply other threads:[~2016-04-11 12:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-11 12:51 [PATCH v2 00/11] serial: 8250: split LPSS to 8250_lpss, enable DMA on Quark Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 01/11] dmaengine: dw: keep copy of custom slave config in dwc Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 02/11] dmaengine: dw: provide probe(), remove() stubs for users Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 03/11] dmaengine: dw: set polarity of handshake interface Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 04/11] dmaengine: dw: override LLP support if asked in platform data Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 05/11] serial: 8250_dma: switch to new dmaengine_terminate_* API Andy Shevchenko
2016-04-12 6:45 ` Heikki Krogerus
2016-04-11 12:51 ` Andy Shevchenko [this message]
2016-04-12 6:46 ` [PATCH v2 06/11] serial: 8250_dma: adjust DMA address of the UART Heikki Krogerus
2016-04-11 12:51 ` [PATCH v2 07/11] serial: 8250: enable AFE on ports where FIFO is 16 bytes Andy Shevchenko
2016-04-11 14:53 ` Peter Hurley
2016-04-11 12:51 ` [PATCH v2 08/11] serial: 8250_lpss: split LPSS driver to separate module Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 09/11] serial: 8250_lpss: move Quark code from PCI driver Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 10/11] serial: 8250_lpss: enable MSI for Intel Quark Andy Shevchenko
2016-04-11 12:51 ` [PATCH v2 11/11] serial: 8250_lpss: enable DMA on Intel Quark UART Andy Shevchenko
2016-04-20 13:29 ` [PATCH v2 00/11] serial: 8250: split LPSS to 8250_lpss, enable DMA on Quark Vinod Koul
2016-04-20 14:05 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1460379071-132591-7-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=ismo.puustinen@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peter@hurleysoftware.com \
--cc=pure.logic@nexus-software.ie \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).