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

Commit beb9487b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Improve DMA error messages 



Make the life of the driver developer/debugger easier:
  - Add __func__ prefix to identical messages,
  - Add DMA directions to messages,
  - Add TX failure messages,
  - Always use "cookie %d" for DMA cookies,
  - "#%d" is reserved for the DMA cookie/descriptor index.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90803072

drivers/tty/serial/sh-sci.c

+16 −11
Original line number Diff line number Diff line
@@ -1319,7 +1319,8 @@ static int sci_dma_rx_push(struct sci_port *s, size_t count) 
	} else if (s->active_rx == s->cookie_rx[1]) {

		active = 1;

	} else {

		dev_err(port->dev, "cookie %d not found!\n", s->active_rx);

		dev_err(port->dev, "%s: Rx cookie %d not found!\n", __func__,

			s->active_rx);

		return 0;

	}
@@ -1345,8 +1346,8 @@ static void sci_dma_rx_complete(void *arg) 
	unsigned long flags;

	int count;



	dev_dbg(port->dev, "%s(%d) active #%d\n",

		__func__, port->line, s->active_rx);

	dev_dbg(port->dev, "%s(%d) active cookie %d\n", __func__, port->line,

		s->active_rx);



	spin_lock_irqsave(&port->lock, flags);
@@ -1418,12 +1419,12 @@ static void sci_submit_rx(struct sci_port *s) 
				s->cookie_rx[i] = -EINVAL;

			}

			dev_warn(s->port.dev,

				 "failed to re-start DMA, using PIO\n");

				 "Failed to re-start Rx DMA, using PIO\n");

			sci_rx_dma_release(s, true);

			return;

		}

		dev_dbg(s->port.dev, "%s(): cookie %d to #%d\n",

			__func__, s->cookie_rx[i], i);

		dev_dbg(s->port.dev, "%s(): cookie %d to #%d\n", __func__,

			s->cookie_rx[i], i);

	}



	s->active_rx = s->cookie_rx[0];
@@ -1443,7 +1444,8 @@ static void work_fn_rx(struct work_struct *work) 
	} else if (s->active_rx == s->cookie_rx[1]) {

		new = 1;

	} else {

		dev_err(port->dev, "cookie %d not found!\n", s->active_rx);

		dev_err(port->dev, "%s: Rx cookie %d not found!\n", __func__,

			s->active_rx);

		return;

	}

	desc = s->desc_rx[new];
@@ -1482,7 +1484,7 @@ static void work_fn_rx(struct work_struct *work) 


	s->active_rx = s->cookie_rx[!new];



	dev_dbg(port->dev, "%s: cookie %d #%d, new active #%d\n",

	dev_dbg(port->dev, "%s: cookie %d #%d, new active cookie %d\n",

		__func__, s->cookie_rx[new], new, s->active_rx);

}
@@ -1516,6 +1518,7 @@ static void work_fn_tx(struct work_struct *work) 
			sg, s->sg_len_tx, DMA_MEM_TO_DEV,

			DMA_PREP_INTERRUPT | DMA_CTRL_ACK);

	if (!desc) {

		dev_warn(port->dev, "Failed preparing Tx DMA descriptor\n");

		/* switch to PIO */

		sci_tx_dma_release(s, true);

		return;
@@ -1704,13 +1707,15 @@ static void sci_request_dma(struct uart_port *port) 
			    UART_XMIT_SIZE,

			    (uintptr_t)port->state->xmit.buf & ~PAGE_MASK);

		nent = dma_map_sg(port->dev, &s->sg_tx, 1, DMA_TO_DEVICE);

		if (!nent)

		if (!nent) {

			dev_warn(port->dev, "Failed mapping Tx DMA descriptor\n");

			sci_tx_dma_release(s, false);

		else

		} else {

			dev_dbg(port->dev, "%s: mapped %d@%p to %pad\n",

				__func__,

				sg_dma_len(&s->sg_tx), port->state->xmit.buf,

				&sg_dma_address(&s->sg_tx));

		}



		s->sg_len_tx = nent;
@@ -1737,7 +1742,7 @@ static void sci_request_dma(struct uart_port *port) 


		if (!buf[0]) {

			dev_warn(port->dev,

				 "failed to allocate dma buffer, using PIO\n");

				 "Failed to allocate Rx dma buffer, using PIO\n");

			sci_rx_dma_release(s, true);

			return;

		}