mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] MMC: dw_mmc: PIO mode fixes
@ 2015-03-06 18:34 Andrey Panov
  2015-03-06 18:34 ` [PATCH 2/2] ARM: Rockchip: Update defconfig Andrey Panov
  2015-03-09 10:41 ` [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Andrey Panov @ 2015-03-06 18:34 UTC (permalink / raw)
  To: barebox

Simplify PIO mode routines.
Fix a bug when IO is possibly performed twice because of using old
interrupt status.
Support for slow-speed card writes.

Signed-off-by: Andrey Panov <rockford@yandex.ru>
---
 drivers/mci/dw_mmc.c | 129 ++++++++++++++++++++++-----------------------------
 1 file changed, 56 insertions(+), 73 deletions(-)

diff --git a/drivers/mci/dw_mmc.c b/drivers/mci/dw_mmc.c
index 076f99d..f8ceeba 100644
--- a/drivers/mci/dw_mmc.c
+++ b/drivers/mci/dw_mmc.c
@@ -320,44 +320,27 @@ static int dwmci_read_data_pio(struct dwmci_host *host, struct mci_data *data)
 {
 	u32 *pdata = (u32 *)data->dest;
 	u32 val, status, timeout;
-	u32 fcnt, bcnt, rcnt, rlen = 0;
-
-	timeout = 100;
-	status = dwmci_readl(host, DWMCI_RINTSTS);
-	while (--timeout && !(status & DWMCI_INTMSK_RXDR))
-		status = dwmci_readl(host, DWMCI_RINTSTS);
-
-	if (!timeout) {
-		dev_err(host->dev, "%s: RX ready wait timeout\n", __func__);
-		return 0;
-	}
-
-	fcnt = data->blocksize;
-	bcnt = data->blocks;
-
-	do {
-		for (rcnt = fcnt>>2; rcnt; rcnt--) {
-			timeout = 20000;
+	u32 rcnt, rlen = 0;
+
+	for (rcnt = (data->blocksize * data->blocks)>>2; rcnt; rcnt--) {
+		timeout = 20000;
+		status = dwmci_readl(host, DWMCI_STATUS);
+		while (--timeout
+		    && (status & DWMCI_STATUS_FIFO_EMPTY)) {
+			udelay(200);
 			status = dwmci_readl(host, DWMCI_STATUS);
-			while (--timeout
-			    && (status & DWMCI_STATUS_FIFO_EMPTY)) {
-				udelay(200);
-				status = dwmci_readl(host, DWMCI_STATUS);
-			}
-			if (!timeout) {
-				dev_err(host->dev, "%s: FIFO underflow timeout\n",
-				    __func__);
-				break;
-			}
-
-			val = dwmci_readl(host, DWMCI_DATA);
-
-			*pdata++ = val;
-			rlen += 4;
 		}
-		status = dwmci_readl(host, DWMCI_RINTSTS);
-		dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_RXDR);
-	} while (--bcnt && (status & DWMCI_INTMSK_RXDR));
+		if (!timeout) {
+			dev_err(host->dev, "%s: FIFO underflow timeout\n",
+			    __func__);
+			break;
+		}
+
+		val = dwmci_readl(host, DWMCI_DATA);
+		*pdata++ = val;
+		rlen += 4;
+	}
+	dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_RXDR);
 
 	return rlen;
 }
