Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-29 00:04:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

Browse source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response
  mmc: use assigned major for block device
  sdhci: handle dma boundary interrupts
  mmc: au1xmmc command types check from data flags
This commit is contained in:
Linus Torvalds 2007-05-14 12:29:14 -07:00
commit 3ec2ab5514
5 changed files with 35 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/mmc/card/block.c
View file

@ -45,8 +45,6 @@
*/ */
#define MMC_SHIFT 3 #define MMC_SHIFT 3
static int major;
/* /*
* There is one mmc_blk_data per slot. * There is one mmc_blk_data per slot.
*/ */
@ -466,7 +464,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
md->queue.issue_fn = mmc_blk_issue_rq; md->queue.issue_fn = mmc_blk_issue_rq;
md->queue.data = md; md->queue.data = md;
md->disk->major = major; md->disk->major = MMC_BLOCK_MAJOR;
md->disk->first_minor = devidx << MMC_SHIFT; md->disk->first_minor = devidx << MMC_SHIFT;
md->disk->fops = &mmc_bdops; md->disk->fops = &mmc_bdops;
md->disk->private_data = md; md->disk->private_data = md;
@ -634,14 +632,9 @@ static int __init mmc_blk_init(void)
{ {
int res = -ENOMEM; int res = -ENOMEM;
res = register_blkdev(major, "mmc"); res = register_blkdev(MMC_BLOCK_MAJOR, "mmc");
if (res < 0) { if (res)
printk(KERN_WARNING "Unable to get major %d for MMC media: %d\n",
major, res);
goto out; goto out;
}
if (major == 0)
major = res;
return mmc_register_driver(&mmc_driver); return mmc_register_driver(&mmc_driver);
@ -652,7 +645,7 @@ static int __init mmc_blk_init(void)
static void __exit mmc_blk_exit(void) static void __exit mmc_blk_exit(void)
{ {
mmc_unregister_driver(&mmc_driver); mmc_unregister_driver(&mmc_driver);
unregister_blkdev(major, "mmc"); unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
} }
module_init(mmc_blk_init); module_init(mmc_blk_init);
@ -661,5 +654,3 @@ module_exit(mmc_blk_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver"); MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");
module_param(major, int, 0444);
MODULE_PARM_DESC(major, "specify the major device number for MMC block driver");

35
drivers/mmc/host/au1xmmc.c
View file

@ -187,9 +187,8 @@ static void au1xmmc_tasklet_finish(unsigned long param)
} }
static int au1xmmc_send_command(struct au1xmmc_host *host, int wait, static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
struct mmc_command *cmd) struct mmc_command *cmd, unsigned int flags)
{ {
u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT); u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
switch (mmc_resp_type(cmd)) { switch (mmc_resp_type(cmd)) {
@ -213,24 +212,16 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
return MMC_ERR_INVALID; return MMC_ERR_INVALID;
} }
switch(cmd->opcode) { if (flags & MMC_DATA_READ) {
case MMC_READ_SINGLE_BLOCK: if (flags & MMC_DATA_MULTI)
case SD_APP_SEND_SCR: mmccmd |= SD_CMD_CT_4;
mmccmd |= SD_CMD_CT_2; else
break; mmccmd |= SD_CMD_CT_2;
case MMC_READ_MULTIPLE_BLOCK: } else if (flags & MMC_DATA_WRITE) {
mmccmd |= SD_CMD_CT_4; if (flags & MMC_DATA_MULTI)
break; mmccmd |= SD_CMD_CT_3;
case MMC_WRITE_BLOCK: else
mmccmd |= SD_CMD_CT_1; mmccmd |= SD_CMD_CT_1;
break;
case MMC_WRITE_MULTIPLE_BLOCK:
mmccmd |= SD_CMD_CT_3;
break;
case MMC_STOP_TRANSMISSION:
mmccmd |= SD_CMD_CT_7;
break;
} }
au_writel(cmd->arg, HOST_CMDARG(host)); au_writel(cmd->arg, HOST_CMDARG(host));
@ -665,6 +656,7 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
{ {
struct au1xmmc_host *host = mmc_priv(mmc); struct au1xmmc_host *host = mmc_priv(mmc);
unsigned int flags = 0;
int ret = MMC_ERR_NONE; int ret = MMC_ERR_NONE;
WARN_ON(irqs_disabled()); WARN_ON(irqs_disabled());
@ -677,11 +669,12 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
if (mrq->data) { if (mrq->data) {
FLUSH_FIFO(host); FLUSH_FIFO(host);
flags = mrq->data->flags;
ret = au1xmmc_prepare_data(host, mrq->data); ret = au1xmmc_prepare_data(host, mrq->data);
} }
if (ret == MMC_ERR_NONE) if (ret == MMC_ERR_NONE)
ret = au1xmmc_send_command(host, 0, mrq->cmd); ret = au1xmmc_send_command(host, 0, mrq->cmd, flags);
if (ret != MMC_ERR_NONE) { if (ret != MMC_ERR_NONE) {
mrq->cmd->error = ret; mrq->cmd->error = ret;

18
drivers/mmc/host/pxamci.c
View file

@ -232,20 +232,14 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
/* /*
* workaround for erratum #42: * workaround for erratum #42:
* Intel PXA27x Family Processor Specification Update Rev 001 * Intel PXA27x Family Processor Specification Update Rev 001
* A bogus CRC error can appear if the msb of a 136 bit
* response is a one.
*/ */
if (cmd->opcode == MMC_ALL_SEND_CID || if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) {
cmd->opcode == MMC_SEND_CSD || pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
cmd->opcode == MMC_SEND_CID) { } else
/* a bogus CRC error can appear if the msb of
the 15 byte response is a one */
if ((cmd->resp[0] & 0x80000000) == 0)
cmd->error = MMC_ERR_BADCRC;
} else {
pr_debug("ignoring CRC from command %d - *risky*\n",cmd->opcode);
}
#else
cmd->error = MMC_ERR_BADCRC;
#endif #endif
cmd->error = MMC_ERR_BADCRC;
} }
pxamci_disable_irq(host, END_CMD_RES); pxamci_disable_irq(host, END_CMD_RES);

9
drivers/mmc/host/sdhci.c
View file

@ -963,6 +963,15 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL)) if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))
sdhci_transfer_pio(host); sdhci_transfer_pio(host);
/*
* We currently don't do anything fancy with DMA
* boundaries, but as we can't disable the feature
* we need to at least restart the transfer.
*/
if (intmask & SDHCI_INT_DMA_END)
writel(readl(host->ioaddr + SDHCI_DMA_ADDRESS),
host->ioaddr + SDHCI_DMA_ADDRESS);
if (intmask & SDHCI_INT_DATA_END) if (intmask & SDHCI_INT_DATA_END)
sdhci_finish_data(host); sdhci_finish_data(host);
} }

2
include/linux/major.h
View file

@ -152,6 +152,8 @@
#define USB_ACM_AUX_MAJOR 167 #define USB_ACM_AUX_MAJOR 167
#define USB_CHAR_MAJOR 180 #define USB_CHAR_MAJOR 180
#define MMC_BLOCK_MAJOR 179
#define VXVM_MAJOR 199 /* VERITAS volume i/o driver */ #define VXVM_MAJOR 199 /* VERITAS volume i/o driver */
#define VXSPEC_MAJOR 200 /* VERITAS volume config driver */ #define VXSPEC_MAJOR 200 /* VERITAS volume config driver */
#define VXDMP_MAJOR 201 /* VERITAS volume multipath driver */ #define VXDMP_MAJOR 201 /* VERITAS volume multipath driver */