Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ebad85 authored by Ryan Case's avatar Ryan Case Committed by Greg Kroah-Hartman
Browse files

tty: serial: qcom_geni_serial: Remove xfer_mode variable 



[ Upstream commit bdc05a8a3f822ca0662464055f902faf760da6be ]

The driver only supports FIFO mode so setting and checking this variable
is unnecessary. If DMA support is ever added then such checks can be
introduced.

Signed-off-by: default avatarRyan Case <ryandcase@chromium.org>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4e438733

drivers/tty/serial/qcom_geni_serial.c

+24 −43
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ struct qcom_geni_serial_port { 
	u32 tx_fifo_depth;

	u32 tx_fifo_width;

	u32 rx_fifo_depth;

	enum geni_se_xfer_mode xfer_mode;

	bool setup;

	int (*handle_rx)(struct uart_port *uport, u32 bytes, bool drop);

	unsigned int baud;
@@ -547,15 +546,8 @@ static int handle_rx_uart(struct uart_port *uport, u32 bytes, bool drop) 
static void qcom_geni_serial_start_tx(struct uart_port *uport)

{

	u32 irq_en;

	struct qcom_geni_serial_port *port = to_dev_port(uport, uport);

	u32 status;



	if (port->xfer_mode == GENI_SE_FIFO) {

		/*

		 * readl ensures reading & writing of IRQ_EN register

		 * is not re-ordered before checking the status of the

		 * Serial Engine.

		 */

	status = readl(uport->membase + SE_GENI_STATUS);

	if (status & M_GENI_CMD_ACTIVE)

		return;
@@ -566,11 +558,9 @@ static void qcom_geni_serial_start_tx(struct uart_port *uport) 
	irq_en = readl(uport->membase +	SE_GENI_M_IRQ_EN);

	irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN;



		writel(DEF_TX_WM, uport->membase +

						SE_GENI_TX_WATERMARK_REG);

	writel(DEF_TX_WM, uport->membase + SE_GENI_TX_WATERMARK_REG);

	writel(irq_en, uport->membase +	SE_GENI_M_IRQ_EN);

}

}



static void qcom_geni_serial_stop_tx(struct uart_port *uport)

{
@@ -579,12 +569,8 @@ static void qcom_geni_serial_stop_tx(struct uart_port *uport) 
	struct qcom_geni_serial_port *port = to_dev_port(uport, uport);



	irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);

	irq_en &= ~M_CMD_DONE_EN;

	if (port->xfer_mode == GENI_SE_FIFO) {

		irq_en &= ~M_TX_FIFO_WATERMARK_EN;

		writel(0, uport->membase +

				     SE_GENI_TX_WATERMARK_REG);

	}

	irq_en &= ~(M_CMD_DONE_EN | M_TX_FIFO_WATERMARK_EN);

	writel(0, uport->membase + SE_GENI_TX_WATERMARK_REG);

	writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);

	status = readl(uport->membase + SE_GENI_STATUS);

	/* Possible stop tx is called multiple times. */
@@ -614,7 +600,6 @@ static void qcom_geni_serial_start_rx(struct uart_port *uport) 


	geni_se_setup_s_cmd(&port->se, UART_START_READ, 0);



	if (port->xfer_mode == GENI_SE_FIFO) {

	irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);

	irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;

	writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
@@ -623,7 +608,6 @@ static void qcom_geni_serial_start_rx(struct uart_port *uport) 
	irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;

	writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);

}

}



static void qcom_geni_serial_stop_rx(struct uart_port *uport)

{
@@ -632,7 +616,6 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport) 
	struct qcom_geni_serial_port *port = to_dev_port(uport, uport);

	u32 irq_clear = S_CMD_DONE_EN;



	if (port->xfer_mode == GENI_SE_FIFO) {

	irq_en = readl(uport->membase + SE_GENI_S_IRQ_EN);

	irq_en &= ~(S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN);

	writel(irq_en, uport->membase + SE_GENI_S_IRQ_EN);
@@ -640,7 +623,6 @@ static void qcom_geni_serial_stop_rx(struct uart_port *uport) 
	irq_en = readl(uport->membase + SE_GENI_M_IRQ_EN);

	irq_en &= ~(M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN);

	writel(irq_en, uport->membase + SE_GENI_M_IRQ_EN);

	}



	status = readl(uport->membase + SE_GENI_STATUS);

	/* Possible stop rx is called multiple times. */
@@ -878,7 +860,6 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport) 
	 * Make an unconditional cancel on the main sequencer to reset

	 * it else we could end up in data loss scenarios.

	 */

	port->xfer_mode = GENI_SE_FIFO;

	if (uart_console(uport))

		qcom_geni_serial_poll_tx_done(uport);

	geni_se_config_packing(&port->se, BITS_PER_BYTE, port->tx_bytes_pw,
@@ -886,7 +867,7 @@ static int qcom_geni_serial_port_setup(struct uart_port *uport) 
	geni_se_config_packing(&port->se, BITS_PER_BYTE, port->rx_bytes_pw,

						false, false, true);

	geni_se_init(&port->se, UART_RX_WM, port->rx_fifo_depth - 2);

	geni_se_select_mode(&port->se, port->xfer_mode);

	geni_se_select_mode(&port->se, GENI_SE_FIFO);

	if (!uart_console(uport)) {

		port->rx_fifo = devm_kcalloc(uport->dev,

			port->rx_fifo_depth, sizeof(u32), GFP_KERNEL);