From: Johan Hovold <johan+linaro@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Bjorn Andersson <andersson@kernel.org>,
Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Jiri Slaby <jirislaby@kernel.org>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Douglas Anderson <dianders@chromium.org>,
Daniel Thompson <daniel.thompson@linaro.org>,
linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 2/4] serial: qcom-geni: fix DMA mapping leak on shutdown
Date: Tue, 7 Mar 2023 17:44:03 +0100 [thread overview]
Message-ID: <20230307164405.14218-3-johan+linaro@kernel.org> (raw)
In-Reply-To: <20230307164405.14218-1-johan+linaro@kernel.org>
Fix what appears to be a copy-paste error that can lead to a leaked DMA
mapping on close() and failure to restart TX after the port is reopened.
Note that rx_dma_addr is generally NULL when
qcom_geni_serial_stop_tx_dma() is called as part of shutdown() (but
tx_dma_addr need not be).
Fixes: 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for serial engine DMA")
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/tty/serial/qcom_geni_serial.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 11da05d8f848..2aa3872e6283 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -596,7 +596,7 @@ static void qcom_geni_serial_stop_tx_dma(struct uart_port *uport)
if (!qcom_geni_serial_main_active(uport))
return;
- if (port->rx_dma_addr) {
+ if (port->tx_dma_addr) {
geni_se_tx_dma_unprep(&port->se, port->tx_dma_addr,
port->tx_remaining);
port->tx_dma_addr = 0;
--
2.39.2
next prev parent reply other threads:[~2023-03-07 16:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 16:44 [PATCH 0/4] serial: qcom-geni: fix console shutdown hang Johan Hovold
2023-03-07 16:44 ` [PATCH 1/4] " Johan Hovold
2023-03-07 18:34 ` Doug Anderson
2023-03-07 16:44 ` Johan Hovold [this message]
2023-03-07 18:36 ` [PATCH 2/4] serial: qcom-geni: fix DMA mapping leak on shutdown Doug Anderson
2023-03-07 16:44 ` [PATCH 3/4] serial: qcom-geni: fix mapping of empty DMA buffer Johan Hovold
2023-03-07 18:41 ` Doug Anderson
2023-03-08 7:51 ` Johan Hovold
2023-03-07 16:44 ` [PATCH 4/4] serial: qcom-geni: drop bogus uart_write_wakeup() Johan Hovold
2023-03-07 18:47 ` Doug Anderson
2023-03-07 16:44 ` [PATCH 0/4] serial: qcom-geni: fix console shutdown hang Bartosz Golaszewski
2023-03-07 16:47 ` Bartosz Golaszewski
2023-03-07 17:03 ` Johan Hovold
2023-03-08 14:27 ` Srinivas Kandagatla
2023-03-08 14:29 ` Srinivas Kandagatla
2023-03-08 17:24 ` Andrew Halaney
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=20230307164405.14218-3-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=bartosz.golaszewski@linaro.org \
--cc=daniel.thompson@linaro.org \
--cc=dianders@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/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