qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-29 15:58:59 +02:00
Code

jz4740-mmc: Request irq with IRQF_DISABLED.

Browse Source 
This fixes a race problem with the ks7010 sdio wireless card.
This commit is contained in:
Lars-Peter Clausen 2010-01-05 03:32:25 +01:00
parent 1547e93d71
commit 4792f29f83
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c
View File

@ -27,6 +27,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <asm/mach-jz4740/gpio.h> #include <asm/mach-jz4740/gpio.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <linux/dma-mapping.h>
#define JZ_REG_MMC_STRPCL 0x00 #define JZ_REG_MMC_STRPCL 0x00
#define JZ_REG_MMC_STATUS 0x04 #define JZ_REG_MMC_STATUS 0x04
@ -100,7 +101,6 @@
#define JZ_MMC_CLK_RATE 24000000 #define JZ_MMC_CLK_RATE 24000000
struct jz4740_mmc_host { struct jz4740_mmc_host {
struct mmc_host *mmc; struct mmc_host *mmc;
struct platform_device *pdev; struct platform_device *pdev;
@ -124,7 +124,6 @@ struct jz4740_mmc_host {
struct timer_list clock_timer; struct timer_list clock_timer;
struct timer_list timeout_timer; struct timer_list timeout_timer;
unsigned waiting:1; unsigned waiting:1;
}; };
static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host); static void jz4740_mmc_cmd_done(struct jz4740_mmc_host *host);
@ -205,7 +204,6 @@ static void jz4740_mmc_write_data(struct jz4740_mmc_host *host, struct mmc_data
uint32_t *sg_pointer; uint32_t *sg_pointer;
int status; int status;
size_t i, j; size_t i, j;
uint16_t snob;
for (sg = data->sg; sg; sg = sg_next(sg)) { for (sg = data->sg; sg; sg = sg_next(sg)) {
sg_pointer = sg_virt(sg); sg_pointer = sg_virt(sg);
@ -288,7 +286,7 @@ static void jz4740_mmc_read_data(struct jz4740_mmc_host *host, struct mmc_data *
struct scatterlist *sg; struct scatterlist *sg;
uint32_t *sg_pointer; uint32_t *sg_pointer;
uint32_t d; uint32_t d;
int status = 0; uint16_t status = 0;
size_t i, j; size_t i, j;
for (sg = data->sg; sg; sg = sg_next(sg)) { for (sg = data->sg; sg; sg = sg_next(sg)) {
@ -333,6 +331,7 @@ static void jz4740_mmc_read_data(struct jz4740_mmc_host *host, struct mmc_data *
flush_dcache_page(sg_page(sg)); flush_dcache_page(sg_page(sg));
} }
status = readl(host->base + JZ_REG_MMC_STATUS);
if (status & JZ_MMC_STATUS_READ_ERROR_MASK) if (status & JZ_MMC_STATUS_READ_ERROR_MASK)
goto err; goto err;
@ -411,7 +410,7 @@ static irqreturn_t jz_mmc_irq(int irq, void *devid)
host->cmd->data->error = -EIO; host->cmd->data->error = -EIO;
} else if(status & (JZ_MMC_STATUS_CRC_READ_ERROR | } else if(status & (JZ_MMC_STATUS_CRC_READ_ERROR |
JZ_MMC_STATUS_CRC_WRITE_ERROR)) { JZ_MMC_STATUS_CRC_WRITE_ERROR)) {
host->cmd->data->error = -ETIMEDOUT; host->cmd->data->error = -EIO;
} }
if (irq_reg & JZ_MMC_IRQ_END_CMD_RES) { if (irq_reg & JZ_MMC_IRQ_END_CMD_RES) {
@ -422,6 +421,7 @@ static irqreturn_t jz_mmc_irq(int irq, void *devid)
return ret; return ret;
handled: handled:
writew(0xff, host->base + JZ_REG_MMC_IREG); writew(0xff, host->base + JZ_REG_MMC_IREG);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -809,7 +809,7 @@ static int __devinit jz4740_mmc_probe(struct platform_device* pdev)
} }
} }
ret = request_threaded_irq(host->irq, jz_mmc_irq, jz_mmc_irq_worker, 0, "MMC/SD", host); ret = request_threaded_irq(host->irq, jz_mmc_irq, jz_mmc_irq_worker, IRQF_DISABLED, "MMC/SD", host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", ret); dev_err(&pdev->dev, "Failed to request irq: %d\n", ret);
goto err_free_card_detect_irq; goto err_free_card_detect_irq;