driver: sdio: fix bugs in write and configuration

1. the original sdio driver is not fully tested for multiple blocks
write, which has lots of bugs
2. the sdio configurations for emsdp and iotdk are not correct are not
correct.
3. code style cleanup

Signed-off-by: Wayne Ren <[email protected]>

Author: Wayne Ren

board/emsdp/drivers/ip/designware/sdio/dw_sdio_obj.c

@@ -91,7 +91,7 @@ static void dw_sdio_0_install(void)
 
 	dw_sdio_ctrl_ptr->reg_base = (void *) EMSDP_SDIO_BASE;
 	dw_sdio_ctrl_ptr->intno = EMSDP_SDIO_INTR;
-	dw_sdio_ctrl_ptr->ref_clk = 200000000;
+	dw_sdio_ctrl_ptr->ref_clk = EMSDP_REF_CLOCK;
 	dw_sdio_ctrl_ptr->fifo_depth = 128;
 
 	dw_sdio_ptr->open = dw_sdio_0_open;

board/iotdk/drivers/ip/designware/sdio/dw_sdio_obj.c

@@ -31,7 +31,6 @@
 #include "embARC_error.h"
 
 #include "iotdk_hardware.h"
-
 #include "ip/designware/sdio/dw_sdio.h"
 #include "dw_sdio_obj.h"
 
@@ -95,7 +94,7 @@ static void dw_sdio_0_install(void)
 
 	dw_sdio_ctrl_ptr->reg_base = (void *) BASE_ADDR_SDIO;
 	dw_sdio_ctrl_ptr->intno = INTNO_SDIO;
-	dw_sdio_ctrl_ptr->ref_clk = 100000000;
+	dw_sdio_ctrl_ptr->ref_clk = CLK_CPU;
 	dw_sdio_ctrl_ptr->fifo_depth = 128;
 
 	dw_sdio_ptr->open = dw_sdio_0_open;

board/iotdk/drivers/sysconf/sysconf.c

@@ -131,6 +131,8 @@ int32_t pll_fout_config(uint32_t freq)
 		eflash_clk_div(1);
 	}
 
+	sdio_clk_divisor(1);
+
 	return 0;
 }
 
@@ -204,7 +206,7 @@ void apb_clk_disable(uint8_t dev)
  */
 void sdio_clk_divisor(uint8_t div)
 {
-	sysconf_reg_ptr->SDIO_REFCLK_DIV;
+	sysconf_reg_ptr->SDIO_REFCLK_DIV = div;
 }
 
 

device/ip/designware/sdio/dw_sdio.c

@@ -27,7 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
 --------------------------------------------- */
-
 #include "embARC_toolchain.h"
 #include "embARC_error.h"
 #include "arc_exception.h"
