Skip to content

Commit

Permalink
mmc: msm_sdcc: Snoop SDIO_CCCR_ABORT register
Browse files Browse the repository at this point in the history
Signed-off-by: San Mehat <san@google.com>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
  • Loading branch information
San Mehat authored and Daniel Walker committed Mar 18, 2010
1 parent 4adbbcc commit b3fa579
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions drivers/mmc/host/msm_sdcc.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <linux/log2.h>
#include <linux/mmc/host.h>
#include <linux/mmc/card.h>
#include <linux/mmc/sdio.h>
#include <linux/clk.h>
#include <linux/scatterlist.h>
#include <linux/platform_device.h>
Expand Down Expand Up @@ -355,6 +356,16 @@ msmsdcc_start_data(struct msmsdcc_host *host, struct mmc_data *data)
}
}

static int
snoop_cccr_abort(struct mmc_command *cmd)
{
if ((cmd->opcode == 52) &&
(cmd->arg & 0x80000000) &&
(((cmd->arg >> 9) & 0x1ffff) == SDIO_CCCR_ABORT))
return 1;
return 0;
}

static void
msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd, u32 c)
{
Expand All @@ -381,6 +392,9 @@ msmsdcc_start_command(struct msmsdcc_host *host, struct mmc_command *cmd, u32 c)
if (cmd == cmd->mrq->stop)
c |= MCI_CSPM_MCIABORT;

if (snoop_cccr_abort(cmd))
c |= MCI_CSPM_MCIABORT;

host->curr.cmd = cmd;

host->stats.cmds++;
Expand Down

0 comments on commit b3fa579

Please sign in to comment.