@@ -366,43 +349,39 @@ static int dwmci_write_data_pio(struct dwmci_host *host, struct mci_data *data)
 {
 	u32 *pdata = (u32 *)data->src;
 	u32 status, timeout;
-	u32 fcnt, bcnt, wcnt, wlen = 0;
-
-	fcnt = host->fifo_size_bytes;
-
-	bcnt = (data->blocks*data->blocksize)/fcnt;
-
-	timeout = 100;
-	status = dwmci_readl(host, DWMCI_RINTSTS);
-
-	while (--timeout && !(status & DWMCI_INTMSK_TXDR))
-		status = dwmci_readl(host, DWMCI_RINTSTS);
-
-	if (!timeout) {
-		dev_err(host->dev, "%s: TX ready wait timeout\n", __func__);
-		return 0;
-	}
-
-	do {
-		for (wcnt = fcnt>>2; wcnt; wcnt--) {
-			timeout = 20000;
+	u32 wcnt, wlen = 0;
+
+	for (wcnt = (data->blocksize * data->blocks)>>2; wcnt; wcnt--) {
+		timeout = 20000;
+		status = dwmci_readl(host, DWMCI_STATUS);
+		while (--timeout
+		    && (status & DWMCI_STATUS_FIFO_FULL)) {
+			udelay(200);
 			status = dwmci_readl(host, DWMCI_STATUS);
-			while (--timeout
-			    && (status & DWMCI_STATUS_FIFO_FULL)) {
-				udelay(200);
-				status = dwmci_readl(host, DWMCI_STATUS);
-			}
-			if (!timeout) {
-				dev_err(host->dev, "%s: FIFO overflow timeout\n",
-				    __func__);
-				break;
-			}
-			dwmci_writel(host, DWMCI_DATA, *pdata++);
-			wlen += 4;
 		}
-		status = dwmci_readl(host, DWMCI_RINTSTS);
-		dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_TXDR);
-	} while (--bcnt && (status & DWMCI_INTMSK_TXDR));
+		if (!timeout) {
+			dev_err(host->dev, "%s: FIFO overflow timeout\n",
+			    __func__);
+			break;
+		}
+		dwmci_writel(host, DWMCI_DATA, *pdata++);
+		wlen += 4;
+	}
+	dwmci_writel(host, DWMCI_RINTSTS, DWMCI_INTMSK_TXDR);
+
+	/* Wait for FIFO is flushed for slow-speed cards */
+	timeout = 20000;
+	status = dwmci_readl(host, DWMCI_STATUS);
+	while (--timeout
+	    && !(status & DWMCI_STATUS_FIFO_EMPTY)) {
+		udelay(10);
+		status = dwmci_readl(host, DWMCI_STATUS);
+	}
+	if (!timeout) {
+		dev_err(host->dev, "%s: FIFO flush timeout\n",
+		    __func__);
+		return -EIO;
+	}
 
 	return wlen;
 }
@@ -528,10 +507,14 @@ dwmci_cmd(struct mci_host *mci, struct mci_cmd *cmd, struct mci_data *data)
 				return -ETIMEDOUT;
 			}
 
-			if (dwmci_use_pio(host) && (mask & DWMCI_INTMSK_RXDR))
+			if (dwmci_use_pio(host) && (mask & DWMCI_INTMSK_RXDR)) {
 				dwmci_read_data_pio(host, data);
-			if (dwmci_use_pio(host) && (mask & DWMCI_INTMSK_TXDR))
+				mask = dwmci_readl(host, DWMCI_RINTSTS);
+			}
+			if (dwmci_use_pio(host) && (mask & DWMCI_INTMSK_TXDR)) {
 				dwmci_write_data_pio(host, data);
+				mask = dwmci_readl(host, DWMCI_RINTSTS);
+			}
 		} while (!(mask & DWMCI_INTMSK_DTO));
 
 		dwmci_writel(host, DWMCI_RINTSTS, mask);
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: Rockchip: Update defconfig
  2015-03-06 18:34 [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Andrey Panov
@ 2015-03-06 18:34 ` Andrey Panov
  2015-03-09 10:41 ` [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Andrey Panov @ 2015-03-06 18:34 UTC (permalink / raw)
  To: barebox

Signed-off-by: Andrey Panov <rockford@yandex.ru>
---
 arch/arm/configs/rockchip_defconfig | 92 +++++++++++++++++++++++++++----------
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 40442ac..e08699d 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -1,51 +1,80 @@
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_CACHE_L2X0=y
 CONFIG_MACH_RADXA_ROCK=y
 CONFIG_THUMB2_BAREBOX=y
-CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_ARM_BOARD_APPEND_ATAG=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
-CONFIG_MALLOC_SIZE=0x4000000
+CONFIG_TEXT_BASE=0x0
+CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
 CONFIG_RELOCATABLE=y
 CONFIG_PROMPT="radxa-rock:"
-CONFIG_LONGHELP=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
-CONFIG_PARTITION=y
+CONFIG_CONSOLE_ACTIVATE_NONE=y
+CONFIG_DEFAULT_COMPRESSION_LZO=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/radxa-rock/env"
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_TFTP=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_LOADB=y
-CONFIG_CMD_LOADY=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_DMESG=y
+CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MM=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTM_VERBOSE=y
+CONFIG_CMD_BOOTM_INITRD=y
+CONFIG_CMD_BOOTM_OFTREE=y
+CONFIG_CMD_BOOTM_OFTREE_UIMAGE=y
+CONFIG_CMD_BOOTM_AIMAGE=y
 CONFIG_CMD_BOOTZ=y
-CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_UIMAGE=y
 CONFIG_CMD_PARTITION=y
-CONFIG_CMD_GPIO=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_DEFAULTENV=y
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_MAGICVAR_HELP=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_FILETYPE=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_SHA1SUM=y
+CONFIG_CMD_SHA224SUM=y
+CONFIG_CMD_SHA256SUM=y
 CONFIG_CMD_UNCOMPRESS=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_LED=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_READF=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_HOST=y
 CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_MM=y
 CONFIG_CMD_CLK=y
+CONFIG_CMD_DETECT=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
+CONFIG_NET_NFS=y
+CONFIG_NET_NETCONSOLE=y
 CONFIG_OFDEVICE=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_DRIVER_SERIAL_NS16550=y
@@ -53,8 +82,21 @@ CONFIG_DRIVER_NET_ARC_EMAC=y
 CONFIG_SMSC_PHY=y
 CONFIG_I2C=y
 CONFIG_I2C_GPIO=y
+CONFIG_MCI=y
+CONFIG_MCI_STARTUP=y
+CONFIG_MCI_MMC_BOOT_PARTITIONS=y
+CONFIG_MCI_DW=y
+CONFIG_MCI_DW_PIO=y
 CONFIG_MFD_ACT8846=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_LED_GPIO_OF=y
+CONFIG_GENERIC_PHY=y
+CONFIG_FS_CRAMFS=y
+CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
+CONFIG_FS_NFS=y
+CONFIG_FS_FAT=y
+CONFIG_FS_BPKFS=y
+CONFIG_FS_UIMAGEFS=y
+CONFIG_LZO_DECOMPRESS=y
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] MMC: dw_mmc: PIO mode fixes
  2015-03-06 18:34 [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Andrey Panov
  2015-03-06 18:34 ` [PATCH 2/2] ARM: Rockchip: Update defconfig Andrey Panov
@ 2015-03-09 10:41 ` Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2015-03-09 10:41 UTC (permalink / raw)
  To: Andrey Panov; +Cc: barebox

On Fri, Mar 06, 2015 at 09:34:21PM +0300, Andrey Panov wrote:
> Simplify PIO mode routines.
> Fix a bug when IO is possibly performed twice because of using old
> interrupt status.
> Support for slow-speed card writes.
> 
> Signed-off-by: Andrey Panov <rockford@yandex.ru>
> ---
>  drivers/mci/dw_mmc.c | 129 ++++++++++++++++++++++-----------------------------
>  1 file changed, 56 insertions(+), 73 deletions(-)

Applied both, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-09 10:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-06 18:34 [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Andrey Panov
2015-03-06 18:34 ` [PATCH 2/2] ARM: Rockchip: Update defconfig Andrey Panov
2015-03-09 10:41 ` [PATCH 1/2] MMC: dw_mmc: PIO mode fixes Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox