From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: gregkh@linuxfoundation.org
Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
"Jiri Slaby (SUSE)" <jirislaby@kernel.org>,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: [PATCH] serial: msm: check dma_map_sg() return value properly
Date: Fri, 19 Apr 2024 10:09:31 +0200 [thread overview]
Message-ID: <20240419080931.30949-1-jirislaby@kernel.org> (raw)
In-Reply-To: <cbf77a8b-b37c-41d8-a7b5-a1c935571a1d@samsung.com>
The -next commit f8fef2fa419f (tty: msm_serial: use
dmaengine_prep_slave_sg()), switched to using dma_map_sg(). But the
return value of dma_map_sg() is special: it returns number of elements
mapped. And not a standard error value.
The commit also forgot to reset dma->tx_sg in case of this failure.
Fix both these mistakes.
Thanks to Marek who helped debugging this.
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/tty/serial/msm_serial.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index ae7a8e3cf467..0a9c5219df88 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -499,15 +499,18 @@ static int msm_handle_tx_dma(struct msm_port *msm_port, unsigned int count)
struct uart_port *port = &msm_port->uart;
struct tty_port *tport = &port->state->port;
struct msm_dma *dma = &msm_port->tx_dma;
+ unsigned int mapped;
int ret;
u32 val;
sg_init_table(&dma->tx_sg, 1);
kfifo_dma_out_prepare(&tport->xmit_fifo, &dma->tx_sg, 1, count);
- ret = dma_map_sg(port->dev, &dma->tx_sg, 1, dma->dir);
- if (ret)
- return ret;
+ mapped = dma_map_sg(port->dev, &dma->tx_sg, 1, dma->dir);
+ if (!mapped) {
+ ret = -EIO;
+ goto zero_sg;
+ }
dma->desc = dmaengine_prep_slave_sg(dma->chan, &dma->tx_sg, 1,
DMA_MEM_TO_DEV,
@@ -548,6 +551,7 @@ static int msm_handle_tx_dma(struct msm_port *msm_port, unsigned int count)
return 0;
unmap:
dma_unmap_sg(port->dev, &dma->tx_sg, 1, dma->dir);
+zero_sg:
sg_init_table(&dma->tx_sg, 1);
return ret;
}
--
2.44.0
next prev parent reply other threads:[~2024-04-19 8:09 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 6:08 [PATCH 00/15] tty: serial: switch from circ_buf to kfifo Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 01/15] kfifo: drop __kfifo_dma_out_finish_r() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 02/15] kfifo: introduce and use kfifo_skip_count() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 03/15] kfifo: add kfifo_out_linear{,_ptr}() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 04/15] kfifo: remove support for physically non-contiguous memory Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 05/15] kfifo: rename l to len_to_end in setup_sgl() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 06/15] kfifo: pass offset to setup_sgl_buf() instead of a pointer Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 07/15] kfifo: add kfifo_dma_out_prepare_mapped() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 08/15] kfifo: fix typos in kernel-doc Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 09/15] tty: 8250_dma: use dmaengine_prep_slave_sg() Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 10/15] tty: 8250_omap: " Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 11/15] tty: msm_serial: " Jiri Slaby (SUSE)
2024-04-15 21:17 ` Marek Szyprowski
2024-04-16 10:23 ` Jiri Slaby
2024-04-17 10:15 ` Marek Szyprowski
2024-04-17 10:50 ` Jiri Slaby
2024-04-17 12:45 ` Marek Szyprowski
2024-04-19 7:17 ` Jiri Slaby
2024-04-19 7:43 ` Jiri Slaby
2024-04-19 7:53 ` Jiri Slaby
2024-04-19 8:00 ` Marek Szyprowski
2024-04-19 8:09 ` Jiri Slaby
2024-04-19 8:09 ` Jiri Slaby (SUSE) [this message]
2024-04-19 9:03 ` [PATCH] serial: msm: check dma_map_sg() return value properly Marek Szyprowski
2024-04-05 6:08 ` [PATCH 12/15] tty: serial: switch from circ_buf to kfifo Jiri Slaby (SUSE)
2024-04-15 12:58 ` Marek Szyprowski
2024-04-15 13:28 ` Jiri Slaby
2024-04-15 14:17 ` Marek Szyprowski
2024-04-16 5:48 ` [PATCH] serial: meson+qcom: don't advance the kfifo twice Jiri Slaby (SUSE)
2024-04-17 10:08 ` [PATCH 12/15] tty: serial: switch from circ_buf to kfifo Anders Roxell
2024-04-17 10:20 ` Marek Szyprowski
2024-04-17 11:19 ` Anders Roxell
2024-04-22 6:45 ` Jiri Slaby
2024-04-22 10:05 ` Anders Roxell
2024-04-16 3:24 ` Pengfei Xu
2024-04-16 7:04 ` Jiri Slaby
2024-04-16 7:19 ` [PATCH] serial: drop debugging WARN_ON_ONCE() from uart_put_char() Jiri Slaby (SUSE)
2024-05-28 15:05 ` [PATCH] serial: drop debugging WARN_ON_ONCE() from uart_write() Tetsuo Handa
2024-06-03 7:10 ` Jiri Slaby
2024-04-05 6:08 ` [PATCH 13/15] tty: atmel_serial: use single DMA mapping for TX Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 14/15] tty: atmel_serial: define macro for RX size Jiri Slaby (SUSE)
2024-04-05 6:08 ` [PATCH 15/15] tty: atmel_serial: use single DMA mapping for RX Jiri Slaby (SUSE)
2024-04-19 15:12 ` [PATCH 00/15] tty: serial: switch from circ_buf to kfifo Neil Armstrong
2024-04-20 5:42 ` Greg KH
2024-04-22 7:50 ` Neil Armstrong
2024-04-22 5:51 ` Jiri Slaby
2024-04-22 7:43 ` neil.armstrong
2024-06-07 20:32 ` Ferry Toth
2024-06-10 20:16 ` Ferry Toth
2024-06-11 7:36 ` Jiri Slaby
2024-06-12 13:13 ` Ilpo Järvinen
2024-06-16 20:55 ` Ferry Toth
2024-06-17 6:23 ` Ilpo Järvinen
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=20240419080931.30949-1-jirislaby@kernel.org \
--to=jirislaby@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=m.szyprowski@samsung.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