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

Commit 4ac24a87 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Pierre Ossman
Browse files

mmc: at91_mci: update bytes_xfered value once xfer done 



Modify bytes_xfered value after a write.

That will report, as accurately as possible, the amount of
sectors that are effectively written.

This update introduces the check of the busy signal given by
the card.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent c5a89c6c

drivers/mmc/host/at91_mci.c

+34 −6
Original line number Original line Diff line number Diff line
@@ -340,8 +340,6 @@ static void at91_mci_post_dma_read(struct at91mci_host *host) 




		dma_unmap_page(NULL, sg->dma_address, sg->length, DMA_FROM_DEVICE);

		dma_unmap_page(NULL, sg->dma_address, sg->length, DMA_FROM_DEVICE);





		data->bytes_xfered += sg->length;



		if (cpu_is_at91rm9200()) {	/* AT91RM9200 errata */

		if (cpu_is_at91rm9200()) {	/* AT91RM9200 errata */

			unsigned int *buffer;

			unsigned int *buffer;

			int index;

			int index;
@@ -357,6 +355,8 @@ static void at91_mci_post_dma_read(struct at91mci_host *host) 
		}

		}





		flush_dcache_page(sg_page(sg));

		flush_dcache_page(sg_page(sg));



		data->bytes_xfered += sg->length;

	}

	}





	/* Is there another transfer to trigger? */

	/* Is there another transfer to trigger? */
@@ -397,9 +397,31 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host) 
		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);

	} else

	} else

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);

}



/*

 * Update bytes tranfered count during a write operation

 */

static void at91_mci_update_bytes_xfered(struct at91mci_host *host)

{

	struct mmc_data *data;





	/* always deal with the effective request (and not the current cmd) */



	if (host->request->cmd && host->request->cmd->error != 0)

		return;



	if (host->request->data) {

		data = host->request->data;

		if (data->flags & MMC_DATA_WRITE) {

			/* card is in IDLE mode now */

			pr_debug("-> bytes_xfered %d, total_length = %d\n",

				data->bytes_xfered, host->total_length);

			data->bytes_xfered = host->total_length;

			data->bytes_xfered = host->total_length;

		}

		}

	}

}







/*Handle after command sent ready*/

/*Handle after command sent ready*/

static int at91_mci_handle_cmdrdy(struct at91mci_host *host)

static int at91_mci_handle_cmdrdy(struct at91mci_host *host)
@@ -413,8 +435,7 @@ static int at91_mci_handle_cmdrdy(struct at91mci_host *host) 
		} else return 1;

		} else return 1;

	} else if (host->cmd->data->flags & MMC_DATA_WRITE) {

	} else if (host->cmd->data->flags & MMC_DATA_WRITE) {

		/*After sendding multi-block-write command, start DMA transfer*/

		/*After sendding multi-block-write command, start DMA transfer*/

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_TXBUFE);

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_TXBUFE | AT91_MCI_BLKE);

		at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);

		at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTEN);

		at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTEN);

	}

	}
@@ -817,6 +838,7 @@ static irqreturn_t at91_mci_irq(int irq, void *devid) 




		if (int_status & AT91_MCI_NOTBUSY) {

		if (int_status & AT91_MCI_NOTBUSY) {

			pr_debug("Card is ready\n");

			pr_debug("Card is ready\n");

			at91_mci_update_bytes_xfered(host);

			completed = 1;

			completed = 1;

		}

		}
@@ -825,7 +847,13 @@ static irqreturn_t at91_mci_irq(int irq, void *devid) 




		if (int_status & AT91_MCI_BLKE) {

		if (int_status & AT91_MCI_BLKE) {

			pr_debug("Block transfer has ended\n");

			pr_debug("Block transfer has ended\n");

			if (host->request->data && host->request->data->blocks > 1) {

				/* multi block write : complete multi write

				 * command and send stop */

				completed = 1;

				completed = 1;

			} else {

				at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);

			}

		}

		}





		if (int_status & AT91_MCI_TXRDY)

		if (int_status & AT91_MCI_TXRDY)