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

Commit 9023a409 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull MMC fixes from Chris Ball:
 - atmel-mci: Fixes for NULL timer and DMA burst/chunk size
 - dw_mmc: Fix DMA ordering, clkdiv calculation, NULL host->data
 - mxs_mmc: Compile fix for CONFIG_OF=y && CONFIG_PM=n
 - omap: Fix NULL deref in mmc_omap_remove_slot(), reg_shift initialization
 - sdhci-s3c: Fix boot regression by adding IRQF_ONESHOT flag
 - Small fixes to core/sd, core/sdio, sdhci

* tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: mxs-mmc: Move of_match_table out of CONFIG_PM
  mmc: sdhci-s3c: pass IRQF ONESHOT to request threaded irq
  mmc: core: return an error on suspend if mmc_deselect_cards fails
  mmc: omap: Fix broken reg_shift initialization
  mmc: omap: Fix NULL pointer dereference if mmc_omap_new_slot() fails
  mmc: omap: Fix a section warning regression
  mmc: dw_mmc: correct the calculation for CLKDIV
  mmc: dw_mmc: fix incorrect setting of host->data of NULL
  mmc: dw_mmc: fix the IDMAC sw reset
  mmc: dw_mmc: fix the transmission handling in IDMAC
  mmc: sdio: fix setting card data bus width as 4-bit
  mmc: atmel-mci: fix burst/chunk size modification
  mmc: atmel-mci: fix data timeout issue
  mmc: sdhci: Use DBG() instead of pr_warning() on large timeout
parents 1bea57f5 a3e545e9

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static int mmc_suspend(struct mmc_host *host) 
		if (!err)

			mmc_card_set_sleep(host->card);

	} else if (!mmc_host_is_spi(host))

		mmc_deselect_cards(host);

		err = mmc_deselect_cards(host);

	host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);

	mmc_release_host(host);

drivers/mmc/core/sd.c

+4 −2
Original line number Diff line number Diff line
@@ -1075,16 +1075,18 @@ static void mmc_sd_detect(struct mmc_host *host) 
 */

static int mmc_sd_suspend(struct mmc_host *host)

{

	int err = 0;



	BUG_ON(!host);

	BUG_ON(!host->card);



	mmc_claim_host(host);

	if (!mmc_host_is_spi(host))

		mmc_deselect_cards(host);

		err = mmc_deselect_cards(host);

	host->card->state &= ~MMC_STATE_HIGHSPEED;

	mmc_release_host(host);



	return 0;

	return err;

}



/*

drivers/mmc/core/sdio.c

+6 −0
Original line number Diff line number Diff line
@@ -218,6 +218,12 @@ static int sdio_enable_wide(struct mmc_card *card) 
	if (ret)

		return ret;



	if ((ctrl & SDIO_BUS_WIDTH_MASK) == SDIO_BUS_WIDTH_RESERVED)

		pr_warning("%s: SDIO_CCCR_IF is invalid: 0x%02x\n",

			   mmc_hostname(card->host), ctrl);



	/* set as 4-bit bus width */

	ctrl &= ~SDIO_BUS_WIDTH_MASK;

	ctrl |= SDIO_BUS_WIDTH_4BIT;



	ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_IF, ctrl, NULL);

drivers/mmc/host/atmel-mci-regs.h

+14 −0
Original line number Diff line number Diff line
@@ -140,4 +140,18 @@ 
#define atmci_writel(port,reg,value)			\

	__raw_writel((value), (port)->regs + reg)



/*

 * Fix sconfig's burst size according to atmel MCI. We need to convert them as:

 * 1 -> 0, 4 -> 1, 8 -> 2, 16 -> 3.

 *

 * This can be done by finding most significant bit set.

 */

static inline unsigned int atmci_convert_chksize(unsigned int maxburst)

{

	if (maxburst > 1)

		return fls(maxburst) - 2;

	else

		return 0;

}



#endif /* __DRIVERS_MMC_ATMEL_MCI_H__ */

drivers/mmc/host/atmel-mci.c

+7 −5
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) 
	enum dma_data_direction		direction;

	enum dma_transfer_direction	slave_dirn;

	unsigned int			sglen;

	u32				maxburst;

	u32 iflags;



	data->error = -EINPROGRESS;
@@ -943,17 +944,18 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) 
	if (!chan)

		return -ENODEV;



	if (host->caps.has_dma)

		atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(3) | ATMCI_DMAEN);



	if (data->flags & MMC_DATA_READ) {

		direction = DMA_FROM_DEVICE;

		host->dma_conf.direction = slave_dirn = DMA_DEV_TO_MEM;

		maxburst = atmci_convert_chksize(host->dma_conf.src_maxburst);

	} else {

		direction = DMA_TO_DEVICE;

		host->dma_conf.direction = slave_dirn = DMA_MEM_TO_DEV;

		maxburst = atmci_convert_chksize(host->dma_conf.dst_maxburst);

	}



	atmci_writel(host, ATMCI_DMA, ATMCI_DMA_CHKSIZE(maxburst) | ATMCI_DMAEN);



	sglen = dma_map_sg(chan->device->dev, data->sg,

			data->sg_len, direction);
@@ -2314,6 +2316,8 @@ static int __init atmci_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, host);



	setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);



	/* We need at least one slot to succeed */

	nr_slots = 0;

	ret = -ENODEV;
@@ -2352,8 +2356,6 @@ static int __init atmci_probe(struct platform_device *pdev) 
		}

	}



	setup_timer(&host->timer, atmci_timeout_timer, (unsigned long)host);



	dev_info(&pdev->dev,

			"Atmel MCI controller at 0x%08lx irq %d, %u slots\n",

			host->mapbase, irq, nr_slots);