Commit 7cf563b2 authored by Akash Asthana's avatar Akash Asthana Committed by Bjorn Andersson

tty: serial: qcom_geni_serial: Add interconnect support

Get the interconnect paths for Uart based Serial Engine device
and vote according to the baud rate requirement of the driver.
Signed-off-by: default avatarAkash Asthana <akashast@codeaurora.org>
Reviewed-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/1592908737-7068-5-git-send-email-akashast@codeaurora.orgSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent bf225ed3
...@@ -945,6 +945,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, ...@@ -945,6 +945,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
struct qcom_geni_serial_port *port = to_dev_port(uport, uport); struct qcom_geni_serial_port *port = to_dev_port(uport, uport);
unsigned long clk_rate; unsigned long clk_rate;
u32 ver, sampling_rate; u32 ver, sampling_rate;
unsigned int avg_bw_core;
qcom_geni_serial_stop_rx(uport); qcom_geni_serial_stop_rx(uport);
/* baud rate */ /* baud rate */
...@@ -966,6 +967,16 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, ...@@ -966,6 +967,16 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport,
ser_clk_cfg = SER_CLK_EN; ser_clk_cfg = SER_CLK_EN;
ser_clk_cfg |= clk_div << CLK_DIV_SHFT; ser_clk_cfg |= clk_div << CLK_DIV_SHFT;
/*
* Bump up BW vote on CPU and CORE path as driver supports FIFO mode
* only.
*/
avg_bw_core = (baud > 115200) ? Bps_to_icc(CORE_2X_50_MHZ)
: GENI_DEFAULT_BW;
port->se.icc_paths[GENI_TO_CORE].avg_bw = avg_bw_core;
port->se.icc_paths[CPU_TO_GENI].avg_bw = Bps_to_icc(baud);
geni_icc_set_bw(&port->se);
/* parity */ /* parity */
tx_trans_cfg = readl(uport->membase + SE_UART_TX_TRANS_CFG); tx_trans_cfg = readl(uport->membase + SE_UART_TX_TRANS_CFG);
tx_parity_cfg = readl(uport->membase + SE_UART_TX_PARITY_CFG); tx_parity_cfg = readl(uport->membase + SE_UART_TX_PARITY_CFG);
...@@ -1235,11 +1246,14 @@ static void qcom_geni_serial_pm(struct uart_port *uport, ...@@ -1235,11 +1246,14 @@ static void qcom_geni_serial_pm(struct uart_port *uport,
if (old_state == UART_PM_STATE_UNDEFINED) if (old_state == UART_PM_STATE_UNDEFINED)
old_state = UART_PM_STATE_OFF; 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_enable(&port->se);
geni_se_resources_on(&port->se); geni_se_resources_on(&port->se);
else if (new_state == UART_PM_STATE_OFF && } else if (new_state == UART_PM_STATE_OFF &&
old_state == UART_PM_STATE_ON) old_state == UART_PM_STATE_ON) {
geni_se_resources_off(&port->se); geni_se_resources_off(&port->se);
geni_icc_disable(&port->se);
}
} }
static const struct uart_ops qcom_geni_console_pops = { static const struct uart_ops qcom_geni_console_pops = {
...@@ -1337,6 +1351,17 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) ...@@ -1337,6 +1351,17 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
ret = geni_icc_get(&port->se, NULL);
if (ret)
return ret;
port->se.icc_paths[GENI_TO_CORE].avg_bw = GENI_DEFAULT_BW;
port->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW;
/* Set BW for register access */
ret = geni_icc_set_bw(&port->se);
if (ret)
return ret;
port->name = devm_kasprintf(uport->dev, GFP_KERNEL, port->name = devm_kasprintf(uport->dev, GFP_KERNEL,
"qcom_geni_serial_%s%d", "qcom_geni_serial_%s%d",
uart_console(uport) ? "console" : "uart", uport->line); uart_console(uport) ? "console" : "uart", uport->line);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment