Merge "msm_serial_hs: Enhancing IPC logs" (6600b56f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/tty/serial/msm_serial_hs.c

+26 −12

Original line number	Diff line number	Diff line
		@@ -515,10 +515,20 @@ static int sps_rx_disconnect(struct sps_pipe *sps_pipe_handler)

		static void hex_dump_ipc(char prefix, char string, int size)
		{
		char linebuf[512];

		hex_dump_to_buffer(string, size, 16, 1, linebuf, sizeof(linebuf), 1);
		MSM_HS_DBG("%s : %s", prefix, linebuf);
		unsigned char linebuf[512];
		unsigned char firstbuf[40], lastbuf[40];

		if ((hs_serial_debug_mask != DBG_LEV) && (size > 20)) {
		hex_dump_to_buffer(string, 10, 16, 1,
		firstbuf, sizeof(firstbuf), 1);
		hex_dump_to_buffer(string + (size - 10), 10, 16, 1,
		lastbuf, sizeof(lastbuf), 1);
		MSM_HS_INFO("%s : %s...%s", prefix, firstbuf, lastbuf);
		} else {
		hex_dump_to_buffer(string, size, 16, 1,
		linebuf, sizeof(linebuf), 1);
		MSM_HS_INFO("%s : %s", prefix, linebuf);
		}
		}

		/*
		@@ -1257,7 +1267,7 @@ static void msm_hs_submit_tx_locked(struct uart_port *uport)

		if (tx_count > left)
		tx_count = left;
		MSM_HS_DBG("%s(): [UART_TX]<%d>\n", __func__, tx_count);
		MSM_HS_INFO("%s(): [UART_TX]<%d>\n", __func__, tx_count);
		hex_dump_ipc("HSUART write: ", &tx_buf->buf[tx_buf->tail], tx_count);
		src_addr = tx->dma_base + tx_buf->tail;
		/* Mask the src_addr to align on a cache
		@@ -1295,7 +1305,7 @@ static void msm_hs_start_rx_locked(struct uart_port *uport)
		return;
		}
		if (rx->rx_cmd_exec) {
		MSM_HS_DBG("%s: Rx Cmd got executed, wait for rx_tlet\n",
		MSM_HS_INFO("%s: Rx Cmd got executed, wait for rx_tlet\n",
		__func__);
		rx->flush = FLUSH_IGNORE;
		return;
		@@ -1482,7 +1492,7 @@ static void msm_serial_hs_rx_tlet(unsigned long tlet_ptr)

		rx_count = msm_uport->rx_count_callback;

		MSM_HS_DBG("%s():[UART_RX]<%d>\n", __func__, rx_count);
		MSM_HS_INFO("%s():[UART_RX]<%d>\n", __func__, rx_count);
		hex_dump_ipc("HSUART Read: ", msm_uport->rx.buffer, rx_count);

		if (0 != (uport->read_status_mask & CREAD)) {
		@@ -1610,7 +1620,8 @@ static void msm_serial_hs_tx_tlet(unsigned long tlet_ptr)
		}

		spin_unlock_irqrestore(&(msm_uport->uport.lock), flags);
		MSM_HS_DBG("In %s()\n", __func__);
		MSM_HS_INFO("In %s()\n", __func__);
		dump_uart_hs_registers(msm_uport);
		}

		/**
		@@ -1877,7 +1888,7 @@ static int msm_hs_check_clock_off(struct uart_port *uport)
		spin_unlock_irqrestore(&uport->lock, flags);

		mutex_unlock(&msm_uport->clk_mutex);

		MSM_HS_INFO("%s: Clocks Off Successfully\n", __func__);
		return 1;
		}

		@@ -1906,7 +1917,7 @@ static enum hrtimer_restart msm_hs_clk_off_retry(struct hrtimer *timer)
		static irqreturn_t msm_hs_isr(int irq, void *dev)
		{
		unsigned long flags;
		unsigned long isr_status;
		unsigned int isr_status;
		struct msm_hs_port msm_uport = (struct msm_hs_port )dev;
		struct uart_port *uport = &msm_uport->uport;
		struct circ_buf *tx_buf = &uport->state->xmit;
		@@ -1916,7 +1927,7 @@ static irqreturn_t msm_hs_isr(int irq, void *dev)
		spin_lock_irqsave(&uport->lock, flags);

		isr_status = msm_hs_read(uport, UART_DM_MISR);
		MSM_HS_DBG("%s:UART_DM_MISR %lx", __func__, isr_status);
		MSM_HS_INFO("%s: DM_ISR: 0x%x\n", __func__, isr_status);
		dump_uart_hs_registers(msm_uport);

		/* Uart RX starting */
		@@ -1976,6 +1987,7 @@ static irqreturn_t msm_hs_isr(int irq, void *dev)
		/* TX FIFO is empty */
		msm_uport->imr_reg &= ~UARTDM_ISR_TXLEV_BMSK;
		msm_hs_write(uport, UART_DM_IMR, msm_uport->imr_reg);
		MSM_HS_DBG("%s: TXLEV Interrupt\n", __func__);
		/*
		* Complete device write before starting clock_off request.
		* Hence mb() requires here.
		@@ -2133,7 +2145,8 @@ void msm_hs_request_clock_on(struct uart_port *uport)
		__func__);
		break;
		}

		MSM_HS_INFO("%s:Clock ON Successful\n", __func__);
		dump_uart_hs_registers(msm_uport);
		spin_unlock_irqrestore(&uport->lock, flags);
		mutex_unlock(&msm_uport->clk_mutex);
		}
		@@ -3167,6 +3180,7 @@ static void msm_hs_shutdown(struct uart_port *uport)
		struct msm_hs_tx *tx = &msm_uport->tx;
		struct sps_pipe *sps_pipe_handle = tx->cons.pipe_handle;

		MSM_HS_INFO("%s()\n", __func__);
		msm_hs_clock_vote(msm_uport);
		/* make sure tx tasklet finishes */
		tasklet_kill(&msm_uport->tx.tlet);