Commit 6801c41a authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Chris Ball

mmc: atmel-mci: add debug logs

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 24011f34
...@@ -630,6 +630,7 @@ static void atmci_send_command(struct atmel_mci *host, ...@@ -630,6 +630,7 @@ static void atmci_send_command(struct atmel_mci *host,
static void atmci_send_stop_cmd(struct atmel_mci *host, struct mmc_data *data) static void atmci_send_stop_cmd(struct atmel_mci *host, struct mmc_data *data)
{ {
dev_dbg(&host->pdev->dev, "send stop command\n");
atmci_send_command(host, data->stop, host->stop_cmdr); atmci_send_command(host, data->stop, host->stop_cmdr);
atmci_writel(host, ATMCI_IER, ATMCI_CMDRDY); atmci_writel(host, ATMCI_IER, ATMCI_CMDRDY);
} }
...@@ -738,6 +739,8 @@ static void atmci_pdc_complete(struct atmel_mci *host) ...@@ -738,6 +739,8 @@ static void atmci_pdc_complete(struct atmel_mci *host)
* to send the stop command or waiting for NBUSY in this case. * to send the stop command or waiting for NBUSY in this case.
*/ */
if (host->data) { if (host->data) {
dev_dbg(&host->pdev->dev,
"(%s) set pending xfer complete\n", __func__);
atmci_set_pending(host, EVENT_XFER_COMPLETE); atmci_set_pending(host, EVENT_XFER_COMPLETE);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
} }
...@@ -775,6 +778,8 @@ static void atmci_dma_complete(void *arg) ...@@ -775,6 +778,8 @@ static void atmci_dma_complete(void *arg)
* to send the stop command or waiting for NBUSY in this case. * to send the stop command or waiting for NBUSY in this case.
*/ */
if (data) { if (data) {
dev_dbg(&host->pdev->dev,
"(%s) set pending xfer complete\n", __func__);
atmci_set_pending(host, EVENT_XFER_COMPLETE); atmci_set_pending(host, EVENT_XFER_COMPLETE);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
...@@ -1001,6 +1006,8 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data) ...@@ -1001,6 +1006,8 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
static void atmci_stop_transfer(struct atmel_mci *host) static void atmci_stop_transfer(struct atmel_mci *host)
{ {
dev_dbg(&host->pdev->dev,
"(%s) set pending xfer complete\n", __func__);
atmci_set_pending(host, EVENT_XFER_COMPLETE); atmci_set_pending(host, EVENT_XFER_COMPLETE);
atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY); atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY);
} }
...@@ -1022,6 +1029,8 @@ static void atmci_stop_transfer_dma(struct atmel_mci *host) ...@@ -1022,6 +1029,8 @@ static void atmci_stop_transfer_dma(struct atmel_mci *host)
atmci_dma_cleanup(host); atmci_dma_cleanup(host);
} else { } else {
/* Data transfer was stopped by the interrupt handler */ /* Data transfer was stopped by the interrupt handler */
dev_dbg(&host->pdev->dev,
"(%s) set pending xfer complete\n", __func__);
atmci_set_pending(host, EVENT_XFER_COMPLETE); atmci_set_pending(host, EVENT_XFER_COMPLETE);
atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY); atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY);
} }
...@@ -1049,6 +1058,8 @@ static void atmci_start_request(struct atmel_mci *host, ...@@ -1049,6 +1058,8 @@ static void atmci_start_request(struct atmel_mci *host,
host->cmd_status = 0; host->cmd_status = 0;
host->data_status = 0; host->data_status = 0;
dev_dbg(&host->pdev->dev, "start request: cmd %u\n", mrq->cmd->opcode);
if (host->need_reset || host->caps.need_reset_after_xfer) { if (host->need_reset || host->caps.need_reset_after_xfer) {
iflags = atmci_readl(host, ATMCI_IMR); iflags = atmci_readl(host, ATMCI_IMR);
iflags &= (ATMCI_SDIOIRQA | ATMCI_SDIOIRQB); iflags &= (ATMCI_SDIOIRQA | ATMCI_SDIOIRQB);
...@@ -1129,6 +1140,7 @@ static void atmci_queue_request(struct atmel_mci *host, ...@@ -1129,6 +1140,7 @@ static void atmci_queue_request(struct atmel_mci *host,
host->state = STATE_SENDING_CMD; host->state = STATE_SENDING_CMD;
atmci_start_request(host, slot); atmci_start_request(host, slot);
} else { } else {
dev_dbg(&host->pdev->dev, "queue request\n");
list_add_tail(&slot->queue_node, &host->queue); list_add_tail(&slot->queue_node, &host->queue);
} }
spin_unlock_bh(&host->lock); spin_unlock_bh(&host->lock);
...@@ -1141,6 +1153,7 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -1141,6 +1153,7 @@ static void atmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
struct mmc_data *data; struct mmc_data *data;
WARN_ON(slot->mrq); WARN_ON(slot->mrq);
dev_dbg(&host->pdev->dev, "MRQ: cmd %u\n", mrq->cmd->opcode);
/* /*
* We may "know" the card is gone even though there's still an * We may "know" the card is gone even though there's still an
...@@ -1530,6 +1543,7 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1530,6 +1543,7 @@ static void atmci_tasklet_func(unsigned long priv)
do { do {
prev_state = state; prev_state = state;
dev_dbg(&host->pdev->dev, "FSM: state=%d\n", state);
switch (state) { switch (state) {
case STATE_IDLE: case STATE_IDLE:
...@@ -1542,14 +1556,18 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1542,14 +1556,18 @@ static void atmci_tasklet_func(unsigned long priv)
* END_REQUEST by default, WAITING_NOTBUSY if it's a * END_REQUEST by default, WAITING_NOTBUSY if it's a
* command needing it or DATA_XFER if there is data. * command needing it or DATA_XFER if there is data.
*/ */
dev_dbg(&host->pdev->dev, "FSM: cmd ready?\n");
if (!atmci_test_and_clear_pending(host, if (!atmci_test_and_clear_pending(host,
EVENT_CMD_RDY)) EVENT_CMD_RDY))
break; break;
dev_dbg(&host->pdev->dev, "set completed cmd ready\n");
host->cmd = NULL; host->cmd = NULL;
atmci_set_completed(host, EVENT_CMD_RDY); atmci_set_completed(host, EVENT_CMD_RDY);
atmci_command_complete(host, mrq->cmd); atmci_command_complete(host, mrq->cmd);
if (mrq->data) { if (mrq->data) {
dev_dbg(&host->pdev->dev,
"command with data transfer");
/* /*
* If there is a command error don't start * If there is a command error don't start
* data transfer. * data transfer.
...@@ -1564,6 +1582,8 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1564,6 +1582,8 @@ static void atmci_tasklet_func(unsigned long priv)
} else } else
state = STATE_DATA_XFER; state = STATE_DATA_XFER;
} else if ((!mrq->data) && (mrq->cmd->flags & MMC_RSP_BUSY)) { } else if ((!mrq->data) && (mrq->cmd->flags & MMC_RSP_BUSY)) {
dev_dbg(&host->pdev->dev,
"command response need waiting notbusy");
atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY); atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY);
state = STATE_WAITING_NOTBUSY; state = STATE_WAITING_NOTBUSY;
} else } else
...@@ -1574,6 +1594,7 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1574,6 +1594,7 @@ static void atmci_tasklet_func(unsigned long priv)
case STATE_DATA_XFER: case STATE_DATA_XFER:
if (atmci_test_and_clear_pending(host, if (atmci_test_and_clear_pending(host,
EVENT_DATA_ERROR)) { EVENT_DATA_ERROR)) {
dev_dbg(&host->pdev->dev, "set completed data error\n");
atmci_set_completed(host, EVENT_DATA_ERROR); atmci_set_completed(host, EVENT_DATA_ERROR);
state = STATE_END_REQUEST; state = STATE_END_REQUEST;
break; break;
...@@ -1586,10 +1607,14 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1586,10 +1607,14 @@ static void atmci_tasklet_func(unsigned long priv)
* to the next step which is WAITING_NOTBUSY in write * to the next step which is WAITING_NOTBUSY in write
* case and directly SENDING_STOP in read case. * case and directly SENDING_STOP in read case.
*/ */
dev_dbg(&host->pdev->dev, "FSM: xfer complete?\n");
if (!atmci_test_and_clear_pending(host, if (!atmci_test_and_clear_pending(host,
EVENT_XFER_COMPLETE)) EVENT_XFER_COMPLETE))
break; break;
dev_dbg(&host->pdev->dev,
"(%s) set completed xfer complete\n",
__func__);
atmci_set_completed(host, EVENT_XFER_COMPLETE); atmci_set_completed(host, EVENT_XFER_COMPLETE);
if (host->data->flags & MMC_DATA_WRITE) { if (host->data->flags & MMC_DATA_WRITE) {
...@@ -1614,10 +1639,12 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1614,10 +1639,12 @@ static void atmci_tasklet_func(unsigned long priv)
* included) or a write operation. In the latest case, * included) or a write operation. In the latest case,
* we need to send a stop command. * we need to send a stop command.
*/ */
dev_dbg(&host->pdev->dev, "FSM: not busy?\n");
if (!atmci_test_and_clear_pending(host, if (!atmci_test_and_clear_pending(host,
EVENT_NOTBUSY)) EVENT_NOTBUSY))
break; break;
dev_dbg(&host->pdev->dev, "set completed not busy\n");
atmci_set_completed(host, EVENT_NOTBUSY); atmci_set_completed(host, EVENT_NOTBUSY);
if (host->data) { if (host->data) {
...@@ -1649,10 +1676,12 @@ static void atmci_tasklet_func(unsigned long priv) ...@@ -1649,10 +1676,12 @@ static void atmci_tasklet_func(unsigned long priv)
* in order to go to the end request state instead of * in order to go to the end request state instead of
* sending stop again. * sending stop again.
*/ */
dev_dbg(&host->pdev->dev, "FSM: cmd ready?\n");
if (!atmci_test_and_clear_pending(host, if (!atmci_test_and_clear_pending(host,
EVENT_CMD_RDY)) EVENT_CMD_RDY))
break; break;
dev_dbg(&host->pdev->dev, "FSM: cmd ready\n");
host->cmd = NULL; host->cmd = NULL;
host->data = NULL; host->data = NULL;
data->bytes_xfered = data->blocks * data->blksz; data->bytes_xfered = data->blocks * data->blksz;
...@@ -1858,18 +1887,21 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1858,18 +1887,21 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
break; break;
if (pending & ATMCI_DATA_ERROR_FLAGS) { if (pending & ATMCI_DATA_ERROR_FLAGS) {
dev_dbg(&host->pdev->dev, "IRQ: data error\n");
atmci_writel(host, ATMCI_IDR, ATMCI_DATA_ERROR_FLAGS atmci_writel(host, ATMCI_IDR, ATMCI_DATA_ERROR_FLAGS
| ATMCI_RXRDY | ATMCI_TXRDY | ATMCI_RXRDY | ATMCI_TXRDY
| ATMCI_ENDRX | ATMCI_ENDTX | ATMCI_ENDRX | ATMCI_ENDTX
| ATMCI_RXBUFF | ATMCI_TXBUFE); | ATMCI_RXBUFF | ATMCI_TXBUFE);
host->data_status = status; host->data_status = status;
dev_dbg(&host->pdev->dev, "set pending data error\n");
smp_wmb(); smp_wmb();
atmci_set_pending(host, EVENT_DATA_ERROR); atmci_set_pending(host, EVENT_DATA_ERROR);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
} }
if (pending & ATMCI_TXBUFE) { if (pending & ATMCI_TXBUFE) {
dev_dbg(&host->pdev->dev, "IRQ: tx buffer empty\n");
atmci_writel(host, ATMCI_IDR, ATMCI_TXBUFE); atmci_writel(host, ATMCI_IDR, ATMCI_TXBUFE);
atmci_writel(host, ATMCI_IDR, ATMCI_ENDTX); atmci_writel(host, ATMCI_IDR, ATMCI_ENDTX);
/* /*
...@@ -1885,6 +1917,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1885,6 +1917,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
atmci_pdc_complete(host); atmci_pdc_complete(host);
} }
} else if (pending & ATMCI_ENDTX) { } else if (pending & ATMCI_ENDTX) {
dev_dbg(&host->pdev->dev, "IRQ: end of tx buffer\n");
atmci_writel(host, ATMCI_IDR, ATMCI_ENDTX); atmci_writel(host, ATMCI_IDR, ATMCI_ENDTX);
if (host->data_size) { if (host->data_size) {
...@@ -1895,6 +1928,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1895,6 +1928,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
} }
if (pending & ATMCI_RXBUFF) { if (pending & ATMCI_RXBUFF) {
dev_dbg(&host->pdev->dev, "IRQ: rx buffer full\n");
atmci_writel(host, ATMCI_IDR, ATMCI_RXBUFF); atmci_writel(host, ATMCI_IDR, ATMCI_RXBUFF);
atmci_writel(host, ATMCI_IDR, ATMCI_ENDRX); atmci_writel(host, ATMCI_IDR, ATMCI_ENDRX);
/* /*
...@@ -1910,6 +1944,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1910,6 +1944,7 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
atmci_pdc_complete(host); atmci_pdc_complete(host);
} }
} else if (pending & ATMCI_ENDRX) { } else if (pending & ATMCI_ENDRX) {
dev_dbg(&host->pdev->dev, "IRQ: end of rx buffer\n");
atmci_writel(host, ATMCI_IDR, ATMCI_ENDRX); atmci_writel(host, ATMCI_IDR, ATMCI_ENDRX);
if (host->data_size) { if (host->data_size) {
...@@ -1926,15 +1961,19 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1926,15 +1961,19 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
* The appropriate workaround is to use the BLKE signal. * The appropriate workaround is to use the BLKE signal.
*/ */
if (pending & ATMCI_BLKE) { if (pending & ATMCI_BLKE) {
dev_dbg(&host->pdev->dev, "IRQ: blke\n");
atmci_writel(host, ATMCI_IDR, ATMCI_BLKE); atmci_writel(host, ATMCI_IDR, ATMCI_BLKE);
smp_wmb(); smp_wmb();
dev_dbg(&host->pdev->dev, "set pending notbusy\n");
atmci_set_pending(host, EVENT_NOTBUSY); atmci_set_pending(host, EVENT_NOTBUSY);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
} }
if (pending & ATMCI_NOTBUSY) { if (pending & ATMCI_NOTBUSY) {
dev_dbg(&host->pdev->dev, "IRQ: not_busy\n");
atmci_writel(host, ATMCI_IDR, ATMCI_NOTBUSY); atmci_writel(host, ATMCI_IDR, ATMCI_NOTBUSY);
smp_wmb(); smp_wmb();
dev_dbg(&host->pdev->dev, "set pending notbusy\n");
atmci_set_pending(host, EVENT_NOTBUSY); atmci_set_pending(host, EVENT_NOTBUSY);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
} }
...@@ -1945,9 +1984,11 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id) ...@@ -1945,9 +1984,11 @@ static irqreturn_t atmci_interrupt(int irq, void *dev_id)
atmci_write_data_pio(host); atmci_write_data_pio(host);
if (pending & ATMCI_CMDRDY) { if (pending & ATMCI_CMDRDY) {
dev_dbg(&host->pdev->dev, "IRQ: cmd ready\n");
atmci_writel(host, ATMCI_IDR, ATMCI_CMDRDY); atmci_writel(host, ATMCI_IDR, ATMCI_CMDRDY);
host->cmd_status = status; host->cmd_status = status;
smp_wmb(); smp_wmb();
dev_dbg(&host->pdev->dev, "set pending cmd rdy\n");
atmci_set_pending(host, EVENT_CMD_RDY); atmci_set_pending(host, EVENT_CMD_RDY);
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment