mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
mmc: Allow 2 byte requests in 4-bit mode for tmio_mmc
Adjust the tmio_mmc block size check to accept 2-byte requests in 4-bit mode if the hardware supports it. Tested with the SDHI hardware block included in sh7724. Signed-off-by: Yusuke Goda <[email protected]> Signed-off-by: Matt Fleming <[email protected]> Acked-by: Magnus Damm <[email protected]> Tested-by: Arnd Hannemann <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
This commit is contained in:
parent
68accd7370
commit
f1334fb3c3
3 changed files with 23 additions and 5 deletions
|
|
@ -658,14 +658,21 @@ static void tmio_mmc_release_dma(struct tmio_mmc_host *host)
|
|||
static int tmio_mmc_start_data(struct tmio_mmc_host *host,
|
||||
struct mmc_data *data)
|
||||
{
|
||||
struct mfd_cell *cell = host->pdev->dev.platform_data;
|
||||
struct tmio_mmc_data *pdata = cell->driver_data;
|
||||
|
||||
pr_debug("setup data transfer: blocksize %08x nr_blocks %d\n",
|
||||
data->blksz, data->blocks);
|
||||
|
||||
/* Hardware cannot perform 1 and 2 byte requests in 4 bit mode */
|
||||
if (data->blksz < 4 && host->mmc->ios.bus_width == MMC_BUS_WIDTH_4) {
|
||||
pr_err("%s: %d byte block unsupported in 4 bit mode\n",
|
||||
mmc_hostname(host->mmc), data->blksz);
|
||||
return -EINVAL;
|
||||
/* Some hardware cannot perform 2 byte requests in 4 bit mode */
|
||||
if (host->mmc->ios.bus_width == MMC_BUS_WIDTH_4) {
|
||||
int blksz_2bytes = pdata->flags & TMIO_MMC_BLKSZ_2BYTES;
|
||||
|
||||
if (data->blksz < 2 || (data->blksz < 4 && !blksz_2bytes)) {
|
||||
pr_err("%s: %d byte block unsupported in 4 bit mode\n",
|
||||
mmc_hostname(host->mmc), data->blksz);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
tmio_mmc_init_sg(host, data);
|
||||
|
|
|
|||
Loading…
Reference in a new issue