diff for duplicates of <50A4B1CE.5070203@freescale.com> diff --git a/a/1.txt b/N1/1.txt index 5102412..8787a94 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -于 2012年11月15日 15:22, Lauri Hintsala 写道: +? 2012?11?15? 15:22, Lauri Hintsala ??: > Hi, > > On 11/15/2012 05:20 AM, Huang Shijie wrote: ->> 于 2012年11月13日 17:42, Lauri Hintsala 写道: +>> ? 2012?11?13? 17:42, Lauri Hintsala ??: >>> Hi Huang, >>> >>> DMA support doesn't work with latest stable v3.6.5 or development @@ -28,3 +28,10 @@ Could you test this patch? thanks Huang Shijie +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-fix-patch.patch +Type: text/x-patch +Size: 2010 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121115/10ceb0c7/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 3d3f870..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Type: text/x-patch; name="0001-fix-patch.patch" -Content-Transfer-Encoding: 7bit -Content-Disposition: attachment; filename="0001-fix-patch.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index c5c4ef1..0000000 --- a/a/2.txt +++ /dev/null @@ -1,66 +0,0 @@ ->From 502db325af8664e239be3da47f32d496f3db036f Mon Sep 17 00:00:00 2001 -From: Huang Shijie <b32955@freescale.com> -Date: Thu, 15 Nov 2012 16:24:31 +0800 -Subject: [PATCH] fix patch - - -Signed-off-by: Huang Shijie <b32955@freescale.com> ---- - drivers/tty/serial/mxs-auart.c | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) - -diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c -index d593e0a..0e60ef2 100644 ---- a/drivers/tty/serial/mxs-auart.c -+++ b/drivers/tty/serial/mxs-auart.c -@@ -542,7 +542,7 @@ static int mxs_auart_dma_init(struct mxs_auart_port *s) - dma_cap_mask_t mask; - - if (auart_dma_enabled(s)) -- return 0; -+ return -EBUSY; - - /* We do not get the right DMA channels. */ - if (s->dma_channel_rx == -1 || s->dma_channel_rx == -1) -@@ -666,10 +666,21 @@ static void mxs_auart_settermios(struct uart_port *u, - * in mx28. - */ - if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG)) { -- if (!mxs_auart_dma_init(s)) -+ if (!mxs_auart_dma_init(s)) { - /* enable DMA tranfer */ - ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE - | AUART_CTRL2_DMAONERR; -+ -+ /* prepare for the DMA RX. */ -+ if (!mxs_auart_dma_prep_rx(s)) { -+ /* Disable the normal RX irq. */ -+ writel(AUART_INTR_RXIEN, -+ u->membase + AUART_INTR_CLR); -+ } else { -+ mxs_auart_dma_exit(s); -+ dev_err(s->dev, "DMA failed.\n"); -+ } -+ } - } - ctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN; - } else { -@@ -687,16 +698,6 @@ static void mxs_auart_settermios(struct uart_port *u, - - uart_update_timeout(u, termios->c_cflag, baud); - -- /* prepare for the DMA RX. */ -- if (auart_dma_enabled(s)) { -- if (!mxs_auart_dma_prep_rx(s)) { -- /* Disable the normal RX interrupt. */ -- writel(AUART_INTR_RXIEN, u->membase + AUART_INTR_CLR); -- } else { -- mxs_auart_dma_exit(s); -- dev_err(s->dev, "We can not start up the DMA.\n"); -- } -- } - } - - static irqreturn_t mxs_auart_irq_handle(int irq, void *context) --- -1.7.0.4 diff --git a/a/content_digest b/N1/content_digest index dfcf6b6..bc87b9b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,26 +3,17 @@ "ref\050A21613.6030709@bluegiga.com\0" "ref\050A45F83.1010009@freescale.com\0" "ref\050A4983F.8080407@bluegiga.com\0" - "From\0Huang Shijie <b32955@freescale.com>\0" - "Subject\0Re: [PATCH v2 2/3] serial: mxs-auart: add the DMA support for mx28\0" + "From\0b32955@freescale.com (Huang Shijie)\0" + "Subject\0[PATCH v2 2/3] serial: mxs-auart: add the DMA support for mx28\0" "Date\0Thu, 15 Nov 2012 17:11:42 +0800\0" - "To\0Lauri Hintsala <lauri.hintsala@bluegiga.com>\0" - "Cc\0gregkh@linuxfoundation.org" - alan@linux.intel.com - linux-serial@vger.kernel.org - linux-arm-kernel@lists.infradead.org - shawn.guo@linaro.org - linux@arm.linux.org.uk - vinod.koul@intel.com - Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com> - " Fabio Estevam <fabio.estevam@freescale.com>\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" - "\344\272\216 2012\345\271\26411\346\234\21015\346\227\245 15:22, Lauri Hintsala \345\206\231\351\201\223:\n" + "? 2012?11?15? 15:22, Lauri Hintsala ??:\n" "> Hi,\n" ">\n" "> On 11/15/2012 05:20 AM, Huang Shijie wrote:\n" - ">> \344\272\216 2012\345\271\26411\346\234\21013\346\227\245 17:42, Lauri Hintsala \345\206\231\351\201\223:\n" + ">> ? 2012?11?13? 17:42, Lauri Hintsala ??:\n" ">>> Hi Huang,\n" ">>>\n" ">>> DMA support doesn't work with latest stable v3.6.5 or development\n" @@ -47,75 +38,13 @@ "Could you test this patch?\n" "\n" "thanks\n" - Huang Shijie - "\01:2\0" - "fn\00001-fix-patch.patch\0" - "b\0" - ">From 502db325af8664e239be3da47f32d496f3db036f Mon Sep 17 00:00:00 2001\n" - "From: Huang Shijie <b32955@freescale.com>\n" - "Date: Thu, 15 Nov 2012 16:24:31 +0800\n" - "Subject: [PATCH] fix patch\n" - "\n" - "\n" - "Signed-off-by: Huang Shijie <b32955@freescale.com>\n" - "---\n" - " drivers/tty/serial/mxs-auart.c | 25 +++++++++++++------------\n" - " 1 files changed, 13 insertions(+), 12 deletions(-)\n" - "\n" - "diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c\n" - "index d593e0a..0e60ef2 100644\n" - "--- a/drivers/tty/serial/mxs-auart.c\n" - "+++ b/drivers/tty/serial/mxs-auart.c\n" - "@@ -542,7 +542,7 @@ static int mxs_auart_dma_init(struct mxs_auart_port *s)\n" - " \tdma_cap_mask_t mask;\n" - " \n" - " \tif (auart_dma_enabled(s))\n" - "-\t\treturn 0;\n" - "+\t\treturn -EBUSY;\n" - " \n" - " \t/* We do not get the right DMA channels. */\n" - " \tif (s->dma_channel_rx == -1 || s->dma_channel_rx == -1)\n" - "@@ -666,10 +666,21 @@ static void mxs_auart_settermios(struct uart_port *u,\n" - " \t\t * in mx28.\n" - " \t\t */\n" - " \t\tif (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG)) {\n" - "-\t\t\tif (!mxs_auart_dma_init(s))\n" - "+\t\t\tif (!mxs_auart_dma_init(s)) {\n" - " \t\t\t\t/* enable DMA tranfer */\n" - " \t\t\t\tctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE\n" - " \t\t\t\t | AUART_CTRL2_DMAONERR;\n" - "+\n" - "+\t\t\t\t/* prepare for the DMA RX. */\n" - "+\t\t\t\tif (!mxs_auart_dma_prep_rx(s)) {\n" - "+\t\t\t\t\t/* Disable the normal RX irq. */\n" - "+\t\t\t\t\twritel(AUART_INTR_RXIEN,\n" - "+\t\t\t\t\t\tu->membase + AUART_INTR_CLR);\n" - "+\t\t\t\t} else {\n" - "+\t\t\t\t\tmxs_auart_dma_exit(s);\n" - "+\t\t\t\t\tdev_err(s->dev, \"DMA failed.\\n\");\n" - "+\t\t\t\t}\n" - "+\t\t\t}\n" - " \t\t}\n" - " \t\tctrl2 |= AUART_CTRL2_CTSEN | AUART_CTRL2_RTSEN;\n" - " \t} else {\n" - "@@ -687,16 +698,6 @@ static void mxs_auart_settermios(struct uart_port *u,\n" - " \n" - " \tuart_update_timeout(u, termios->c_cflag, baud);\n" - " \n" - "-\t/* prepare for the DMA RX. */\n" - "-\tif (auart_dma_enabled(s)) {\n" - "-\t\tif (!mxs_auart_dma_prep_rx(s)) {\n" - "-\t\t\t/* Disable the normal RX interrupt. */\n" - "-\t\t\twritel(AUART_INTR_RXIEN, u->membase + AUART_INTR_CLR);\n" - "-\t\t} else {\n" - "-\t\t\tmxs_auart_dma_exit(s);\n" - "-\t\t\tdev_err(s->dev, \"We can not start up the DMA.\\n\");\n" - "-\t\t}\n" - "-\t}\n" - " }\n" - " \n" - " static irqreturn_t mxs_auart_irq_handle(int irq, void *context)\n" - "-- \n" - 1.7.0.4 + "Huang Shijie\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-fix-patch.patch\n" + "Type: text/x-patch\n" + "Size: 2010 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121115/10ceb0c7/attachment.bin> -277c19f83e9ecd1d4714c16e1f8f272f4d0865575f7c49e0121b4a5423b57cc4 +a811f846e9cec6e0c6c78940c55f1b31d2a0a04085eeb6f044d0bdbdf37efd9f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.