:Blackfin SD Host Controller Driver
PATCH v4 1/1 :Blackfin SD Host Controller Driver
From: Cliff Cai <[email protected]>
Add SD host driver for Blackfin BF54x and BF51x.
---
v4
change the copyright domain to 2007-2009
drivers/mmc/host/Kconfig | 19 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/bfin_sdh.c | 634 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 654 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/host/bfin_sdh.c
drivers/mmc/host/Kconfig +19 -0
@@ -357,3 +357,22 @@ config MMC_VIA_SDMMC If you have a controller with this interface, say Y or M here. If unsure, say N. + +config SDH_BFIN + tristate "Blackfin Secure Digital Host support" + depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512)) + help + If you say yes here you will get support for the Blackfin on-chip + Secure Digital Host interface. This includes support for MMC and + SD cards. + + To compile this driver as a module, choose M here: the + module will be called bfin_sdh. + + If unsure, say N. + +config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND + bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround" + depends on SDH_BFIN + help + If you say yes here SD-Cards may work on the EZkit.
drivers/mmc/host/Makefile +1 -0
@@ -34,6 +34,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o obj-$(CONFIG_MMC_CB710) += cb710-mmc.o obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o +obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o ifeq ($(CONFIG_CB710_DEBUG),y) CFLAGS-cb710-mmc += -DDEBUG
drivers/mmc/host/bfin_sdh.c new file +634 -0
634 lines not on this page · raw message
Signature · 1 line
1.6.5.3
Quoted 19 lines · On Wed, 25 Nov 2009 23:19:50 +0800 <[email protected]> wrote:
From: Cliff Cai <[email protected]>
Add SD host driver for Blackfin BF54x and BF51x.
Signed-off-by Cliff Cai <[email protected]>Signed-off-by Bryan Wu <[email protected]>Signed-off-by Mike Frysinger <[email protected]>...
(quoted diff) +8
-0+config SDH_BFIN + tristate "Blackfin Secure Digital Host support" + depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512)) + help + If you say yes here you will get support for the Blackfin on-chip + Secure Digital Host interface. This includes support for MMC and + SD cards. +
Review
Quoted 10 lines
(quoted diff) +10
-0+ To compile this driver as a module, choose M here: the + module will be called bfin_sdh. + + If unsure, say N. + +config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND + bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround" + depends on SDH_BFIN + help + If you say yes here SD-Cards may work on the EZkit.
Indenting is all mangled.
Review
Quoted 9 lines
...
(quoted diff) +6
-0+struct dma_desc_array { + unsigned long start_addr; + unsigned short cfg; + unsigned short x_count; + short x_modify; +} __attribute__((packed));
__packed is preferred.
Quoted 54 lines
(quoted diff) +51
-0+struct sdh_host { + struct mmc_host *mmc; + spinlock_t lock; + struct resource *res; + void __iomem *base; + int irq; + int stat_irq; + int dma_ch; + int dma_dir; + struct dma_desc_array *sg_cpu; + dma_addr_t sg_dma; + int dma_len; + + unsigned int imask; + unsigned int power_mode; + unsigned int clk_div; + + struct mmc_request *mrq; + struct mmc_command *cmd; + struct mmc_data *data; +}; +static int sdh_setup_data(struct sdh_host *host, struct mmc_data *data) +{ + unsigned int length; + unsigned int data_ctl; + unsigned int dma_cfg; + struct scatterlist *sg; + + dev_dbg(mmc_dev(host->mmc), "%s enter flags: 0x%x\n", __func__, data->flags); + host->data = data; + data_ctl = 0; + dma_cfg = 0; + + length = data->blksz * data->blocks; + bfin_write_SDH_DATA_LGTH(length); + + if (data->flags & MMC_DATA_STREAM) + data_ctl |= DTX_MODE; + + if (data->flags & MMC_DATA_READ) + data_ctl |= DTX_DIR; + /* Only supports power-of-2 block size */ + if (data->blksz & (data->blksz - 1)) + return -EINVAL; + data_ctl |= ((ffs(data->blksz) - 1) << 4); + + bfin_write_SDH_DATA_CTL(data_ctl); + + bfin_write_SDH_DATA_TIMER(0xFFFF); + SSYNC(); +
Review
Quoted 10 lines
(quoted diff) +10
-0+ if (data->flags & MMC_DATA_READ) { + host->dma_dir = DMA_FROM_DEVICE; + dma_cfg |= WNR; + } else + host->dma_dir = DMA_TO_DEVICE; + + sdh_enable_stat_irq(host, (DAT_CRC_FAIL | DAT_TIME_OUT | DAT_END)); + host->dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, host->dma_dir); +#if defined(CONFIG_BF54x) + int i;
This is going to generate a compiler warning. We don't use the c99 declaration form in kernel code.
Quoted 47 lines
(quoted diff) +47
-0+ dma_cfg |= DMAFLOW_ARRAY | NDSIZE_5 | RESTART | WDSIZE_32 | DMAEN; + for_each_sg(data->sg, sg, host->dma_len, i) { + host->sg_cpu[i].start_addr = sg_dma_address(sg); + host->sg_cpu[i].cfg = dma_cfg; + host->sg_cpu[i].x_count = sg_dma_len(sg) / 4; + host->sg_cpu[i].x_modify = 4; + dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, cfg:0x%x, x_count:0x%x,\ + x_modify:0x%x\n", i, host->sg_cpu[i].start_addr, + host->sg_cpu[i].cfg, host->sg_cpu[i].x_count, + host->sg_cpu[i].x_modify); + } + flush_dcache_range((unsigned int)host->sg_cpu, + (unsigned int)host->sg_cpu + + host->dma_len * sizeof(struct dma_desc_array)); + /* Set the last descriptor to stop mode */ + host->sg_cpu[host->dma_len - 1].cfg &= ~(DMAFLOW | NDSIZE); + host->sg_cpu[host->dma_len - 1].cfg |= DI_EN; + + set_dma_curr_desc_addr(host->dma_ch, (unsigned long *)host->sg_dma); + set_dma_x_count(host->dma_ch, 0); + set_dma_x_modify(host->dma_ch, 0); + set_dma_config(host->dma_ch, dma_cfg); +#elif defined(CONFIG_BF51x) + /* RSI DMA doesn't work in array mode */ + dma_cfg |= WDSIZE_32 | DMAEN; + set_dma_start_addr(host->dma_ch, sg_dma_address(&data->sg[0])); + set_dma_x_count(host->dma_ch, length / 4); + set_dma_x_modify(host->dma_ch, 4); + set_dma_config(host->dma_ch, dma_cfg); +#endif + bfin_write_SDH_DATA_CTL(bfin_read_SDH_DATA_CTL() | DTX_DMA_E | DTX_E); + + SSYNC(); + + dev_dbg(mmc_dev(host->mmc), "%s exit\n", __func__); + return 0; +} + +static void sdh_start_cmd(struct sdh_host *host, struct mmc_command *cmd) +{ + unsigned int sdh_cmd; + unsigned int stat_mask; + + dev_dbg(mmc_dev(host->mmc), "%s enter cmd: 0x%p\n", __func__, cmd); + WARN_ON(host->cmd != NULL); + host->cmd = cmd; +
Review
Quoted 10 lines
(quoted diff) +10
-0+ sdh_cmd = 0; + stat_mask = 0; + + sdh_cmd |= cmd->opcode; + + if (cmd->flags & MMC_RSP_PRESENT) { + sdh_cmd |= CMD_RSP; + stat_mask |= CMD_RESP_END; + } else + stat_mask |= CMD_SENT;
Arguably wrong from a coding-style POV and looks weird IMO. Adds a bit of risk that subsequent coders will think they're writing in python adn will add bugs.
Quoted 23 lines
(quoted diff) +20
-0+ if (cmd->flags & MMC_RSP_136) + sdh_cmd |= CMD_L_RSP; + + stat_mask |= CMD_CRC_FAIL | CMD_TIME_OUT; + + sdh_enable_stat_irq(host, stat_mask); + + bfin_write_SDH_ARGUMENT(cmd->arg); + bfin_write_SDH_COMMAND(sdh_cmd | CMD_E); + bfin_write_SDH_CLK_CTL(bfin_read_SDH_CLK_CTL() | CLK_E); + SSYNC(); +} + +static irqreturn_t sdh_stat_irq(int irq, void *devid) +{ + struct sdh_host *host = devid; + unsigned int status; + int handled = 0; + + dev_dbg(mmc_dev(host->mmc), "%s enter\n", __func__);
Review
Quoted 10 lines
(quoted diff) +10
-0+ status = bfin_read_SDH_E_STATUS(); + if (status & SD_CARD_DET) { + mmc_detect_change(host->mmc, 0); + bfin_write_SDH_E_STATUS(SD_CARD_DET); + } + status = bfin_read_SDH_STATUS(); + if (status & (CMD_SENT | CMD_RESP_END | CMD_TIME_OUT | CMD_CRC_FAIL)) { + handled |= sdh_cmd_done(host, status); + bfin_write_SDH_STATUS_CLR( CMD_SENT_STAT | CMD_RESP_END_STAT | \ + CMD_TIMEOUT_STAT | CMD_CRC_FAIL_STAT);
Please always use scripts/checkpatch.pl.
Quoted 5 lines
(quoted diff) +4
-0+ SSYNC(); + } + + status = bfin_read_SDH_STATUS();
Review
Quoted 10 lines
(quoted diff) +8
-0+ if (status & (DAT_END | DAT_TIME_OUT | DAT_CRC_FAIL | RX_OVERRUN | TX_UNDERRUN)) + handled |= sdh_data_done(host, status); + + dev_dbg(mmc_dev(host->mmc), "%s exit\n\n", __func__); + + return IRQ_RETVAL(handled); +} +
Fixes:
drivers/mmc/host/Kconfig renamed from drivers/mmc/host/Kconfig~blackfin-sd-host-controller-driver-fix +13 -13
@@ -367,20 +367,20 @@ config MMC_VIA_SDMMC If unsure, say N. config SDH_BFIN - tristate "Blackfin Secure Digital Host support" - depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512)) - help - If you say yes here you will get support for the Blackfin on-chip - Secure Digital Host interface. This includes support for MMC and - SD cards. + tristate "Blackfin Secure Digital Host support" + depends on MMC && ((BF54x && !BF544) || (BF51x && !BF512)) + help + If you say yes here you will get support for the Blackfin on-chip + Secure Digital Host interface. This includes support for MMC and + SD cards. - To compile this driver as a module, choose M here: the - module will be called bfin_sdh. + To compile this driver as a module, choose M here: the + module will be called bfin_sdh. - If unsure, say N. + If unsure, say N. config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND - bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround" - depends on SDH_BFIN - help - If you say yes here SD-Cards may work on the EZkit. + bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround" + depends on SDH_BFIN + help + If you say yes here SD-Cards may work on the EZkit.
diff -puN drivers/mmc/host/Makefile~blackfin-sd-host-controller-driver-fix drivers/mmc/host/Makefile
drivers/mmc/host/bfin_sdh.c renamed from drivers/mmc/host/bfin_sdh.c~blackfin-sd-host-controller-driver-fix +16 -12
@@ -53,7 +53,7 @@ struct dma_desc_array {unsigned short cfg;unsigned short x_count;short x_modify; -} __attribute__((packed)); +} __packed;struct sdh_host {struct mmc_host *mmc;
@@ -149,15 +149,17 @@ static int sdh_setup_data(struct sdh_hossdh_enable_stat_irq (host, (DAT_CRC_FAIL |DAT_TIME_OUT |DAT_END )); host->dma_len =dma_map_sg (mmc_dev (host->mmc), data->sg, data->sg_len, host->dma_dir);#if defined(CONFIG_BF54x) -int i; dma_cfg |=DMAFLOW_ARRAY |NDSIZE_5 |RESTART |WDSIZE_32 |DMAEN ; -for_each_sg (data->sg, sg, host->dma_len, i) { - host->sg_cpu[i].start_addr =sg_dma_address (sg); - host->sg_cpu[i].cfg = dma_cfg; - host->sg_cpu[i].x_count =sg_dma_len (sg) /4 ; - host->sg_cpu[i].x_modify =4 ; -dev_dbg (mmc_dev (host->mmc),"%d: start_addr:0x%lx, cfg:0x%x, x_count:0x%x,\ -x_modify:0x%x\n" , i, host->sg_cpu[i].start_addr, + { +int i; +for_each_sg (data->sg, sg, host->dma_len, i) { + host->sg_cpu[i].start_addr =sg_dma_address (sg); + host->sg_cpu[i].cfg = dma_cfg; + host->sg_cpu[i].x_count =sg_dma_len (sg) /4 ; + host->sg_cpu[i].x_modify =4 ; +dev_dbg (mmc_dev (host->mmc),"%d: start_addr:0x%lx, " +"cfg:0x%x, x_count:0x%x, x_modify:0x%x\n" , + i, host->sg_cpu[i].start_addr, host->sg_cpu[i].cfg, host->sg_cpu[i].x_count, host->sg_cpu[i].x_modify); }
@@ -205,8 +207,9 @@ static void sdh_start_cmd(struct sdh_hosif (cmd->flags &MMC_RSP_PRESENT ) { sdh_cmd |=CMD_RSP ; stat_mask |=CMD_RESP_END ; - }else + }else { stat_mask |=CMD_SENT ; + }if (cmd->flags &MMC_RSP_136 ) sdh_cmd |=CMD_L_RSP ;
@@ -304,8 +307,9 @@ static int sdh_data_done(struct sdh_hostif (host->mrq->stop) {sdh_stop_clock (host);sdh_start_cmd (host, host->mrq->stop); - }else + } else }sdh_finish_request (host, host->mrq); + }return 1 ; }
@@ -425,7 +429,7 @@ static irqreturn_t sdh_stat_irq(int irq, status =bfin_read_SDH_STATUS ();if (status & (CMD_SENT |CMD_RESP_END |CMD_TIME_OUT |CMD_CRC_FAIL )) { handled |=sdh_cmd_done (host, status); -bfin_write_SDH_STATUS_CLR (CMD_SENT_STAT |CMD_RESP_END_STAT | \ +bfin_write_SDH_STATUS_CLR (CMD_SENT_STAT |CMD_RESP_END_STAT | \CMD_TIMEOUT_STAT |CMD_CRC_FAIL_STAT );SSYNC (); }
_
Quoted 9 lines · Andrew Morton
Review
Quoted 6 lines · On Wed, 25 Nov 2009 23:19:50 +0800 cliffcai.sh wrote:
(quoted diff) +6
-0+struct dma_desc_array { + unsigned long start_addr; + unsigned short cfg; + unsigned short x_count; + short x_modify; +} __attribute__((packed));
__packedis preferred.
we should move this into the Blackfin dma.h at any rate
Quoted 15 lines
Quoted 15 lines
(quoted diff) +15
-0+static void sdh_start_cmd(struct sdh_host *host, struct mmc_command *cmd) +{ + unsigned int sdh_cmd; + unsigned int stat_mask; + + dev_dbg(mmc_dev(host->mmc), "%s enter cmd: 0x%p\n", __func__, cmd); + WARN_ON(host->cmd != NULL); + host->cmd = cmd; + + sdh_cmd = 0; + stat_mask = 0; + + sdh_cmd |= cmd->opcode; + + if (cmd->flags & MMC_RSP_PRESENT) {
Quoted 8 lines
Quoted 4 lines
+
sdh_cmd|=CMD_RSP;
+stat_mask|=CMD_RESP_END;
+ } else
+stat_mask|=CMD_SENT;Arguably wrong from a coding-style POV and looks weird IMO. Adds a bit of risk that subsequent coders will think they're writing in python adn will add bugs.
i dont really get what you're referring to here. the code in question looks ifne to me, and i dont see anything "python-esque" about it
Quoted 4 lines
Fixes:
- } else
+ } else }
guessing you actually meant '{' there
-mike
Quoted 11 lines · On Wed, 25 Nov 2009 17:25:20 -0500 Mike Frysinger <[email protected]> wrote:
Quoted 11 lines
Quoted 11 lines
(quoted diff) +11
-0+static void sdh_start_cmd(struct sdh_host *host, struct mmc_command *cmd) +{ + __ __ unsigned int sdh_cmd; + __ __ unsigned int stat_mask; + + __ __ dev_dbg(mmc_dev(host->mmc), "%s enter cmd: 0x%p\n", __func__, cmd); + __ __ WARN_ON(host->cmd != NULL); + __ __ host->cmd = cmd; + + __ __ sdh_cmd = 0; + __ __ stat_mask = 0;
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+ + __ __ sdh_cmd |= cmd->opcode; + + __ __ if (cmd->flags & MMC_RSP_PRESENT) { + __ __ __ __ __ __ sdh_cmd |= CMD_RSP; + __ __ __ __ __ __ stat_mask |= CMD_RESP_END; + __ __ } else + __ __ __ __ __ __ stat_mask |= CMD_SENT;
(ftso gmail)
Quoted 6 lines
Quoted 3 lines
Arguably wrong from a coding-style POV and looks weird IMO.
__Addsa bit of risk that subsequent coders will think they're writing in python adn will add bugs.i dont really get what you're referring to here. the code in question looks ifne to me, and i dont see anything "python-esque" about it
Code like
if (expr) {
line1;
line2;
} else
line3;looks odd and can cause people to later add bugs along the lines of
if (expr) {
line1;
line2;
} else
+ line3a;
line3;this is particularly the case if line3 is long, or is preceded by a comment. This has happened in the past.
Adding the missing braces reduces the risk that this will occur.
Quoted 25 lines · Andrew Morton
Quoted 6 lines · On Wed, 25 Nov 2009 17:25:20 -0500 Mike Frysinger wrote:
Quoted 3 lines
Arguably wrong from a coding-style POV and looks weird IMO.
__Addsa bit of risk that subsequent coders will think they're writing in python adn will add bugs.i dont really get what you're referring to here. the code in question looks ifne to me, and i dont see anything "python-esque" about it
Code like
if (expr) {
line1;
line2;
} else
line3;looks odd and can cause people to later add bugs along the lines of
if (expr) {
line1;
line2;
} else
+ line3a;
line3;
Quoted 4 lines
this is particularly the case if line3 is long, or is preceded by a comment. This has happened in the past.
Adding the missing braces reduces the risk that this will occur.
*shrug* people can screw up braces regardless of how many statements and/or branches there are. i doubt people are going to get confused and think kernel code is python, but if you really want to be pedantic about braces, doesnt matter that much to me.
-mike
Quoted 18 lines · Andrew Morton
drivers/mmc/host/bfin_sdh.c renamed from drivers/mmc/host/bfin_sdh.c~blackfin-sd-host-controller-driver-fix +3
-8@@ -149,15 +149,17 @@ static int sdh_setup_data(struct sdh_hos sdh_enable_stat_irq(host, (DAT_CRC_FAIL | DAT_TIME_OUT | DAT_END)); host->dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len, host->dma_dir); #if defined(CONFIG_BF54x) - int i; dma_cfg |= DMAFLOW_ARRAY | NDSIZE_5 | RESTART | WDSIZE_32 | DMAEN; - for_each_sg(data->sg, sg, host->dma_len, i) { - host->sg_cpu[i].start_addr = sg_dma_address(sg); - host->sg_cpu[i].cfg = dma_cfg; - host->sg_cpu[i].x_count = sg_dma_len(sg) / 4; - host->sg_cpu[i].x_modify = 4; - dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, cfg:0x%x, x_count:0x%x,\ - x_modify:0x%x\n", i, host->sg_cpu[i].start_addr, + { + int i; + for_each_sg(data->sg, sg, host->dma_len, i) {
drivers/mmc/host/bfin_sdh.c static int sdh_setup_data(struct sdh_hos · line 165
Quoted 10 lines
drivers/mmc/host/bfin_sdh.c renamed from drivers/mmc/host/bfin_sdh.c~blackfin-sd-host-controller-driver-fix +7
-0+ host->sg_cpu[i].start_addr = sg_dma_address(sg); + host->sg_cpu[i].cfg = dma_cfg; + host->sg_cpu[i].x_count = sg_dma_len(sg) / 4; + host->sg_cpu[i].x_modify = 4; + dev_dbg(mmc_dev(host->mmc), "%d: start_addr:0x%lx, " + "cfg:0x%x, x_count:0x%x, x_modify:0x%x\n", + i, host->sg_cpu[i].start_addr, host->sg_cpu[i].cfg, host->sg_cpu[i].x_count, host->sg_cpu[i].x_modify); }
this change also has an error in it ... the new opening brace brace stole the closing brace from the for_each_sg()
-mike