at91_mci: Cover more AT91RM9200 and AT91SAM9261 errata. (9da3cbaf) · Commits · 戴 / test

According to the documentation the AT91SAM9261 MCI shares the block size limitations of the AT91RM9200 MCI. Also the errata documentation for AT91RM9200 and AT91SAM9261 state that stream commands are not supported. This has not been tested on actual hardware. Signed-off-by:

Ville Syrjala <syrjala@sci.fi> Signed-off-by:

Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by:

Pierre Ossman <drzeus@drzeus.cx>

drivers/mmc/host/at91_mci.c

+14 −6

Original line number	Diff line number	Diff line
		@@ -520,12 +520,20 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command

		if (data) {

		if ( cpu_is_at91rm9200() && (data->blksz & 0x3) ) {
		if (cpu_is_at91rm9200() \|\| cpu_is_at91sam9261()) {
		if (data->blksz & 0x3) {
		pr_debug("Unsupported block size\n");
		cmd->error = -EINVAL;
		mmc_request_done(host->mmc, host->request);
		return;
		}
		if (data->flags & MMC_DATA_STREAM) {
		pr_debug("Stream commands not supported\n");
		cmd->error = -EINVAL;
		mmc_request_done(host->mmc, host->request);
		return;
		}
		}

		block_length = data->blksz;
		blocks = data->blocks;
		@@ -577,7 +585,7 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
		mr \|= AT91_MCI_PDCMODE;
		at91_mci_write(host, AT91_MCI_MR, mr);

		if (!cpu_is_at91rm9200())
		if (!(cpu_is_at91rm9200() \|\| cpu_is_at91sam9261()))
		at91_mci_write(host, AT91_MCI_BLKR,
		AT91_MCI_BLKR_BCNT(blocks) \|
		AT91_MCI_BLKR_BLKLEN(block_length));

Admin message