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

Commit 225faf87 authored by Jaehoon Chung's avatar Jaehoon Chung Committed by Ulf Hansson
Browse files

mmc: dw_mmc: fix the wrong max_blk_size 



According to DesignWare TRM, BLKSIZ is 16bits.
Then it's correct that max_blk_size should be 0xFFFF, not 0x10000.

Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent d57fe83e

drivers/mmc/host/dw_mmc.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2595,13 +2595,13 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 
	/* Useful defaults if platform data is unset. */

	/* Useful defaults if platform data is unset. */

	if (host->use_dma == TRANS_MODE_IDMAC) {

	if (host->use_dma == TRANS_MODE_IDMAC) {

		mmc->max_segs = host->ring_size;

		mmc->max_segs = host->ring_size;

		mmc->max_blk_size = 65536;

		mmc->max_blk_size = 65535;

		mmc->max_seg_size = 0x1000;

		mmc->max_seg_size = 0x1000;

		mmc->max_req_size = mmc->max_seg_size * host->ring_size;

		mmc->max_req_size = mmc->max_seg_size * host->ring_size;

		mmc->max_blk_count = mmc->max_req_size / 512;

		mmc->max_blk_count = mmc->max_req_size / 512;

	} else if (host->use_dma == TRANS_MODE_EDMAC) {

	} else if (host->use_dma == TRANS_MODE_EDMAC) {

		mmc->max_segs = 64;

		mmc->max_segs = 64;

		mmc->max_blk_size = 65536;

		mmc->max_blk_size = 65535;

		mmc->max_blk_count = 65535;

		mmc->max_blk_count = 65535;

		mmc->max_req_size =

		mmc->max_req_size =

				mmc->max_blk_size * mmc->max_blk_count;

				mmc->max_blk_size * mmc->max_blk_count;
@@ -2609,7 +2609,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 
	} else {

	} else {

		/* TRANS_MODE_PIO */

		/* TRANS_MODE_PIO */

		mmc->max_segs = 64;

		mmc->max_segs = 64;

		mmc->max_blk_size = 65536; /* BLKSIZ is 16 bits */

		mmc->max_blk_size = 65535; /* BLKSIZ is 16 bits */

		mmc->max_blk_count = 512;

		mmc->max_blk_count = 512;

		mmc->max_req_size = mmc->max_blk_size *

		mmc->max_req_size = mmc->max_blk_size *

				    mmc->max_blk_count;

				    mmc->max_blk_count;