diff options
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-s3c.c | 72 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 97 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 3 |
3 files changed, 160 insertions, 12 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index bfbd2d2..aeeb5ec 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -80,7 +80,7 @@ static void sdhci_s3c_check_sclk(struct sdhci_host *host) tmp &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK; tmp |= ourhost->cur_clk << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT; - writel(tmp, host->ioaddr + 0x80); + writel(tmp, host->ioaddr + S3C_SDHCI_CONTROL2); } } @@ -114,6 +114,46 @@ static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host) return max; } +static void sdhci_s3c_set_ios(struct sdhci_host *host, + struct mmc_ios *ios) +{ + struct sdhci_s3c *ourhost = to_s3c(host); + struct s3c_sdhci_platdata *pdata = ourhost->pdata; + int width; + u8 tmp; + + sdhci_s3c_check_sclk(host); + + if (ios->power_mode != MMC_POWER_OFF) { + switch (ios->bus_width) { + case MMC_BUS_WIDTH_8: + width = 8; + tmp = readb(host->ioaddr + SDHCI_HOST_CONTROL); + writeb(tmp | SDHCI_S3C_CTRL_8BITBUS, + host->ioaddr + SDHCI_HOST_CONTROL); + break; + case MMC_BUS_WIDTH_4: + width = 4; + break; + case MMC_BUS_WIDTH_1: + width = 1; + break; + default: + BUG(); + } + + if (pdata->cfg_gpio) + pdata->cfg_gpio(ourhost->pdev, width); + } + + if (pdata->cfg_card) { + pdata->cfg_card(ourhost->pdev, host->ioaddr, + ios, host->mmc->card); + pdata->rx_cfg = 0; + pdata->tx_cfg = 0; + } +} + /** * sdhci_s3c_consider_clock - consider one the bus clocks for current setting * @ourhost: Our SDHCI instance. @@ -203,18 +243,15 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock) ctrl |= best_src << S3C_SDHCI_CTRL2_SELBASECLK_SHIFT; writel(ctrl, host->ioaddr + S3C_SDHCI_CONTROL2); } +} - /* reconfigure the hardware for new clock rate */ - - { - struct mmc_ios ios; - - ios.clock = clock; +static int sdhci_s3c_adjust_cfg(struct sdhci_host *host, int rw) +{ + struct sdhci_s3c *ourhost = to_s3c(host); + struct s3c_sdhci_platdata *pdata = ourhost->pdata; - if (ourhost->pdata->cfg_card) - (ourhost->pdata->cfg_card)(ourhost->pdev, host->ioaddr, - &ios, NULL); - } + if(pdata->adjust_cfg_card) + pdata->adjust_cfg_card(pdata, host->ioaddr, rw); } /** @@ -318,6 +355,8 @@ static struct sdhci_ops sdhci_s3c_ops = { .set_clock = sdhci_s3c_set_clock, .get_min_clock = sdhci_s3c_get_min_clock, .platform_8bit_width = sdhci_s3c_platform_8bit_width, + .set_ios = sdhci_s3c_set_ios, + .adjust_cfg = sdhci_s3c_adjust_cfg, }; static void sdhci_s3c_notify_change(struct platform_device *dev, int state) @@ -489,6 +528,7 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) /* Setup quirks for the controller */ host->quirks |= SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC; host->quirks |= SDHCI_QUIRK_NO_HISPD_BIT; + host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; #ifndef CONFIG_MMC_SDHCI_S3C_DMA @@ -496,6 +536,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev) * support as well. */ host->quirks |= SDHCI_QUIRK_BROKEN_DMA; + /* PIO currently has problems with multi-block IO */ + host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK; + #endif /* CONFIG_MMC_SDHCI_S3C_DMA */ /* It seems we do not get an DATA transfer complete on non-busy @@ -578,11 +621,16 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev) struct s3c_sdhci_platdata *pdata = pdev->dev.platform_data; struct sdhci_host *host = platform_get_drvdata(pdev); struct sdhci_s3c *sc = sdhci_priv(host); - int ptr; + int ptr, dead = 0; + u32 scratch; if (pdata->cd_type == S3C_SDHCI_CD_EXTERNAL && pdata->ext_cd_cleanup) pdata->ext_cd_cleanup(&sdhci_s3c_notify_change); + scratch = readl(host->ioaddr + SDHCI_INT_STATUS); + if (scratch == (u32)-1) + dead = 1; + if (sc->ext_cd_irq) free_irq(sc->ext_cd_irq, sc); diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 32aeb42..cd2833f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -26,6 +26,8 @@ #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> +#include <plat/regs-sdhci.h> + #include "sdhci.h" #define DRIVER_NAME "sdhci" @@ -104,6 +106,24 @@ static void sdhci_dumpregs(struct sdhci_host *host) * * \*****************************************************************************/ +static void sdhci_enable_clock_card(struct sdhci_host *host) +{ + u16 clk; + + clk = readw(host->ioaddr + SDHCI_CLOCK_CONTROL); + clk |= SDHCI_CLOCK_CARD_EN; + writew(clk, host->ioaddr + SDHCI_CLOCK_CONTROL); +} + +static void sdhci_disable_clock_card(struct sdhci_host *host) +{ + u16 clk; + + clk = readw(host->ioaddr + SDHCI_CLOCK_CONTROL); + clk &= ~SDHCI_CLOCK_CARD_EN; + writew(clk, host->ioaddr + SDHCI_CLOCK_CONTROL); +} + static void sdhci_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set) { u32 ier; @@ -930,9 +950,14 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) int flags; u32 mask; unsigned long timeout; +#if defined(CONFIG_MMC_SDHCI_S3C) || defined(CONFIG_MMC_SDHCI_MODULE) + int i; +#endif WARN_ON(host->cmd); + del_timer(&host->busy_check_timer); + /* Wait max 10 ms */ timeout = 10; @@ -962,8 +987,12 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) host->cmd = cmd; + sdhci_enable_clock_card(host); sdhci_prepare_data(host, cmd); + if(cmd->flags & MMC_RSP_BUSY) + sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL); + sdhci_writel(host, cmd->arg, SDHCI_ARGUMENT); sdhci_set_transfer_mode(host, cmd); @@ -994,6 +1023,17 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) if (cmd->data || (cmd->opcode == MMC_SEND_TUNING_BLOCK)) flags |= SDHCI_CMD_DATA; +#if defined(CONFIG_MMC_SDHCI_S3C) || defined(CONFIG_MMC_SDHCI_MODULE) + mask = readl(host->ioaddr + SDHCI_INT_STATUS); + writel(mask & SDHCI_INT_DATA_MASK & SDHCI_INT_CMD_MASK, host->ioaddr + SDHCI_INT_STATUS); + + for(i=0; i<0x1000000; i++) { + mask = readl(host->ioaddr + S3C64XX_SDHCI_CONTROL4); + if(!(mask & S3C64XX_SDHCI_CONTROL4_BUSY)) + break; + } +#endif + sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND); } @@ -1289,6 +1329,9 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) sdhci_reinit(host); } + if (host->ops->set_ios) + host->ops->set_ios(host, ios); + sdhci_set_clock(host, ios->clock); if (ios->power_mode == MMC_POWER_OFF) @@ -1799,6 +1842,26 @@ static void sdhci_enable_preset_value(struct mmc_host *mmc, bool enable) spin_unlock_irqrestore(&host->lock, flags); } +void sdhci_adjust_cfg(struct mmc_host *mmc, int rw) +{ + struct sdhci_host *host; + unsigned long flags; + struct mmc_ios *ios = &mmc->ios; + unsigned int clock; + + host = mmc_priv(mmc); + + spin_lock_irqsave(&host->lock, flags); + + if(host->ops->adjust_cfg) + host->ops->adjust_cfg(host, rw); + + sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA); + + mmiowb(); + spin_unlock_irqrestore(&host->lock, flags); +} + static const struct mmc_host_ops sdhci_ops = { .request = sdhci_request, .set_ios = sdhci_set_ios, @@ -1807,6 +1870,7 @@ static const struct mmc_host_ops sdhci_ops = { .start_signal_voltage_switch = sdhci_start_signal_voltage_switch, .execute_tuning = sdhci_execute_tuning, .enable_preset_value = sdhci_enable_preset_value, + .adjust_cfg = sdhci_adjust_cfg, }; /*****************************************************************************\ @@ -1852,6 +1916,9 @@ static void sdhci_tasklet_finish(unsigned long param) host = (struct sdhci_host*)param; + if(host == NULL) + return; + /* * If this tasklet gets rescheduled while running, it will * be run again afterwards but without any active request. @@ -1865,6 +1932,9 @@ static void sdhci_tasklet_finish(unsigned long param) mrq = host->mrq; + if(mrq == NULL || mrq->cmd == NULL) + goto out; + /* * The controller needs a reset of internal state machines * upon error conditions. @@ -1890,6 +1960,11 @@ static void sdhci_tasklet_finish(unsigned long param) sdhci_reset(host, SDHCI_RESET_CMD); sdhci_reset(host, SDHCI_RESET_DATA); } +out: + if(readl(host->ioaddr + SDHCI_PRESENT_STATE) & SDHCI_DATA_INHIBIT) + mod_timer(&host->busy_check_timer, jiffies + msecs_to_jiffies(10)); + else + sdhci_disable_clock_card(host); host->mrq = NULL; host->cmd = NULL; @@ -1950,6 +2025,23 @@ static void sdhci_tuning_timer(unsigned long data) spin_unlock_irqrestore(&host->lock, flags); } +static void sdhci_busy_check_timer(unsigned long data) +{ + struct sdhci_host *host; + unsigned long flags; + + host = (struct sdhci_host*)data; + + spin_lock_irqsave(&host->lock, flags); + + if(readl(host->ioaddr + SDHCI_PRESENT_STATE) & (SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT)) + mod_timer(&host->busy_check_timer, jiffies + msecs_to_jiffies(10)); + else + sdhci_disable_clock_card(host); + + spin_unlock_irqrestore(&host->lock, flags); +} + /*****************************************************************************\ * * * Interrupt handling * @@ -1976,6 +2068,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) if (host->cmd->error) { tasklet_schedule(&host->finish_tasklet); + host->cmd = NULL; return; } @@ -2236,6 +2329,8 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) if (ret) return ret; + del_timer(&host->busy_check_timer); + free_irq(host->irq, host); if (host->vmmc) @@ -2701,6 +2796,7 @@ int sdhci_add_host(struct sdhci_host *host) sdhci_tasklet_finish, (unsigned long)host); setup_timer(&host->timer, sdhci_timeout_timer, (unsigned long)host); + setup_timer(&host->busy_check_timer, sdhci_busy_check_timer, (unsigned long)host); if (host->version >= SDHCI_SPEC_300) { init_waitqueue_head(&host->buf_ready_int); @@ -2806,6 +2902,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) del_timer_sync(&host->timer); if (host->version >= SDHCI_SPEC_300) del_timer_sync(&host->tuning_timer); + del_timer_sync(&host->busy_check_timer); tasklet_kill(&host->card_tasklet); tasklet_kill(&host->finish_tasklet); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 745c42f..98d0bc2 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -274,6 +274,9 @@ struct sdhci_ops { void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); + void (*set_ios)(struct sdhci_host *host, + struct mmc_ios *ios); + void (*adjust_cfg)(struct sdhci_host *host, int rw); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS |