Merge master.kernel.org:/home/rmk/linux-2.6-mmc (8e9c238c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/mmc/mmc.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -495,6 +495,7 @@ static void mmc_decode_cid(struct mmc_card *card)

	case 2: /* MMC v2.0 - v2.2 */		case 2: /* MMC v2.0 - v2.2 */
	case 3: /* MMC v3.1 - v3.3 */		case 3: /* MMC v3.1 - v3.3 */
			case 4: /* MMC v4 */
	card->cid.manfid = UNSTUFF_BITS(resp, 120, 8);		card->cid.manfid = UNSTUFF_BITS(resp, 120, 8);
	card->cid.oemid = UNSTUFF_BITS(resp, 104, 16);		card->cid.oemid = UNSTUFF_BITS(resp, 104, 16);
	card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8);		card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8);

drivers/mmc/mmc_block.c

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -187,7 +187,13 @@ static int mmc_blk_issue_rq(struct mmc_queue mq, struct request req)
	brq.data.flags \|= MMC_DATA_WRITE;		brq.data.flags \|= MMC_DATA_WRITE;
	brq.data.blocks = 1;		brq.data.blocks = 1;
	}		}
	brq.mrq.stop = brq.data.blocks > 1 ? &brq.stop : NULL;
			if (brq.data.blocks > 1) {
			brq.data.flags \|= MMC_DATA_MULTI;
			brq.mrq.stop = &brq.stop;
			} else {
			brq.mrq.stop = NULL;
			}

	brq.data.sg = mq->sg;		brq.data.sg = mq->sg;
	brq.data.sg_len = blk_rq_map_sg(req->q, req, brq.data.sg);		brq.data.sg_len = blk_rq_map_sg(req->q, req, brq.data.sg);

drivers/mmc/wbsd.c

+270 −263

