--- drivers/mmc/host/msm_sdcc.c
+++ drivers/mmc/host/msm_sdcc.c
@@ -56,7 +56,6 @@
pr_debug("%s: %s: " fmt "\n", mmc_hostname(host->mmc), __func__ , args)
#define IRQ_DEBUG 0
-#define DISABLE_WIMAX_BUSCLK_PWRSAVE 1
#if defined(CONFIG_DEBUG_FS)
static void msmsdcc_dbg_createhost(struct msmsdcc_host *);
@@ -72,6 +71,7 @@ static int msmsdcc_auto_suspend(struct m
#define BUSCLK_PWRSAVE 1
#define BUSCLK_TIMEOUT (HZ)
#define SQN_BUSCLK_TIMEOUT (5 * HZ)
+
static unsigned int msmsdcc_fmin = 144000;
static unsigned int msmsdcc_fmax = 50000000;
static unsigned int msmsdcc_4bit = 1;
@@ -86,14 +86,18 @@ static unsigned long msmsdcc_irqtime;
#define PIO_SPINMAX 30
#define CMD_SPINMAX 20
-#define WRITE_WAIT_DAT0_MAX 10
+#define WRITE_WAIT_DAT0_MAX 10
-#define VERBOSE_COMMAND_TIMEOUTS 1
+#define VERBOSE_COMMAND_TIMEOUTS 1
+#define SDC_CLK_VERBOSE 1
#ifdef CONFIG_WIMAX
extern int mmc_wimax_get_status(void);
+extern int mmc_wimax_get_busclk_pwrsave(void);
+extern void mmc_wimax_enable_host_wakeup(int on);
#else
static int mmc_wimax_get_status(void) { return 0; }
+static int mmc_wimax_get_busclk_pwrsave(void) { return 0; }
#endif
#if IRQ_DEBUG == 1
@@ -130,14 +134,6 @@ static int is_sd_platform(struct mmc_pla
return 0;
}
-static int is_mmc_platform(struct mmc_platform_data *plat)
-{
- if (plat->slot_type && *plat->slot_type == MMC_TYPE_MMC)
- return 1;
-
- return 0;
-}
-
#if BUSCLK_PWRSAVE
static int is_wimax_platform(struct mmc_platform_data *plat)
{
@@ -151,11 +147,28 @@ static inline void
msmsdcc_disable_clocks(struct msmsdcc_host *host, int deferr)
{
u32 delay = BUSCLK_TIMEOUT;
+
+ if (is_wimax_platform(host->plat) && mmc_wimax_get_status()) {
+ if (host->curr.mrq) {
+ printk("%s [WiMAX] %s curr.mrq != NULL", __func__, mmc_hostname(host->mmc));
+ return;
+ }
+
+ if (!host->clks_on) {
+ printk("%s [WiMAX] %s clks_on is OFF", __func__, mmc_hostname(host->mmc));
+ return;
+ }
+ }
+
WARN_ON(!host->clks_on);
- WARN_ON(host->curr.mrq);
+
+ if (host->curr.mrq)
+ printk("%s call %s()", mmc_hostname(host->mmc), __func__);
+
+ BUG_ON(host->curr.mrq);
if (is_wimax_platform(host->plat) && mmc_wimax_get_status()) {
- if (DISABLE_WIMAX_BUSCLK_PWRSAVE)
+ if (!mmc_wimax_get_busclk_pwrsave())
return;
else
delay = SQN_BUSCLK_TIMEOUT;
@@ -166,12 +179,31 @@ msmsdcc_disable_clocks(struct msmsdcc_ho
} else {
del_timer_sync(&host->busclk_timer);
if (host->clks_on) {
+#if SDC_CLK_VERBOSE
+ if (is_wimax_platform(host->plat)) {
+#ifdef CONFIG_WIMAX
+ mmc_wimax_enable_host_wakeup(1);
+#endif
+ pr_info("%s: Disable clocks\n", mmc_hostname(host->mmc));
+ }
+#endif
clk_disable(host->clk);
clk_disable(host->pclk);
host->clks_on = 0;
}
}
}
+EXPORT_SYMBOL(msmsdcc_disable_clocks);
+
+int
+msmsdcc_get_sdc_clocks(struct msmsdcc_host *host)
+{
+ if (host->clks_on)
+ return 1;
+ else
+ return 0;
+}
+EXPORT_SYMBOL(msmsdcc_get_sdc_clocks);
static void
msmsdcc_busclk_expired(unsigned long _data)
@@ -180,6 +212,12 @@ msmsdcc_busclk_expired(unsigned long _da
unsigned long flags;
/* dev_info(mmc_dev(host->mmc), "Bus clock timer expired - S\n"); */
+#if SDC_CLK_VERBOSE
+ if (is_wimax_platform(host->plat)) {
+ pr_info("%s: Bus clock timer expired\n", mmc_hostname(host->mmc));
+ }
+#endif
+
spin_lock_irqsave(&host->lock, flags);
if (host->clks_on)
msmsdcc_disable_clocks(host, 0);
@@ -196,6 +234,15 @@ msmsdcc_enable_clocks(struct msmsdcc_hos
del_timer_sync(&host->busclk_timer);
if (!host->clks_on) {
+#if SDC_CLK_VERBOSE
+ if (is_wimax_platform(host->plat)) {
+ pr_info("%s: Enable clocks\n", mmc_hostname(host->mmc));
+
+#ifdef CONFIG_WIMAX
+ mmc_wimax_enable_host_wakeup(0);
+#endif
+ }
+#endif
rc = clk_enable(host->pclk);
if (rc)
return rc;
@@ -242,7 +289,7 @@ static void
msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd,
u32 c);
-static void
+void
msmsdcc_request_end(struct msmsdcc_host *host, struct mmc_request *mrq)
{
BUG_ON(host->curr.data);
@@ -266,13 +313,15 @@ msmsdcc_request_end(struct msmsdcc_host
mmc_request_done(host->mmc, mrq);
spin_lock(&host->lock);
}
+EXPORT_SYMBOL(msmsdcc_request_end);
-static void
+void
msmsdcc_stop_data(struct msmsdcc_host *host)
{
host->curr.data = NULL;
host->curr.got_dataend = 0;
}
+EXPORT_SYMBOL(msmsdcc_stop_data);
uint32_t msmsdcc_fifo_addr(struct msmsdcc_host *host)
{
@@ -785,6 +834,8 @@ msmsdcc_pio_irq(int irq, void *dev_id)
struct msmsdcc_host *host = dev_id;
uint32_t status;
+
+ spin_lock(&host->lock);
status = msmsdcc_readl(host, MMCISTATUS);
#if IRQ_DEBUG
msmsdcc_print_status(host, "irq1-r", status);
@@ -821,6 +872,7 @@ msmsdcc_pio_irq(int irq, void *dev_id)
printk("TX\n");
}
+ spin_unlock(&host->lock);
return IRQ_HANDLED;
}
@@ -886,6 +938,7 @@ msmsdcc_pio_irq(int irq, void *dev_id)
if (!host->curr.xfer_remain)
msmsdcc_writel(host, 0, MMCIMASK1);
+ spin_unlock(&host->lock);
return IRQ_HANDLED;
}
@@ -971,8 +1024,11 @@ msmsdcc_handle_irq_data(struct msmsdcc_h
* Check to see if there is still data to be read,
* and simulate a PIO irq.
*/
- if (readl(base + MMCISTATUS) & MCI_RXDATAAVLBL)
+ if (readl(base + MMCISTATUS) & MCI_RXDATAAVLBL) {
+ spin_unlock(&host->lock);
msmsdcc_pio_irq(1, host);
+ spin_lock(&host->lock);
+ }
msmsdcc_stop_data(host);
if (!data->error)
@@ -1110,11 +1166,8 @@ msmsdcc_set_ios(struct mmc_host *mmc, st
clk |= MCI_CLK_ENABLE;
}
- /* Set WIDEBUS */
- if (ios->bus_width == MMC_BUS_WIDTH_8)
- clk |= MCI_CLK_WIDEBUS_8;
- else if (ios->bus_width == MMC_BUS_WIDTH_4)
- clk |= MCI_CLK_WIDEBUS_4;
+ if (ios->bus_width == MMC_BUS_WIDTH_4)
+ clk |= (2 << 10); /* Set WIDEBUS */
if (ios->clock > 400000 && msmsdcc_pwrsave)
clk |= (1 << 9); /* PWRSAVE */
@@ -1305,6 +1358,12 @@ static void msmsdcc_early_suspend(struct
host->polling_enabled = host->mmc->caps & MMC_CAP_NEEDS_POLL;
host->mmc->caps &= ~MMC_CAP_NEEDS_POLL;
spin_unlock_irqrestore(&host->lock, flags);
+
+ if (is_wimax_platform(host->plat)) {
+ if (host->clks_on) {
+ msmsdcc_disable_clocks(host, 0);
+ }
+ }
};
static void msmsdcc_late_resume(struct early_suspend *h)
{
@@ -1318,6 +1377,7 @@ static void msmsdcc_late_resume(struct e
mmc_detect_change(host->mmc, 0);
spin_unlock_irqrestore(&host->lock, flags);
}
+
};
#endif
@@ -1442,11 +1502,8 @@ msmsdcc_probe(struct platform_device *pd
mmc->f_max = msmsdcc_fmax;
mmc->ocr_avail = plat->ocr_mask;
- if (is_mmc_platform(host->plat))
- mmc->caps |= MMC_CAP_8_BIT_DATA;
- else if (msmsdcc_4bit)
+ if (msmsdcc_4bit)
mmc->caps |= MMC_CAP_4_BIT_DATA;
-
if (msmsdcc_sdioirq)
mmc->caps |= MMC_CAP_SDIO_IRQ;
mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
@@ -1587,6 +1644,10 @@ msmsdcc_suspend(struct platform_device *
struct mmc_host *mmc = mmc_get_drvdata(dev);
int rc = 0;
+#if SDC_CLK_VERBOSE
+ printk("%s enter\n", __func__);
+#endif
+
if (mmc) {
struct msmsdcc_host *host = mmc_priv(mmc);
@@ -1602,11 +1663,22 @@ msmsdcc_suspend(struct platform_device *
del_timer_sync(&host->busclk_timer);
#endif
if (host->clks_on) {
+#if SDC_CLK_VERBOSE
+ if (is_wimax_platform(host->plat)) {
+ pr_info("%s: Disable clocks in %s\n", mmc_hostname(host->mmc), __func__);
+ }
+#endif
+ // For suspend case
clk_disable(host->clk);
clk_disable(host->pclk);
host->clks_on = 0;
}
}
+
+#if SDC_CLK_VERBOSE
+ printk("%s leave\n", __func__);
+#endif
+
return rc;
}
@@ -1615,6 +1687,10 @@ msmsdcc_resume(struct platform_device *d
{
struct mmc_host *mmc = mmc_get_drvdata(dev);
+#if SDC_CLK_VERBOSE
+ printk("%s enter\n", __func__);
+#endif
+
if (mmc) {
struct msmsdcc_host *host = mmc_priv(mmc);
@@ -1634,9 +1710,16 @@ msmsdcc_resume(struct platform_device *d
enable_irq(host->stat_irq);
#if BUSCLK_PWRSAVE
- msmsdcc_disable_clocks(host, 1);
+ if (host->clks_on)
+ msmsdcc_disable_clocks(host, 1);
#endif
+
}
+
+#if SDC_CLK_VERBOSE
+ printk("%s leave\n", __func__);
+#endif
+
return 0;
}
projects / ziggy471-frankenstein-kernel.git / blobdiff