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

Commit 66a5e619 authored by Chandana Kishori Chiluveru's avatar Chandana Kishori Chiluveru Committed by Venkata Manasa Kakarla
Browse files

serial:msm_geni_serial: CANCEL bit changes for 4.14 based target 



Cancel bit changes on msm-4.14 based on qup version.

Change-Id: Icfbf7ab0c7545d4fdd5e415fcb8efbbc17ba58dd
Signed-off-by: default avatarChandana Kishori Chiluveru <cchiluve@codeaurora.org>
parent fcf1e573

drivers/tty/serial/msm_geni_serial.c

+29 −12
Original line number Diff line number Diff line
@@ -130,10 +130,8 @@ 
				M_CMD_CANCEL_EN | M_CMD_ABORT_EN)

#define S_IRQ_BITS		(S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN |\

				S_CMD_CANCEL_EN | S_CMD_ABORT_EN)

#define DMA_TX_IRQ_BITS		(TX_RESET_DONE | TX_DMA_DONE |\

				TX_GENI_CANCEL_IRQ)

#define DMA_RX_IRQ_BITS		(RX_EOT | RX_GENI_CANCEL_IRQ |\

				RX_RESET_DONE | UART_DMA_RX_ERRS |\

#define DMA_TX_IRQ_BITS		(TX_RESET_DONE | TX_DMA_DONE)

#define DMA_RX_IRQ_BITS		(RX_EOT | RX_RESET_DONE | UART_DMA_RX_ERRS |\

				UART_DMA_RX_PARITY_ERR | UART_DMA_RX_BREAK |\

				RX_DMA_DONE)
@@ -300,8 +298,13 @@ static void msm_geni_serial_enable_interrupts(struct uart_port *uport) 
	geni_m_irq_en |= M_IRQ_BITS;

	geni_s_irq_en |= S_IRQ_BITS;

	if (port->xfer_mode == SE_DMA) {

		if (((port->ver_info.hw_major_ver <= 1)	&&

			(port->ver_info.hw_minor_ver <= 2)))

			dma_m_irq_en |= DMA_TX_IRQ_BITS;

		dma_s_irq_en |= DMA_RX_IRQ_BITS;

		else

			dma_m_irq_en |= DMA_TX_IRQ_BITS | TX_GENI_CANCEL_IRQ;

		dma_s_irq_en |= (DMA_RX_IRQ_BITS |

					RX_GENI_CANCEL_IRQ(port->ver_info));

	}



	geni_write_reg_nolog(geni_m_irq_en, uport->membase, SE_GENI_M_IRQ_EN);
@@ -340,8 +343,14 @@ static bool msm_serial_try_disable_interrupts(struct uart_port *uport) 
	geni_m_irq_en &= ~M_IRQ_BITS;

	geni_s_irq_en &= ~S_IRQ_BITS;

	if (port->xfer_mode == SE_DMA) {

		if (((port->ver_info.hw_major_ver <= 1)	&&

			(port->ver_info.hw_minor_ver <= 2)))

			dma_m_irq_en &= ~DMA_TX_IRQ_BITS;

		dma_s_irq_en &= ~DMA_RX_IRQ_BITS;

		else

			dma_m_irq_en &= ~(DMA_TX_IRQ_BITS |

						TX_GENI_CANCEL_IRQ);

		dma_s_irq_en &= DMA_RX_IRQ_BITS |

					RX_GENI_CANCEL_IRQ(port->ver_info);

	}



	geni_write_reg_nolog(geni_m_irq_en, uport->membase, SE_GENI_M_IRQ_EN);
@@ -2034,9 +2043,15 @@ static void msm_geni_serial_handle_isr(struct uart_port *uport, 


			if (dma_tx_status & TX_DMA_DONE)

				msm_geni_serial_handle_dma_tx(uport);

			if (dma_tx_status & (TX_RESET_DONE |

						TX_GENI_CANCEL_IRQ))



			if (((msm_port->ver_info.hw_major_ver <= 1) &&

				(msm_port->ver_info.hw_minor_ver <= 2)) &&

				(dma_tx_status & TX_RESET_DONE)) {

				m_cmd_done = true;

			} else if (dma_tx_status & (TX_RESET_DONE |

				TX_GENI_CANCEL_IRQ)) {

				m_cmd_done = true;

			}

			if (m_irq_status & (M_CMD_CANCEL_EN | M_CMD_ABORT_EN))

				m_cmd_done = true;

		}
@@ -2072,7 +2087,8 @@ static void msm_geni_serial_handle_isr(struct uart_port *uport, 
					dma_rx_status & RX_DMA_DONE) {

				msm_geni_serial_handle_dma_rx(uport,

							drop_rx);

				if (!(dma_rx_status & RX_GENI_CANCEL_IRQ)) {

				if (!(dma_rx_status &

				RX_GENI_CANCEL_IRQ(msm_port->ver_info))) {

					geni_se_rx_dma_start(uport->membase,

					DMA_RX_BUF_SIZE, &msm_port->rx_dma);

				}
@@ -2085,7 +2101,8 @@ static void msm_geni_serial_handle_isr(struct uart_port *uport, 
				WARN_ON(1);

			}



			if (dma_rx_status & (RX_EOT | RX_GENI_CANCEL_IRQ |

			if (dma_rx_status & (RX_EOT |

				RX_GENI_CANCEL_IRQ(msm_port->ver_info) |

								RX_DMA_DONE))

				s_cmd_done = true;

include/linux/qcom-geni-se.h

+6 −1
Original line number Diff line number Diff line
@@ -391,7 +391,12 @@ struct se_geni_rsc { 
#define RX_RESET_DONE		(BIT(3))

#define RX_FLUSH_DONE		(BIT(4))

#define RX_GENI_GP_IRQ		(GENMASK(10, 5))

#define RX_GENI_CANCEL_IRQ	(BIT(14))

/*

 * QUPs which have HW version <=1.2 11th bit of

 * DMA_RX_IRQ_STAT register denotes RX_GENI_CANCEL_IRQ bit.

 */

#define RX_GENI_CANCEL_IRQ(n)	(((n.hw_major_ver <= 1) &&\

				(n.hw_minor_ver <= 2)) ? BIT(11) : BIT(14))

#define RX_GENI_GP_IRQ_EXT	(GENMASK(13, 12))



/* DMA DEBUG Register fields */