Merge pull request #109 from IRISZZW/spi_cs_fix

spi cs fix and remove rw009 and esp_slip

Author: Wayne Ren

board/emsdp/drivers/ip/designware/spi/dw_spi_obj.c

@@ -44,6 +44,7 @@ static void dw_spi_0_isr(void *ptr);
 
 static DEV_SPI			dw_spi_0;			/*!< designware spi object */
 static DW_SPI_CTRL		dw_spi_0_ctrl;			/*!< designware spi 0 ctrl */
+static uint32_t dw_spi_0_cs_status;
 
 static int32_t dw_spi_0_open (uint32_t mode, uint32_t param)
 {
@@ -57,7 +58,17 @@ static int32_t dw_spi_0_close (void)
 
 static int32_t dw_spi_0_control (uint32_t ctrl_cmd, void *param)
 {
-	return dw_spi_control(&dw_spi_0, ctrl_cmd, param);
+	int32_t ercd;
+
+	ercd = dw_spi_control(&dw_spi_0, ctrl_cmd, param);
+
+	if (ctrl_cmd == SPI_CMD_MST_SEL_DEV) {
+		dw_spi_0_cs_status = cpu_lock_save();
+	} else if (ctrl_cmd == SPI_CMD_MST_DSEL_DEV) {
+		cpu_unlock_restore(dw_spi_0_cs_status);
+	}
+
+	return ercd;
 }
 
 static int32_t dw_spi_0_write (const void *data, uint32_t len)
@@ -137,7 +148,7 @@ static void dw_spi_1_isr(void *ptr);
 
 static DEV_SPI			dw_spi_1;			/*!< designware spi 1 object */
 static DW_SPI_CTRL		dw_spi_1_ctrl;			/*!< designware spi 1 ctrl */
-
+static uint32_t dw_spi_1_cs_status;
 
 static int32_t dw_spi_1_open (uint32_t mode, uint32_t param)
 {
@@ -151,7 +162,17 @@ static int32_t dw_spi_1_close (void)
 
 static int32_t dw_spi_1_control (uint32_t ctrl_cmd, void *param)
 {
-	return dw_spi_control(&dw_spi_1, ctrl_cmd, param);
+	int32_t ercd;
+
+	ercd = dw_spi_control(&dw_spi_1, ctrl_cmd, param);
+
+	if (ctrl_cmd == SPI_CMD_MST_SEL_DEV) {
+		dw_spi_1_cs_status = cpu_lock_save();
+	} else if (ctrl_cmd == SPI_CMD_MST_DSEL_DEV) {
+		cpu_unlock_restore(dw_spi_1_cs_status);
+	}
+
+	return ercd;
 }
 
 static int32_t dw_spi_1_write (const void *data, uint32_t len)

board/emsdp/drivers/pmwifi/pmwifi.c

@@ -45,7 +45,6 @@
 
 #include "pmwifi.h"
 
-// #define PMWIFI_CHECK_EXP(EXPR, ERROR_CODE)		CHECK_EXP(EXPR, ercd, ERROR_CODE, error_exit)
 
 #if (USE_EMSDP_RSWIFI_0)
 /** PMOD WIFI SPI FREQ & CLK MODE SETTINGS */
@@ -58,12 +57,9 @@
 #if defined(WIFI_RS9113)
 #include "rs9113_adapter.h"
 
-
 /* WF OPERATIONS */
 #define EMSDP_RSWIFI_0_TIMER_ID		TIMER_0
 
-#define EMSDP_RSWIFI_0_SPI_CPULOCK_ENABLE
-
 /** install wnic 0 to system */
 #define RSWIFI_0_NAME		"RS9113"
 #define RSWIFI_0_IFNAME0	'r'
@@ -78,7 +74,6 @@ const uint8_t  rswifi_0_mac_addr[WNIC_HDR_LEN] = {
 	EMSDP_RSWIFI_0_MAC_ADDR5
 };
 
-
 static int32_t rswifi_0_wnic_get_info(uint32_t cmd, void *rinfo)
 {
 	return rs9113_wnic_get_info(&rswifi_0_wnic, cmd, rinfo);
@@ -252,32 +247,32 @@ static void rswifi_0_install(void)
 	rswifi_wnic_on_ops_ptr->on_dev_asserted	= NULL;
 
 
-	rswifi_wnic_ptr->wnic_get_info 			= rswifi_0_wnic_get_info	;
-	rswifi_wnic_ptr->wnic_control			= rswifi_0_wnic_control		;
-	rswifi_wnic_ptr->wnic_init				= rswifi_0_wnic_init		;
-	rswifi_wnic_ptr->poll_init_status		= rswifi_0_poll_init_status	;
-	rswifi_wnic_ptr->poll_busy_status		= rswifi_0_poll_busy_status	;
-	rswifi_wnic_ptr->set_network_type		= rswifi_0_set_network_type	;
-	rswifi_wnic_ptr->set_macaddr			= rswifi_0_set_macaddr		;
-	rswifi_wnic_ptr->get_macaddr			= rswifi_0_get_macaddr		;
-	rswifi_wnic_ptr->start_scan				= rswifi_0_start_scan		;
-	rswifi_wnic_ptr->stop_scan				= rswifi_0_stop_scan		;
-	rswifi_wnic_ptr->poll_scan_status		= rswifi_0_poll_scan_status	;
+	rswifi_wnic_ptr->wnic_get_info 		= rswifi_0_wnic_get_info;
+	rswifi_wnic_ptr->wnic_control		= rswifi_0_wnic_control;
+	rswifi_wnic_ptr->wnic_init		= rswifi_0_wnic_init;
+	rswifi_wnic_ptr->poll_init_status	= rswifi_0_poll_init_status;
+	rswifi_wnic_ptr->poll_busy_status	= rswifi_0_poll_busy_status;
+	rswifi_wnic_ptr->set_network_type	= rswifi_0_set_network_type;
+	rswifi_wnic_ptr->set_macaddr		= rswifi_0_set_macaddr;
+	rswifi_wnic_ptr->get_macaddr		= rswifi_0_get_macaddr;
+	rswifi_wnic_ptr->start_scan		= rswifi_0_start_scan;
+	rswifi_wnic_ptr->stop_scan		= rswifi_0_stop_scan;
+	rswifi_wnic_ptr->poll_scan_status	= rswifi_0_poll_scan_status;
 	rswifi_wnic_ptr->get_scan_result_cnt	= rswifi_0_get_scan_result_cnt;
-	rswifi_wnic_ptr->get_scan_result 		= rswifi_0_get_scan_result	;
-	rswifi_wnic_ptr->wnic_connect			= rswifi_0_wnic_connect		;
-	rswifi_wnic_ptr->poll_conn_status		= rswifi_0_poll_conn_status	;
-	rswifi_wnic_ptr->wnic_disconnect		= rswifi_0_wnic_disconnect	;
-	rswifi_wnic_ptr->prepare_tx				= rswifi_0_prepare_tx		;
-	rswifi_wnic_ptr->add_tx_data			= rswifi_0_add_tx_data		;
-	rswifi_wnic_ptr->commit_tx				= rswifi_0_commit_tx		;
-	rswifi_wnic_ptr->prepare_rx				= rswifi_0_prepare_rx		;
-	rswifi_wnic_ptr->get_rx_data			= rswifi_0_get_rx_data		;
-	rswifi_wnic_ptr->accept_rx				= rswifi_0_accept_rx		;
-	rswifi_wnic_ptr->config_power_mode		= rswifi_0_config_power_mode;
-	rswifi_wnic_ptr->poll_power_mode		= rswifi_0_poll_power_mode	;
-	rswifi_wnic_ptr->wnic_reset				= rswifi_0_wnic_reset		;
-	rswifi_wnic_ptr->period_process			= rswifi_0_period_process	;
+	rswifi_wnic_ptr->get_scan_result 	= rswifi_0_get_scan_result;
+	rswifi_wnic_ptr->wnic_connect		= rswifi_0_wnic_connect;
+	rswifi_wnic_ptr->poll_conn_status	= rswifi_0_poll_conn_status;
+	rswifi_wnic_ptr->wnic_disconnect	= rswifi_0_wnic_disconnect;
+	rswifi_wnic_ptr->prepare_tx		= rswifi_0_prepare_tx;
+	rswifi_wnic_ptr->add_tx_data		= rswifi_0_add_tx_data;
+	rswifi_wnic_ptr->commit_tx		= rswifi_0_commit_tx;
+	rswifi_wnic_ptr->prepare_rx		= rswifi_0_prepare_rx;
+	rswifi_wnic_ptr->get_rx_data		= rswifi_0_get_rx_data;
+	rswifi_wnic_ptr->accept_rx		= rswifi_0_accept_rx;
+	rswifi_wnic_ptr->config_power_mode	= rswifi_0_config_power_mode;
+	rswifi_wnic_ptr->poll_power_mode	= rswifi_0_poll_power_mode;
+	rswifi_wnic_ptr->wnic_reset		= rswifi_0_wnic_reset;
+	rswifi_wnic_ptr->period_process		= rswifi_0_period_process;
 }
 
 #else /* WIFI_RSI */

board/emsk/drivers/ip/designware/spi/dw_spi_obj.c

@@ -75,8 +75,8 @@ static void dw_spi_0_isr(void *ptr);
 
 DEV_SPI			dw_spi_0;			/*!< designware spi object */
 DW_SPI_CTRL		dw_spi_0_ctrl;			/*!< designware spi 0 ctrl */
-#if HW_VERSION >= 22
-static uint32_t spi_mst_cs_ctrl_creg = 0;
+#if HW_VERSION < 22
+static uint32_t dw_spi_0_cs_status;
 #endif
 
 /** designware spi 0 open */
@@ -92,18 +92,22 @@ static int32_t dw_spi_0_close (void)
 /** designware spi 0 control */
 static int32_t dw_spi_0_control (uint32_t ctrl_cmd, void *param)
 {
-#if HW_VERSION >= 22
 	int32_t ercd;
 	ercd = dw_spi_control(&dw_spi_0, ctrl_cmd, param);
+#if HW_VERSION >= 22
 	if (ctrl_cmd == SPI_CMD_MST_SEL_DEV) {
-		_arc_write_uncached_32((void *)spi_mst_cs_ctrl_creg, 1 << ((uint32_t)param));
+		_arc_write_uncached_32((void *)(PERIPHERAL_BASE + REL_REGBASE_SPI_MST_CS_CTRL), 1 << ((uint32_t)param));
 	} else if (ctrl_cmd == SPI_CMD_MST_DSEL_DEV) {
-		_arc_write_uncached_32((void *)spi_mst_cs_ctrl_creg, 0);
+		_arc_write_uncached_32((void *)(PERIPHERAL_BASE + REL_REGBASE_SPI_MST_CS_CTRL), 0);
 	}
-	return ercd;
 #else
-	return dw_spi_control(&dw_spi_0, ctrl_cmd, param);
+	if (ctrl_cmd == SPI_CMD_MST_SEL_DEV) {
+		dw_spi_0_cs_status = cpu_lock_save();
+	} else if (ctrl_cmd == SPI_CMD_MST_DSEL_DEV) {
+		cpu_unlock_restore(dw_spi_0_cs_status);
+	}
 #endif
+	return ercd;
 }
 /** designware spi 0 write */
 static int32_t dw_spi_0_write (const void *data, uint32_t len)
@@ -134,10 +138,6 @@ static void dw_spi_0_install(void)
 	 */
 	spi_abs_base = (uint32_t)PERIPHERAL_BASE + DW_SPI_0_RELBASE;
 
-#if HW_VERSION >= 22
-	spi_mst_cs_ctrl_creg = spi_abs_base + REL_REGBASE_SPI_MST_CS_CTRL;
-#endif
-
 	dw_spi_reg_ptr = (DW_SPI_REG *)spi_abs_base;
 
 	/** spi info init */