From: Akash Asthana <akashast@codeaurora.org>
To: gregkh@linuxfoundation.org, agross@kernel.org,
bjorn.andersson@linaro.org, wsa@the-dreams.de,
broonie@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org,
georgi.djakov@linaro.org
Cc: linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org,
devicetree@vger.kernel.org, swboyd@chromium.org,
mgautam@codeaurora.org, linux-arm-msm@vger.kernel.org,
linux-serial@vger.kernel.org, mka@chromium.org,
dianders@chromium.org, evgreen@chromium.org,
Akash Asthana <akashast@codeaurora.org>
Subject: [PATCH V4 7/9] tty: serial: qcom_geni_serial: Add interconnect support
Date: Wed, 15 Apr 2020 15:53:16 +0530 [thread overview]
Message-ID: <1586946198-13912-8-git-send-email-akashast@codeaurora.org> (raw)
In-Reply-To: <1586946198-13912-1-git-send-email-akashast@codeaurora.org>
Get the interconnect paths for Uart based Serial Engine device
and vote according to the baud rate requirement of the driver.
Signed-off-by: Akash Asthana <akashast@codeaurora.org>
---
Changes in V2:
- As per Bjorn's comment, removed se == NULL check from geni_serial_icc_get
- As per Bjorn's comment, removed code to set se->icc_path* to NULL in failure
- As per Bjorn's comment, introduced and using devm_of_icc_get API for getting
path handle
- As per Matthias comment, added error handling for icc_set_bw call
Changes in V3:
- As per Matthias comment, use common library APIs defined in geni-se
driver for ICC functionality.
Changes in V4:
- As per Mark's comment move peak_bw guess as twice of avg_bw if
nothing mentioned explicitly to ICC core.
- As per Matthias's comment select core clock BW based on baud rate.
If it's less than 115200 go for GENI_DEFAULT_BW else CORE_2X_50_MHZ
drivers/tty/serial/qcom_geni_serial.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
index 8c5d97c..a5b2f1c 100644
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@ -965,6 +965,15 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
ser_clk_cfg = SER_CLK_EN;
ser_clk_cfg |= clk_div << CLK_DIV_SHFT;
+ /*
+ * Bump up BW vote on CPU and CORE path as driver supports FIFO mode
+ * only.
+ */
+ port->se.icc_paths[0].avg_bw = (baud > 115200) ?
+ Bps_to_icc(CORE_2X_50_MHZ) : GENI_DEFAULT_BW;
+ port->se.icc_paths[1].avg_bw = Bps_to_icc(baud);
+ geni_icc_vote_on(&port->se);
+
/* parity */
tx_trans_cfg = readl(uport->membase + SE_UART_TX_TRANS_CFG);
tx_parity_cfg = readl(uport->membase + SE_UART_TX_PARITY_CFG);
@@ -1202,11 +1211,14 @@ static void qcom_geni_serial_pm(struct uart_port *uport,
if (old_state == UART_PM_STATE_UNDEFINED)
old_state = UART_PM_STATE_OFF;
- if (new_state == UART_PM_STATE_ON && old_state == UART_PM_STATE_OFF)
+ if (new_state == UART_PM_STATE_ON && old_state == UART_PM_STATE_OFF) {
+ geni_icc_vote_on(&port->se);
geni_se_resources_on(&port->se);
- else if (new_state == UART_PM_STATE_OFF &&
- old_state == UART_PM_STATE_ON)
+ } else if (new_state == UART_PM_STATE_OFF &&
+ old_state == UART_PM_STATE_ON) {
geni_se_resources_off(&port->se);
+ geni_icc_vote_off(&port->se);
+ }
}
static const struct uart_ops qcom_geni_console_pops = {
@@ -1304,6 +1316,13 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ ret = geni_icc_get(&port->se, NULL);
+ if (ret)
+ return ret;
+ /* Set the bus quota to a reasonable value for register access */
+ port->se.icc_paths[0].avg_bw = GENI_DEFAULT_BW;
+ port->se.icc_paths[1].avg_bw = GENI_DEFAULT_BW;
+
port->name = devm_kasprintf(uport->dev, GFP_KERNEL,
"qcom_geni_serial_%s%d",
uart_console(uport) ? "console" : "uart", uport->line);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-04-15 10:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 10:23 [PATCH V4 0/9] Add interconnect support to QSPI and QUP drivers Akash Asthana
2020-04-15 10:23 ` [PATCH V4 1/9] interconnect: Add devm_of_icc_get() as exported API for users Akash Asthana
2020-04-28 16:04 ` Georgi Djakov
2020-04-15 10:23 ` [PATCH V4 2/9] interconnect: Set peak requirement as twice of average Akash Asthana
2020-04-23 9:31 ` Georgi Djakov
2020-04-28 9:46 ` Akash Asthana
2020-04-28 10:53 ` Georgi Djakov
2020-04-15 10:23 ` [PATCH V4 3/9] soc: qcom: geni: Support for ICC voting Akash Asthana
2020-04-15 23:36 ` Matthias Kaehlcke
2020-04-28 9:48 ` Akash Asthana
2020-04-15 10:23 ` [PATCH V4 4/9] soc: qcom-geni-se: Add interconnect support to fix earlycon crash Akash Asthana
2020-04-16 0:31 ` Matthias Kaehlcke
2020-04-28 10:21 ` Akash Asthana
2020-04-28 15:48 ` Matthias Kaehlcke
2020-04-15 10:23 ` [PATCH V4 5/9] i2c: i2c-qcom-geni: Add interconnect support Akash Asthana
2020-04-16 17:09 ` Matthias Kaehlcke
2020-04-15 10:23 ` [PATCH V4 6/9] spi: spi-geni-qcom: " Akash Asthana
2020-04-15 11:39 ` Mark Brown
2020-04-15 10:23 ` Akash Asthana [this message]
2020-04-16 17:17 ` [PATCH V4 7/9] tty: serial: qcom_geni_serial: " Matthias Kaehlcke
2020-04-15 10:23 ` [PATCH V4 8/9] spi: spi-qcom-qspi: " Akash Asthana
2020-04-15 10:23 ` [PATCH V4 9/9] arm64: dts: sc7180: Add interconnect for QUP and QSPI Akash Asthana
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=1586946198-13912-8-git-send-email-akashast@codeaurora.org \
--to=akashast@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=evgreen@chromium.org \
--cc=georgi.djakov@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mgautam@codeaurora.org \
--cc=mka@chromium.org \
--cc=robh+dt@kernel.org \
--cc=swboyd@chromium.org \
--cc=wsa@the-dreams.de \
/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).