@@ -60,7 +59,10 @@ Inline void dw_sdio_fifo_read_poll(DW_SDIO_CTRL_PTR sdio, uint32_t *buf, uint32_
 	uint32_t i;
 
 	while (size) {
-		len = dw_sdio_reg_read(sdio, DWSDIO_REG_STATUS);
+		do {
+			len = dw_sdio_reg_read(sdio, DWSDIO_REG_STATUS);
+		} while (len & DWSDIO_STATUS_FIFO_EMPTY);
+
 		len = (len & DWSDIO_STATUS_MASK_FIFO) >> DWSDIO_STATUS_BIT_FIFO;
 
 		len = min(size, len);
@@ -96,8 +98,11 @@ Inline void dw_sdio_fifo_write_poll(DW_SDIO_CTRL_PTR sdio, uint32_t *buf, uint32
 	uint32_t i;
 	uint32_t fifo_depth = sdio->fifo_depth;
 
- 	while (size) {
- 		len = dw_sdio_reg_read(sdio, DWSDIO_REG_STATUS);
+	while (size) {
+		do {
+			len = dw_sdio_reg_read(sdio, DWSDIO_REG_STATUS);
+		} while (len & DWSDIO_STATUS_FIFO_FULL);
+
 		len = fifo_depth - ((len & DWSDIO_STATUS_MASK_FIFO) >> DWSDIO_STATUS_BIT_FIFO);
 		len = min(size, len);
 
@@ -188,7 +193,6 @@ static int32_t dw_sdio_bus_freq_set(DW_SDIO_CTRL_PTR sdio, uint32_t card_number,
 	dw_sdio_reg_write(sdio, DWSDIO_REG_CLKSRC, 0);
 	dw_sdio_reg_write(sdio, DWSDIO_REG_CLKDIV, div);
 
-
 	dw_sdio_reg_write(sdio, DWSDIO_REG_CMD, DWSDIO_CMD_PRV_DAT_WAIT |
 			DWSDIO_CMD_UPD_CLK | DWSDIO_CMD_START |  DWSDIO_CMD_USE_HOLD_REG);
 
@@ -284,7 +288,6 @@ static int32_t dw_sdio_data_transfer_poll(DW_SDIO_CTRL_PTR sdio, SDIO_DATA_PTR d
 {
 	uint32_t size;
 	uint32_t status;
-	int32_t ret;
 	uint32_t timeout = 1000;
 	uint32_t start = OSP_GET_CUR_MS();
 
@@ -295,30 +298,28 @@ static int32_t dw_sdio_data_transfer_poll(DW_SDIO_CTRL_PTR sdio, SDIO_DATA_PTR d
 
 		if (status & (DWSDIO_INT_DATA_ERR | DWSDIO_INT_DATA_TMO)) {
 			DBG("%s:, data transfer error!\r\n", __func__);
-			ret = E_SYS;
-			break;
+			return E_SYS;
+		}
+
+		if (status & DWSDIO_INT_DTO) {
+			return E_OK;
 		}
 
-		if (data->flags == SDIO_DATA_READ && (status & DWSDIO_INT_RXDR)) {
+		if (data->flags == SDIO_DATA_READ && (status & DWSDIO_INT_RXDR) && size) {
 			dw_sdio_fifo_read_poll(sdio, (uint32_t *)data->in, size);
+			size = 0;
 			dw_sdio_reg_write(sdio, DWSDIO_REG_RINTSTS, DWSDIO_INT_RXDR);
-		} else if (data->flags == SDIO_DATA_WRITE && (status & DWSDIO_INT_TXDR)) {
+		} else if (data->flags == SDIO_DATA_WRITE && (status & DWSDIO_INT_TXDR) && size) {
 			dw_sdio_fifo_write_poll(sdio, (uint32_t *)data->out, size);
+			size = 0;
 			dw_sdio_reg_write(sdio, DWSDIO_REG_RINTSTS, DWSDIO_INT_TXDR);
 		}
 
-		if (status & DWSDIO_INT_DTO) {
-			ret = E_OK;
-			break;
-		}
-
 		if ((OSP_GET_CUR_MS() - start) > timeout) {
 			DBG("%s: timeout on data transfer\r\n", __func__);
 			return E_TMOUT;
 		}
 	}
-
-	return ret;
 }
 
 void dw_sdio_isr(DEV_SDIO *sdio_obj, void *ptr)
@@ -419,7 +420,6 @@ int32_t dw_sdio_cmd_poll(DEV_SDIO *sdio_obj, SDIO_CMD_PTR cmd, SDIO_DATA_PTR dat
 		return E_SYS;
 	}
 
-
 	if (cmd->resp_type & SDIO_RSP_PRESENT) {
 		if (cmd->resp_type & SDIO_RSP_136) {
 			cmd->resp[0] = dw_sdio_reg_read(sdio, DWSDIO_REG_RESP3);
@@ -509,9 +509,9 @@ int32_t dw_sdio_cd(DEV_SDIO *sdio_obj, uint32_t card_number)
 	 * Some use 0 (CD pin to GNU) to indicate card detect.
 	 */
 #ifdef DWSDIO_CARD_DETECT_HIGH_LEVEL
-	val = dw_sdio_reg_read(sdio,  DWSDIO_REG_CDETECT);
+	val = dw_sdio_reg_read(sdio, DWSDIO_REG_CDETECT);
 #else
-	val = ~dw_sdio_reg_read(sdio,  DWSDIO_REG_CDETECT);
+	val = ~dw_sdio_reg_read(sdio, DWSDIO_REG_CDETECT);
 #endif
 
 	if ((val & (1 << card_number)) == (1 << card_number)) {
@@ -523,13 +523,12 @@ int32_t dw_sdio_cd(DEV_SDIO *sdio_obj, uint32_t card_number)
 
 int32_t dw_sdio_wp(DEV_SDIO *sdio_obj, uint32_t card_number)
 {
-
 	uint32_t val;
 
 	DEV_SDIO_INFO_PTR sdio_info_ptr = &(sdio_obj->sdio_info);
 	DW_SDIO_CTRL_PTR sdio = (DW_SDIO_CTRL_PTR)sdio_info_ptr->sdio_ctrl;
 
-	val = dw_sdio_reg_read(sdio,  DWSDIO_REG_WRTPRT);
+	val = dw_sdio_reg_read(sdio, DWSDIO_REG_WRTPRT);
 
 	if ((val & (1 << card_number)) == (1 << card_number)) {
 		return 1; /* the specific card is write-protect */
@@ -554,8 +553,8 @@ int32_t dw_sdio_control(DEV_SDIO *sdio_obj, SDIO_CTRL_CMD_PTR ctrl_cmd, void *pa
 			dw_sdio_bus_type_set(sdio, card, (uint32_t)param);
 			break;
 		case SDIO_CMD_SET_BUS_FREQ:
-		 	dw_sdio_bus_freq_set(sdio, card, (uint32_t)param);
-		 	break;
+			dw_sdio_bus_freq_set(sdio, card, (uint32_t)param);
+			break;
 		/* \todo add more cmds */
 		default:
 			ret = E_PAR;

device/ip/designware/sdio/dw_sdio_hal.h

@@ -198,6 +198,8 @@
 
 
 #define DWSDIO_STATUS_BIT_FIFO	(17)
+#define DWSDIO_STATUS_FIFO_FULL (0x8)
+#define DWSDIO_STATUS_FIFO_EMPTY (0x4)
 #define DWSDIO_STATUS_MASK_FIFO (0x3ffe0000)
 
 /* status bit */
@@ -211,9 +213,8 @@
 #define DWSDIO_FIFOTH_BIT_DMA_M_SIZE 28
 #define DWSDIO_FIFOTH_MASK_DMA_M_SIZE  (0x7 << DWSDIO_FIFOTH_BIT_DMA_M_SIZE)
 #define DWSDIO_FIFOTH_M_SIZE(x)		((x) << DWSDIO_FIFOTH_BIT_DMA_M_SIZE)
-#define DWSDIO_FIFOTH_TX_WMASK(x) 	((x))
-#define DWSDIO_FIFOTH_RX_WMASK(x) 	((x) << DWSDIO_FIFOTH_BIT_RX_WMARK)
-
+#define DWSDIO_FIFOTH_TX_WMASK(x)	((x))
+#define DWSDIO_FIFOTH_RX_WMASK(x)	((x) << DWSDIO_FIFOTH_BIT_RX_WMARK)
 
 /* interrupt status bit */
 #define DWSDIO_INT_CAD		(0x1U)		//Card Detected
@@ -237,7 +238,6 @@
 				DWSDIO_INT_FRUN | DWSDIO_INT_DCRC)
 #define DWSDIO_INT_DATA_TMO	(DWSDIO_INT_DRTO | DWSDIO_INT_HTO)
 
-
-#define DWSDIO_ENUMERATION_FREQ 	(400000) /* 400 Khz for card enumeration */
+#define DWSDIO_ENUMERATION_FREQ	(400000) /* 400 Khz for card enumeration */
 
 #endif /* _DW_SDIO_HAL_H_ */

middleware/fatfs/source/diskdrv/ff_sdcard_sdio.c

@@ -483,7 +483,7 @@ static int32_t sdio_write_blocks(FS_SDCARD_SDIO_CTRL_PTR sd_dev, const void *buf
 		if (sd_dev->card_info.version & SDCARD_CT_SDC) {
 			cmd.cmdidx = CMD55;
 			cmd.resp_type = SDIO_RSP_R1;
-			cmd.arg = 0;
+			cmd.arg = sd_dev->card_info.rca << 16;;
 
 			ret = sd_host->cmd_poll(&cmd, NULL);
 
@@ -516,6 +516,19 @@ static int32_t sdio_write_blocks(FS_SDCARD_SDIO_CTRL_PTR sd_dev, const void *buf
 		return ret;
 	}
 
+	if (blkcnt > 1) {
+		cmd.cmdidx = CMD12;
+		cmd.arg = 0;
+		cmd.resp_type= SDIO_RSP_R1b;
+
+		ret = sd_host->cmd_poll(&cmd, NULL);
+		if (ret < 0 ) {
+			DBG("fail to send stop cmd\r\n");
+			return ret;
+		}
+	}
+
+
 	return blkcnt;
 }