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

Commit 118cd17d authored by Ben Dooks's avatar Ben Dooks Committed by Linus Torvalds
Browse files

sdhci: add adma descriptor set call 



The code to write the ADMA descriptor into memory is repeated several
times throughout sdhci_adma_table_pre, and thus should be moved into a
common function.  This will also be useful if the patch to make the write
more efficient is accepted.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3fb7fb4a

drivers/mmc/host/sdhci.c

+20 −30
Original line number Original line Diff line number Diff line
@@ -376,6 +376,20 @@ static void sdhci_kunmap_atomic(void *buffer, unsigned long *flags) 
	local_irq_restore(*flags);

	local_irq_restore(*flags);

}

}





static void sdhci_set_adma_desc(u8 *desc, u32 addr, int len, unsigned cmd)

{

	desc[7] = (addr >> 24) & 0xff;

	desc[6] = (addr >> 16) & 0xff;

	desc[5] = (addr >> 8) & 0xff;

	desc[4] = (addr >> 0) & 0xff;



	desc[3] = (len >> 8) & 0xff;

	desc[2] = (len >> 0) & 0xff;



	desc[0] = cmd & 0xff;

	desc[1] = cmd >> 8;

}



static int sdhci_adma_table_pre(struct sdhci_host *host,

static int sdhci_adma_table_pre(struct sdhci_host *host,

	struct mmc_data *data)

	struct mmc_data *data)

{

{
@@ -443,19 +457,11 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
				sdhci_kunmap_atomic(buffer, &flags);

				sdhci_kunmap_atomic(buffer, &flags);

			}

			}





			desc[7] = (align_addr >> 24) & 0xff;

			/* tran, valid */

			desc[6] = (align_addr >> 16) & 0xff;

			sdhci_set_adma_desc(desc, align_addr, offset, 0x21);

			desc[5] = (align_addr >> 8) & 0xff;

			desc[4] = (align_addr >> 0) & 0xff;





			BUG_ON(offset > 65536);

			BUG_ON(offset > 65536);





			desc[3] = (offset >> 8) & 0xff;

			desc[2] = (offset >> 0) & 0xff;



			desc[1] = 0x00;

			desc[0] = 0x21; /* tran, valid */



			align += 4;

			align += 4;

			align_addr += 4;

			align_addr += 4;
@@ -465,19 +471,10 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
			len -= offset;

			len -= offset;

		}

		}





		desc[7] = (addr >> 24) & 0xff;

		desc[6] = (addr >> 16) & 0xff;

		desc[5] = (addr >> 8) & 0xff;

		desc[4] = (addr >> 0) & 0xff;



		BUG_ON(len > 65536);

		BUG_ON(len > 65536);





		desc[3] = (len >> 8) & 0xff;

		/* tran, valid */

		desc[2] = (len >> 0) & 0xff;

		sdhci_set_adma_desc(desc, addr, len, 0x21);



		desc[1] = 0x00;

		desc[0] = 0x21; /* tran, valid */



		desc += 8;

		desc += 8;





		/*

		/*
@@ -490,16 +487,9 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, 
	/*

	/*

	 * Add a terminating entry.

	 * Add a terminating entry.

	 */

	 */

	desc[7] = 0;

	desc[6] = 0;

	desc[5] = 0;

	desc[4] = 0;



	desc[3] = 0;

	desc[2] = 0;





	desc[1] = 0x00;

	/* nop, end, valid */

	desc[0] = 0x03; /* nop, end, valid */

	sdhci_set_adma_desc(desc, 0, 0, 0x3);





	/*

	/*

	 * Resync align buffer as we might have changed it.

	 * Resync align buffer as we might have changed it.