Commit 42431acb authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[MMC] MMC_CAP_BYTEBLOCK flag for non-log2 block sizes capable hosts 



Some MMC hosts can only handle log2 block sizes.  Unfortunately,
the MMC password support needs to be able to send non-log2 block
sizes.  Provide a capability so that the MMC password support can
decide whether it should use this support or not.

The unfortunate side effect of this host limitation is that any
MMC card protected by a password which is not a log2 block size
can not be accessed on a host which only allows a log2 block size.

This change just adds the flag.  The MMC password support code
needs updating to use it (if and when it is finally submitted.)

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent db53f28b

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/omap.c

+4 −3
Original line number Diff line number Diff line
@@ -1034,13 +1034,14 @@ static int __init mmc_omap_probe(struct platform_device *pdev) 
	host->irq = pdev->resource[1].start;

	host->base = (void __iomem*)IO_ADDRESS(r->start);



	if (minfo->wire4)

		 mmc->caps |= MMC_CAP_4_BIT_DATA;



	mmc->ops = &mmc_omap_ops;

	mmc->f_min = 400000;

	mmc->f_max = 24000000;

	mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;

	mmc->caps = MMC_CAP_BYTEBLOCK;



	if (minfo->wire4)

		 mmc->caps |= MMC_CAP_4_BIT_DATA;



	/* Use scatterlist DMA to reduce per-transfer costs.

	 * NOTE max_seg_size assumption that small blocks aren't

drivers/mmc/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot) 
	mmc->ops = &sdhci_ops;

	mmc->f_min = host->max_clk / 256;

	mmc->f_max = host->max_clk;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE | MMC_CAP_BYTEBLOCK;



	mmc->ocr_avail = 0;

	if (caps & SDHCI_CAN_VDD_330)

drivers/mmc/wbsd.c

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ static int __devinit wbsd_alloc_mmc(struct device *dev) 
	mmc->f_min = 375000;

	mmc->f_max = 24000000;

	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE;

	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_MULTIWRITE | MMC_CAP_BYTEBLOCK;



	spin_lock_init(&host->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE