FSL eSDHC support
v2 cover FSL eSDHC support
Hi all,
Much thanks for the previous comments. Here comes v2.
Changes since v1:
- "Add support for bus-specific IO memory accessors" patch no longer touches sdhci-pci. The changes were no longer needed since I dropped "Add type checking ..." patch back in RFCv2;
- Patch "Add support for hosts with strict 32 bit addressing" dropped. Now we handle the 32 bit magic in eSDHC's writew() accessor;
- Patch "Add quirk for controllers with max. block size up to 4096 bytes" replaced by "Add quirk for forcing maximum block size to 2048 bytes";
- SDHCI_INT_ALL_MASK changed to (unsigned int)-1;
- Addressed Pierre's comments in "Add support for card-detection polling" patch.
Changes since the third RFC:
- Use uninitialized_var() (suggested by Laurent Pinchart);
- Fixed a bug in eSDHC SDCLK prescaler calculations because of which we were over-clocking the SDCLK, and that caused CRC errors using some SD cards;
- Not a change, but some status: SDHS (50 MHz) cards were tested to NOT work (at least on MPC837x boards) -- this is to be investigated further. SDHC (> 4 GB) cards were not tested, yet.
Changes since the second RFC:
- Addressed all comments that were raised by Pierre Ossman. There were too many to mention them all, so here is the link:
http://lkml.org/lkml/2009/2/6/320
Changes since the first RFC:
- Use of_iomap() in sdhci-of.c (suggested by Arnd Bergmann). Also added Arnd's Acked-by: line for the sdhci-of patch.
- Kconfig help text improved (thanks to Matt Sealey and M. Warner Losh).
- In "sdhci: Add quirk to suppress PIO interrupts during DMA transfers"
patch: sdhci_init() now clears SDHCI_PIO_DISABLED flag, otherwise we won't disable PIO interrupts after suspend.
- New patch: "sdhci: Add type checking for IO memory accessors"
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
PATCH v2 1/11 sdhci: Add support for bus-specific IO memory accessors
Currently the SDHCI driver works with PCI accessors (write{l,b,w} and read{l,b,w}).
With this patch drivers may change memory accessors, so that we can support hosts with "weird" IO memory access requirments.
For example, in "FSL eSDHC" SDHCI hardware all registers are 32 bit width, with big-endian addressing. That is, readb(0x2f) should turn into readb(0x2c), and readw(0x2c) should be translated to le16_to_cpu(readw(0x2e)).
--- drivers/mmc/host/sdhci.c | 214 ++++++++++++++++++++++++++++----------------- drivers/mmc/host/sdhci.h | 14 +++ 2 files changed, 147 insertions(+), 81 deletions(-)
drivers/mmc/host/sdhci.c +133 -81
@@ -18,6 +18,7 @@#include <linux/io.h> #include <linux/dma-mapping.h> #include <linux/scatterlist.h> +#include <linux/compiler.h> #include <linux/leds.h>
@@ -48,35 +49,35 @@ static void sdhci_dumpregs(struct sdhci_host *host) printk(KERN_DEBUG DRIVER_NAME ": ============== REGISTER DUMP ==============\n"); printk(KERN_DEBUG DRIVER_NAME ": Sys addr: 0x%08x | Version: 0x%08x\n", -readl (host->ioaddr +SDHCI_DMA_ADDRESS ), - readw(host->ioaddr + SDHCI_HOST_VERSION)); +sdhci_readl (host,SDHCI_DMA_ADDRESS ), + sdhci_readw(host, SDHCI_HOST_VERSION)); printk(KERN_DEBUG DRIVER_NAME ": Blk size: 0x%08x | Blk cnt: 0x%08x\n", -readw (host->ioaddr +SDHCI_BLOCK_SIZE ), - readw(host->ioaddr + SDHCI_BLOCK_COUNT)); +sdhci_readw (host,SDHCI_BLOCK_SIZE ), + sdhci_readw(host, SDHCI_BLOCK_COUNT)); printk(KERN_DEBUG DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n", -readl (host->ioaddr +SDHCI_ARGUMENT ), - readw(host->ioaddr + SDHCI_TRANSFER_MODE)); +sdhci_readl (host,SDHCI_ARGUMENT ), + sdhci_readw(host, SDHCI_TRANSFER_MODE)); printk(KERN_DEBUG DRIVER_NAME ": Present: 0x%08x | Host ctl: 0x%08x\n", -readl (host->ioaddr +SDHCI_PRESENT_STATE ), - readb(host->ioaddr + SDHCI_HOST_CONTROL)); +sdhci_readl (host,SDHCI_PRESENT_STATE ), + sdhci_readb(host, SDHCI_HOST_CONTROL)); printk(KERN_DEBUG DRIVER_NAME ": Power: 0x%08x | Blk gap: 0x%08x\n", -readb (host->ioaddr +SDHCI_POWER_CONTROL ), - readb(host->ioaddr + SDHCI_BLOCK_GAP_CONTROL)); +sdhci_readb (host,SDHCI_POWER_CONTROL ), + sdhci_readb(host, SDHCI_BLOCK_GAP_CONTROL)); printk(KERN_DEBUG DRIVER_NAME ": Wake-up: 0x%08x | Clock: 0x%08x\n", -readb (host->ioaddr +SDHCI_WAKE_UP_CONTROL ), - readw(host->ioaddr + SDHCI_CLOCK_CONTROL)); +sdhci_readb (host,SDHCI_WAKE_UP_CONTROL ), + sdhci_readw(host, SDHCI_CLOCK_CONTROL)); printk(KERN_DEBUG DRIVER_NAME ": Timeout: 0x%08x | Int stat: 0x%08x\n", -readb (host->ioaddr +SDHCI_TIMEOUT_CONTROL ), - readl(host->ioaddr + SDHCI_INT_STATUS)); +sdhci_readb (host,SDHCI_TIMEOUT_CONTROL ), + sdhci_readl(host, SDHCI_INT_STATUS)); printk(KERN_DEBUG DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n", -readl (host->ioaddr +SDHCI_INT_ENABLE ), - readl(host->ioaddr + SDHCI_SIGNAL_ENABLE)); +sdhci_readl (host,SDHCI_INT_ENABLE ), + sdhci_readl(host, SDHCI_SIGNAL_ENABLE)); printk(KERN_DEBUG DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n", -readw (host->ioaddr +SDHCI_ACMD12_ERR ), - readw(host->ioaddr + SDHCI_SLOT_INT_STATUS)); +sdhci_readw (host,SDHCI_ACMD12_ERR ), + sdhci_readw(host, SDHCI_SLOT_INT_STATUS)); printk(KERN_DEBUG DRIVER_NAME ": Caps: 0x%08x | Max curr: 0x%08x\n", -readl (host->ioaddr +SDHCI_CAPABILITIES ), - readl(host->ioaddr + SDHCI_MAX_CURRENT)); +sdhci_readl (host,SDHCI_CAPABILITIES ), + sdhci_readl(host, SDHCI_MAX_CURRENT)); printk(KERN_DEBUG DRIVER_NAME ": ===========================================\n"); }
@@ -87,17 +88,71 @@ static void sdhci_dumpregs(struct sdhci_host *host)* * \*****************************************************************************/ +void sdhci_writel (struct sdhci_host *host,u32 val,int reg) +{ +if (unlikely (host->ops->writel)) + host->ops->writel (host, val, reg); +else +writel (val, host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_writel); + +void sdhci_writew (struct sdhci_host *host,u16 val,int reg) +{ +if (unlikely (host->ops->writew)) + host->ops->writew (host, val, reg); +else +writew (val, host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_writew); + +void sdhci_writeb (struct sdhci_host *host,u8 val,int reg) +{ +if (unlikely (host->ops->writeb)) + host->ops->writeb (host, val, reg); +else +writeb (val, host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_writeb); + +u32 sdhci_readl (struct sdhci_host *host,int reg) +{ +if (unlikely (host->ops->readl)) +return host->ops->readl (host, reg); +else +return readl (host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_readl); + +u16 sdhci_readw (struct sdhci_host *host,int reg) +{ +if (unlikely (host->ops->readw)) +return host->ops->readw (host, reg); +else +return readw (host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_readw); + +u8 sdhci_readb (struct sdhci_host *host,int reg) +{ +if (unlikely (host->ops->readb)) +return host->ops->readb (host, reg); +else +return readb (host->ioaddr + reg); +} +EXPORT_SYMBOL_GPL (sdhci_readb); +static void sdhci_reset (struct sdhci_host *host,u8 mask) {unsigned long timeout;if (host->quirks &SDHCI_QUIRK_NO_CARD_NO_RESET ) { -if (!(readl (host->ioaddr +SDHCI_PRESENT_STATE ) & +if (!(sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ))return ; } -writeb (mask, host->ioaddr +SDHCI_SOFTWARE_RESET ); +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET );if (mask &SDHCI_RESET_ALL ) host->clock =0 ;
@@ -106,7 +161,7 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) timeout =100 ;/* hw clears the bit when it's done */ -while (readb (host->ioaddr +SDHCI_SOFTWARE_RESET ) & mask) { +while (sdhci_readb (host,SDHCI_SOFTWARE_RESET ) & mask) {if (timeout ==0 ) {printk (KERN_ERR "%s: Reset 0x%x never completed.\n" ,mmc_hostname (host->mmc), (int )mask);
@@ -132,26 +187,26 @@ static void sdhci_init(struct sdhci_host *host)SDHCI_INT_DMA_END |SDHCI_INT_DATA_END |SDHCI_INT_RESPONSE |SDHCI_INT_ADMA_ERROR ; -writel (intmask, host->ioaddr +SDHCI_INT_ENABLE ); -writel (intmask, host->ioaddr +SDHCI_SIGNAL_ENABLE ); +sdhci_writel (host, intmask,SDHCI_INT_ENABLE ); +sdhci_writel (host, intmask,SDHCI_SIGNAL_ENABLE ); }static void sdhci_activate_led (struct sdhci_host *host) {u8 ctrl; - ctrl =readb (host->ioaddr +SDHCI_HOST_CONTROL ); + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL ); ctrl |=SDHCI_CTRL_LED ; -writeb (ctrl, host->ioaddr +SDHCI_HOST_CONTROL ); +sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); }static void sdhci_deactivate_led (struct sdhci_host *host) {u8 ctrl; - ctrl =readb (host->ioaddr +SDHCI_HOST_CONTROL ); + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL ); ctrl &= ~SDHCI_CTRL_LED ; -writeb (ctrl, host->ioaddr +SDHCI_HOST_CONTROL ); +sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); }#ifdef SDHCI_USE_LEDS_CLASS
@@ -205,7 +260,7 @@ static void sdhci_read_block_pio(struct sdhci_host *host)while (len) {if (chunk ==0 ) { - scratch =readl (host->ioaddr +SDHCI_BUFFER ); + scratch =sdhci_readl (host,SDHCI_BUFFER ); chunk =4 ; }
@@ -257,7 +312,7 @@ static void sdhci_write_block_pio(struct sdhci_host *host) len--;if ((chunk ==4 ) || ((len ==0 ) && (blksize ==0 ))) { -writel (scratch, host->ioaddr +SDHCI_BUFFER ); +sdhci_writel (host, scratch,SDHCI_BUFFER ); chunk =0 ; scratch =0 ; }
@@ -292,7 +347,7 @@ static void sdhci_transfer_pio(struct sdhci_host *host) (host->data->blocks == 1)) mask = ~0 ; -while (readl (host->ioaddr +SDHCI_PRESENT_STATE ) & mask) { +while (sdhci_readl (host,SDHCI_PRESENT_STATE ) & mask) {if (host->data->flags &MMC_DATA_READ )sdhci_read_block_pio (host);else
@@ -581,7 +636,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) host->data_early =0 ; count =sdhci_calc_timeout (host, data); -writeb (count, host->ioaddr +SDHCI_TIMEOUT_CONTROL ); +sdhci_writeb (host, count,SDHCI_TIMEOUT_CONTROL );if (host->flags &SDHCI_USE_DMA ) host->flags |=SDHCI_REQ_USE_DMA ;
@@ -661,8 +716,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)WARN_ON (1 ); host->flags &= ~SDHCI_REQ_USE_DMA ; }else { -writel (host->adma_addr, - host->ioaddr +SDHCI_ADMA_ADDRESS ); +sdhci_writel (host, host->adma_addr, +SDHCI_ADMA_ADDRESS ); } }else {int sg_cnt;
@@ -681,8 +736,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) host->flags &= ~SDHCI_REQ_USE_DMA ; }else {WARN_ON (sg_cnt !=1 ); -writel (sg_dma_address (data->sg), - host->ioaddr +SDHCI_DMA_ADDRESS ); +sdhci_writel (host,sg_dma_address (data->sg), +SDHCI_DMA_ADDRESS ); } } }
@@ -693,14 +748,14 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)* is ADMA. */ if (host->version >=SDHCI_SPEC_200 ) { - ctrl =readb (host->ioaddr +SDHCI_HOST_CONTROL ); + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL ); ctrl &= ~SDHCI_CTRL_DMA_MASK ;if ((host->flags &SDHCI_REQ_USE_DMA ) && (host->flags &SDHCI_USE_ADMA )) ctrl |=SDHCI_CTRL_ADMA32 ;else ctrl |=SDHCI_CTRL_SDMA ; -writeb (ctrl, host->ioaddr +SDHCI_HOST_CONTROL ); +sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL ); }if (!(host->flags &SDHCI_REQ_USE_DMA )) {
@@ -710,9 +765,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) }/* We do not handle DMA boundaries, so set it to max (512 KiB) */ -writew (SDHCI_MAKE_BLKSZ (7 , data->blksz), - host->ioaddr +SDHCI_BLOCK_SIZE ); -writew (data->blocks, host->ioaddr +SDHCI_BLOCK_COUNT ); +sdhci_writew (host,SDHCI_MAKE_BLKSZ (7 , data->blksz),SDHCI_BLOCK_SIZE ); +sdhci_writew (host, data->blocks,SDHCI_BLOCK_COUNT ); } static void sdhci_set_transfer_mode(struct sdhci_host *host,
@@ -733,7 +787,7 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,if (host->flags &SDHCI_REQ_USE_DMA ) mode |=SDHCI_TRNS_DMA ; -writew (mode, host->ioaddr +SDHCI_TRANSFER_MODE ); +sdhci_writew (host, mode,SDHCI_TRANSFER_MODE ); }static void sdhci_finish_data (struct sdhci_host *host)
@@ -802,7 +856,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)if (host->mrq->data && (cmd == host->mrq->data->stop)) mask &= ~SDHCI_DATA_INHIBIT ; -while (readl (host->ioaddr +SDHCI_PRESENT_STATE ) & mask) { +while (sdhci_readl (host,SDHCI_PRESENT_STATE ) & mask) {if (timeout ==0 ) {printk (KERN_ERR "%s: Controller never released " "inhibit bit(s).\n" ,mmc_hostname (host->mmc));
@@ -821,7 +875,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)sdhci_prepare_data (host, cmd->data); -writel (cmd->arg, host->ioaddr +SDHCI_ARGUMENT ); +sdhci_writel (host, cmd->arg,SDHCI_ARGUMENT );sdhci_set_transfer_mode (host, cmd->data);
@@ -849,8 +903,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)if (cmd->data) flags |=SDHCI_CMD_DATA ; -writew (SDHCI_MAKE_CMD (cmd->opcode, flags), - host->ioaddr +SDHCI_COMMAND ); +sdhci_writew (host,SDHCI_MAKE_CMD (cmd->opcode, flags),SDHCI_COMMAND ); }static void sdhci_finish_command (struct sdhci_host *host)
@@ -863,15 +916,15 @@ static void sdhci_finish_command(struct sdhci_host *host)if (host->cmd->flags &MMC_RSP_136 ) {/* CRC is stripped so we need to do some shifting. */ for (i =0 ;i <4 ;i++) { - host->cmd->resp[i] =readl (host->ioaddr + + host->cmd->resp[i] =sdhci_readl (host,SDHCI_RESPONSE + (3 -i)*4 ) <<8 ;if (i !=3 ) host->cmd->resp[i] |= -readb (host->ioaddr + +sdhci_readb (host,SDHCI_RESPONSE + (3 -i)*4 -1 ); } }else { - host->cmd->resp[0 ] =readl (host->ioaddr +SDHCI_RESPONSE ); + host->cmd->resp[0 ] =sdhci_readl (host,SDHCI_RESPONSE ); } }
@@ -895,7 +948,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)if (clock == host->clock)return ; -writew (0 , host->ioaddr +SDHCI_CLOCK_CONTROL ); +sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL );if (clock ==0 ) goto out;
@@ -908,11 +961,11 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) clk = div <<SDHCI_DIVIDER_SHIFT ; clk |=SDHCI_CLOCK_INT_EN ; -writew (clk, host->ioaddr +SDHCI_CLOCK_CONTROL ); +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL );/* Wait max 10 ms */ timeout =10 ; -while (!((clk =readw (host->ioaddr +SDHCI_CLOCK_CONTROL )) +while (!((clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL )) &SDHCI_CLOCK_INT_STABLE )) {if (timeout ==0 ) { printk(KERN_ERR "%s: Internal clock never "
@@ -925,7 +978,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) } clk |=SDHCI_CLOCK_CARD_EN ; -writew (clk, host->ioaddr +SDHCI_CLOCK_CONTROL ); +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); out: host->clock = clock;
@@ -939,7 +992,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)return ;if (power == (unsigned short )-1 ) { -writeb (0 , host->ioaddr +SDHCI_POWER_CONTROL ); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); goto out; }
@@ -948,7 +1001,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)* a new value. Some controllers don't seem to like this though. */ if (!(host->quirks &SDHCI_QUIRK_SINGLE_POWER_WRITE )) -writeb (0 , host->ioaddr +SDHCI_POWER_CONTROL ); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); pwr =SDHCI_POWER_ON ;
@@ -973,10 +1026,9 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)* and set turn on power at the same time, so set the voltage first. */ if ((host->quirks &SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER )) -writeb (pwr & ~SDHCI_POWER_ON , - host->ioaddr +SDHCI_POWER_CONTROL ); +sdhci_writeb (host, pwr & ~SDHCI_POWER_ON ,SDHCI_POWER_CONTROL ); -writeb (pwr, host->ioaddr +SDHCI_POWER_CONTROL ); +sdhci_writeb (host, pwr,SDHCI_POWER_CONTROL ); out: host->power = power;
@@ -1005,7 +1057,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) host->mrq = mrq; -if (!(readl (host->ioaddr +SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ) +if (!(sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ) || (host->flags &SDHCI_DEVICE_DEAD )) { host->mrq->cmd->error = -ENOMEDIUM ;tasklet_schedule (&host->finish_tasklet);
@@ -1034,7 +1086,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)* Should clear out any weird states. */ if (ios->power_mode ==MMC_POWER_OFF ) { -writel (0 , host->ioaddr +SDHCI_SIGNAL_ENABLE ); +sdhci_writel (host,0 ,SDHCI_SIGNAL_ENABLE );sdhci_init (host); }
@@ -1045,7 +1097,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)else sdhci_set_power (host, ios->vdd); - ctrl =readb (host->ioaddr +SDHCI_HOST_CONTROL ); + ctrl =sdhci_readb (host,SDHCI_HOST_CONTROL );if (ios->bus_width ==MMC_BUS_WIDTH_4 ) ctrl |=SDHCI_CTRL_4BITBUS ;
@@ -1057,7 +1109,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)else ctrl &= ~SDHCI_CTRL_HISPD ; -writeb (ctrl, host->ioaddr +SDHCI_HOST_CONTROL ); +sdhci_writeb (host, ctrl,SDHCI_HOST_CONTROL );/* * Some (ENE) controllers go apeshit on some ios operation,
@@ -1085,7 +1137,7 @@ static int sdhci_get_ro(struct mmc_host *mmc)if (host->flags &SDHCI_DEVICE_DEAD ) present =0 ;else - present =readl (host->ioaddr +SDHCI_PRESENT_STATE ); + present =sdhci_readl (host,SDHCI_PRESENT_STATE );spin_unlock_irqrestore (&host->lock, flags);
@@ -1105,14 +1157,14 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)if (host->flags &SDHCI_DEVICE_DEAD ) goto out; - ier =readl (host->ioaddr +SDHCI_INT_ENABLE ); + ier =sdhci_readl (host,SDHCI_INT_ENABLE ); ier &= ~SDHCI_INT_CARD_INT ;if (enable) ier |=SDHCI_INT_CARD_INT ; -writel (ier, host->ioaddr +SDHCI_INT_ENABLE ); -writel (ier, host->ioaddr +SDHCI_SIGNAL_ENABLE ); +sdhci_writel (host, ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, ier,SDHCI_SIGNAL_ENABLE ); out:mmiowb ();
@@ -1142,7 +1194,7 @@ static void sdhci_tasklet_card(unsigned long param)spin_lock_irqsave (&host->lock, flags); -if (!(readl (host->ioaddr +SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT )) { +if (!(sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT )) {if (host->mrq) {printk (KERN_ERR "%s: Card removed during transfer!\n" ,mmc_hostname (host->mmc));
@@ -1346,8 +1398,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)* 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 ); +sdhci_writel (host,sdhci_readl (host,SDHCI_DMA_ADDRESS ), +SDHCI_DMA_ADDRESS );if (intmask &SDHCI_INT_DATA_END ) {if (host->cmd) {
@@ -1373,7 +1425,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)spin_lock (&host->lock); - intmask =readl (host->ioaddr +SDHCI_INT_STATUS ); + intmask =sdhci_readl (host,SDHCI_INT_STATUS );if (!intmask || intmask ==0xffffffff ) { result =IRQ_NONE ;
@@ -1384,22 +1436,22 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) mmc_hostname(host->mmc), intmask);if (intmask & (SDHCI_INT_CARD_INSERT |SDHCI_INT_CARD_REMOVE )) { -writel (intmask & (SDHCI_INT_CARD_INSERT |SDHCI_INT_CARD_REMOVE ), - host->ioaddr +SDHCI_INT_STATUS ); +sdhci_writel (host, intmask & (SDHCI_INT_CARD_INSERT | +SDHCI_INT_CARD_REMOVE ),SDHCI_INT_STATUS );tasklet_schedule (&host->card_tasklet); } intmask &= ~(SDHCI_INT_CARD_INSERT |SDHCI_INT_CARD_REMOVE );if (intmask &SDHCI_INT_CMD_MASK ) { -writel (intmask &SDHCI_INT_CMD_MASK , - host->ioaddr +SDHCI_INT_STATUS ); +sdhci_writel (host, intmask &SDHCI_INT_CMD_MASK , +SDHCI_INT_STATUS );sdhci_cmd_irq (host, intmask &SDHCI_INT_CMD_MASK ); }if (intmask &SDHCI_INT_DATA_MASK ) { -writel (intmask &SDHCI_INT_DATA_MASK , - host->ioaddr +SDHCI_INT_STATUS ); +sdhci_writel (host, intmask &SDHCI_INT_DATA_MASK , +SDHCI_INT_STATUS );sdhci_data_irq (host, intmask &SDHCI_INT_DATA_MASK ); }
@@ -1410,7 +1462,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)if (intmask &SDHCI_INT_BUS_POWER ) {printk (KERN_ERR "%s: Card is consuming too much power!\n" ,mmc_hostname (host->mmc)); -writel (SDHCI_INT_BUS_POWER , host->ioaddr +SDHCI_INT_STATUS ); +sdhci_writel (host,SDHCI_INT_BUS_POWER ,SDHCI_INT_STATUS ); } intmask &= ~SDHCI_INT_BUS_POWER ;
@@ -1425,7 +1477,7 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) mmc_hostname(host->mmc), intmask);sdhci_dumpregs (host); -writel (intmask, host->ioaddr +SDHCI_INT_STATUS ); +sdhci_writel (host, intmask,SDHCI_INT_STATUS ); } result =IRQ_HANDLED ;
@@ -1537,7 +1589,7 @@ int sdhci_add_host(struct sdhci_host *host)sdhci_reset (host,SDHCI_RESET_ALL ); - host->version =readw (host->ioaddr +SDHCI_HOST_VERSION ); + host->version =sdhci_readw (host,SDHCI_HOST_VERSION ); host->version = (host->version &SDHCI_SPEC_VER_MASK ) >>SDHCI_SPEC_VER_SHIFT ;if (host->version >SDHCI_SPEC_200 ) {
@@ -1546,7 +1598,7 @@ int sdhci_add_host(struct sdhci_host *host) host->version); } - caps =readl (host->ioaddr +SDHCI_CAPABILITIES ); + caps =sdhci_readl (host,SDHCI_CAPABILITIES );if (host->quirks &SDHCI_QUIRK_FORCE_DMA ) host->flags |=SDHCI_USE_DMA ;
drivers/mmc/host/sdhci.h +14 -0
@@ -9,6 +9,7 @@* your option) any later version. */ +#include <linux/types.h> #include <linux/scatterlist.h> /*
@@ -267,9 +268,22 @@ struct sdhci_host {struct sdhci_ops { +u32 (*readl)(struct sdhci_host *host,int reg); +u16 (*readw)(struct sdhci_host *host,int reg); +u8 (*readb)(struct sdhci_host *host,int reg); +void (*writel)(struct sdhci_host *host,u32 val,int reg); +void (*writew)(struct sdhci_host *host,u16 val,int reg); +void (*writeb)(struct sdhci_host *host,u8 val,int reg); +int (*enable_dma)(struct sdhci_host *host); }; +extern void sdhci_writel (struct sdhci_host *host,u32 val,int reg); +extern void sdhci_writew (struct sdhci_host *host,u16 val,int reg); +extern void sdhci_writeb (struct sdhci_host *host,u8 val,int reg); +extern u32 sdhci_readl (struct sdhci_host *host,int reg); +extern u16 sdhci_readw (struct sdhci_host *host,int reg); +extern u8 sdhci_readb (struct sdhci_host *host,int reg);extern struct sdhci_host *sdhci_alloc_host (struct device *dev,size_t priv_size);
Signature · 1 line
1.5.6.5
PATCH v2 2/11 sdhci: Split card-detection IRQs management from sdhci_init()
In reply to Anton VorontsovCard detection interrupts should be handled separately as they should not be enabled before mmc_add_host() returns and should be disabled before calling mmc_remove_host(). The same is for suspend and resume routines.
sdhci_init() no longer enables card-detection irqs. Instead, two new functions implemented: sdhci_enable_card_detection() and sdhci_disable_card_detection().
New sdhci_reinit() call implemented to behave the same way as the old sdhci_init().
Also, this patch implements and uses few new helpers to manage IRQs in a more conveinient way, that is:
- sdhci_clear_set_irqs()
- sdhci_unmask_irqs()
- sdhci_mask_irqs()
- SDHCI_INT_ALL_MASK constant
sdhci_enable_sdio_irq() converted to these new helpers, plus the helpers will be used by the subsequent patches.
--- drivers/mmc/host/sdhci.c | 78 ++++++++++++++++++++++++++++++++++++---------- drivers/mmc/host/sdhci.h | 1 + 2 files changed, 62 insertions(+), 17 deletions(-)
drivers/mmc/host/sdhci.c +61 -17
@@ -142,6 +142,47 @@ u8 sdhci_readb(struct sdhci_host *host, int reg) }EXPORT_SYMBOL_GPL (sdhci_readb); +static void sdhci_clear_set_irqs (struct sdhci_host *host,u32 clear,u32 set) +{ +u32 ier; + + ier =sdhci_readl (host,SDHCI_INT_ENABLE ); + ier &= ~clear; + ier |= set; +sdhci_writel (host, ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, ier,SDHCI_SIGNAL_ENABLE ); +} + +static void sdhci_unmask_irqs (struct sdhci_host *host,u32 irqs) +{ +sdhci_clear_set_irqs (host,0 , irqs); +} + +static void sdhci_mask_irqs (struct sdhci_host *host,u32 irqs) +{ +sdhci_clear_set_irqs (host, irqs,0 ); +} + +static void sdhci_set_card_detection (struct sdhci_host *host,bool enable) +{ +u32 irqs =SDHCI_INT_CARD_REMOVE |SDHCI_INT_CARD_INSERT ; + +if (enable) +sdhci_unmask_irqs (host, irqs); +else +sdhci_mask_irqs (host, irqs); +} + +static void sdhci_enable_card_detection (struct sdhci_host *host) +{ +sdhci_set_card_detection (host, true); +} + +static void sdhci_disable_card_detection (struct sdhci_host *host) +{ +sdhci_set_card_detection (host, false); +} +static void sdhci_reset (struct sdhci_host *host,u8 mask) {unsigned long timeout;
@@ -175,20 +216,21 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)static void sdhci_init (struct sdhci_host *host) { -u32 intmask; -sdhci_reset (host,SDHCI_RESET_ALL ); - intmask =SDHCI_INT_BUS_POWER |SDHCI_INT_DATA_END_BIT | +sdhci_clear_set_irqs (host,SDHCI_INT_ALL_MASK , +SDHCI_INT_BUS_POWER |SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC |SDHCI_INT_DATA_TIMEOUT |SDHCI_INT_INDEX |SDHCI_INT_END_BIT |SDHCI_INT_CRC |SDHCI_INT_TIMEOUT | -SDHCI_INT_CARD_REMOVE |SDHCI_INT_CARD_INSERT |SDHCI_INT_DATA_AVAIL |SDHCI_INT_SPACE_AVAIL |SDHCI_INT_DMA_END |SDHCI_INT_DATA_END |SDHCI_INT_RESPONSE | -SDHCI_INT_ADMA_ERROR ; +SDHCI_INT_ADMA_ERROR ); +} -sdhci_writel (host, intmask,SDHCI_INT_ENABLE ); -sdhci_writel (host, intmask,SDHCI_SIGNAL_ENABLE ); +static void sdhci_reinit (struct sdhci_host *host) +{ +sdhci_init (host); +sdhci_enable_card_detection (host); }static void sdhci_activate_led (struct sdhci_host *host)
@@ -1087,7 +1129,7 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)*/ if (ios->power_mode ==MMC_POWER_OFF ) {sdhci_writel (host,0 ,SDHCI_SIGNAL_ENABLE ); -sdhci_init (host); +sdhci_reinit (host); }sdhci_set_clock (host, ios->clock);
@@ -1148,7 +1190,6 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable) {struct sdhci_host *host;unsigned long flags; -u32 ier; host =mmc_priv (mmc);
@@ -1157,15 +1198,10 @@ static void sdhci_enable_sdio_irq(struct mmc_host *mmc, int enable)if (host->flags &SDHCI_DEVICE_DEAD ) goto out; - ier =sdhci_readl (host,SDHCI_INT_ENABLE ); - - ier &= ~SDHCI_INT_CARD_INT ;if (enable) - ier |=SDHCI_INT_CARD_INT ; - -sdhci_writel (host, ier,SDHCI_INT_ENABLE ); -sdhci_writel (host, ier,SDHCI_SIGNAL_ENABLE ); - +sdhci_unmask_irqs (host,SDHCI_INT_CARD_INT ); +else +sdhci_mask_irqs (host,SDHCI_INT_CARD_INT ); out:mmiowb ();
@@ -1507,6 +1543,8 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) {int ret; +sdhci_disable_card_detection (host); + ret =mmc_suspend_host (host->mmc, state);if (ret)return ret;
@@ -1539,6 +1577,8 @@ int sdhci_resume_host(struct sdhci_host *host)if (ret)return ret; +sdhci_enable_card_detection (host); +return 0 ; }
@@ -1798,6 +1838,8 @@ int sdhci_add_host(struct sdhci_host *host) (host->flags &SDHCI_USE_ADMA )?"A" :"" , (host->flags & SDHCI_USE_DMA)?"DMA":"PIO"); +sdhci_enable_card_detection (host); +return 0 ;#ifdef SDHCI_USE_LEDS_CLASS
@@ -1834,6 +1876,8 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)spin_unlock_irqrestore (&host->lock, flags); } +sdhci_disable_card_detection (host); +mmc_remove_host (host->mmc);#ifdef SDHCI_USE_LEDS_CLASS
drivers/mmc/host/sdhci.h +1 -0
@@ -124,6 +124,7 @@ SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | \ SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_DATA_CRC | \ SDHCI_INT_DATA_END_BIT) +#define SDHCI_INT_ALL_MASK ((unsigned int)-1)#define SDHCI_ACMD12_ERR 0x3C
Signature · 1 line
1.5.6.5
PATCH v2 3/11 sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
In reply to Anton VorontsovSome hosts (that is, FSL eSDHC) throw PIO interrupts during DMA transfers, this causes tons of unneeded interrupts, and thus highly degraded speed.
This patch modifies the driver so that now we only enable relevant (DMA or PIO) interrupts during transfers.
--- drivers/mmc/host/sdhci.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +14 -3
@@ -222,9 +222,7 @@ static void sdhci_init(struct sdhci_host *host)SDHCI_INT_BUS_POWER |SDHCI_INT_DATA_END_BIT |SDHCI_INT_DATA_CRC |SDHCI_INT_DATA_TIMEOUT |SDHCI_INT_INDEX |SDHCI_INT_END_BIT |SDHCI_INT_CRC |SDHCI_INT_TIMEOUT | -SDHCI_INT_DATA_AVAIL |SDHCI_INT_SPACE_AVAIL | -SDHCI_INT_DMA_END |SDHCI_INT_DATA_END |SDHCI_INT_RESPONSE | - SDHCI_INT_ADMA_ERROR); + SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE); }static void sdhci_reinit (struct sdhci_host *host)
@@ -658,6 +656,17 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data)return count; } +static void sdhci_set_transfer_irqs (struct sdhci_host *host) +{ +u32 pio_irqs =SDHCI_INT_DATA_AVAIL |SDHCI_INT_SPACE_AVAIL ; +u32 dma_irqs =SDHCI_INT_DMA_END |SDHCI_INT_ADMA_ERROR ; + +if (host->flags &SDHCI_REQ_USE_DMA ) +sdhci_clear_set_irqs (host, pio_irqs, dma_irqs); +else +sdhci_clear_set_irqs (host, dma_irqs, pio_irqs); +} +static void sdhci_prepare_data (struct sdhci_host *host,struct mmc_data *data) {u8 count;
@@ -806,6 +815,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) host->blocks = data->blocks; } +sdhci_set_transfer_irqs (host); +/* We do not handle DMA boundaries, so set it to max (512 KiB) */ sdhci_writew (host,SDHCI_MAKE_BLKSZ (7 , data->blksz),SDHCI_BLOCK_SIZE );sdhci_writew (host, data->blocks,SDHCI_BLOCK_COUNT );
Signature · 1 line
1.5.6.5
PATCH v2 4/11 sdhci: Add support for card-detection polling
In reply to Anton VorontsovThis patch adds SDHCI_QUIRK_BROKEN_CARD_DETECTION quirk. When specified, sdhci driver will set MMC_CAP_NEEDS_POLL MMC host capability, and won't enable card insert/remove interrupts.
This is needed for hosts with unreliable card detection, such as FSL eSDHC. The original eSDHC driver was tring to "debounce" card-detection IRQs by reading present state and disabling particular interrupts. But with this debouncing scheme I noticed that sometimes we miss card insertion/removal events.
--- drivers/mmc/host/sdhci.c | 17 +++++++++++++++-- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci.c +15 -2
@@ -167,6 +167,9 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable) {u32 irqs =SDHCI_INT_CARD_REMOVE |SDHCI_INT_CARD_INSERT ; +if (host->quirks &SDHCI_QUIRK_BROKEN_CARD_DETECTION ) +return ; +if (enable)sdhci_unmask_irqs (host, irqs);else
@@ -1096,6 +1099,7 @@ out:static void sdhci_request (struct mmc_host *mmc,struct mmc_request *mrq) {struct sdhci_host *host; +bool present;unsigned long flags; host =mmc_priv (mmc);
@@ -1110,8 +1114,14 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) host->mrq = mrq; -if (!(sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ) - || (host->flags &SDHCI_DEVICE_DEAD )) { +/* If polling, assume that the card is always present. */ +if (host->quirks &SDHCI_QUIRK_BROKEN_CARD_DETECTION ) + present = true; +else + present =sdhci_readl (host,SDHCI_PRESENT_STATE ) & +SDHCI_CARD_PRESENT ; + +if (!present || host->flags &SDHCI_DEVICE_DEAD ) { host->mrq->cmd->error = -ENOMEDIUM ;tasklet_schedule (&host->finish_tasklet); }else
@@ -1745,6 +1755,9 @@ int sdhci_add_host(struct sdhci_host *host)if (caps &SDHCI_CAN_DO_HISPD ) mmc->caps |=MMC_CAP_SD_HIGHSPEED ; +if (host->quirks &SDHCI_QUIRK_BROKEN_CARD_DETECTION ) + mmc->caps |=MMC_CAP_NEEDS_POLL ; + mmc->ocr_avail =0 ;if (caps &SDHCI_CAN_VDD_330 ) mmc->ocr_avail |=MMC_VDD_32_33 |MMC_VDD_33_34 ;
drivers/mmc/host/sdhci.h +2 -0
@@ -212,6 +212,8 @@ struct sdhci_host {#define SDHCI_QUIRK_BROKEN_SMALL_PIO (1<<13)/* Controller does not provide transfer-complete interrupt when not busy */ #define SDHCI_QUIRK_NO_BUSY_IRQ (1<<14) +/* Controller has unreliable card detection */ +#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 1 line
1.5.6.5
PATCH v2 5/11 sdhci: Add support for hosts reporting inverted write-protect state
In reply to Anton VorontsovThis patch adds SDHCI_QUIRK_INVERTED_WRITE_PROTECT quirk. When specified, the sdhci driver will invert WP state.
p.s. Actually, the quirk is more board-specific than
controller-specific.
--- drivers/mmc/host/sdhci.c | 2 ++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci.c +2 -0
@@ -1204,6 +1204,8 @@ static int sdhci_get_ro(struct mmc_host *mmc)spin_unlock_irqrestore (&host->lock, flags); +if (host->quirks &SDHCI_QUIRK_INVERTED_WRITE_PROTECT ) +return !!(present &SDHCI_WRITE_PROTECT );return !(present &SDHCI_WRITE_PROTECT ); }
drivers/mmc/host/sdhci.h +2 -0
@@ -214,6 +214,8 @@ struct sdhci_host {#define SDHCI_QUIRK_NO_BUSY_IRQ (1<<14)/* Controller has unreliable card detection */ #define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15) +/* Controller reports inverted write-protect state */ +#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT (1<<16)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 1 line
1.5.6.5
PATCH v2 6/11 sdhci: Add get_{max,timeout}_clock callbacks
In reply to Anton VorontsovFrom: Ben Dooks <[email protected]>
Some controllers do not provide clock information in their capabilities (in the Samsung case, it is because there are multiple clock sources available to the controller). Add hooks to allow the system to supply clock information.
p.s.
In the original Ben's patch there was a bug that makes sdhci_add_host() return -ENODEV even if callbacks were specified. This is fixed now.
--- drivers/mmc/host/sdhci.c | 22 +++++++++++++++------- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci.c +15 -7
@@ -1729,19 +1729,27 @@ int sdhci_add_host(struct sdhci_host *host) host->max_clk = (caps &SDHCI_CLOCK_BASE_MASK ) >>SDHCI_CLOCK_BASE_SHIFT ; + host->max_clk *=1000000 ;if (host->max_clk ==0 ) { -printk (KERN_ERR "%s: Hardware doesn't specify base clock " -"frequency.\n" ,mmc_hostname (mmc)); -return -ENODEV ; +if (!host->ops->get_max_clock) { +printk (KERN_ERR +"%s: Hardware doesn't specify base clock " +"frequency.\n" ,mmc_hostname (mmc)); +return -ENODEV ; + } + host->max_clk = host->ops->get_max_clock (host); } - host->max_clk *=1000000 ; host->timeout_clk = (caps &SDHCI_TIMEOUT_CLK_MASK ) >>SDHCI_TIMEOUT_CLK_SHIFT ;if (host->timeout_clk ==0 ) { -printk (KERN_ERR "%s: Hardware doesn't specify timeout clock " -"frequency.\n" ,mmc_hostname (mmc)); -return -ENODEV ; +if (!host->ops->get_timeout_clock) { +printk (KERN_ERR +"%s: Hardware doesn't specify timeout clock " +"frequency.\n" ,mmc_hostname (mmc)); +return -ENODEV ; + } + host->timeout_clk = host->ops->get_timeout_clock (host); }if (caps &SDHCI_TIMEOUT_CLK_UNIT ) host->timeout_clk *=1000 ;
drivers/mmc/host/sdhci.h +2 -0
@@ -281,6 +281,8 @@ struct sdhci_ops {void (*writeb)(struct sdhci_host *host,u8 val,int reg);int (*enable_dma)(struct sdhci_host *host); +unsigned int (*get_max_clock)(struct sdhci_host *host); +unsigned int (*get_timeout_clock)(struct sdhci_host *host); };extern void sdhci_writel (struct sdhci_host *host,u32 val,int reg);
Signature · 1 line
1.5.6.5
PATCH v2 7/11 sdhci: Add set_clock callback and a quirk for nonstandard clocks
In reply to Anton VorontsovFSL eSDHC hosts have incompatible register map to manage the SDCLK. This patch adds set_clock callback so that drivers could overwrite set_clock behaviour.
Similar patch[1] was posted by Ben Dooks, though in Ben's version the callback is named change_clock, plus the patch has some unrelated bits that makes the patch difficult to reuse.
[1] http://lkml.org/lkml/2008/12/2/160
--- drivers/mmc/host/sdhci.c | 6 ++++++ drivers/mmc/host/sdhci.h | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci.c +6 -0
@@ -1004,6 +1004,12 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)if (clock == host->clock)return ; +if (host->ops->set_clock) { + host->ops->set_clock (host, clock); +if (host->quirks &SDHCI_QUIRK_NONSTANDARD_CLOCK ) +return ; + } +sdhci_writew (host,0 ,SDHCI_CLOCK_CONTROL );if (clock ==0 )
drivers/mmc/host/sdhci.h +4 -0
@@ -216,6 +216,8 @@ struct sdhci_host {#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)/* Controller reports inverted write-protect state */ #define SDHCI_QUIRK_INVERTED_WRITE_PROTECT (1<<16) +/* Controller has nonstandard clock management */ +#define SDHCI_QUIRK_NONSTANDARD_CLOCK (1<<17)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
@@ -280,6 +282,8 @@ struct sdhci_ops {void (*writew)(struct sdhci_host *host,u16 val,int reg);void (*writeb)(struct sdhci_host *host,u8 val,int reg); +void (*set_clock)(struct sdhci_host *host,unsigned int clock); +int (*enable_dma)(struct sdhci_host *host);unsigned int (*get_max_clock)(struct sdhci_host *host);unsigned int (*get_timeout_clock)(struct sdhci_host *host);
Signature · 1 line
1.5.6.5
PATCH v2 8/11 sdhci: Add quirk for controllers that need small delays for PIO
In reply to Anton VorontsovSmall udelay is needed to make eSDHC work in PIO mode. Without the delay reading causes endless interrupt storm, and writing corrupts data. The first guess would be that we must wait for some bit in some register, but I didn't find any reliable bits that change before and after the delay.
--- drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci.c +3 -0
@@ -391,6 +391,9 @@ static void sdhci_transfer_pio(struct sdhci_host *host) mask = ~0 ;while (sdhci_readl (host,SDHCI_PRESENT_STATE ) & mask) { +if (host->quirks &SDHCI_QUIRK_PIO_NEEDS_DELAY ) +udelay (100 ); +if (host->data->flags &MMC_DATA_READ )sdhci_read_block_pio (host);else
drivers/mmc/host/sdhci.h +2 -0
@@ -218,6 +218,8 @@ struct sdhci_host {#define SDHCI_QUIRK_INVERTED_WRITE_PROTECT (1<<16)/* Controller has nonstandard clock management */ #define SDHCI_QUIRK_NONSTANDARD_CLOCK (1<<17) +/* Controller does not like fast PIO transfers */ +#define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<18)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 1 line
1.5.6.5
PATCH v2 9/11 sdhci: Add quirk for controllers that need IRQ re-init after reset
In reply to Anton VorontsovFSL eSDHC controllers losing signal/interrupt enable states after reset, so we should re-enable them.
--- drivers/mmc/host/sdhci.c | 7 +++++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci.c +7 -0
@@ -189,6 +189,7 @@ static void sdhci_disable_card_detection(struct sdhci_host *host)static void sdhci_reset (struct sdhci_host *host,u8 mask) {unsigned long timeout; +u32 uninitialized_var (ier );if (host->quirks &SDHCI_QUIRK_NO_CARD_NO_RESET ) { if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) &
@@ -196,6 +197,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask)return ; } +if (host->quirks &SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET ) + ier =sdhci_readl (host,SDHCI_INT_ENABLE ); +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET );if (mask &SDHCI_RESET_ALL )
@@ -215,6 +219,9 @@ static void sdhci_reset(struct sdhci_host *host, u8 mask) timeout--;mdelay (1 ); } + +if (host->quirks &SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET ) +sdhci_clear_set_irqs (host,SDHCI_INT_ALL_MASK , ier); }static void sdhci_init (struct sdhci_host *host)
drivers/mmc/host/sdhci.h +2 -0
@@ -220,6 +220,8 @@ struct sdhci_host {#define SDHCI_QUIRK_NONSTANDARD_CLOCK (1<<17)/* Controller does not like fast PIO transfers */ #define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<18) +/* Controller losing signal/interrupt enable states after reset */ +#define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET (1<<19)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 1 line
1.5.6.5
PATCH v2 10/11 sdhci: Add quirk for forcing maximum block size to 2048 bytes
In reply to Anton VorontsovFSL eSDHC controllers can support maximum block size up to 4096 bytes, the MBL (Maximum Block Length) field in the capabilities register extended by one bit, and is set to 0x3.
But the SDHCI core doesn't support blocks of 4096 bytes, and thus forces blksz to the lowest value -- 512 bytes. With this patch we can pin up the blksz to the maximum supported block size, i.e. 2048 bytes.
--- drivers/mmc/host/sdhci.c | 20 +++++++++++++------- drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 15 insertions(+), 7 deletions(-)
drivers/mmc/host/sdhci.c +13 -7
@@ -1832,13 +1832,19 @@ int sdhci_add_host(struct sdhci_host *host)* Maximum block size. This varies from controller to controller and * is specified in the capabilities register. */ - mmc->max_blk_size = (caps &SDHCI_MAX_BLOCK_MASK ) >>SDHCI_MAX_BLOCK_SHIFT ; -if (mmc->max_blk_size >=3 ) { -printk (KERN_WARNING "%s: Invalid maximum block size, " -"assuming 512 bytes\n" ,mmc_hostname (mmc)); - mmc->max_blk_size =512 ; - }else - mmc->max_blk_size =512 << mmc->max_blk_size; +if (host->quirks &SDHCI_QUIRK_FORCE_BLK_SZ_2048 ) { + mmc->max_blk_size =2 ; + }else { + mmc->max_blk_size = (caps &SDHCI_MAX_BLOCK_MASK ) >> +SDHCI_MAX_BLOCK_SHIFT ; +if (mmc->max_blk_size >=3 ) { +printk (KERN_WARNING "%s: Invalid maximum block size, " +"assuming 512 bytes\n" ,mmc_hostname (mmc)); + mmc->max_blk_size =0 ; + } + } + + mmc->max_blk_size =512 << mmc->max_blk_size;/* * Maximum block count.
drivers/mmc/host/sdhci.h +2 -0
@@ -222,6 +222,8 @@ struct sdhci_host {#define SDHCI_QUIRK_PIO_NEEDS_DELAY (1<<18)/* Controller losing signal/interrupt enable states after reset */ #define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET (1<<19) +/* Controller has to be forced to use block size of 2048 bytes */ +#define SDHCI_QUIRK_FORCE_BLK_SZ_2048 (1<<20)int irq;/* Device IRQ */ void __iomem * ioaddr;/* Mapped address */
Signature · 1 line
1.5.6.5
PATCH v2 11/11 mmc: Add OpenFirmware bindings for SDHCI driver
In reply to Anton VorontsovThis patch adds a new driver: sdhci-of. The driver is similar to the sdhci-pci, it contains common probe code, and controller-specific ops and quirks.
So far there are only Freescale eSDHC ops and quirks.
--- drivers/mmc/host/Kconfig | 10 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-of.c | 309 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 320 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/host/sdhci-of.c
drivers/mmc/host/Kconfig +10 -0
@@ -65,6 +65,16 @@ config MMC_RICOH_MMC If unsure, say Y. +config MMC_SDHCI_OF + tristate "SDHCI support on OpenFirmware platforms" + depends on MMC_SDHCI && PPC_OF + help + This selects the OF support for Secure Digital Host Controller + Interfaces. So far, only the Freescale eSDHC controller is known + to exist on OF platforms. + + If unsure, say N. + config MMC_OMAP tristate "TI OMAP Multimedia Card Interface support" depends on ARCH_OMAP
drivers/mmc/host/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o obj-$(CONFIG_MMC_RICOH_MMC) += ricoh_mmc.o +obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_OMAP) += omap.o
drivers/mmc/host/sdhci-of.c new file +309 -0
309 lines not on this page · raw message
Signature · 1 line
1.5.6.5
Re: [PATCH 11/11] mmc: Add OpenFirmware bindings for SDHCI driver
Quoted 6 lines · On Thu, 5 Mar 2009 23:28:50 +0300 Anton Vorontsov <[email protected]>…
This patch adds a new driver: sdhci-of. The driver is similar to the sdhci-pci, it contains common probe code, and controller-specific ops and quirks.
So far there are only Freescale eSDHC ops and quirks.
Quoted 9 lines
Signed-off-by Anton Vorontsov <[email protected]>Acked-by Arnd Bergmann <[email protected]>--- drivers/mmc/host/Kconfig | 10 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-of.c | 309 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 320 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/host/sdhci-of.c
I'd like a MAINTAINERS entry for this (sub)driver.
Rgds
Signature · 6 lines
-- Pierre Ossman WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.