Commit a8c91da5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (53 commits)
  mmc: dw_mmc: support mmc power control with regulator
  mmc: dw_mmc: fix suspend/resume operation
  mmc: dw_mmc: add quirks for unreliable card detect, and capabilities
  mmc: tmio: fix address in kunmap_atomic() calls
  mmc: core: reset card voltage after power off
  mmc: core: export function mmc_do_release_host()
  mmc: sdio: remember new card RCA when redetecting card
  mmc: dw_mmc: Remove set-but-unused variable.
  mmc: sdhci-esdhc-imx: add card detect on custom GPIO for mx25/35
  mmc: sdhci-esdhc: broken card detection is not a default quirk
  mmc: sdhci-esdhc-imx: add write protect on custom GPIO on mx25/35
  mmc: msm_sdcc: remove needless cache flush after dma_unmap_sg()
  mmc: sh_mmcif: support aggressive clock gating
  mmc: check if mmc cards < 2GB do sector addressing
  mmc: core: comment on why sdio_reset is done at init time
  mmc: dw_mmc: support DDR mode
  mmc: via-sdmmc: Remove set-but-unused variable.
  mmc: cb710: Return err value in cb710_wait_while_busy()
  mmc: sdhci-pci: Remove set-but-unused variable.
  mmc: mxs-mmc: add mmc host driver for i.MX23/28
  ...
parents 26b95cac c07946a3
What: /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_offset
Date: January 2011
Contact: Chuanxiao Dong <chuanxiao.dong@intel.com>
Description:
Enhanced area is a new feature defined in eMMC4.4 standard.
eMMC4.4 or later card can support such feature. This kind of
area can help to improve the card performance. If the feature
is enabled, this attribute will indicate the start address of
enhanced data area. If not, this attribute will be -EINVAL.
Unit Byte. Format decimal.
What: /sys/devices/.../mmc_host/mmcX/mmcX:XXXX/enhanced_area_size
Date: January 2011
Contact: Chuanxiao Dong <chuanxiao.dong@intel.com>
Description:
Enhanced area is a new feature defined in eMMC4.4 standard.
eMMC4.4 or later card can support such feature. This kind of
area can help to improve the card performance. If the feature
is enabled, this attribute will indicate the size of enhanced
data area. If not, this attribute will be -EINVAL.
Unit KByte. Format decimal.
/*
* Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef __MACH_MXS_MMC_H__
#define __MACH_MXS_MMC_H__
struct mxs_mmc_platform_data {
int wp_gpio; /* write protect pin */
unsigned int flags;
#define SLOTF_4_BIT_CAPABLE (1 << 0)
#define SLOTF_8_BIT_CAPABLE (1 << 1)
};
#endif /* __MACH_MXS_MMC_H__ */
...@@ -10,7 +10,17 @@ ...@@ -10,7 +10,17 @@
#ifndef __ASM_ARCH_IMX_ESDHC_H #ifndef __ASM_ARCH_IMX_ESDHC_H
#define __ASM_ARCH_IMX_ESDHC_H #define __ASM_ARCH_IMX_ESDHC_H
/**
* struct esdhc_platform_data - optional platform data for esdhc on i.MX
*
* strongly recommended for i.MX25/35, not needed for other variants
*
* @wp_gpio: gpio for write_protect (-EINVAL if unused)
* @cd_gpio: gpio for card_detect interrupt (-EINVAL if unused)
*/
struct esdhc_platform_data { struct esdhc_platform_data {
unsigned int wp_gpio; /* write protect pin */ unsigned int wp_gpio;
unsigned int cd_gpio;
}; };
#endif /* __ASM_ARCH_IMX_ESDHC_H */ #endif /* __ASM_ARCH_IMX_ESDHC_H */
...@@ -58,12 +58,11 @@ config SDIO_UART ...@@ -58,12 +58,11 @@ config SDIO_UART
config MMC_TEST config MMC_TEST
tristate "MMC host test driver" tristate "MMC host test driver"
default n
help help
Development driver that performs a series of reads and writes Development driver that performs a series of reads and writes
to a memory card in order to expose certain well known bugs to a memory card in order to expose certain well known bugs
in host controllers. The tests are executed by writing to the in host controllers. The tests are executed by writing to the
"test" file in sysfs under each card. Note that whatever is "test" file in debugfs under each card. Note that whatever is
on your card will be overwritten by these tests. on your card will be overwritten by these tests.
This driver is only of interest to those developing or This driver is only of interest to those developing or
......
...@@ -621,6 +621,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) ...@@ -621,6 +621,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
md->disk->private_data = md; md->disk->private_data = md;
md->disk->queue = md->queue.queue; md->disk->queue = md->queue.queue;
md->disk->driverfs_dev = &card->dev; md->disk->driverfs_dev = &card->dev;
set_disk_ro(md->disk, md->read_only);
/* /*
* As discussed on lkml, GENHD_FL_REMOVABLE should: * As discussed on lkml, GENHD_FL_REMOVABLE should:
......
This diff is collapsed.
...@@ -6,6 +6,7 @@ obj-$(CONFIG_MMC) += mmc_core.o ...@@ -6,6 +6,7 @@ obj-$(CONFIG_MMC) += mmc_core.o
mmc_core-y := core.o bus.o host.o \ mmc_core-y := core.o bus.o host.o \
mmc.o mmc_ops.o sd.o sd_ops.o \ mmc.o mmc_ops.o sd.o sd_ops.o \
sdio.o sdio_ops.o sdio_bus.o \ sdio.o sdio_ops.o sdio_bus.o \
sdio_cis.o sdio_io.o sdio_irq.o sdio_cis.o sdio_io.o sdio_irq.o \
quirks.o
mmc_core-$(CONFIG_DEBUG_FS) += debugfs.o mmc_core-$(CONFIG_DEBUG_FS) += debugfs.o
...@@ -167,8 +167,6 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) ...@@ -167,8 +167,6 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
WARN_ON(!host->claimed); WARN_ON(!host->claimed);
led_trigger_event(host->led, LED_FULL);
mrq->cmd->error = 0; mrq->cmd->error = 0;
mrq->cmd->mrq = mrq; mrq->cmd->mrq = mrq;
if (mrq->data) { if (mrq->data) {
...@@ -194,6 +192,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) ...@@ -194,6 +192,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
} }
} }
mmc_host_clk_ungate(host); mmc_host_clk_ungate(host);
led_trigger_event(host->led, LED_FULL);
host->ops->request(host, mrq); host->ops->request(host, mrq);
} }
...@@ -528,7 +527,14 @@ int mmc_try_claim_host(struct mmc_host *host) ...@@ -528,7 +527,14 @@ int mmc_try_claim_host(struct mmc_host *host)
} }
EXPORT_SYMBOL(mmc_try_claim_host); EXPORT_SYMBOL(mmc_try_claim_host);
static void mmc_do_release_host(struct mmc_host *host) /**
* mmc_do_release_host - release a claimed host
* @host: mmc host to release
*
* If you successfully claimed a host, this function will
* release it again.
*/
void mmc_do_release_host(struct mmc_host *host)
{ {
unsigned long flags; unsigned long flags;
...@@ -543,6 +549,7 @@ static void mmc_do_release_host(struct mmc_host *host) ...@@ -543,6 +549,7 @@ static void mmc_do_release_host(struct mmc_host *host)
wake_up(&host->wq); wake_up(&host->wq);
} }
} }
EXPORT_SYMBOL(mmc_do_release_host);
void mmc_host_deeper_disable(struct work_struct *work) void mmc_host_deeper_disable(struct work_struct *work)
{ {
...@@ -1002,6 +1009,13 @@ static void mmc_power_off(struct mmc_host *host) ...@@ -1002,6 +1009,13 @@ static void mmc_power_off(struct mmc_host *host)
{ {
host->ios.clock = 0; host->ios.clock = 0;
host->ios.vdd = 0; host->ios.vdd = 0;
/*
* Reset ocr mask to be the highest possible voltage supported for
* this mmc host. This value will be used at next power up.
*/
host->ocr = 1 << (fls(host->ocr_avail) - 1);
if (!mmc_host_is_spi(host)) { if (!mmc_host_is_spi(host)) {
host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN; host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
host->ios.chip_select = MMC_CS_DONTCARE; host->ios.chip_select = MMC_CS_DONTCARE;
...@@ -1495,6 +1509,12 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq) ...@@ -1495,6 +1509,12 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
mmc_hostname(host), __func__, host->f_init); mmc_hostname(host), __func__, host->f_init);
#endif #endif
mmc_power_up(host); mmc_power_up(host);
/*
* sdio_reset sends CMD52 to reset card. Since we do not know
* if the card is being re-initialized, just send it. CMD52
* should be ignored by SD/eMMC cards.
*/
sdio_reset(host); sdio_reset(host);
mmc_go_idle(host); mmc_go_idle(host);
......
...@@ -61,6 +61,8 @@ int mmc_attach_mmc(struct mmc_host *host); ...@@ -61,6 +61,8 @@ int mmc_attach_mmc(struct mmc_host *host);
int mmc_attach_sd(struct mmc_host *host); int mmc_attach_sd(struct mmc_host *host);
int mmc_attach_sdio(struct mmc_host *host); int mmc_attach_sdio(struct mmc_host *host);
void mmc_fixup_device(struct mmc_card *card);
/* Module parameters */ /* Module parameters */
extern int use_spi_crc; extern int use_spi_crc;
......
...@@ -160,10 +160,7 @@ static bool mmc_host_may_gate_card(struct mmc_card *card) ...@@ -160,10 +160,7 @@ static bool mmc_host_may_gate_card(struct mmc_card *card)
* gate the clock, because there is somebody out there that may still * gate the clock, because there is somebody out there that may still
* be using it. * be using it.
*/ */
if (mmc_card_sdio(card)) return !(card->quirks & MMC_QUIRK_BROKEN_CLK_GATING);
return false;
return true;
} }
/** /**
......
...@@ -302,6 +302,44 @@ static int mmc_read_ext_csd(struct mmc_card *card) ...@@ -302,6 +302,44 @@ static int mmc_read_ext_csd(struct mmc_card *card)
} }
if (card->ext_csd.rev >= 4) { if (card->ext_csd.rev >= 4) {
/*
* Enhanced area feature support -- check whether the eMMC
* card has the Enhanced area enabled. If so, export enhanced
* area offset and size to user by adding sysfs interface.
*/
if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) &&
(ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) {
u8 hc_erase_grp_sz =
ext_csd[EXT_CSD_HC_ERASE_GRP_SIZE];
u8 hc_wp_grp_sz =
ext_csd[EXT_CSD_HC_WP_GRP_SIZE];
card->ext_csd.enhanced_area_en = 1;
/*
* calculate the enhanced data area offset, in bytes
*/
card->ext_csd.enhanced_area_offset =
(ext_csd[139] << 24) + (ext_csd[138] << 16) +
(ext_csd[137] << 8) + ext_csd[136];
if (mmc_card_blockaddr(card))
card->ext_csd.enhanced_area_offset <<= 9;
/*
* calculate the enhanced data area size, in kilobytes
*/
card->ext_csd.enhanced_area_size =
(ext_csd[142] << 16) + (ext_csd[141] << 8) +
ext_csd[140];
card->ext_csd.enhanced_area_size *=
(size_t)(hc_erase_grp_sz * hc_wp_grp_sz);
card->ext_csd.enhanced_area_size <<= 9;
} else {
/*
* If the enhanced area is not enabled, disable these
* device attributes.
*/
card->ext_csd.enhanced_area_offset = -EINVAL;
card->ext_csd.enhanced_area_size = -EINVAL;
}
card->ext_csd.sec_trim_mult = card->ext_csd.sec_trim_mult =
ext_csd[EXT_CSD_SEC_TRIM_MULT]; ext_csd[EXT_CSD_SEC_TRIM_MULT];
card->ext_csd.sec_erase_mult = card->ext_csd.sec_erase_mult =
...@@ -336,6 +374,9 @@ MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid); ...@@ -336,6 +374,9 @@ MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid);
MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name); MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid); MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial); MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
MMC_DEV_ATTR(enhanced_area_offset, "%llu\n",
card->ext_csd.enhanced_area_offset);
MMC_DEV_ATTR(enhanced_area_size, "%u\n", card->ext_csd.enhanced_area_size);
static struct attribute *mmc_std_attrs[] = { static struct attribute *mmc_std_attrs[] = {
&dev_attr_cid.attr, &dev_attr_cid.attr,
...@@ -349,6 +390,8 @@ static struct attribute *mmc_std_attrs[] = { ...@@ -349,6 +390,8 @@ static struct attribute *mmc_std_attrs[] = {
&dev_attr_name.attr, &dev_attr_name.attr,
&dev_attr_oemid.attr, &dev_attr_oemid.attr,
&dev_attr_serial.attr, &dev_attr_serial.attr,
&dev_attr_enhanced_area_offset.attr,
&dev_attr_enhanced_area_size.attr,
NULL, NULL,
}; };
...@@ -378,6 +421,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -378,6 +421,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
int err, ddr = 0; int err, ddr = 0;
u32 cid[4]; u32 cid[4];
unsigned int max_dtr; unsigned int max_dtr;
u32 rocr;
BUG_ON(!host); BUG_ON(!host);
WARN_ON(!host->claimed); WARN_ON(!host->claimed);
...@@ -391,7 +435,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -391,7 +435,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
mmc_go_idle(host); mmc_go_idle(host);
/* The extra bit indicates that we support high capacity */ /* The extra bit indicates that we support high capacity */
err = mmc_send_op_cond(host, ocr | (1 << 30), NULL); err = mmc_send_op_cond(host, ocr | (1 << 30), &rocr);
if (err) if (err)
goto err; goto err;
...@@ -479,10 +523,50 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, ...@@ -479,10 +523,50 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
err = mmc_read_ext_csd(card); err = mmc_read_ext_csd(card);
if (err) if (err)
goto free_card; goto free_card;
/* If doing byte addressing, check if required to do sector
* addressing. Handle the case of <2GB cards needing sector
* addressing. See section 8.1 JEDEC Standard JED84-A441;
* ocr register has bit 30 set for sector addressing.
*/
if (!(mmc_card_blockaddr(card)) && (rocr & (1<<30)))
mmc_card_set_blockaddr(card);
/* Erase size depends on CSD and Extended CSD */ /* Erase size depends on CSD and Extended CSD */
mmc_set_erase_size(card); mmc_set_erase_size(card);
} }
/*
* If enhanced_area_en is TRUE, host needs to enable ERASE_GRP_DEF
* bit. This bit will be lost everytime after a reset or power off.
*/
if (card->ext_csd.enhanced_area_en) {
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_ERASE_GROUP_DEF, 1);
if (err && err != -EBADMSG)
goto free_card;
if (err) {
err = 0;
/*
* Just disable enhanced area off & sz
* will try to enable ERASE_GROUP_DEF
* during next time reinit
*/
card->ext_csd.enhanced_area_offset = -EINVAL;
card->ext_csd.enhanced_area_size = -EINVAL;
} else {
card->ext_csd.erase_group_def = 1;
/*
* enable ERASE_GRP_DEF successfully.
* This will affect the erase size, so
* here need to reset erase size
*/
mmc_set_erase_size(card);
}
}
/* /*
* Activate high speed (if supported) * Activate high speed (if supported)
*/ */
......
/*
* This file contains work-arounds for many known sdio hardware
* bugs.
*
* Copyright (c) 2011 Pierre Tardy <tardyp@gmail.com>
* Inspired from pci fixup code:
* Copyright (c) 1999 Martin Mares <mj@ucw.cz>
*
*/
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mmc/card.h>
#include <linux/mod_devicetable.h>
/*
* The world is not perfect and supplies us with broken mmc/sdio devices.
* For at least a part of these bugs we need a work-around
*/
struct mmc_fixup {
u16 vendor, device; /* You can use SDIO_ANY_ID here of course */
void (*vendor_fixup)(struct mmc_card *card, int data);
int data;
};
/*
* This hook just adds a quirk unconditionnally
*/
static void __maybe_unused add_quirk(struct mmc_card *card, int data)
{
card->quirks |= data;
}
/*
* This hook just removes a quirk unconditionnally
*/
static void __maybe_unused remove_quirk(struct mmc_card *card, int data)
{
card->quirks &= ~data;
}
/*
* This hook just adds a quirk for all sdio devices
*/
static void add_quirk_for_sdio_devices(struct mmc_card *card, int data)
{
if (mmc_card_sdio(card))
card->quirks |= data;
}
#ifndef SDIO_VENDOR_ID_TI
#define SDIO_VENDOR_ID_TI 0x0097
#endif
#ifndef SDIO_DEVICE_ID_TI_WL1271
#define SDIO_DEVICE_ID_TI_WL1271 0x4076
#endif
static const struct mmc_fixup mmc_fixup_methods[] = {
/* by default sdio devices are considered CLK_GATING broken */
/* good cards will be whitelisted as they are tested */
{ SDIO_ANY_ID, SDIO_ANY_ID,
add_quirk_for_sdio_devices, MMC_QUIRK_BROKEN_CLK_GATING },
{ SDIO_VENDOR_ID_TI, SDIO_DEVICE_ID_TI_WL1271,
remove_quirk, MMC_QUIRK_BROKEN_CLK_GATING },
{ 0 }
};
void mmc_fixup_device(struct mmc_card *card)
{
const struct mmc_fixup *f;
for (f = mmc_fixup_methods; f->vendor_fixup; f++) {
if ((f->vendor == card->cis.vendor
|| f->vendor == (u16) SDIO_ANY_ID) &&
(f->device == card->cis.device
|| f->device == (u16) SDIO_ANY_ID)) {
dev_dbg(&card->dev, "calling %pF\n", f->vendor_fixup);
f->vendor_fixup(card, f->data);
}
}
}
EXPORT_SYMBOL(mmc_fixup_device);
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "core.h" #include "core.h"
#include "bus.h" #include "bus.h"
#include "mmc_ops.h" #include "mmc_ops.h"
#include "sd.h"
#include "sd_ops.h" #include "sd_ops.h"
static const unsigned int tran_exp[] = { static const unsigned int tran_exp[] = {
......
...@@ -395,6 +395,14 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -395,6 +395,14 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
if (err) if (err)
goto remove; goto remove;
/*
* Update oldcard with the new RCA received from the SDIO
* device -- we're doing this so that it's updated in the
* "card" struct when oldcard overwrites that later.
*/
if (oldcard)
oldcard->rca = card->rca;
mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL); mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
} }
...@@ -458,6 +466,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, ...@@ -458,6 +466,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
card = oldcard; card = oldcard;
} }
mmc_fixup_device(card);
if (card->type == MMC_TYPE_SD_COMBO) { if (card->type == MMC_TYPE_SD_COMBO) {
err = mmc_sd_setup_card(host, card, oldcard != NULL); err = mmc_sd_setup_card(host, card, oldcard != NULL);
......
...@@ -311,7 +311,7 @@ config MMC_MSM ...@@ -311,7 +311,7 @@ config MMC_MSM
config MMC_MXC config MMC_MXC
tristate "Freescale i.MX2/3 Multimedia Card Interface support" tristate "Freescale i.MX2/3 Multimedia Card Interface support"
depends on ARCH_MXC depends on MACH_MX21 || MACH_MX27 || ARCH_MX31
help help
This selects the Freescale i.MX2/3 Multimedia card Interface. This selects the Freescale i.MX2/3 Multimedia card Interface.
If you have a i.MX platform with a Multimedia Card slot, If you have a i.MX platform with a Multimedia Card slot,
...@@ -319,6 +319,15 @@ config MMC_MXC ...@@ -319,6 +319,15 @@ config MMC_MXC
If unsure, say N. If unsure, say N.
config MMC_MXS
tristate "Freescale MXS Multimedia Card Interface support"
depends on ARCH_MXS && MXS_DMA
help
This selects the Freescale SSP MMC controller found on MXS based
platforms like mx23/28.
If unsure, say N.
config MMC_TIFM_SD config MMC_TIFM_SD
tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)" tristate "TI Flash Media MMC/SD Interface support (EXPERIMENTAL)"
depends on EXPERIMENTAL && PCI depends on EXPERIMENTAL && PCI
......
...@@ -6,6 +6,7 @@ obj-$(CONFIG_MMC_ARMMMCI) += mmci.o ...@@ -6,6 +6,7 @@ obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_PXA) += pxamci.o
obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_IMX) += imxmmc.o
obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o
obj-$(CONFIG_MMC_MXS) += mxs-mmc.o
obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o
obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o
obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o
......
...@@ -578,7 +578,8 @@ static void atmci_dma_cleanup(struct atmel_mci *host) ...@@ -578,7 +578,8 @@ static void atmci_dma_cleanup(struct atmel_mci *host)
struct mmc_data *data = host->data; struct mmc_data *data = host->data;
if (data) if (data)
dma_unmap_sg(&host->pdev->dev, data->sg, data->sg_len, dma_unmap_sg(host->dma.chan->device->dev,
data->sg, data->sg_len,
((data->flags & MMC_DATA_WRITE) ((data->flags & MMC_DATA_WRITE)
? DMA_TO_DEVICE : DMA_FROM_DEVICE)); ? DMA_TO_DEVICE : DMA_FROM_DEVICE));
} }
...@@ -588,7 +589,7 @@ static void atmci_stop_dma(struct atmel_mci *host) ...@@ -588,7 +589,7 @@ static void atmci_stop_dma(struct atmel_mci *host)
struct dma_chan *chan = host->data_chan; struct dma_chan *chan = host->data_chan;
if (chan) { if (chan) {
chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); dmaengine_terminate_all(chan);
atmci_dma_cleanup(host); atmci_dma_cleanup(host);
} else { } else {
/* Data transfer was stopped by the interrupt handler */ /* Data transfer was stopped by the interrupt handler */
...@@ -684,11 +685,11 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) ...@@ -684,11 +685,11 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
else else
direction = DMA_TO_DEVICE; direction = DMA_TO_DEVICE;
sglen = dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, direction); sglen = dma_map_sg(chan->device->dev, data->sg,
if (sglen != data->sg_len) data->sg_len, direction);
goto unmap_exit;
desc = chan->device->device_prep_slave_sg(chan, desc = chan->device->device_prep_slave_sg(chan,
data->sg, data->sg_len, direction, data->sg, sglen, direction,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) if (!desc)
goto unmap_exit; goto unmap_exit;
...@@ -699,7 +700,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data) ...@@ -699,7 +700,7 @@ atmci_prepare_data_dma(struct atmel_mci *host, struct mmc_data *data)
return 0; return 0;
unmap_exit: unmap_exit:
dma_unmap_sg(&host->pdev->dev, data->sg, sglen, direction); dma_unmap_sg(chan->device->dev, data->sg, data->sg_len, direction);
return -ENOMEM; return -ENOMEM;
} }
...@@ -709,8 +710,8 @@ static void atmci_submit_data(struct atmel_mci *host) ...@@ -709,8 +710,8 @@ static void atmci_submit_data(struct atmel_mci *host)
struct dma_async_tx_descriptor *desc = host->dma.data_desc; struct dma_async_tx_descriptor *desc = host->dma.data_desc;
if (chan) { if (chan) {
desc->tx_submit(desc); dmaengine_submit(desc);
chan->device->device_issue_pending(chan); dma_async_issue_pending(chan);
} }
} }
......
...@@ -205,7 +205,7 @@ static int cb710_wait_while_busy(struct cb710_slot *slot, uint8_t mask) ...@@ -205,7 +205,7 @@ static int cb710_wait_while_busy(struct cb710_slot *slot, uint8_t mask)
"WAIT12: waited %d loops, mask %02X, entry val %08X, exit val %08X\n", "WAIT12: waited %d loops, mask %02X, entry val %08X, exit val %08X\n",
limit, mask, e, x); limit, mask, e, x);
#endif #endif
return 0; return err;
} }
static void cb710_mmc_set_transfer_size(struct cb710_slot *slot, static void cb710_mmc_set_transfer_size(struct cb710_slot *slot,
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
#include <linux/mmc/dw_mmc.h> #include <linux/mmc/dw_mmc.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/regulator/consumer.h>
#include "dw_mmc.h" #include "dw_mmc.h"
...@@ -562,7 +563,8 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot) ...@@ -562,7 +563,8 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot)
SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT, 0); SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT, 0);
/* enable clock */ /* enable clock */
mci_writel(host, CLKENA, SDMMC_CLKEN_ENABLE); mci_writel(host, CLKENA, SDMMC_CLKEN_ENABLE |
SDMMC_CLKEN_LOW_PWR);
/* inform CIU */ /* inform CIU */
mci_send_cmd(slot, mci_send_cmd(slot,
...@@ -661,6 +663,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) ...@@ -661,6 +663,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{ {
struct dw_mci_slot *slot = mmc_priv(mmc); struct dw_mci_slot *slot = mmc_priv(mmc);
u32 regs;
/* set default 1 bit mode */ /* set default 1 bit mode */
slot->ctype = SDMMC_CTYPE_1BIT; slot->ctype = SDMMC_CTYPE_1BIT;
...@@ -672,6 +675,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ...@@ -672,6 +675,16 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
case MMC_BUS_WIDTH_4: case MMC_BUS_WIDTH_4:
slot->ctype = SDMMC_CTYPE_4BIT; slot->ctype = SDMMC_CTYPE_4BIT;
break; break;
case MMC_BUS_WIDTH_8:
slot->ctype = SDMMC_CTYPE_8BIT;
break;
}
/* DDR mode set */
if (ios->ddr) {
regs = mci_readl(slot->host, UHS_REG);
regs |= (0x1 << slot->id) << 16;
mci_writel(slot->host, UHS_REG, regs);
} }
if (ios->clock) { if (ios->clock) {
...@@ -717,7 +730,9 @@ static int dw_mci_get_cd(struct mmc_host *mmc) ...@@ -717,7 +730,9 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
struct dw_mci_board *brd = slot->host->pdata; struct dw_mci_board *brd = slot->host->pdata;
/* Use platform get_cd function, else try onboard card detect */ /* Use platform get_cd function, else try onboard card detect */
if (brd->get_cd) if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
present = 1;
else if (brd->get_cd)
present = !brd->get_cd(slot->id); present = !brd->get_cd(slot->id);
else else
present = (mci_readl(slot->host, CDETECT) & (1 << slot->id)) present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
...@@ -1019,13 +1034,10 @@ static void dw_mci_read_data_pio(struct dw_mci *host) ...@@ -1019,13 +1034,10 @@ static void dw_mci_read_data_pio(struct dw_mci *host)
struct mmc_data *data = host->data; struct mmc_data *data = host->data;
int shift = host->data_shift; int shift = host->data_shift;
u32 status; u32 status;
unsigned int nbytes = 0, len, old_len, count = 0; unsigned int nbytes = 0, len;
do { do {
len = SDMMC_GET_FCNT(mci_readl(host, STATUS)) << shift; len = SDMMC_GET_FCNT(mci_readl(host, STATUS)) << shift;
if (count == 0)
old_len = len;
if (offset + len <= sg->length) { if (offset + len <= sg->length) {
host->pull_data(host, (void *)(buf + offset), len); host->pull_data(host, (void *)(buf + offset), len);
...@@ -1070,7 +1082,6 @@ static void dw_mci_read_data_pio(struct dw_mci *host) ...@@ -1070,7 +1082,6 @@ static void dw_mci_read_data_pio(struct dw_mci *host)
tasklet_schedule(&host->tasklet); tasklet_schedule(&host->tasklet);
return; return;
} }
count++;
} while (status & SDMMC_INT_RXDR); /*if the RXDR is ready read again*/ } while (status & SDMMC_INT_RXDR); /*if the RXDR is ready read again*/
len = SDMMC_GET_FCNT(mci_readl(host, STATUS)); len = SDMMC_GET_FCNT(mci_readl(host, STATUS));
host->pio_offset = offset; host->pio_offset = offset;
...@@ -1395,7 +1406,11 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) ...@@ -1395,7 +1406,11 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
if (host->pdata->setpower) if (host->pdata->setpower)
host->pdata->setpower(id, 0); host->pdata->setpower(id, 0);
mmc->caps = 0; if (host->pdata->caps)
mmc->caps = host->pdata->caps;
else
mmc->caps = 0;
if (host->pdata->get_bus_wd) if (host->pdata->get_bus_wd)
if (host->pdata->get_bus_wd(slot->id) >= 4) if (host->pdata->get_bus_wd(slot->id) >= 4)
mmc->caps |= MMC_CAP_4_BIT_DATA; mmc->caps |= MMC_CAP_4_BIT_DATA;
...@@ -1426,6 +1441,13 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) ...@@ -1426,6 +1441,13 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
} }
#endif /* CONFIG_MMC_DW_IDMAC */ #endif /* CONFIG_MMC_DW_IDMAC */
host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
if (IS_ERR(host->vmmc)) {
printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc));
host->vmmc = NULL;
} else
regulator_enable(host->vmmc);
if (dw_mci_get_cd(mmc)) if (dw_mci_get_cd(mmc))
set_bit(DW_MMC_CARD_PRESENT, &slot->flags); set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
else else
...@@ -1441,6 +1463,12 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) ...@@ -1441,6 +1463,12 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id)
/* Card initially undetected */ /* Card initially undetected */
slot->last_detect_state = 0; slot->last_detect_state = 0;
/*
* Card may have been plugged in prior to boot so we
* need to run the detect tasklet
*/
tasklet_schedule(&host->card_tasklet);
return 0; return 0;
} }
...@@ -1619,8 +1647,9 @@ static int dw_mci_probe(struct platform_device *pdev) ...@@ -1619,8 +1647,9 @@ static int dw_mci_probe(struct platform_device *pdev)
*/ */
fifo_size = mci_readl(host, FIFOTH); fifo_size = mci_readl(host, FIFOTH);
fifo_size = (fifo_size >> 16) & 0x7ff; fifo_size = (fifo_size >> 16) & 0x7ff;
mci_writel(host, FIFOTH, ((0x2 << 28) | ((fifo_size/2 - 1) << 16) | host->fifoth_val = ((0x2 << 28) | ((fifo_size/2 - 1) << 16) |
((fifo_size/2) << 0))); ((fifo_size/2) << 0));
mci_writel(host, FIFOTH, host->fifoth_val);
/* disable clock to CIU */ /* disable clock to CIU */
mci_writel(host, CLKENA, 0); mci_writel(host, CLKENA, 0);
...@@ -1683,6 +1712,12 @@ static int dw_mci_probe(struct platform_device *pdev) ...@@ -1683,6 +1712,12 @@ static int dw_mci_probe(struct platform_device *pdev)
host->sg_cpu, host->sg_dma); host->sg_cpu, host->sg_dma);
iounmap(host->regs); iounmap(host->regs);
if (host->vmmc) {
regulator_disable(host->vmmc);
regulator_put(host->vmmc);
}
err_freehost: err_freehost:
kfree(host); kfree(host);
return ret; return ret;
...@@ -1714,6 +1749,11 @@ static int __exit dw_mci_remove(struct platform_device *pdev) ...@@ -1714,6 +1749,11 @@ static int __exit dw_mci_remove(struct platform_device *pdev)
if (host->use_dma && host->dma_ops->exit) if (host->use_dma && host->dma_ops->exit)
host->dma_ops->exit(host); host->dma_ops->exit(host);
if (host->vmmc) {
regulator_disable(host->vmmc);
regulator_put(host->vmmc);
}
iounmap(host->regs); iounmap(host->regs);
kfree(host); kfree(host);
...@@ -1729,6 +1769,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg) ...@@ -1729,6 +1769,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)
int i, ret; int i, ret;
struct dw_mci *host = platform_get_drvdata(pdev); struct dw_mci *host = platform_get_drvdata(pdev);
if (host->vmmc)
regulator_enable(host->vmmc);
for (i = 0; i < host->num_slots; i++) { for (i = 0; i < host->num_slots; i++) {
struct dw_mci_slot *slot = host->slot[i]; struct dw_mci_slot *slot = host->slot[i];
if (!slot) if (!slot)
...@@ -1744,6 +1787,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg) ...@@ -1744,6 +1787,9 @@ static int dw_mci_suspend(struct platform_device *pdev, pm_message_t mesg)
} }
} }
if (host->vmmc)
regulator_disable(host->vmmc);
return 0; return 0;
} }
...@@ -1752,6 +1798,23 @@ static int dw_mci_resume(struct platform_device *pdev) ...@@ -1752,6 +1798,23 @@ static int dw_mci_resume(struct platform_device *pdev)
int i, ret; int i, ret;
struct dw_mci *host = platform_get_drvdata(pdev); struct dw_mci *host = platform_get_drvdata(pdev);
if (host->dma_ops->init)
host->dma_ops->init(host);
if (!mci_wait_reset(&pdev->dev, host)) {
ret = -ENODEV;
return ret;
}
/* Restore the old value at FIFOTH register */
mci_writel(host, FIFOTH, host->fifoth_val);
mci_writel(host, RINTSTS, 0xFFFFFFFF);
mci_writel(host, INTMASK, SDMMC_INT_CMD_DONE | SDMMC_INT_DATA_OVER |
SDMMC_INT_TXDR | SDMMC_INT_RXDR |
DW_MCI_ERROR_FLAGS | SDMMC_INT_CD);
mci_writel(host, CTRL, SDMMC_CTRL_INT_ENABLE);
for (i = 0; i < host->num_slots; i++) { for (i = 0; i < host->num_slots; i++) {
struct dw_mci_slot *slot = host->slot[i]; struct dw_mci_slot *slot = host->slot[i];
if (!slot) if (!slot)
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#define SDMMC_USRID 0x068 #define SDMMC_USRID 0x068
#define SDMMC_VERID 0x06c #define SDMMC_VERID 0x06c
#define SDMMC_HCON 0x070 #define SDMMC_HCON 0x070
#define SDMMC_UHS_REG 0x074
#define SDMMC_BMOD 0x080 #define SDMMC_BMOD 0x080
#define SDMMC_PLDMND 0x084 #define SDMMC_PLDMND 0x084
#define SDMMC_DBADDR 0x088 #define SDMMC_DBADDR 0x088
...@@ -51,7 +52,6 @@ ...@@ -51,7 +52,6 @@
#define SDMMC_DSCADDR 0x094 #define SDMMC_DSCADDR 0x094
#define SDMMC_BUFADDR 0x098 #define SDMMC_BUFADDR 0x098
#define SDMMC_DATA 0x100 #define SDMMC_DATA 0x100
#define SDMMC_DATA_ADR 0x100
/* shift bit field */ /* shift bit field */
#define _SBF(f, v) ((v) << (f)) #define _SBF(f, v) ((v) << (f))
......
...@@ -267,14 +267,6 @@ msmsdcc_dma_complete_tlet(unsigned long data) ...@@ -267,14 +267,6 @@ msmsdcc_dma_complete_tlet(unsigned long data)
dma_unmap_sg(mmc_dev(host->mmc), host->dma.sg, host->dma.num_ents, dma_unmap_sg(mmc_dev(host->mmc), host->dma.sg, host->dma.num_ents,
host->dma.dir); host->dma.dir);
if (host->curr.user_pages) {
struct scatterlist *sg = host->dma.sg;
int i;
for (i = 0; i < host->dma.num_ents; i++)
flush_dcache_page(sg_page(sg++));
}
host->dma.sg = NULL; host->dma.sg = NULL;
host->dma.busy = 0; host->dma.busy = 0;
......
...@@ -32,16 +32,14 @@ ...@@ -32,16 +32,14 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/dmaengine.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <mach/mmc.h> #include <mach/mmc.h>
#ifdef CONFIG_ARCH_MX2 #include <mach/dma.h>
#include <mach/dma-mx1-mx2.h>
#define HAS_DMA
#endif
#define DRIVER_NAME "mxc-mmc" #define DRIVER_NAME "mxc-mmc"
...@@ -118,7 +116,8 @@ struct mxcmci_host { ...@@ -118,7 +116,8 @@ struct mxcmci_host {
void __iomem *base; void __iomem *base;
int irq; int irq;
int detect_irq; int detect_irq;
int dma; struct dma_chan *dma;
struct dma_async_tx_descriptor *desc;
int do_dma; int do_dma;
int default_irq_mask; int default_irq_mask;
int use_sdio; int use_sdio;
...@@ -129,7 +128,6 @@ struct mxcmci_host { ...@@ -129,7 +128,6 @@ struct mxcmci_host {
struct mmc_command *cmd; struct mmc_command *cmd;
struct mmc_data *data; struct mmc_data *data;
unsigned int dma_nents;
unsigned int datasize; unsigned int datasize;
unsigned int dma_dir; unsigned int dma_dir;
...@@ -144,6 +142,11 @@ struct mxcmci_host { ...@@ -144,6 +142,11 @@ struct mxcmci_host {
spinlock_t lock; spinlock_t lock;
struct regulator *vcc; struct regulator *vcc;
int burstlen;
int dmareq;
struct dma_slave_config dma_slave_config;
struct imx_dma_data dma_data;
}; };
static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios); static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios);
...@@ -206,17 +209,16 @@ static void mxcmci_softreset(struct mxcmci_host *host) ...@@ -206,17 +209,16 @@ static void mxcmci_softreset(struct mxcmci_host *host)
writew(0xff, host->base + MMC_REG_RES_TO); writew(0xff, host->base + MMC_REG_RES_TO);
} }
static int mxcmci_setup_dma(struct mmc_host *mmc);
static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data) static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
{ {
unsigned int nob = data->blocks; unsigned int nob = data->blocks;
unsigned int blksz = data->blksz; unsigned int blksz = data->blksz;
unsigned int datasize = nob * blksz; unsigned int datasize = nob * blksz;
#ifdef HAS_DMA
struct scatterlist *sg; struct scatterlist *sg;
int i; int i, nents;
int ret;
#endif
if (data->flags & MMC_DATA_STREAM) if (data->flags & MMC_DATA_STREAM)
nob = 0xffff; nob = 0xffff;
...@@ -227,7 +229,9 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data) ...@@ -227,7 +229,9 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
writew(blksz, host->base + MMC_REG_BLK_LEN); writew(blksz, host->base + MMC_REG_BLK_LEN);
host->datasize = datasize; host->datasize = datasize;
#ifdef HAS_DMA if (!mxcmci_use_dma(host))
return 0;
for_each_sg(data->sg, sg, data->sg_len, i) { for_each_sg(data->sg, sg, data->sg_len, i) {
if (sg->offset & 3 || sg->length & 3) { if (sg->offset & 3 || sg->length & 3) {
host->do_dma = 0; host->do_dma = 0;
...@@ -235,34 +239,30 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data) ...@@ -235,34 +239,30 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
} }
} }
if (data->flags & MMC_DATA_READ) { if (data->flags & MMC_DATA_READ)
host->dma_dir = DMA_FROM_DEVICE; host->dma_dir = DMA_FROM_DEVICE;
host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg, else
data->sg_len, host->dma_dir);
ret = imx_dma_setup_sg(host->dma, data->sg, host->dma_nents,
datasize,
host->res->start + MMC_REG_BUFFER_ACCESS,
DMA_MODE_READ);
} else {
host->dma_dir = DMA_TO_DEVICE; host->dma_dir = DMA_TO_DEVICE;
host->dma_nents = dma_map_sg(mmc_dev(host->mmc), data->sg,
data->sg_len, host->dma_dir);
ret = imx_dma_setup_sg(host->dma, data->sg, host->dma_nents, nents = dma_map_sg(host->dma->device->dev, data->sg,
datasize, data->sg_len, host->dma_dir);
host->res->start + MMC_REG_BUFFER_ACCESS, if (nents != data->sg_len)
DMA_MODE_WRITE); return -EINVAL;
}
host->desc = host->dma->device->device_prep_slave_sg(host->dma,
data->sg, data->sg_len, host->dma_dir,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (ret) { if (!host->desc) {
dev_err(mmc_dev(host->mmc), "failed to setup DMA : %d\n", ret); dma_unmap_sg(host->dma->device->dev, data->sg, data->sg_len,
return ret; host->dma_dir);
host->do_dma = 0;
return 0; /* Fall back to PIO */
} }
wmb(); wmb();
imx_dma_enable(host->dma); dmaengine_submit(host->desc);
#endif /* HAS_DMA */
return 0; return 0;
} }
...@@ -337,13 +337,11 @@ static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat) ...@@ -337,13 +337,11 @@ static int mxcmci_finish_data(struct mxcmci_host *host, unsigned int stat)
struct mmc_data *data = host->data; struct mmc_data *data = host->data;
int data_error; int data_error;
#ifdef HAS_DMA
if (mxcmci_use_dma(host)) { if (mxcmci_use_dma(host)) {
imx_dma_disable(host->dma); dmaengine_terminate_all(host->dma);
dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_nents, dma_unmap_sg(host->dma->device->dev, data->sg, data->sg_len,
host->dma_dir); host->dma_dir);
} }
#endif
if (stat & STATUS_ERR_MASK) { if (stat & STATUS_ERR_MASK) {
dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n", dev_dbg(mmc_dev(host->mmc), "request failed. status: 0x%08x\n",
...@@ -545,7 +543,6 @@ static void mxcmci_datawork(struct work_struct *work) ...@@ -545,7 +543,6 @@ static void mxcmci_datawork(struct work_struct *work)
} }
} }
#ifdef HAS_DMA
static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat) static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat)
{ {
struct mmc_data *data = host->data; struct mmc_data *data = host->data;
...@@ -568,7 +565,6 @@ static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat) ...@@ -568,7 +565,6 @@ static void mxcmci_data_done(struct mxcmci_host *host, unsigned int stat)
mxcmci_finish_request(host, host->req); mxcmci_finish_request(host, host->req);
} }
} }
#endif /* HAS_DMA */
static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat) static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat)
{ {
...@@ -606,12 +602,10 @@ static irqreturn_t mxcmci_irq(int irq, void *devid) ...@@ -606,12 +602,10 @@ static irqreturn_t mxcmci_irq(int irq, void *devid)
sdio_irq = (stat & STATUS_SDIO_INT_ACTIVE) && host->use_sdio; sdio_irq = (stat & STATUS_SDIO_INT_ACTIVE) && host->use_sdio;
spin_unlock_irqrestore(&host->lock, flags); spin_unlock_irqrestore(&host->lock, flags);
#ifdef HAS_DMA
if (mxcmci_use_dma(host) && if (mxcmci_use_dma(host) &&
(stat & (STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE))) (stat & (STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE)))
writel(STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE, writel(STATUS_READ_OP_DONE | STATUS_WRITE_OP_DONE,
host->base + MMC_REG_STATUS); host->base + MMC_REG_STATUS);
#endif
if (sdio_irq) { if (sdio_irq) {
writel(STATUS_SDIO_INT_ACTIVE, host->base + MMC_REG_STATUS); writel(STATUS_SDIO_INT_ACTIVE, host->base + MMC_REG_STATUS);
...@@ -621,14 +615,14 @@ static irqreturn_t mxcmci_irq(int irq, void *devid) ...@@ -621,14 +615,14 @@ static irqreturn_t mxcmci_irq(int irq, void *devid)
if (stat & STATUS_END_CMD_RESP) if (stat & STATUS_END_CMD_RESP)
mxcmci_cmd_done(host, stat); mxcmci_cmd_done(host, stat);
#ifdef HAS_DMA
if (mxcmci_use_dma(host) && if (mxcmci_use_dma(host) &&
(stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE))) (stat & (STATUS_DATA_TRANS_DONE | STATUS_WRITE_OP_DONE)))
mxcmci_data_done(host, stat); mxcmci_data_done(host, stat);
#endif
if (host->default_irq_mask && if (host->default_irq_mask &&
(stat & (STATUS_CARD_INSERTION | STATUS_CARD_REMOVAL))) (stat & (STATUS_CARD_INSERTION | STATUS_CARD_REMOVAL)))
mmc_detect_change(host->mmc, msecs_to_jiffies(200)); mmc_detect_change(host->mmc, msecs_to_jiffies(200));
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -642,9 +636,10 @@ static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req) ...@@ -642,9 +636,10 @@ static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req)
host->req = req; host->req = req;
host->cmdat &= ~CMD_DAT_CONT_INIT; host->cmdat &= ~CMD_DAT_CONT_INIT;
#ifdef HAS_DMA
host->do_dma = 1; if (host->dma)
#endif host->do_dma = 1;
if (req->data) { if (req->data) {
error = mxcmci_setup_data(host, req->data); error = mxcmci_setup_data(host, req->data);
if (error) { if (error) {
...@@ -660,6 +655,7 @@ static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req) ...@@ -660,6 +655,7 @@ static void mxcmci_request(struct mmc_host *mmc, struct mmc_request *req)
} }
error = mxcmci_start_cmd(host, req->cmd, cmdat); error = mxcmci_start_cmd(host, req->cmd, cmdat);
out: out:
if (error) if (error)
mxcmci_finish_request(host, req); mxcmci_finish_request(host, req);
...@@ -698,22 +694,46 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios) ...@@ -698,22 +694,46 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios)
prescaler, divider, clk_in, clk_ios); prescaler, divider, clk_in, clk_ios);
} }
static int mxcmci_setup_dma(struct mmc_host *mmc)
{
struct mxcmci_host *host = mmc_priv(mmc);
struct dma_slave_config *config = &host->dma_slave_config;
config->dst_addr = host->res->start + MMC_REG_BUFFER_ACCESS;
config->src_addr = host->res->start + MMC_REG_BUFFER_ACCESS;
config->dst_addr_width = 4;
config->src_addr_width = 4;
config->dst_maxburst = host->burstlen;
config->src_maxburst = host->burstlen;
return dmaengine_slave_config(host->dma, config);
}
static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{ {
struct mxcmci_host *host = mmc_priv(mmc); struct mxcmci_host *host = mmc_priv(mmc);
#ifdef HAS_DMA int burstlen, ret;
unsigned int blen;
/* /*
* use burstlen of 64 in 4 bit mode (--> reg value 0) * use burstlen of 64 in 4 bit mode (--> reg value 0)
* use burstlen of 16 in 1 bit mode (--> reg value 16) * use burstlen of 16 in 1 bit mode (--> reg value 16)
*/ */
if (ios->bus_width == MMC_BUS_WIDTH_4) if (ios->bus_width == MMC_BUS_WIDTH_4)
blen = 0; burstlen = 64;
else else
blen = 16; burstlen = 16;
if (mxcmci_use_dma(host) && burstlen != host->burstlen) {
host->burstlen = burstlen;
ret = mxcmci_setup_dma(mmc);
if (ret) {
dev_err(mmc_dev(host->mmc),
"failed to config DMA channel. Falling back to PIO\n");
dma_release_channel(host->dma);
host->do_dma = 0;
}
}
imx_dma_config_burstlen(host->dma, blen);
#endif
if (ios->bus_width == MMC_BUS_WIDTH_4) if (ios->bus_width == MMC_BUS_WIDTH_4)
host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4; host->cmdat |= CMD_DAT_CONT_BUS_WIDTH_4;
else else
...@@ -794,6 +814,18 @@ static void mxcmci_init_card(struct mmc_host *host, struct mmc_card *card) ...@@ -794,6 +814,18 @@ static void mxcmci_init_card(struct mmc_host *host, struct mmc_card *card)
host->caps |= MMC_CAP_4_BIT_DATA; host->caps |= MMC_CAP_4_BIT_DATA;
} }
static bool filter(struct dma_chan *chan, void *param)
{
struct mxcmci_host *host = param;
if (!imx_dma_is_general_purpose(chan))
return false;
chan->private = &host->dma_data;
return true;
}
static const struct mmc_host_ops mxcmci_ops = { static const struct mmc_host_ops mxcmci_ops = {
.request = mxcmci_request, .request = mxcmci_request,
.set_ios = mxcmci_set_ios, .set_ios = mxcmci_set_ios,
...@@ -808,6 +840,7 @@ static int mxcmci_probe(struct platform_device *pdev) ...@@ -808,6 +840,7 @@ static int mxcmci_probe(struct platform_device *pdev)
struct mxcmci_host *host = NULL; struct mxcmci_host *host = NULL;
struct resource *iores, *r; struct resource *iores, *r;
int ret = 0, irq; int ret = 0, irq;
dma_cap_mask_t mask;
printk(KERN_INFO "i.MX SDHC driver\n"); printk(KERN_INFO "i.MX SDHC driver\n");
...@@ -883,29 +916,23 @@ static int mxcmci_probe(struct platform_device *pdev) ...@@ -883,29 +916,23 @@ static int mxcmci_probe(struct platform_device *pdev)
writel(host->default_irq_mask, host->base + MMC_REG_INT_CNTR); writel(host->default_irq_mask, host->base + MMC_REG_INT_CNTR);
#ifdef HAS_DMA
host->dma = imx_dma_request_by_prio(DRIVER_NAME, DMA_PRIO_LOW);
if (host->dma < 0) {
dev_err(mmc_dev(host->mmc), "imx_dma_request_by_prio failed\n");
ret = -EBUSY;
goto out_clk_put;
}
r = platform_get_resource(pdev, IORESOURCE_DMA, 0); r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!r) { if (r) {
ret = -EINVAL; host->dmareq = r->start;
goto out_free_dma; host->dma_data.peripheral_type = IMX_DMATYPE_SDHC;
host->dma_data.priority = DMA_PRIO_LOW;
host->dma_data.dma_request = host->dmareq;
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
host->dma = dma_request_channel(mask, filter, host);
if (host->dma)
mmc->max_seg_size = dma_get_max_seg_size(
host->dma->device->dev);
} }
ret = imx_dma_config_channel(host->dma, if (!host->dma)
IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_FIFO, dev_info(mmc_dev(host->mmc), "dma not available. Using PIO\n");
IMX_DMA_MEMSIZE_32 | IMX_DMA_TYPE_LINEAR,
r->start, 0);
if (ret) {
dev_err(mmc_dev(host->mmc), "failed to config DMA channel\n");
goto out_free_dma;
}
#endif
INIT_WORK(&host->datawork, mxcmci_datawork); INIT_WORK(&host->datawork, mxcmci_datawork);
ret = request_irq(host->irq, mxcmci_irq, 0, DRIVER_NAME, host); ret = request_irq(host->irq, mxcmci_irq, 0, DRIVER_NAME, host);
...@@ -928,9 +955,8 @@ static int mxcmci_probe(struct platform_device *pdev) ...@@ -928,9 +955,8 @@ static int mxcmci_probe(struct platform_device *pdev)
out_free_irq: out_free_irq:
free_irq(host->irq, host); free_irq(host->irq, host);
out_free_dma: out_free_dma:
#ifdef HAS_DMA if (host->dma)
imx_dma_free(host->dma); dma_release_channel(host->dma);
#endif
out_clk_put: out_clk_put:
clk_disable(host->clk); clk_disable(host->clk);
clk_put(host->clk); clk_put(host->clk);
...@@ -960,9 +986,10 @@ static int mxcmci_remove(struct platform_device *pdev) ...@@ -960,9 +986,10 @@ static int mxcmci_remove(struct platform_device *pdev)
free_irq(host->irq, host); free_irq(host->irq, host);
iounmap(host->base); iounmap(host->base);
#ifdef HAS_DMA
imx_dma_free(host->dma); if (host->dma)
#endif dma_release_channel(host->dma);
clk_disable(host->clk); clk_disable(host->clk);
clk_put(host->clk); clk_put(host->clk);
......
This diff is collapsed.
...@@ -15,9 +15,11 @@ ...@@ -15,9 +15,11 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/gpio.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/sdhci-pltfm.h> #include <linux/mmc/sdhci-pltfm.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/esdhc.h>
#include "sdhci.h" #include "sdhci.h"
#include "sdhci-pltfm.h" #include "sdhci-pltfm.h"
#include "sdhci-esdhc.h" #include "sdhci-esdhc.h"
...@@ -30,6 +32,39 @@ static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, i ...@@ -30,6 +32,39 @@ static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, i
writel(((readl(base) & ~(mask << shift)) | (val << shift)), base); writel(((readl(base) & ~(mask << shift)) | (val << shift)), base);
} }
static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
{
/* fake CARD_PRESENT flag on mx25/35 */
u32 val = readl(host->ioaddr + reg);
if (unlikely(reg == SDHCI_PRESENT_STATE)) {
struct esdhc_platform_data *boarddata =
host->mmc->parent->platform_data;
if (boarddata && gpio_is_valid(boarddata->cd_gpio)
&& gpio_get_value(boarddata->cd_gpio))
/* no card, if a valid gpio says so... */
val &= SDHCI_CARD_PRESENT;
else
/* ... in all other cases assume card is present */
val |= SDHCI_CARD_PRESENT;
}
return val;
}
static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
{
if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE))
/*
* these interrupts won't work with a custom card_detect gpio
* (only applied to mx25/35)
*/
val &= ~(SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT);
writel(val, host->ioaddr + reg);
}
static u16 esdhc_readw_le(struct sdhci_host *host, int reg) static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
{ {
if (unlikely(reg == SDHCI_HOST_VERSION)) if (unlikely(reg == SDHCI_HOST_VERSION))
...@@ -100,10 +135,39 @@ static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host) ...@@ -100,10 +135,39 @@ static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
return clk_get_rate(pltfm_host->clk) / 256 / 16; return clk_get_rate(pltfm_host->clk) / 256 / 16;
} }
static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host)
{
struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data;
if (boarddata && gpio_is_valid(boarddata->wp_gpio))
return gpio_get_value(boarddata->wp_gpio);
else
return -ENOSYS;
}
static struct sdhci_ops sdhci_esdhc_ops = {
.read_w = esdhc_readw_le,
.write_w = esdhc_writew_le,
.write_b = esdhc_writeb_le,
.set_clock = esdhc_set_clock,
.get_max_clock = esdhc_pltfm_get_max_clock,
.get_min_clock = esdhc_pltfm_get_min_clock,
};
static irqreturn_t cd_irq(int irq, void *data)
{
struct sdhci_host *sdhost = (struct sdhci_host *)data;
tasklet_schedule(&sdhost->card_tasklet);
return IRQ_HANDLED;
};
static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pdata) static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pdata)
{ {
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data;
struct clk *clk; struct clk *clk;
int err;
clk = clk_get(mmc_dev(host->mmc), NULL); clk = clk_get(mmc_dev(host->mmc), NULL);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
...@@ -116,32 +180,78 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd ...@@ -116,32 +180,78 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
if (cpu_is_mx35() || cpu_is_mx51()) if (cpu_is_mx35() || cpu_is_mx51())
host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
/* Fix errata ENGcm07207 which is present on i.MX25 and i.MX35 */ if (cpu_is_mx25() || cpu_is_mx35()) {
if (cpu_is_mx25() || cpu_is_mx35()) /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK; host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK;
/* write_protect can't be routed to controller, use gpio */
sdhci_esdhc_ops.get_ro = esdhc_pltfm_get_ro;
}
if (boarddata) {
err = gpio_request_one(boarddata->wp_gpio, GPIOF_IN, "ESDHC_WP");
if (err) {
dev_warn(mmc_dev(host->mmc),
"no write-protect pin available!\n");
boarddata->wp_gpio = err;
}
err = gpio_request_one(boarddata->cd_gpio, GPIOF_IN, "ESDHC_CD");
if (err) {
dev_warn(mmc_dev(host->mmc),
"no card-detect pin available!\n");
goto no_card_detect_pin;
}
/* i.MX5x has issues to be researched */
if (!cpu_is_mx25() && !cpu_is_mx35())
goto not_supported;
err = request_irq(gpio_to_irq(boarddata->cd_gpio), cd_irq,
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
mmc_hostname(host->mmc), host);
if (err) {
dev_warn(mmc_dev(host->mmc), "request irq error\n");
goto no_card_detect_irq;
}
sdhci_esdhc_ops.write_l = esdhc_writel_le;
sdhci_esdhc_ops.read_l = esdhc_readl_le;
/* Now we have a working card_detect again */
host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
}
return 0;
no_card_detect_irq:
gpio_free(boarddata->cd_gpio);
no_card_detect_pin:
boarddata->cd_gpio = err;
not_supported:
return 0; return 0;
} }
static void esdhc_pltfm_exit(struct sdhci_host *host) static void esdhc_pltfm_exit(struct sdhci_host *host)
{ {
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct esdhc_platform_data *boarddata = host->mmc->parent->platform_data;
if (boarddata && gpio_is_valid(boarddata->wp_gpio))
gpio_free(boarddata->wp_gpio);
if (boarddata && gpio_is_valid(boarddata->cd_gpio)) {
gpio_free(boarddata->cd_gpio);
if (!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION))
free_irq(gpio_to_irq(boarddata->cd_gpio), host);
}
clk_disable(pltfm_host->clk); clk_disable(pltfm_host->clk);
clk_put(pltfm_host->clk); clk_put(pltfm_host->clk);
} }
static struct sdhci_ops sdhci_esdhc_ops = {
.read_w = esdhc_readw_le,
.write_w = esdhc_writew_le,
.write_b = esdhc_writeb_le,
.set_clock = esdhc_set_clock,
.get_max_clock = esdhc_pltfm_get_max_clock,
.get_min_clock = esdhc_pltfm_get_min_clock,
};
struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = { struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_ADMA, .quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_ADMA
| SDHCI_QUIRK_BROKEN_CARD_DETECTION,
/* ADMA has issues. Might be fixable */ /* ADMA has issues. Might be fixable */
.ops = &sdhci_esdhc_ops, .ops = &sdhci_esdhc_ops,
.init = esdhc_pltfm_init, .init = esdhc_pltfm_init,
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
*/ */
#define ESDHC_DEFAULT_QUIRKS (SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \ #define ESDHC_DEFAULT_QUIRKS (SDHCI_QUIRK_FORCE_BLK_SZ_2048 | \
SDHCI_QUIRK_BROKEN_CARD_DETECTION | \
SDHCI_QUIRK_NO_BUSY_IRQ | \ SDHCI_QUIRK_NO_BUSY_IRQ | \
SDHCI_QUIRK_NONSTANDARD_CLOCK | \ SDHCI_QUIRK_NONSTANDARD_CLOCK | \
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | \ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | \
......
...@@ -73,7 +73,8 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host) ...@@ -73,7 +73,8 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
} }
struct sdhci_of_data sdhci_esdhc = { struct sdhci_of_data sdhci_esdhc = {
.quirks = ESDHC_DEFAULT_QUIRKS, /* card detection could be handled via GPIO */
.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION,
.ops = { .ops = {
.read_l = sdhci_be32bs_readl, .read_l = sdhci_be32bs_readl,
.read_w = esdhc_readw, .read_w = esdhc_readw,
......
...@@ -546,6 +546,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { ...@@ -546,6 +546,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
.driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc, .driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc,
}, },
{
.vendor = PCI_VENDOR_ID_RICOH,
.device = 0xe823,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = (kernel_ulong_t)&sdhci_ricoh_mmc,
},
{ {
.vendor = PCI_VENDOR_ID_ENE, .vendor = PCI_VENDOR_ID_ENE,
.device = PCI_DEVICE_ID_ENE_CB712_SD, .device = PCI_DEVICE_ID_ENE_CB712_SD,
...@@ -900,9 +908,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( ...@@ -900,9 +908,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
{ {
struct sdhci_pci_slot *slot; struct sdhci_pci_slot *slot;
struct sdhci_host *host; struct sdhci_host *host;
resource_size_t addr;
int ret; int ret;
if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) { if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
...@@ -949,7 +954,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( ...@@ -949,7 +954,6 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
goto free; goto free;
} }
addr = pci_resource_start(pdev, bar);
host->ioaddr = pci_ioremap_bar(pdev, bar); host->ioaddr = pci_ioremap_bar(pdev, bar);
if (!host->ioaddr) { if (!host->ioaddr) {
dev_err(&pdev->dev, "failed to remap registers\n"); dev_err(&pdev->dev, "failed to remap registers\n");
......
...@@ -499,6 +499,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) ...@@ -499,6 +499,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
* SDHCI block, or a missing configuration that needs to be set. */ * SDHCI block, or a missing configuration that needs to be set. */
host->quirks |= SDHCI_QUIRK_NO_BUSY_IRQ; host->quirks |= SDHCI_QUIRK_NO_BUSY_IRQ;
/* This host supports the Auto CMD12 */
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
if (pdata->cd_type == S3C_SDHCI_CD_NONE || if (pdata->cd_type == S3C_SDHCI_CD_NONE ||
pdata->cd_type == S3C_SDHCI_CD_PERMANENT) pdata->cd_type == S3C_SDHCI_CD_PERMANENT)
host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
......
...@@ -169,7 +169,7 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host, ...@@ -169,7 +169,7 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host,
if (rc) { if (rc) {
dev_err(mmc_dev(host->mmc), dev_err(mmc_dev(host->mmc),
"failed to allocate wp gpio\n"); "failed to allocate wp gpio\n");
goto out_cd; goto out_irq;
} }
tegra_gpio_enable(plat->wp_gpio); tegra_gpio_enable(plat->wp_gpio);
gpio_direction_input(plat->wp_gpio); gpio_direction_input(plat->wp_gpio);
...@@ -195,6 +195,9 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host, ...@@ -195,6 +195,9 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host,
gpio_free(plat->wp_gpio); gpio_free(plat->wp_gpio);
} }
out_irq:
if (gpio_is_valid(plat->cd_gpio))
free_irq(gpio_to_irq(plat->cd_gpio), host);
out_cd: out_cd:
if (gpio_is_valid(plat->cd_gpio)) { if (gpio_is_valid(plat->cd_gpio)) {
tegra_gpio_disable(plat->cd_gpio); tegra_gpio_disable(plat->cd_gpio);
...@@ -225,6 +228,7 @@ static void tegra_sdhci_pltfm_exit(struct sdhci_host *host) ...@@ -225,6 +228,7 @@ static void tegra_sdhci_pltfm_exit(struct sdhci_host *host)
} }
if (gpio_is_valid(plat->cd_gpio)) { if (gpio_is_valid(plat->cd_gpio)) {
free_irq(gpio_to_irq(plat->cd_gpio), host);
tegra_gpio_disable(plat->cd_gpio); tegra_gpio_disable(plat->cd_gpio);
gpio_free(plat->cd_gpio); gpio_free(plat->cd_gpio);
} }
......
...@@ -169,7 +169,7 @@ struct sh_mmcif_host { ...@@ -169,7 +169,7 @@ struct sh_mmcif_host {
struct dma_chan *chan_rx; struct dma_chan *chan_rx;
struct dma_chan *chan_tx; struct dma_chan *chan_tx;
struct completion dma_complete; struct completion dma_complete;
unsigned int dma_sglen; bool dma_active;
}; };
static inline void sh_mmcif_bitset(struct sh_mmcif_host *host, static inline void sh_mmcif_bitset(struct sh_mmcif_host *host,
...@@ -194,10 +194,12 @@ static void mmcif_dma_complete(void *arg) ...@@ -194,10 +194,12 @@ static void mmcif_dma_complete(void *arg)
return; return;
if (host->data->flags & MMC_DATA_READ) if (host->data->flags & MMC_DATA_READ)
dma_unmap_sg(&host->pd->dev, host->data->sg, host->dma_sglen, dma_unmap_sg(host->chan_rx->device->dev,
host->data->sg, host->data->sg_len,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
else else
dma_unmap_sg(&host->pd->dev, host->data->sg, host->dma_sglen, dma_unmap_sg(host->chan_tx->device->dev,
host->data->sg, host->data->sg_len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
complete(&host->dma_complete); complete(&host->dma_complete);
...@@ -211,9 +213,10 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host) ...@@ -211,9 +213,10 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
dma_cookie_t cookie = -EINVAL; dma_cookie_t cookie = -EINVAL;
int ret; int ret;
ret = dma_map_sg(&host->pd->dev, sg, host->data->sg_len, DMA_FROM_DEVICE); ret = dma_map_sg(chan->device->dev, sg, host->data->sg_len,
DMA_FROM_DEVICE);
if (ret > 0) { if (ret > 0) {
host->dma_sglen = ret; host->dma_active = true;
desc = chan->device->device_prep_slave_sg(chan, sg, ret, desc = chan->device->device_prep_slave_sg(chan, sg, ret,
DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
} }
...@@ -221,14 +224,9 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host) ...@@ -221,14 +224,9 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
if (desc) { if (desc) {
desc->callback = mmcif_dma_complete; desc->callback = mmcif_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) { sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAREN);
desc = NULL; dma_async_issue_pending(chan);
ret = cookie;
} else {
sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAREN);
chan->device->device_issue_pending(chan);
}
} }
dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n", dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n",
__func__, host->data->sg_len, ret, cookie); __func__, host->data->sg_len, ret, cookie);
...@@ -238,7 +236,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host) ...@@ -238,7 +236,7 @@ static void sh_mmcif_start_dma_rx(struct sh_mmcif_host *host)
if (ret >= 0) if (ret >= 0)
ret = -EIO; ret = -EIO;
host->chan_rx = NULL; host->chan_rx = NULL;
host->dma_sglen = 0; host->dma_active = false;
dma_release_channel(chan); dma_release_channel(chan);
/* Free the Tx channel too */ /* Free the Tx channel too */
chan = host->chan_tx; chan = host->chan_tx;
...@@ -263,9 +261,10 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) ...@@ -263,9 +261,10 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
dma_cookie_t cookie = -EINVAL; dma_cookie_t cookie = -EINVAL;
int ret; int ret;
ret = dma_map_sg(&host->pd->dev, sg, host->data->sg_len, DMA_TO_DEVICE); ret = dma_map_sg(chan->device->dev, sg, host->data->sg_len,
DMA_TO_DEVICE);
if (ret > 0) { if (ret > 0) {
host->dma_sglen = ret; host->dma_active = true;
desc = chan->device->device_prep_slave_sg(chan, sg, ret, desc = chan->device->device_prep_slave_sg(chan, sg, ret,
DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
} }
...@@ -273,14 +272,9 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) ...@@ -273,14 +272,9 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
if (desc) { if (desc) {
desc->callback = mmcif_dma_complete; desc->callback = mmcif_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) { sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAWEN);
desc = NULL; dma_async_issue_pending(chan);
ret = cookie;
} else {
sh_mmcif_bitset(host, MMCIF_CE_BUF_ACC, BUF_ACC_DMAWEN);
chan->device->device_issue_pending(chan);
}
} }
dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n", dev_dbg(&host->pd->dev, "%s(): mapped %d -> %d, cookie %d\n",
__func__, host->data->sg_len, ret, cookie); __func__, host->data->sg_len, ret, cookie);
...@@ -290,7 +284,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host) ...@@ -290,7 +284,7 @@ static void sh_mmcif_start_dma_tx(struct sh_mmcif_host *host)
if (ret >= 0) if (ret >= 0)
ret = -EIO; ret = -EIO;
host->chan_tx = NULL; host->chan_tx = NULL;
host->dma_sglen = 0; host->dma_active = false;
dma_release_channel(chan); dma_release_channel(chan);
/* Free the Rx channel too */ /* Free the Rx channel too */
chan = host->chan_rx; chan = host->chan_rx;
...@@ -317,7 +311,7 @@ static bool sh_mmcif_filter(struct dma_chan *chan, void *arg) ...@@ -317,7 +311,7 @@ static bool sh_mmcif_filter(struct dma_chan *chan, void *arg)
static void sh_mmcif_request_dma(struct sh_mmcif_host *host, static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
struct sh_mmcif_plat_data *pdata) struct sh_mmcif_plat_data *pdata)
{ {
host->dma_sglen = 0; host->dma_active = false;
/* We can only either use DMA for both Tx and Rx or not use it at all */ /* We can only either use DMA for both Tx and Rx or not use it at all */
if (pdata->dma) { if (pdata->dma) {
...@@ -364,7 +358,7 @@ static void sh_mmcif_release_dma(struct sh_mmcif_host *host) ...@@ -364,7 +358,7 @@ static void sh_mmcif_release_dma(struct sh_mmcif_host *host)
dma_release_channel(chan); dma_release_channel(chan);
} }
host->dma_sglen = 0; host->dma_active = false;
} }
static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk) static void sh_mmcif_clock_control(struct sh_mmcif_host *host, unsigned int clk)
...@@ -753,7 +747,7 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host, ...@@ -753,7 +747,7 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,
} }
sh_mmcif_get_response(host, cmd); sh_mmcif_get_response(host, cmd);
if (host->data) { if (host->data) {
if (!host->dma_sglen) { if (!host->dma_active) {
ret = sh_mmcif_data_trans(host, mrq, cmd->opcode); ret = sh_mmcif_data_trans(host, mrq, cmd->opcode);
} else { } else {
long time = long time =
...@@ -765,7 +759,7 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host, ...@@ -765,7 +759,7 @@ static void sh_mmcif_start_cmd(struct sh_mmcif_host *host,
ret = time; ret = time;
sh_mmcif_bitclr(host, MMCIF_CE_BUF_ACC, sh_mmcif_bitclr(host, MMCIF_CE_BUF_ACC,
BUF_ACC_DMAREN | BUF_ACC_DMAWEN); BUF_ACC_DMAREN | BUF_ACC_DMAWEN);
host->dma_sglen = 0; host->dma_active = false;
} }
if (ret < 0) if (ret < 0)
mrq->data->bytes_xfered = 0; mrq->data->bytes_xfered = 0;
...@@ -850,15 +844,15 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ...@@ -850,15 +844,15 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
struct sh_mmcif_host *host = mmc_priv(mmc); struct sh_mmcif_host *host = mmc_priv(mmc);
struct sh_mmcif_plat_data *p = host->pd->dev.platform_data; struct sh_mmcif_plat_data *p = host->pd->dev.platform_data;
if (ios->power_mode == MMC_POWER_OFF) { if (ios->power_mode == MMC_POWER_UP) {
if (p->set_pwr)
p->set_pwr(host->pd, ios->power_mode);
} else if (ios->power_mode == MMC_POWER_OFF || !ios->clock) {
/* clock stop */ /* clock stop */
sh_mmcif_clock_control(host, 0); sh_mmcif_clock_control(host, 0);
if (p->down_pwr) if (ios->power_mode == MMC_POWER_OFF && p->down_pwr)
p->down_pwr(host->pd); p->down_pwr(host->pd);
return; return;
} else if (ios->power_mode == MMC_POWER_UP) {
if (p->set_pwr)
p->set_pwr(host->pd, ios->power_mode);
} }
if (ios->clock) if (ios->clock)
......
...@@ -152,7 +152,6 @@ struct tmio_mmc_host { ...@@ -152,7 +152,6 @@ struct tmio_mmc_host {
struct tasklet_struct dma_complete; struct tasklet_struct dma_complete;
struct tasklet_struct dma_issue; struct tasklet_struct dma_issue;
#ifdef CONFIG_TMIO_MMC_DMA #ifdef CONFIG_TMIO_MMC_DMA
unsigned int dma_sglen;
u8 bounce_buf[PAGE_CACHE_SIZE] __attribute__((aligned(MAX_ALIGN))); u8 bounce_buf[PAGE_CACHE_SIZE] __attribute__((aligned(MAX_ALIGN)));
struct scatterlist bounce_sg; struct scatterlist bounce_sg;
#endif #endif
...@@ -220,44 +219,48 @@ static char *tmio_mmc_kmap_atomic(struct scatterlist *sg, unsigned long *flags) ...@@ -220,44 +219,48 @@ static char *tmio_mmc_kmap_atomic(struct scatterlist *sg, unsigned long *flags)
return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
} }
static void tmio_mmc_kunmap_atomic(void *virt, unsigned long *flags) static void tmio_mmc_kunmap_atomic(struct scatterlist *sg, unsigned long *flags, void *virt)
{ {
kunmap_atomic(virt, KM_BIO_SRC_IRQ); kunmap_atomic(virt - sg->offset, KM_BIO_SRC_IRQ);
local_irq_restore(*flags); local_irq_restore(*flags);
} }
#ifdef CONFIG_MMC_DEBUG #ifdef CONFIG_MMC_DEBUG
#define STATUS_TO_TEXT(a) \ #define STATUS_TO_TEXT(a, status, i) \
do { \ do { \
if (status & TMIO_STAT_##a) \ if (status & TMIO_STAT_##a) { \
if (i++) \
printk(" | "); \
printk(#a); \ printk(#a); \
} \
} while (0) } while (0)
void pr_debug_status(u32 status) void pr_debug_status(u32 status)
{ {
int i = 0;
printk(KERN_DEBUG "status: %08x = ", status); printk(KERN_DEBUG "status: %08x = ", status);
STATUS_TO_TEXT(CARD_REMOVE); STATUS_TO_TEXT(CARD_REMOVE, status, i);
STATUS_TO_TEXT(CARD_INSERT); STATUS_TO_TEXT(CARD_INSERT, status, i);
STATUS_TO_TEXT(SIGSTATE); STATUS_TO_TEXT(SIGSTATE, status, i);
STATUS_TO_TEXT(WRPROTECT); STATUS_TO_TEXT(WRPROTECT, status, i);
STATUS_TO_TEXT(CARD_REMOVE_A); STATUS_TO_TEXT(CARD_REMOVE_A, status, i);
STATUS_TO_TEXT(CARD_INSERT_A); STATUS_TO_TEXT(CARD_INSERT_A, status, i);
STATUS_TO_TEXT(SIGSTATE_A); STATUS_TO_TEXT(SIGSTATE_A, status, i);
STATUS_TO_TEXT(CMD_IDX_ERR); STATUS_TO_TEXT(CMD_IDX_ERR, status, i);
STATUS_TO_TEXT(STOPBIT_ERR); STATUS_TO_TEXT(STOPBIT_ERR, status, i);
STATUS_TO_TEXT(ILL_FUNC); STATUS_TO_TEXT(ILL_FUNC, status, i);
STATUS_TO_TEXT(CMD_BUSY); STATUS_TO_TEXT(CMD_BUSY, status, i);
STATUS_TO_TEXT(CMDRESPEND); STATUS_TO_TEXT(CMDRESPEND, status, i);
STATUS_TO_TEXT(DATAEND); STATUS_TO_TEXT(DATAEND, status, i);
STATUS_TO_TEXT(CRCFAIL); STATUS_TO_TEXT(CRCFAIL, status, i);
STATUS_TO_TEXT(DATATIMEOUT); STATUS_TO_TEXT(DATATIMEOUT, status, i);
STATUS_TO_TEXT(CMDTIMEOUT); STATUS_TO_TEXT(CMDTIMEOUT, status, i);
STATUS_TO_TEXT(RXOVERFLOW); STATUS_TO_TEXT(RXOVERFLOW, status, i);
STATUS_TO_TEXT(TXUNDERRUN); STATUS_TO_TEXT(TXUNDERRUN, status, i);
STATUS_TO_TEXT(RXRDY); STATUS_TO_TEXT(RXRDY, status, i);
STATUS_TO_TEXT(TXRQ); STATUS_TO_TEXT(TXRQ, status, i);
STATUS_TO_TEXT(ILL_ACCESS); STATUS_TO_TEXT(ILL_ACCESS, status, i);
printk("\n"); printk("\n");
} }
...@@ -507,7 +510,7 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) ...@@ -507,7 +510,7 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
host->sg_off += count; host->sg_off += count;
tmio_mmc_kunmap_atomic(sg_virt, &flags); tmio_mmc_kunmap_atomic(host->sg_ptr, &flags, sg_virt);
if (host->sg_off == host->sg_ptr->length) if (host->sg_off == host->sg_ptr->length)
tmio_mmc_next_sg(host); tmio_mmc_next_sg(host);
...@@ -767,7 +770,7 @@ static void tmio_check_bounce_buffer(struct tmio_mmc_host *host) ...@@ -767,7 +770,7 @@ static void tmio_check_bounce_buffer(struct tmio_mmc_host *host)
unsigned long flags; unsigned long flags;
void *sg_vaddr = tmio_mmc_kmap_atomic(host->sg_orig, &flags); void *sg_vaddr = tmio_mmc_kmap_atomic(host->sg_orig, &flags);
memcpy(sg_vaddr, host->bounce_buf, host->bounce_sg.length); memcpy(sg_vaddr, host->bounce_buf, host->bounce_sg.length);
tmio_mmc_kunmap_atomic(sg_vaddr, &flags); tmio_mmc_kunmap_atomic(host->sg_orig, &flags, sg_vaddr);
} }
} }
...@@ -825,23 +828,16 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host) ...@@ -825,23 +828,16 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
sg = host->sg_ptr; sg = host->sg_ptr;
} }
ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, DMA_FROM_DEVICE); ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);
if (ret > 0) { if (ret > 0)
host->dma_sglen = ret;
desc = chan->device->device_prep_slave_sg(chan, sg, ret, desc = chan->device->device_prep_slave_sg(chan, sg, ret,
DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
}
if (desc) { if (desc) {
desc->callback = tmio_dma_complete; desc->callback = tmio_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) { dma_async_issue_pending(chan);
desc = NULL;
ret = cookie;
} else {
chan->device->device_issue_pending(chan);
}
} }
dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n", dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
__func__, host->sg_len, ret, cookie, host->mrq); __func__, host->sg_len, ret, cookie, host->mrq);
...@@ -901,26 +897,20 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host) ...@@ -901,26 +897,20 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
void *sg_vaddr = tmio_mmc_kmap_atomic(sg, &flags); void *sg_vaddr = tmio_mmc_kmap_atomic(sg, &flags);
sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length); sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length);
memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length); memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length);
tmio_mmc_kunmap_atomic(sg_vaddr, &flags); tmio_mmc_kunmap_atomic(sg, &flags, sg_vaddr);
host->sg_ptr = &host->bounce_sg; host->sg_ptr = &host->bounce_sg;
sg = host->sg_ptr; sg = host->sg_ptr;
} }
ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, DMA_TO_DEVICE); ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);
if (ret > 0) { if (ret > 0)
host->dma_sglen = ret;
desc = chan->device->device_prep_slave_sg(chan, sg, ret, desc = chan->device->device_prep_slave_sg(chan, sg, ret,
DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
}
if (desc) { if (desc) {
desc->callback = tmio_dma_complete; desc->callback = tmio_dma_complete;
desc->callback_param = host; desc->callback_param = host;
cookie = desc->tx_submit(desc); cookie = dmaengine_submit(desc);
if (cookie < 0) {
desc = NULL;
ret = cookie;
}
} }
dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n", dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
__func__, host->sg_len, ret, cookie, host->mrq); __func__, host->sg_len, ret, cookie, host->mrq);
...@@ -964,7 +954,7 @@ static void tmio_issue_tasklet_fn(unsigned long priv) ...@@ -964,7 +954,7 @@ static void tmio_issue_tasklet_fn(unsigned long priv)
struct tmio_mmc_host *host = (struct tmio_mmc_host *)priv; struct tmio_mmc_host *host = (struct tmio_mmc_host *)priv;
struct dma_chan *chan = host->chan_tx; struct dma_chan *chan = host->chan_tx;
chan->device->device_issue_pending(chan); dma_async_issue_pending(chan);
} }
static void tmio_tasklet_fn(unsigned long arg) static void tmio_tasklet_fn(unsigned long arg)
...@@ -978,10 +968,12 @@ static void tmio_tasklet_fn(unsigned long arg) ...@@ -978,10 +968,12 @@ static void tmio_tasklet_fn(unsigned long arg)
goto out; goto out;
if (host->data->flags & MMC_DATA_READ) if (host->data->flags & MMC_DATA_READ)
dma_unmap_sg(&host->pdev->dev, host->sg_ptr, host->dma_sglen, dma_unmap_sg(host->chan_rx->device->dev,
host->sg_ptr, host->sg_len,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
else else
dma_unmap_sg(&host->pdev->dev, host->sg_ptr, host->dma_sglen, dma_unmap_sg(host->chan_tx->device->dev,
host->sg_ptr, host->sg_len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
tmio_mmc_do_data_irq(host); tmio_mmc_do_data_irq(host);
......
...@@ -802,12 +802,9 @@ static const struct mmc_host_ops via_sdc_ops = { ...@@ -802,12 +802,9 @@ static const struct mmc_host_ops via_sdc_ops = {
static void via_reset_pcictrl(struct via_crdr_mmc_host *host) static void via_reset_pcictrl(struct via_crdr_mmc_host *host)
{ {
void __iomem *addrbase;
unsigned long flags; unsigned long flags;
u8 gatt; u8 gatt;
addrbase = host->pcictrl_mmiobase;
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
via_save_pcictrlreg(host); via_save_pcictrlreg(host);
......
...@@ -54,6 +54,9 @@ struct mmc_ext_csd { ...@@ -54,6 +54,9 @@ struct mmc_ext_csd {
unsigned int sec_trim_mult; /* Secure trim multiplier */ unsigned int sec_trim_mult; /* Secure trim multiplier */
unsigned int sec_erase_mult; /* Secure erase multiplier */ unsigned int sec_erase_mult; /* Secure erase multiplier */
unsigned int trim_timeout; /* In milliseconds */ unsigned int trim_timeout; /* In milliseconds */
bool enhanced_area_en; /* enable bit */
unsigned long long enhanced_area_offset; /* Units: Byte */
unsigned int enhanced_area_size; /* Units: KB */
}; };
struct sd_scr { struct sd_scr {
...@@ -121,6 +124,7 @@ struct mmc_card { ...@@ -121,6 +124,7 @@ struct mmc_card {
/* for byte mode */ /* for byte mode */
#define MMC_QUIRK_NONSTD_SDIO (1<<2) /* non-standard SDIO card attached */ #define MMC_QUIRK_NONSTD_SDIO (1<<2) /* non-standard SDIO card attached */
/* (missing CIA registers) */ /* (missing CIA registers) */
#define MMC_QUIRK_BROKEN_CLK_GATING (1<<3) /* clock gating the sdio bus will make card fail */
unsigned int erase_size; /* erase size in sectors */ unsigned int erase_size; /* erase size in sectors */
unsigned int erase_shift; /* if erase unit is power 2 */ unsigned int erase_shift; /* if erase unit is power 2 */
...@@ -148,6 +152,8 @@ struct mmc_card { ...@@ -148,6 +152,8 @@ struct mmc_card {
struct dentry *debugfs_root; struct dentry *debugfs_root;
}; };
void mmc_fixup_device(struct mmc_card *dev);
#define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC) #define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC)
#define mmc_card_sd(c) ((c)->type == MMC_TYPE_SD) #define mmc_card_sd(c) ((c)->type == MMC_TYPE_SD)
#define mmc_card_sdio(c) ((c)->type == MMC_TYPE_SDIO) #define mmc_card_sdio(c) ((c)->type == MMC_TYPE_SDIO)
......
...@@ -160,6 +160,7 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int); ...@@ -160,6 +160,7 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort); extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
extern void mmc_release_host(struct mmc_host *host); extern void mmc_release_host(struct mmc_host *host);
extern void mmc_do_release_host(struct mmc_host *host);
extern int mmc_try_claim_host(struct mmc_host *host); extern int mmc_try_claim_host(struct mmc_host *host);
/** /**
......
...@@ -140,6 +140,7 @@ struct dw_mci { ...@@ -140,6 +140,7 @@ struct dw_mci {
u32 bus_hz; u32 bus_hz;
u32 current_speed; u32 current_speed;
u32 num_slots; u32 num_slots;
u32 fifoth_val;
struct platform_device *pdev; struct platform_device *pdev;
struct dw_mci_board *pdata; struct dw_mci_board *pdata;
struct dw_mci_slot *slot[MAX_MCI_SLOTS]; struct dw_mci_slot *slot[MAX_MCI_SLOTS];
...@@ -151,6 +152,8 @@ struct dw_mci { ...@@ -151,6 +152,8 @@ struct dw_mci {
/* Workaround flags */ /* Workaround flags */
u32 quirks; u32 quirks;
struct regulator *vmmc; /* Power regulator */
}; };
/* DMA ops for Internal/External DMAC interface */ /* DMA ops for Internal/External DMAC interface */
...@@ -165,14 +168,14 @@ struct dw_mci_dma_ops { ...@@ -165,14 +168,14 @@ struct dw_mci_dma_ops {
}; };
/* IP Quirks/flags. */ /* IP Quirks/flags. */
/* No special quirks or flags to cater for */
#define DW_MCI_QUIRK_NONE 0
/* DTO fix for command transmission with IDMAC configured */ /* DTO fix for command transmission with IDMAC configured */
#define DW_MCI_QUIRK_IDMAC_DTO 1 #define DW_MCI_QUIRK_IDMAC_DTO BIT(0)
/* delay needed between retries on some 2.11a implementations */ /* delay needed between retries on some 2.11a implementations */
#define DW_MCI_QUIRK_RETRY_DELAY 2 #define DW_MCI_QUIRK_RETRY_DELAY BIT(1)
/* High Speed Capable - Supports HS cards (upto 50MHz) */ /* High Speed Capable - Supports HS cards (upto 50MHz) */
#define DW_MCI_QUIRK_HIGHSPEED 4 #define DW_MCI_QUIRK_HIGHSPEED BIT(2)
/* Unreliable card detection */
#define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3)
struct dma_pdata; struct dma_pdata;
...@@ -192,6 +195,8 @@ struct dw_mci_board { ...@@ -192,6 +195,8 @@ struct dw_mci_board {
u32 quirks; /* Workaround / Quirk flags */ u32 quirks; /* Workaround / Quirk flags */
unsigned int bus_hz; /* Bus speed */ unsigned int bus_hz; /* Bus speed */
unsigned int caps; /* Capabilities */
/* delay in mS before detecting cards after interrupt */ /* delay in mS before detecting cards after interrupt */
u32 detect_delay_ms; u32 detect_delay_ms;
......
...@@ -253,6 +253,8 @@ struct _mmc_csd { ...@@ -253,6 +253,8 @@ struct _mmc_csd {
* EXT_CSD fields * EXT_CSD fields
*/ */
#define EXT_CSD_PARTITION_ATTRIBUTE 156 /* R/W */
#define EXT_CSD_PARTITION_SUPPORT 160 /* RO */
#define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */ #define EXT_CSD_ERASE_GROUP_DEF 175 /* R/W */
#define EXT_CSD_ERASED_MEM_CONT 181 /* RO */ #define EXT_CSD_ERASED_MEM_CONT 181 /* RO */
#define EXT_CSD_BUS_WIDTH 183 /* R/W */ #define EXT_CSD_BUS_WIDTH 183 /* R/W */
...@@ -262,6 +264,7 @@ struct _mmc_csd { ...@@ -262,6 +264,7 @@ struct _mmc_csd {
#define EXT_CSD_CARD_TYPE 196 /* RO */ #define EXT_CSD_CARD_TYPE 196 /* RO */
#define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */ #define EXT_CSD_SEC_CNT 212 /* RO, 4 bytes */
#define EXT_CSD_S_A_TIMEOUT 217 /* RO */ #define EXT_CSD_S_A_TIMEOUT 217 /* RO */
#define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */
#define EXT_CSD_ERASE_TIMEOUT_MULT 223 /* RO */ #define EXT_CSD_ERASE_TIMEOUT_MULT 223 /* RO */
#define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */
#define EXT_CSD_SEC_TRIM_MULT 229 /* RO */ #define EXT_CSD_SEC_TRIM_MULT 229 /* RO */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment