From 35195aa9e06f718a341054e4f71cc518dea43d83 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Mar 2011 11:48:33 +0800 Subject: [PATCH] =?utf8?q?sd/mmc:1.=E5=9C=A8dto=E4=B8=AD=E6=96=AD=E6=9D=A5?= =?utf8?q?=E4=BA=86=E4=BB=A5=E5=90=8E=E6=B8=85=E6=8E=89=E6=8E=A7=E5=88=B6?= =?utf8?q?=E5=99=A8=E7=9A=84dma=5Fenable=E4=BD=8D.2.=E4=BF=AE=E6=94=B9?= =?utf8?q?=E4=B8=AD=E6=96=AD=E5=A4=84=E7=90=86=E5=87=BD=E6=95=B0=E4=B8=AD?= =?utf8?q?=E7=9A=84=E4=BB=A3=E7=A0=81,=E8=AE=A9=E5=85=B6=E6=9B=B4=E5=8A=A0?= =?utf8?q?=E5=90=88=E7=90=86.3.=E5=8E=BB=E6=8E=89=E5=8D=A1=E6=A3=80?= =?utf8?q?=E6=B5=8B=E6=97=B6=E7=9A=84=E5=AF=84=E5=AD=98=E5=99=A8=E5=A4=8D?= =?utf8?q?=E4=BD=8D=E6=93=8D=E4=BD=9C.4.=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?utf8?q?=E4=BA=9Blog?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- drivers/mmc/host/rk29_sdmmc.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c index 92758a7ed480..2e8698a719df 100755 --- a/drivers/mmc/host/rk29_sdmmc.c +++ b/drivers/mmc/host/rk29_sdmmc.c @@ -864,6 +864,8 @@ static void rk29_sdmmc_tasklet_func(unsigned long priv) EVENT_DATA_COMPLETE)) break; host->data = NULL; + rk29_sdmmc_write(host->regs, SDMMC_CTRL, (rk29_sdmmc_read(host->regs, SDMMC_CTRL))&(~SDMMC_CTRL_DMA_ENABLE)); + rk29_sdmmc_set_completed(host, EVENT_DATA_COMPLETE); status = host->data_status; if (unlikely(status & RK29_SDMMC_DATA_ERROR_FLAGS)) { @@ -1147,15 +1149,17 @@ static irqreturn_t rk29_sdmmc1_card_detect_interrupt(int irq, void *dev_id) static irqreturn_t rk29_sdmmc_interrupt(int irq, void *dev_id) { struct rk29_sdmmc *host = dev_id; - u32 status, pending; - unsigned int pass_count = 0; + u32 status, pending, mask; +// unsigned int pass_count = 0; bool present; bool present_old; spin_lock(&host->lock); - do { +// do { status = rk29_sdmmc_read(host->regs, SDMMC_RINTSTS); - pending = rk29_sdmmc_read(host->regs, SDMMC_MINTSTS);// read only mask reg + mask = rk29_sdmmc_read(host->regs, SDMMC_MINTSTS);// read only mask reg + pending = status & mask; + if (!pending) break; if(pending & SDMMC_INT_CD) { @@ -1163,12 +1167,14 @@ static irqreturn_t rk29_sdmmc_interrupt(int irq, void *dev_id) present = rk29_sdmmc_get_cd(host->mmc); present_old = test_bit(RK29_SDMMC_CARD_PRESENT, &host->flags); if (present != 0) { + printk("[zwp],%s,card detect interrupt,card present \n",__FUNCTION__); set_bit(RK29_SDMMC_CARD_PRESENT, &host->flags); if(present == present_old) mod_timer(&host->detect_timer, jiffies + msecs_to_jiffies(2000)); else mod_timer(&host->detect_timer, jiffies + msecs_to_jiffies(200)); - } else { + } else { + printk("[zwp],%s,card detect interrupt,card not present \n",__FUNCTION__); clear_bit(RK29_SDMMC_CARD_PRESENT, &host->flags); mod_timer(&host->detect_timer, jiffies + msecs_to_jiffies(10)); } @@ -1179,6 +1185,8 @@ static irqreturn_t rk29_sdmmc_interrupt(int irq, void *dev_id) smp_wmb(); rk29_sdmmc_set_pending(host, EVENT_CMD_COMPLETE); tasklet_schedule(&host->tasklet); + printk("[zwp] %s :cmd transfer error(int status 0x%x cmd %d host->state %d pending_events %d)\n", + __FUNCTION__,status,host->cmd->opcode,host->state,host->pending_events); } if (pending & RK29_SDMMC_DATA_ERROR_FLAGS) { // if there is an error, let report DATA_ERROR @@ -1187,6 +1195,8 @@ static irqreturn_t rk29_sdmmc_interrupt(int irq, void *dev_id) smp_wmb(); rk29_sdmmc_set_pending(host, EVENT_DATA_ERROR); tasklet_schedule(&host->tasklet); + printk("[zwp] %s :data transfer error(int status 0x%x host->state %d pending_events %d pending=0x%x)\n", + __FUNCTION__,status,host->state,host->pending_events,pending); } if(pending & SDMMC_INT_DTO) { @@ -1223,9 +1233,10 @@ static irqreturn_t rk29_sdmmc_interrupt(int irq, void *dev_id) rk29_sdmmc_write(host->regs, SDMMC_RINTSTS,SDMMC_INT_SDIO); mmc_signal_sdio_irq(host->mmc); } - } while (pass_count++ < 5); +// } while (pass_count++ < 5); spin_unlock(&host->lock); - return pass_count ? IRQ_HANDLED : IRQ_NONE; + return IRQ_HANDLED; +// return pass_count ? IRQ_HANDLED : IRQ_NONE; } /* @@ -1246,15 +1257,18 @@ static void rk29_sdmmc_detect_change(unsigned long data) mrq = host->mrq; if (mrq) { if (mrq == host->curr_mrq) { +#if 0 //TODO ,ºóÃæÒª°ÑÕâ¿é´¦ÀíÒƵ½tasklet,ʹÓÃ״̬»úÀ´×ö /* reset all blocks */ rk29_sdmmc_write(host->regs, SDMMC_CTRL, (SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET | SDMMC_CTRL_DMA_RESET)); /* wait till resets clear */ while (rk29_sdmmc_read(host->regs, SDMMC_CTRL) & (SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET | SDMMC_CTRL_DMA_RESET)); /* FIFO threshold settings */ rk29_sdmmc_write(host->regs, SDMMC_CTRL, rk29_sdmmc_read(host->regs, SDMMC_CTRL) | SDMMC_CTRL_INT_ENABLE); +#endif host->data = NULL; host->cmd = NULL; - + printk("[zwp] %s >> %s >> %d state=%d\n", __FILE__, __FUNCTION__,__LINE__,host->state); + switch (host->state) { case STATE_IDLE: break; -- 2.34.1