Skip to content

Commit

Permalink
MMC: OMAP: Start new commands from work queue instead of irq
Browse files Browse the repository at this point in the history
Use work queues for starting new commands instead of starting them
directly from irq handler. The command scheduling needs to be delayed
a bit for some cards which should not be done from an interrupt.

Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
  • Loading branch information
Jarkko Lavinen authored and Pierre Ossman committed Apr 18, 2008
1 parent 0807a9b commit 0f602ec
Showing 1 changed file with 42 additions and 6 deletions.
48 changes: 42 additions & 6 deletions drivers/mmc/host/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ struct mmc_omap_host {
unsigned abort:1;
struct timer_list cmd_abort_timer;

struct work_struct slot_release_work;
struct mmc_omap_slot *next_slot;
struct work_struct send_stop_work;
struct mmc_data *stop_data;

unsigned int sg_len;
int sg_idx;
u16 * buffer;
Expand Down Expand Up @@ -236,6 +241,21 @@ static void mmc_omap_select_slot(struct mmc_omap_slot *slot, int claimed)
static void mmc_omap_start_request(struct mmc_omap_host *host,
struct mmc_request *req);

static void mmc_omap_slot_release_work(struct work_struct *work)
{
struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
slot_release_work);
struct mmc_omap_slot *next_slot = host->next_slot;
struct mmc_request *rq;

host->next_slot = NULL;
mmc_omap_select_slot(next_slot, 1);

rq = next_slot->mrq;
next_slot->mrq = NULL;
mmc_omap_start_request(host, rq);
}

static void mmc_omap_release_slot(struct mmc_omap_slot *slot, int clk_enabled)
{
struct mmc_omap_host *host = slot->host;
Expand All @@ -257,21 +277,19 @@ static void mmc_omap_release_slot(struct mmc_omap_slot *slot, int clk_enabled)
/* Check for any pending requests */
for (i = 0; i < host->nr_slots; i++) {
struct mmc_omap_slot *new_slot;
struct mmc_request *rq;

if (host->slots[i] == NULL || host->slots[i]->mrq == NULL)
continue;

BUG_ON(host->next_slot != NULL);
new_slot = host->slots[i];
/* The current slot should not have a request in queue */
BUG_ON(new_slot == host->current_slot);

host->next_slot = new_slot;
host->mmc = new_slot->mmc;
spin_unlock_irqrestore(&host->slot_lock, flags);
mmc_omap_select_slot(new_slot, 1);
rq = new_slot->mrq;
new_slot->mrq = NULL;
mmc_omap_start_request(host, rq);
schedule_work(&host->slot_release_work);
return;
}

Expand Down Expand Up @@ -400,6 +418,20 @@ mmc_omap_release_dma(struct mmc_omap_host *host, struct mmc_data *data,
dma_data_dir);
}

static void mmc_omap_send_stop_work(struct work_struct *work)
{
struct mmc_omap_host *host = container_of(work, struct mmc_omap_host,
send_stop_work);
struct mmc_omap_slot *slot = host->current_slot;
struct mmc_data *data = host->stop_data;
unsigned long tick_ns;

tick_ns = (1000000000 + slot->fclk_freq - 1)/slot->fclk_freq;
ndelay(8*tick_ns);

mmc_omap_start_command(host, data->stop);
}

static void
mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
{
Expand All @@ -424,7 +456,8 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
return;
}

mmc_omap_start_command(host, data->stop);
host->stop_data = data;
schedule_work(&host->send_stop_work);
}

static void
Expand Down Expand Up @@ -1389,6 +1422,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
goto err_free_mem_region;
}

INIT_WORK(&host->slot_release_work, mmc_omap_slot_release_work);
INIT_WORK(&host->send_stop_work, mmc_omap_send_stop_work);

INIT_WORK(&host->cmd_abort_work, mmc_omap_abort_command);
setup_timer(&host->cmd_abort_timer, mmc_omap_cmd_timer,
(unsigned long) host);
Expand Down

0 comments on commit 0f602ec

Please sign in to comment.