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

Commit fecf3404 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc 

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Don't check READY_FOR_DATA when reading
  [MMC] MMC_CAP_BYTEBLOCK flag for non-log2 block sizes capable hosts
  [MMC] Add multi block-write capability
  [MMC] Remove data->blksz_bits member
  [MMC] Convert mmci to use data->blksz rather than data->blksz_bits
parents 94c12cc7 2ed6d22c

drivers/mmc/at91_mci.c

+1 −0
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ static int at91_mci_probe(struct platform_device *pdev) 
	mmc->f_min = 375000;

	mmc->f_max = 25000000;

	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;

	mmc->caps = MMC_CAP_BYTEBLOCK;



	host = mmc_priv(mmc);

	host->mmc = mmc;

drivers/mmc/imxmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ static int imxmci_probe(struct platform_device *pdev) 
	mmc->f_min = 150000;

	mmc->f_max = CLK_RATE/2;

	mmc->ocr_avail = MMC_VDD_32_33;

	mmc->caps |= MMC_CAP_4_BIT_DATA;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_BYTEBLOCK;



	/* MMC core transfer sizes tunable parameters */

	mmc->max_hw_segs = 64;

drivers/mmc/mmc.c

+0 −1
Original line number Diff line number Diff line
@@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host) 


		mmc_set_data_timeout(&data, card, 0);



		data.blksz_bits = 3;

		data.blksz = 1 << 3;

		data.blocks = 1;

		data.flags = MMC_DATA_READ;

drivers/mmc/mmc_block.c

+40 −26
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/mmc/card.h>

#include <linux/mmc/host.h>

#include <linux/mmc/protocol.h>

#include <linux/mmc/host.h>



#include <asm/system.h>

#include <asm/uaccess.h>
@@ -165,6 +166,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
	do {

		struct mmc_blk_request brq;

		struct mmc_command cmd;

		u32 readcmd, writecmd;



		memset(&brq, 0, sizeof(struct mmc_blk_request));

		brq.mrq.cmd = &brq.cmd;
@@ -172,7 +174,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 


		brq.cmd.arg = req->sector << 9;

		brq.cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;

		brq.data.blksz_bits = md->block_bits;

		brq.data.blksz = 1 << md->block_bits;

		brq.data.blocks = req->nr_sectors >> (md->block_bits - 9);

		brq.stop.opcode = MMC_STOP_TRANSMISSION;
@@ -181,20 +182,31 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 


		mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);



		if (rq_data_dir(req) == READ) {

			brq.cmd.opcode = brq.data.blocks > 1 ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK;

			brq.data.flags |= MMC_DATA_READ;

		} else {

			brq.cmd.opcode = MMC_WRITE_BLOCK;

			brq.data.flags |= MMC_DATA_WRITE;

		/*

		 * If the host doesn't support multiple block writes, force

		 * block writes to single block.

		 */

		if (rq_data_dir(req) != READ &&

		    !(card->host->caps & MMC_CAP_MULTIWRITE))

			brq.data.blocks = 1;

		}



		if (brq.data.blocks > 1) {

			brq.data.flags |= MMC_DATA_MULTI;

			brq.mrq.stop = &brq.stop;

			readcmd = MMC_READ_MULTIPLE_BLOCK;

			writecmd = MMC_WRITE_MULTIPLE_BLOCK;

		} else {

			brq.mrq.stop = NULL;

			readcmd = MMC_READ_SINGLE_BLOCK;

			writecmd = MMC_WRITE_BLOCK;

		}



		if (rq_data_dir(req) == READ) {

			brq.cmd.opcode = readcmd;

			brq.data.flags |= MMC_DATA_READ;

		} else {

			brq.cmd.opcode = writecmd;

			brq.data.flags |= MMC_DATA_WRITE;

		}



		brq.data.sg = mq->sg;
@@ -219,6 +231,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
			goto cmd_err;

		}



		if (rq_data_dir(req) != READ) {

			do {

				int err;
@@ -240,6 +253,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) 
			if (mmc_decode_status(cmd.resp))

				goto cmd_err;

#endif

		}



		/*

		 * A block was successfully transferred.

drivers/mmc/mmci.c

+9 −4
Original line number Diff line number Diff line
@@ -69,12 +69,13 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) 
	unsigned int datactrl, timeout, irqmask;

	unsigned long long clks;

	void __iomem *base;

	int blksz_bits;



	DBG(host, "blksz %04x blks %04x flags %08x\n",

	    1 << data->blksz_bits, data->blocks, data->flags);

	    data->blksz, data->blocks, data->flags);



	host->data = data;

	host->size = data->blocks << data->blksz_bits;

	host->size = data->blksz;

	host->data_xfered = 0;



	mmci_init_sg(host, data);
@@ -88,7 +89,10 @@ static void mmci_start_data(struct mmci_host *host, struct mmc_data *data) 
	writel(timeout, base + MMCIDATATIMER);

	writel(host->size, base + MMCIDATALENGTH);



	datactrl = MCI_DPSM_ENABLE | data->blksz_bits << 4;

	blksz_bits = ffs(data->blksz) - 1;

	BUG_ON(1 << blksz_bits != data->blksz);



	datactrl = MCI_DPSM_ENABLE | blksz_bits << 4;

	if (data->flags & MMC_DATA_READ) {

		datactrl |= MCI_DPSM_DIRECTION;

		irqmask = MCI_RXFIFOHALFFULLMASK;
@@ -145,7 +149,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, 
	      unsigned int status)

{

	if (status & MCI_DATABLOCKEND) {

		host->data_xfered += 1 << data->blksz_bits;

		host->data_xfered += data->blksz;

	}

	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {

		if (status & MCI_DATACRCFAIL)
@@ -505,6 +509,7 @@ static int mmci_probe(struct amba_device *dev, void *id) 
	mmc->f_min = (host->mclk + 511) / 512;

	mmc->f_max = min(host->mclk, fmax);

	mmc->ocr_avail = plat->ocr_mask;

	mmc->caps = MMC_CAP_MULTIWRITE;



	/*

	 * We can do SGIO