Original line number	Original line	Diff line number	Diff line
	@@ -217,8 +217,7 @@ static void wbsd_request_end(struct wbsd_host* host, struct mmc_request* mrq)

	DBGF("Ending request, cmd (%x)\n", mrq->cmd->opcode);		DBGF("Ending request, cmd (%x)\n", mrq->cmd->opcode);

	if (host->dma >= 0)		if (host->dma >= 0) {
	{
	/*		/*
	* Release ISA DMA controller.		* Release ISA DMA controller.
	*/		*/
	@@ -270,8 +269,7 @@ static inline int wbsd_next_sg(struct wbsd_host* host)
	/*		/*
	* Any entries left?		* Any entries left?
	*/		*/
	if (host->num_sg > 0)		if (host->num_sg > 0) {
	{
	host->offset = 0;		host->offset = 0;
	host->remain = host->cur_sg->length;		host->remain = host->cur_sg->length;
	}		}
	@@ -308,8 +306,7 @@ static inline void wbsd_sg_to_dma(struct wbsd_host* host, struct mmc_data* data)
	* be the entire list though so make sure that		* be the entire list though so make sure that
	* we do not transfer too much.		* we do not transfer too much.
	*/		*/
	for (i = 0;i < len;i++)		for (i = 0; i < len; i++) {
	{
	sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;		sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;
	if (size < sg[i].length)		if (size < sg[i].length)
	memcpy(dmabuf, sgbuf, size);		memcpy(dmabuf, sgbuf, size);
	@@ -354,8 +351,7 @@ static inline void wbsd_dma_to_sg(struct wbsd_host* host, struct mmc_data* data)
	* be the entire list though so make sure that		* be the entire list though so make sure that
	* we do not transfer too much.		* we do not transfer too much.
	*/		*/
	for (i = 0;i < len;i++)		for (i = 0; i < len; i++) {
	{
	sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;		sgbuf = kmap_atomic(sg[i].page, KM_BIO_SRC_IRQ) + sg[i].offset;
	if (size < sg[i].length)		if (size < sg[i].length)
	memcpy(sgbuf, dmabuf, size);		memcpy(sgbuf, dmabuf, size);
	@@ -393,22 +389,16 @@ static inline void wbsd_get_short_reply(struct wbsd_host* host,
	/*		/*
	* Correct response type?		* Correct response type?
	*/		*/
	if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_SHORT)		if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_SHORT) {
	{
	cmd->error = MMC_ERR_INVALID;		cmd->error = MMC_ERR_INVALID;
	return;		return;
	}		}

	cmd->resp[0] =		cmd->resp[0] = wbsd_read_index(host, WBSD_IDX_RESP12) << 24;
	wbsd_read_index(host, WBSD_IDX_RESP12) << 24;		cmd->resp[0] \|= wbsd_read_index(host, WBSD_IDX_RESP13) << 16;
	cmd->resp[0] \|=		cmd->resp[0] \|= wbsd_read_index(host, WBSD_IDX_RESP14) << 8;
	wbsd_read_index(host, WBSD_IDX_RESP13) << 16;		cmd->resp[0] \|= wbsd_read_index(host, WBSD_IDX_RESP15) << 0;
	cmd->resp[0] \|=		cmd->resp[1] = wbsd_read_index(host, WBSD_IDX_RESP16) << 24;
	wbsd_read_index(host, WBSD_IDX_RESP14) << 8;
	cmd->resp[0] \|=
	wbsd_read_index(host, WBSD_IDX_RESP15) << 0;
	cmd->resp[1] =
	wbsd_read_index(host, WBSD_IDX_RESP16) << 24;
	}		}

	static inline void wbsd_get_long_reply(struct wbsd_host *host,		static inline void wbsd_get_long_reply(struct wbsd_host *host,
	@@ -419,14 +409,12 @@ static inline void wbsd_get_long_reply(struct wbsd_host* host,
	/*		/*
	* Correct response type?		* Correct response type?
	*/		*/
	if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_LONG)		if (wbsd_read_index(host, WBSD_IDX_RSPLEN) != WBSD_RSP_LONG) {
	{
	cmd->error = MMC_ERR_INVALID;		cmd->error = MMC_ERR_INVALID;
	return;		return;
	}		}

	for (i = 0;i < 4;i++)		for (i = 0; i < 4; i++) {
	{
	cmd->resp[i] =		cmd->resp[i] =
	wbsd_read_index(host, WBSD_IDX_RESP1 + i * 4) << 24;		wbsd_read_index(host, WBSD_IDX_RESP1 + i * 4) << 24;
	cmd->resp[i] \|=		cmd->resp[i] \|=
	@@ -471,8 +459,7 @@ static void wbsd_send_command(struct wbsd_host* host, struct mmc_command* cmd)
	/*		/*
	* Do we expect a reply?		* Do we expect a reply?
	*/		*/
	if ((cmd->flags & MMC_RSP_MASK) != MMC_RSP_NONE)		if ((cmd->flags & MMC_RSP_MASK) != MMC_RSP_NONE) {
	{
	/*		/*
	* Read back status.		* Read back status.
	*/		*/
	@@ -488,8 +475,7 @@ static void wbsd_send_command(struct wbsd_host* host, struct mmc_command* cmd)
	else if ((cmd->flags & MMC_RSP_CRC) && (isr & WBSD_INT_CRC))		else if ((cmd->flags & MMC_RSP_CRC) && (isr & WBSD_INT_CRC))
	cmd->error = MMC_ERR_BADCRC;		cmd->error = MMC_ERR_BADCRC;
	/* All ok */		/* All ok */
	else		else {
	{
	if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_SHORT)		if ((cmd->flags & MMC_RSP_MASK) == MMC_RSP_SHORT)
	wbsd_get_short_reply(host, cmd);		wbsd_get_short_reply(host, cmd);
	else		else
	@@ -522,8 +508,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
	* Drain the fifo. This has a tendency to loop longer		* Drain the fifo. This has a tendency to loop longer
	* than the FIFO length (usually one block).		* than the FIFO length (usually one block).
	*/		*/
	while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_EMPTY))		while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_EMPTY)) {
	{
	/*		/*
	* The size field in the FSR is broken so we have to		* The size field in the FSR is broken so we have to
	* do some guessing.		* do some guessing.
	@@ -535,8 +520,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
	else		else
	fifo = 1;		fifo = 1;

	for (i = 0;i < fifo;i++)		for (i = 0; i < fifo; i++) {
	{
	*buffer = inb(host->base + WBSD_DFR);		*buffer = inb(host->base + WBSD_DFR);
	buffer++;		buffer++;
	host->offset++;		host->offset++;
	@@ -547,8 +531,7 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
	/*		/*
	* Transfer done?		* Transfer done?
	*/		*/
	if (data->bytes_xfered == host->size)		if (data->bytes_xfered == host->size) {
	{
	wbsd_kunmap_sg(host);		wbsd_kunmap_sg(host);
	return;		return;
	}		}
	@@ -556,15 +539,13 @@ static void wbsd_empty_fifo(struct wbsd_host* host)
	/*		/*
	* End of scatter list entry?		* End of scatter list entry?
	*/		*/
	if (host->remain == 0)		if (host->remain == 0) {
	{
	wbsd_kunmap_sg(host);		wbsd_kunmap_sg(host);

	/*		/*
	* Get next entry. Check if last.		* Get next entry. Check if last.
	*/		*/
	if (!wbsd_next_sg(host))		if (!wbsd_next_sg(host)) {
	{
	/*		/*
	* We should never reach this point.		* We should never reach this point.
	* It means that we're trying to		* It means that we're trying to
	@@ -613,8 +594,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
	* Fill the fifo. This has a tendency to loop longer		* Fill the fifo. This has a tendency to loop longer
	* than the FIFO length (usually one block).		* than the FIFO length (usually one block).
	*/		*/
	while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_FULL))		while (!((fsr = inb(host->base + WBSD_FSR)) & WBSD_FIFO_FULL)) {
	{
	/*		/*
	* The size field in the FSR is broken so we have to		* The size field in the FSR is broken so we have to
	* do some guessing.		* do some guessing.
	@@ -626,8 +606,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
	else		else
	fifo = 15;		fifo = 15;

	for (i = 16;i > fifo;i--)		for (i = 16; i > fifo; i--) {
	{
	outb(*buffer, host->base + WBSD_DFR);		outb(*buffer, host->base + WBSD_DFR);
	buffer++;		buffer++;
	host->offset++;		host->offset++;
	@@ -638,8 +617,7 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
	/*		/*
	* Transfer done?		* Transfer done?
	*/		*/
	if (data->bytes_xfered == host->size)		if (data->bytes_xfered == host->size) {
	{
	wbsd_kunmap_sg(host);		wbsd_kunmap_sg(host);
	return;		return;
	}		}
	@@ -647,15 +625,13 @@ static void wbsd_fill_fifo(struct wbsd_host* host)
	/*		/*
	* End of scatter list entry?		* End of scatter list entry?
	*/		*/
	if (host->remain == 0)		if (host->remain == 0) {
	{
	wbsd_kunmap_sg(host);		wbsd_kunmap_sg(host);

	/*		/*
	* Get next entry. Check if last.		* Get next entry. Check if last.
	*/		*/
	if (!wbsd_next_sg(host))		if (!wbsd_next_sg(host)) {
	{
	/*		/*
	* We should never reach this point.		* We should never reach this point.
	* It means that we're trying to		* It means that we're trying to
	@@ -706,8 +682,10 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
	*/		*/
	if (data->timeout_ns > 127000000)		if (data->timeout_ns > 127000000)
	wbsd_write_index(host, WBSD_IDX_TAAC, 127);		wbsd_write_index(host, WBSD_IDX_TAAC, 127);
	else		else {
	wbsd_write_index(host, WBSD_IDX_TAAC, data->timeout_ns/1000000);		wbsd_write_index(host, WBSD_IDX_TAAC,
			data->timeout_ns / 1000000);
			}

	if (data->timeout_clks > 255)		if (data->timeout_clks > 255)
	wbsd_write_index(host, WBSD_IDX_NSAC, 255);		wbsd_write_index(host, WBSD_IDX_NSAC, 255);
	@@ -722,23 +700,18 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
	* Space for CRC must be included in the size.		* Space for CRC must be included in the size.
	* Two bytes are needed for each data line.		* Two bytes are needed for each data line.
	*/		*/
	if (host->bus_width == MMC_BUS_WIDTH_1)		if (host->bus_width == MMC_BUS_WIDTH_1) {
	{
	blksize = (1 << data->blksz_bits) + 2;		blksize = (1 << data->blksz_bits) + 2;

	wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);		wbsd_write_index(host, WBSD_IDX_PBSMSB, (blksize >> 4) & 0xF0);
	wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);		wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
	}		} else if (host->bus_width == MMC_BUS_WIDTH_4) {
	else if (host->bus_width == MMC_BUS_WIDTH_4)
	{
	blksize = (1 << data->blksz_bits) + 2 * 4;		blksize = (1 << data->blksz_bits) + 2 * 4;

	wbsd_write_index(host, WBSD_IDX_PBSMSB, ((blksize >> 4) & 0xF0)		wbsd_write_index(host, WBSD_IDX_PBSMSB,
	\| WBSD_DATA_WIDTH);		((blksize >> 4) & 0xF0) \| WBSD_DATA_WIDTH);
	wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);		wbsd_write_index(host, WBSD_IDX_PBSLSB, blksize & 0xFF);
	}		} else {
	else
	{
	data->error = MMC_ERR_INVALID;		data->error = MMC_ERR_INVALID;
	return;		return;
	}		}
	@@ -755,14 +728,12 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
	/*		/*
	* DMA transfer?		* DMA transfer?
	*/		*/
	if (host->dma >= 0)		if (host->dma >= 0) {
	{
	/*		/*
	* The buffer for DMA is only 64 kB.		* The buffer for DMA is only 64 kB.
	*/		*/
	BUG_ON(host->size > 0x10000);		BUG_ON(host->size > 0x10000);
	if (host->size > 0x10000)		if (host->size > 0x10000) {
	{
	data->error = MMC_ERR_INVALID;		data->error = MMC_ERR_INVALID;
	return;		return;
	}		}
	@@ -794,9 +765,7 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
	* Enable DMA on the host.		* Enable DMA on the host.
	*/		*/
	wbsd_write_index(host, WBSD_IDX_DMA, WBSD_DMA_ENABLE);		wbsd_write_index(host, WBSD_IDX_DMA, WBSD_DMA_ENABLE);
	}		} else {
	else
	{
	/*		/*
	* This flag is used to keep printk		* This flag is used to keep printk
	* output to a minimum.		* output to a minimum.
	@@ -817,13 +786,10 @@ static void wbsd_prepare_data(struct wbsd_host* host, struct mmc_data* data)
	* Set up FIFO threshold levels (and fill		* Set up FIFO threshold levels (and fill
	* buffer if doing a write).		* buffer if doing a write).
	*/		*/
	if (data->flags & MMC_DATA_READ)		if (data->flags & MMC_DATA_READ) {
	{
	wbsd_write_index(host, WBSD_IDX_FIFOEN,		wbsd_write_index(host, WBSD_IDX_FIFOEN,
	WBSD_FIFOEN_FULL \| 8);		WBSD_FIFOEN_FULL \| 8);
	}		} else {
	else
	{
	wbsd_write_index(host, WBSD_IDX_FIFOEN,		wbsd_write_index(host, WBSD_IDX_FIFOEN,
	WBSD_FIFOEN_EMPTY \| 8);		WBSD_FIFOEN_EMPTY \| 8);
	wbsd_fill_fifo(host);		wbsd_fill_fifo(host);
	@@ -851,16 +817,14 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
	* Wait for the controller to leave data		* Wait for the controller to leave data
	* transfer state.		* transfer state.
	*/		*/
	do		do {
	{
	status = wbsd_read_index(host, WBSD_IDX_STATUS);		status = wbsd_read_index(host, WBSD_IDX_STATUS);
	} while (status & (WBSD_BLOCK_READ \| WBSD_BLOCK_WRITE));		} while (status & (WBSD_BLOCK_READ \| WBSD_BLOCK_WRITE));

	/*		/*
	* DMA transfer?		* DMA transfer?
	*/		*/
	if (host->dma >= 0)		if (host->dma >= 0) {
	{
	/*		/*
	* Disable DMA on the host.		* Disable DMA on the host.
	*/		*/
	@@ -878,16 +842,13 @@ static void wbsd_finish_data(struct wbsd_host* host, struct mmc_data* data)
	/*		/*
	* Any leftover data?		* Any leftover data?
	*/		*/
	if (count)		if (count) {
	{
	printk(KERN_ERR "%s: Incomplete DMA transfer. "		printk(KERN_ERR "%s: Incomplete DMA transfer. "
	"%d bytes left.\n",		"%d bytes left.\n",
	mmc_hostname(host->mmc), count);		mmc_hostname(host->mmc), count);

	data->error = MMC_ERR_FAILED;		data->error = MMC_ERR_FAILED;
	}		} else {
	else
	{
	/*		/*
	* Transfer data from DMA buffer to		* Transfer data from DMA buffer to
	* SG list.		* SG list.
	@@ -930,8 +891,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
	* If there is no card in the slot then		* If there is no card in the slot then
	* timeout immediatly.		* timeout immediatly.
	*/		*/
	if (!(host->flags & WBSD_FCARD_PRESENT))		if (!(host->flags & WBSD_FCARD_PRESENT)) {
	{
	cmd->error = MMC_ERR_TIMEOUT;		cmd->error = MMC_ERR_TIMEOUT;
	goto done;		goto done;
	}		}
	@@ -939,8 +899,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
	/*		/*
	* Does the request include data?		* Does the request include data?
	*/		*/
	if (cmd->data)		if (cmd->data) {
	{
	wbsd_prepare_data(host, cmd->data);		wbsd_prepare_data(host, cmd->data);

	if (cmd->data->error != MMC_ERR_NONE)		if (cmd->data->error != MMC_ERR_NONE)
	@@ -954,8 +913,7 @@ static void wbsd_request(struct mmc_host* mmc, struct mmc_request* mrq)
	* will be finished after the data has		* will be finished after the data has
	* transfered.		* transfered.
	*/		*/
	if (cmd->data && (cmd->error == MMC_ERR_NONE))		if (cmd->data && (cmd->error == MMC_ERR_NONE)) {
	{
	/*		/*
	* Dirty fix for hardware bug.		* Dirty fix for hardware bug.
	*/		*/
	@@ -1004,8 +962,7 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
	* Only write to the clock register when		* Only write to the clock register when
	* there is an actual change.		* there is an actual change.
	*/		*/
	if (clk != host->clk)		if (clk != host->clk) {
	{
	wbsd_write_index(host, WBSD_IDX_CLK, clk);		wbsd_write_index(host, WBSD_IDX_CLK, clk);
	host->clk = clk;		host->clk = clk;
	}		}
	@@ -1013,8 +970,7 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
	/*		/*
	* Power up card.		* Power up card.
	*/		*/
	if (ios->power_mode != MMC_POWER_OFF)		if (ios->power_mode != MMC_POWER_OFF) {
	{
	pwr = inb(host->base + WBSD_CSR);		pwr = inb(host->base + WBSD_CSR);
	pwr &= ~WBSD_POWER_N;		pwr &= ~WBSD_POWER_N;
	outb(pwr, host->base + WBSD_CSR);		outb(pwr, host->base + WBSD_CSR);
	@@ -1026,16 +982,12 @@ static void wbsd_set_ios(struct mmc_host* mmc, struct mmc_ios* ios)
	* that needs to be disabled.		* that needs to be disabled.
	*/		*/
	setup = wbsd_read_index(host, WBSD_IDX_SETUP);		setup = wbsd_read_index(host, WBSD_IDX_SETUP);
	if (ios->chip_select == MMC_CS_HIGH)		if (ios->chip_select == MMC_CS_HIGH) {
	{
	BUG_ON(ios->bus_width != MMC_BUS_WIDTH_1);		BUG_ON(ios->bus_width != MMC_BUS_WIDTH_1);
	setup \|= WBSD_DAT3_H;		setup \|= WBSD_DAT3_H;
	host->flags \|= WBSD_FIGNORE_DETECT;		host->flags \|= WBSD_FIGNORE_DETECT;
	}		} else {
	else		if (setup & WBSD_DAT3_H) {
	{
	if (setup & WBSD_DAT3_H)
	{
	setup &= ~WBSD_DAT3_H;		setup &= ~WBSD_DAT3_H;

	/*		/*
	@@ -1144,8 +1096,7 @@ static void wbsd_tasklet_card(unsigned long param)

	spin_lock(&host->lock);		spin_lock(&host->lock);

	if (host->flags & WBSD_FIGNORE_DETECT)		if (host->flags & WBSD_FIGNORE_DETECT) {
	{
	spin_unlock(&host->lock);		spin_unlock(&host->lock);
	return;		return;
	}		}
	@@ -1153,23 +1104,18 @@ static void wbsd_tasklet_card(unsigned long param)
	csr = inb(host->base + WBSD_CSR);		csr = inb(host->base + WBSD_CSR);
	WARN_ON(csr == 0xff);		WARN_ON(csr == 0xff);

	if (csr & WBSD_CARDPRESENT)		if (csr & WBSD_CARDPRESENT) {
	{		if (!(host->flags & WBSD_FCARD_PRESENT)) {
	if (!(host->flags & WBSD_FCARD_PRESENT))
	{
	DBG("Card inserted\n");		DBG("Card inserted\n");
	host->flags \|= WBSD_FCARD_PRESENT;		host->flags \|= WBSD_FCARD_PRESENT;

	delay = 500;		delay = 500;
	}		}
	}		} else if (host->flags & WBSD_FCARD_PRESENT) {
	else if (host->flags & WBSD_FCARD_PRESENT)
	{
	DBG("Card removed\n");		DBG("Card removed\n");
	host->flags &= ~WBSD_FCARD_PRESENT;		host->flags &= ~WBSD_FCARD_PRESENT;

	if (host->mrq)		if (host->mrq) {
	{
	printk(KERN_ERR "%s: Card removed during transfer!\n",		printk(KERN_ERR "%s: Card removed during transfer!\n",
	mmc_hostname(host->mmc));		mmc_hostname(host->mmc));
	wbsd_reset(host);		wbsd_reset(host);
	@@ -1213,8 +1159,7 @@ static void wbsd_tasklet_fifo(unsigned long param)
	/*		/*
	* Done?		* Done?
	*/		*/
	if (host->size == data->bytes_xfered)		if (host->size == data->bytes_xfered) {
	{
	wbsd_write_index(host, WBSD_IDX_FIFOEN, 0);		wbsd_write_index(host, WBSD_IDX_FIFOEN, 0);
	tasklet_schedule(&host->finish_tasklet);		tasklet_schedule(&host->finish_tasklet);
	}		}
	@@ -1300,8 +1245,7 @@ static void wbsd_tasklet_block(unsigned long param)
	spin_lock(&host->lock);		spin_lock(&host->lock);

	if ((wbsd_read_index(host, WBSD_IDX_CRCSTATUS) & WBSD_CRC_MASK) !=		if ((wbsd_read_index(host, WBSD_IDX_CRCSTATUS) & WBSD_CRC_MASK) !=
	WBSD_CRC_OK)		WBSD_CRC_OK) {
	{
	data = wbsd_get_data(host);		data = wbsd_get_data(host);
	if (!data)		if (!data)
	goto end;		goto end;
	@@ -1477,16 +1421,14 @@ static int __devinit wbsd_scan(struct wbsd_host* host)
	wbsd_lock_config(host);		wbsd_lock_config(host);

	for (k = 0; k < ARRAY_SIZE(valid_ids); k++) {		for (k = 0; k < ARRAY_SIZE(valid_ids); k++) {
	if (id == valid_ids[k])		if (id == valid_ids[k]) {
	{
	host->chip_id = id;		host->chip_id = id;

	return 0;		return 0;
	}		}
	}		}

	if (id != 0xFFFF)		if (id != 0xFFFF) {
	{
	DBG("Unknown hardware (id %x) found at %x\n",		DBG("Unknown hardware (id %x) found at %x\n",
	id, config_ports[i]);		id, config_ports[i]);
	}		}
	@@ -1579,8 +1521,8 @@ static void __devinit wbsd_request_dma(struct wbsd_host* host, int dma)
	*/		*/
	BUG_ON(1);		BUG_ON(1);

	dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,		dma_unmap_single(host->mmc->dev, host->dma_addr,
	DMA_BIDIRECTIONAL);		WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
	host->dma_addr = (dma_addr_t)NULL;		host->dma_addr = (dma_addr_t)NULL;

	kfree(host->dma_buffer);		kfree(host->dma_buffer);
	@@ -1596,9 +1538,10 @@ static void __devinit wbsd_request_dma(struct wbsd_host* host, int dma)

	static void __devexit wbsd_release_dma(struct wbsd_host *host)		static void __devexit wbsd_release_dma(struct wbsd_host *host)
	{		{
	if (host->dma_addr)		if (host->dma_addr) {
	dma_unmap_single(host->mmc->dev, host->dma_addr, WBSD_DMA_SIZE,		dma_unmap_single(host->mmc->dev, host->dma_addr,
	DMA_BIDIRECTIONAL);		WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
			}
	kfree(host->dma_buffer);		kfree(host->dma_buffer);
	if (host->dma >= 0)		if (host->dma >= 0)
	free_dma(host->dma);		free_dma(host->dma);
	@@ -1629,12 +1572,18 @@ static int __devinit wbsd_request_irq(struct wbsd_host* host, int irq)
	/*		/*
	* Set up tasklets.		* Set up tasklets.
	*/		*/
	tasklet_init(&host->card_tasklet, wbsd_tasklet_card, (unsigned long)host);		tasklet_init(&host->card_tasklet, wbsd_tasklet_card,
	tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo, (unsigned long)host);		(unsigned long)host);
	tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc, (unsigned long)host);		tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo,
	tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout, (unsigned long)host);		(unsigned long)host);
	tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish, (unsigned long)host);		tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc,
	tasklet_init(&host->block_tasklet, wbsd_tasklet_block, (unsigned long)host);		(unsigned long)host);
			tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout,
			(unsigned long)host);
			tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish,
			(unsigned long)host);
			tasklet_init(&host->block_tasklet, wbsd_tasklet_block,
			(unsigned long)host);

	return 0;		return 0;
	}		}
	@@ -1820,16 +1769,12 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
	* Scan for hardware.		* Scan for hardware.
	*/		*/
	ret = wbsd_scan(host);		ret = wbsd_scan(host);
	if (ret)		if (ret) {
	{		if (pnp && (ret == -ENODEV)) {
	if (pnp && (ret == -ENODEV))
	{
	printk(KERN_WARNING DRIVER_NAME		printk(KERN_WARNING DRIVER_NAME
	": Unable to confirm device presence. You may "		": Unable to confirm device presence. You may "
	"experience lock-ups.\n");		"experience lock-ups.\n");
	}		} else {
	else
	{
	wbsd_free_mmc(dev);		wbsd_free_mmc(dev);
	return ret;		return ret;
	}		}
	@@ -1839,8 +1784,7 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
	* Request resources.		* Request resources.
	*/		*/
	ret = wbsd_request_resources(host, io, irq, dma);		ret = wbsd_request_resources(host, io, irq, dma);
	if (ret)		if (ret) {
	{
	wbsd_release_resources(host);		wbsd_release_resources(host);
	wbsd_free_mmc(dev);		wbsd_free_mmc(dev);
	return ret;		return ret;
	@@ -1849,18 +1793,15 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
	/*		/*
	* See if chip needs to be configured.		* See if chip needs to be configured.
	*/		*/
	if (pnp)		if (pnp) {
	{		if ((host->config != 0) && !wbsd_chip_validate(host)) {
	if ((host->config != 0) && !wbsd_chip_validate(host))
	{
	printk(KERN_WARNING DRIVER_NAME		printk(KERN_WARNING DRIVER_NAME
	": PnP active but chip not configured! "		": PnP active but chip not configured! "
	"You probably have a buggy BIOS. "		"You probably have a buggy BIOS. "
	"Configuring chip manually.\n");		"Configuring chip manually.\n");
	wbsd_chip_config(host);		wbsd_chip_config(host);
	}		}
	}		} else
	else
	wbsd_chip_config(host);		wbsd_chip_config(host);

	/*		/*
	@@ -1868,8 +1809,7 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma,
	* Not tested.		* Not tested.
	*/		*/
	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	if (host->config)		if (host->config) {
	{
	wbsd_unlock_config(host);		wbsd_unlock_config(host);
	wbsd_write_config(host, WBSD_CONF_PME, 0xA0);		wbsd_write_config(host, WBSD_CONF_PME, 0xA0);
	wbsd_lock_config(host);		wbsd_lock_config(host);
	@@ -1980,37 +1920,54 @@ static void __devexit wbsd_pnp_remove(struct pnp_dev * dev)

	#ifdef CONFIG_PM		#ifdef CONFIG_PM

	static int wbsd_suspend(struct platform_device *dev, pm_message_t state)		static int wbsd_suspend(struct wbsd_host *host, pm_message_t state)
			{
			BUG_ON(host == NULL);

			return mmc_suspend_host(host->mmc, state);
			}

			static int wbsd_resume(struct wbsd_host *host)
			{
			BUG_ON(host == NULL);

			wbsd_init_device(host);

			return mmc_resume_host(host->mmc);
			}

			static int wbsd_platform_suspend(struct platform_device *dev,
			pm_message_t state)
	{		{
	struct mmc_host *mmc = platform_get_drvdata(dev);		struct mmc_host *mmc = platform_get_drvdata(dev);
	struct wbsd_host *host;		struct wbsd_host *host;
	int ret;		int ret;

	if (!mmc)		if (mmc == NULL)
	return 0;		return 0;

	DBG("Suspending...\n");		DBGF("Suspending...\n");

	ret = mmc_suspend_host(mmc, state);
	if (!ret)
	return ret;

	host = mmc_priv(mmc);		host = mmc_priv(mmc);

			ret = wbsd_suspend(host, state);
			if (ret)
			return ret;

	wbsd_chip_poweroff(host);		wbsd_chip_poweroff(host);

	return 0;		return 0;
	}		}

	static int wbsd_resume(struct platform_device *dev)		static int wbsd_platform_resume(struct platform_device *dev)
	{		{
	struct mmc_host *mmc = platform_get_drvdata(dev);		struct mmc_host *mmc = platform_get_drvdata(dev);
	struct wbsd_host *host;		struct wbsd_host *host;

	if (!mmc)		if (mmc == NULL)
	return 0;		return 0;

	DBG("Resuming...\n");		DBGF("Resuming...\n");

	host = mmc_priv(mmc);		host = mmc_priv(mmc);

	@@ -2021,15 +1978,68 @@ static int wbsd_resume(struct platform_device *dev)
	*/		*/
	mdelay(5);		mdelay(5);

	wbsd_init_device(host);		return wbsd_resume(host);
			}

			#ifdef CONFIG_PNP

			static int wbsd_pnp_suspend(struct pnp_dev *pnp_dev, pm_message_t state)
			{
			struct mmc_host *mmc = dev_get_drvdata(&pnp_dev->dev);
			struct wbsd_host *host;

			if (mmc == NULL)
			return 0;

			DBGF("Suspending...\n");

	return mmc_resume_host(mmc);		host = mmc_priv(mmc);

			return wbsd_suspend(host, state);
	}		}

			static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
			{
			struct mmc_host *mmc = dev_get_drvdata(&pnp_dev->dev);
			struct wbsd_host *host;

			if (mmc == NULL)
			return 0;

			DBGF("Resuming...\n");

			host = mmc_priv(mmc);

			/*
			* See if chip needs to be configured.
			*/
			if (host->config != 0) {
			if (!wbsd_chip_validate(host)) {
			printk(KERN_WARNING DRIVER_NAME
			": PnP active but chip not configured! "
			"You probably have a buggy BIOS. "
			"Configuring chip manually.\n");
			wbsd_chip_config(host);
			}
			}

			/*
			* Allow device to initialise itself properly.
			*/
			mdelay(5);

			return wbsd_resume(host);
			}

			#endif /* CONFIG_PNP */

	#else /* CONFIG_PM */		#else /* CONFIG_PM */

	#define wbsd_suspend NULL		#define wbsd_platform_suspend NULL
	#define wbsd_resume NULL		#define wbsd_platform_resume NULL

			#define wbsd_pnp_suspend NULL
			#define wbsd_pnp_resume NULL

	#endif /* CONFIG_PM */		#endif /* CONFIG_PM */

	@@ -2039,8 +2049,8 @@ static struct platform_driver wbsd_driver = {
	.probe = wbsd_probe,		.probe = wbsd_probe,
	.remove = __devexit_p(wbsd_remove),		.remove = __devexit_p(wbsd_remove),

	.suspend = wbsd_suspend,		.suspend = wbsd_platform_suspend,
	.resume = wbsd_resume,		.resume = wbsd_platform_resume,
	.driver = {		.driver = {
	.name = DRIVER_NAME,		.name = DRIVER_NAME,
	},		},
	@@ -2053,6 +2063,9 @@ static struct pnp_driver wbsd_pnp_driver = {
	.id_table = pnp_dev_table,		.id_table = pnp_dev_table,
	.probe = wbsd_pnp_probe,		.probe = wbsd_pnp_probe,
	.remove = __devexit_p(wbsd_pnp_remove),		.remove = __devexit_p(wbsd_pnp_remove),

			.suspend = wbsd_pnp_suspend,
			.resume = wbsd_pnp_resume,
	};		};

	#endif /* CONFIG_PNP */		#endif /* CONFIG_PNP */
	@@ -2072,31 +2085,26 @@ static int __init wbsd_drv_init(void)

	#ifdef CONFIG_PNP		#ifdef CONFIG_PNP

	if (!nopnp)		if (!nopnp) {
	{
	result = pnp_register_driver(&wbsd_pnp_driver);		result = pnp_register_driver(&wbsd_pnp_driver);
	if (result < 0)		if (result < 0)
	return result;		return result;
	}		}

	#endif /* CONFIG_PNP */		#endif /* CONFIG_PNP */

	if (nopnp)		if (nopnp) {
	{
	result = platform_driver_register(&wbsd_driver);		result = platform_driver_register(&wbsd_driver);
	if (result < 0)		if (result < 0)
	return result;		return result;

	wbsd_device = platform_device_alloc(DRIVER_NAME, -1);		wbsd_device = platform_device_alloc(DRIVER_NAME, -1);
	if (!wbsd_device)		if (!wbsd_device) {
	{
	platform_driver_unregister(&wbsd_driver);		platform_driver_unregister(&wbsd_driver);
	return -ENOMEM;		return -ENOMEM;
	}		}

	result = platform_device_add(wbsd_device);		result = platform_device_add(wbsd_device);
	if (result)		if (result) {
	{
	platform_device_put(wbsd_device);		platform_device_put(wbsd_device);
	platform_driver_unregister(&wbsd_driver);		platform_driver_unregister(&wbsd_driver);
	return result;		return result;
	@@ -2115,8 +2123,7 @@ static void __exit wbsd_drv_exit(void)

	#endif /* CONFIG_PNP */		#endif /* CONFIG_PNP */

	if (nopnp)		if (nopnp) {
	{
	platform_device_unregister(wbsd_device);		platform_device_unregister(wbsd_device);

	platform_driver_unregister(&wbsd_driver);		platform_driver_unregister(&wbsd_driver);

include/linux/mmc/mmc.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,14 +27,15 @@ struct mmc_command {
	#define MMC_RSP_MASK (3 << 0)		#define MMC_RSP_MASK (3 << 0)
	#define MMC_RSP_CRC (1 << 3) /* expect valid crc */		#define MMC_RSP_CRC (1 << 3) /* expect valid crc */
	#define MMC_RSP_BUSY (1 << 4) /* card may send busy */		#define MMC_RSP_BUSY (1 << 4) /* card may send busy */
			#define MMC_RSP_OPCODE (1 << 5) /* response contains opcode */

	/*		/*
	* These are the response types, and correspond to valid bit		* These are the response types, and correspond to valid bit
	* patterns of the above flags. One additional valid pattern		* patterns of the above flags. One additional valid pattern
	* is all zeros, which means we don't expect a response.		* is all zeros, which means we don't expect a response.
	*/		*/
	#define MMC_RSP_R1 (MMC_RSP_SHORT\|MMC_RSP_CRC)		#define MMC_RSP_R1 (MMC_RSP_SHORT\|MMC_RSP_CRC\|MMC_RSP_OPCODE)
	#define MMC_RSP_R1B (MMC_RSP_SHORT\|MMC_RSP_CRC\|MMC_RSP_BUSY)		#define MMC_RSP_R1B (MMC_RSP_SHORT\|MMC_RSP_CRC\|MMC_RSP_OPCODE\|MMC_RSP_BUSY)
	#define MMC_RSP_R2 (MMC_RSP_LONG\|MMC_RSP_CRC)		#define MMC_RSP_R2 (MMC_RSP_LONG\|MMC_RSP_CRC)
	#define MMC_RSP_R3 (MMC_RSP_SHORT)		#define MMC_RSP_R3 (MMC_RSP_SHORT)
	#define MMC_RSP_R6 (MMC_RSP_SHORT\|MMC_RSP_CRC)		#define MMC_RSP_R6 (MMC_RSP_SHORT\|MMC_RSP_CRC)
	@@ -64,6 +65,7 @@ struct mmc_data {
	#define MMC_DATA_WRITE (1 << 8)		#define MMC_DATA_WRITE (1 << 8)
	#define MMC_DATA_READ (1 << 9)		#define MMC_DATA_READ (1 << 9)
	#define MMC_DATA_STREAM (1 << 10)		#define MMC_DATA_STREAM (1 << 10)
			#define MMC_DATA_MULTI (1 << 11)

	unsigned int bytes_xfered;		unsigned int bytes_xfered;