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

Commit ac1da9a2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB" 



This reverts commit e4662786 which is
commit 3d7c194b7c9ad414264935ad4f943a6ce285ebb1 upstream.

It breaks the abi and is only needed on systems that have PAGE_SIZE >=
64kb, which is not Android systems at the moment.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I52b344609b63e66b96511790a9bd4025157ff3cc
parent c2531fc2

drivers/mmc/host/sdhci.c

+3 −18
Original line number Diff line number Diff line
@@ -749,19 +749,7 @@ static void sdhci_adma_table_pre(struct sdhci_host *host, 
			len -= offset;

		}



		/*

		 * The block layer forces a minimum segment size of PAGE_SIZE,

		 * so 'len' can be too big here if PAGE_SIZE >= 64KiB. Write

		 * multiple descriptors, noting that the ADMA table is sized

		 * for 4KiB chunks anyway, so it will be big enough.

		 */

		while (len > host->max_adma) {

			int n = 32 * 1024; /* 32KiB*/



			__sdhci_adma_write_desc(host, &desc, addr, n, ADMA2_TRAN_VALID);

			addr += n;

			len -= n;

		}

		BUG_ON(len > 65536);



		/* tran, valid */

		if (len)
@@ -3717,7 +3705,6 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, 
	 * descriptor for each segment, plus 1 for a nop end descriptor.

	 */

	host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;

	host->max_adma = 65536;



	return host;

}
@@ -4368,12 +4355,10 @@ int sdhci_setup_host(struct sdhci_host *host) 
	 * be larger than 64 KiB though.

	 */

	if (host->flags & SDHCI_USE_ADMA) {

		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC) {

			host->max_adma = 65532; /* 32-bit alignment */

		if (host->quirks & SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC)

			mmc->max_seg_size = 65535;

		} else {

		else

			mmc->max_seg_size = 65536;

		}

	} else {

		mmc->max_seg_size = mmc->max_req_size;

	}

drivers/mmc/host/sdhci.h

+1 −3
Original line number Diff line number Diff line
@@ -349,8 +349,7 @@ struct sdhci_adma2_64_desc { 


/*

 * Maximum segments assuming a 512KiB maximum requisition size and a minimum

 * 4KiB page size. Note this also allows enough for multiple descriptors in

 * case of PAGE_SIZE >= 64KiB.

 * 4KiB page size.

 */

#define SDHCI_MAX_SEGS		128
@@ -550,7 +549,6 @@ struct sdhci_host { 
	unsigned int blocks;	/* remaining PIO blocks */



	int sg_count;		/* Mapped sg entries */

	int max_adma;		/* Max. length in ADMA descriptor */



	void *adma_table;	/* ADMA descriptor table */

	void *align_buffer;	/* Bounce buffer */