@@ -1323,7 +1323,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;
}
@@ -1349,8 +1350,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);
@@ -1433,12 +1434,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];
@@ -1458,7 +1459,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];
@@ -1497,7 +1499,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);
}
@@ -1532,6 +1534,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;
@@ -1718,13 +1721,15 @@ static void sci_request_dma(struct uart_port *port)
sg_init_one(&s->sg_tx, port->state->xmit.buf, UART_XMIT_SIZE);
nent = dma_map_sg(chan->device->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;
@@ -1752,7 +1757,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;
}
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: Geert Uytterhoeven <geert+renesas@glider.be> --- v2: - Add "cookie %d" and ""#%d" consistency. --- drivers/tty/serial/sh-sci.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)