board: emsdp: fix spi byte loss issue in redpine wifi

adjust spi clk config,the old value may be too fast

Signed-off-by: Yuguo Zou <[email protected]>

Author: YuguoWH

board/emsdp/drivers/ip/subsystem/spi/dfss_spi_obj.c

@@ -55,7 +55,7 @@ static SS_SPI_MASTER_DEV_CONTEXT spi_master_context0 = {
 	IO_SPI_MST0_INT_TX_REQ,
 	IO_SPI_MST0_INT_IDLE,
 	IO_SPI_MST0_INT_ERR,
-	BOARD_SPI_FREQ,
+	EMSDP_SPI_REF_CLOCK,
 	0,
 	spi_rx_cb0,
 	spi_tx_cb0,
@@ -110,7 +110,7 @@ static void dfss_spi_0_install(void)
 	spi_master_context0.info = info;
 	/** spi info init */
 	info->status = DEV_DISABLED;
-	info->freq = 2000000;
+	info->freq = 1000000;
 	info->opn_cnt = 0;
 	info->mode = DEV_MASTER_MODE;
 	info->clk_mode = SPI_CLK_MODE_DEFAULT;
@@ -143,7 +143,7 @@ static SS_SPI_MASTER_DEV_CONTEXT spi_master_context1 = {
 	IO_SPI_MST1_INT_TX_REQ,
 	IO_SPI_MST1_INT_IDLE,
 	IO_SPI_MST1_INT_ERR,
-	BOARD_SPI_FREQ,
+	EMSDP_SPI_REF_CLOCK,
 	0,
 	spi_rx_cb1,
 	spi_tx_cb1,
@@ -198,7 +198,7 @@ static void dfss_spi_1_install(void)
 	spi_master_context1.info = info;
 	/** spi info init */
 	info->status = DEV_DISABLED;
-	info->freq = 2000000;
+	info->freq = 1000000;
 	info->opn_cnt = 0;
 	info->mode = DEV_MASTER_MODE;
 	info->clk_mode = SPI_CLK_MODE_DEFAULT;
@@ -232,7 +232,7 @@ static SS_SPI_MASTER_DEV_CONTEXT spi_master_context2 = {
 	IO_SPI_MST2_INT_TX_REQ,
 	IO_SPI_MST2_INT_IDLE,
 	IO_SPI_MST2_INT_ERR,
-	BOARD_SPI_FREQ,
+	EMSDP_SPI_REF_CLOCK,
 	0,
 	spi_rx_cb2,
 	spi_tx_cb2,

board/emsdp/emsdp.h

@@ -59,8 +59,10 @@
 #define BOARD_CONSOLE_UART_ID			DW_UART_0_ID
 #define BOARD_CONSOLE_UART_BAUD			UART_BAUDRATE_115200
 
+
 #ifndef BOARD_SPI_FREQ
-#define BOARD_SPI_FREQ					EMSDP_SPI_REF_CLOCK
+/* SPI bus working frequency, this value is not EMSDP_SPI_REF_CLOCK */
+#define BOARD_SPI_FREQ					(1000000)
 #endif
 #define BOARD_RSI_SPI_ID				DW_SPI_0_ID
 #define BOARD_RSI_SPI_CS				0

device/peripheral/wifi/rs9113/hal/rsi_hal_mcu_spi.c

@@ -26,30 +26,15 @@
 #include "dev_spi.h"
 #include "board.h"
 #include "embARC_error.h"
+//#define DEBUG
 #include "embARC_debug.h"
+#include "arc_exception.h"
 
 /**
  * Global Variables
  */
 #define RSI_CHECK_EXP(EXPR, ERROR_CODE)		CHECK_EXP(EXPR, ercd, ERROR_CODE, error_exit)
 
-// int32_t rsi_spi_open(uint32_t freq, uint32_t clk_mode)
-// {
-// 	int32_t ercd = E_OK;
-// 	DEV_SPI_PTR rsi_spi_ptr;
-
-// 	rsi_spi_ptr = spi_get_dev(BOARD_RSI_SPI_ID);
-// 	RSI_CHECK_EXP(rsi_spi_ptr != NULL, E_OBJ);
-
-// 	DBG("rsi_spi_open DEV_MASTER_MODE= 0x%x (%d),freq= 0x%x (%d) \r\n", DEV_MASTER_MODE, DEV_MASTER_MODE, freq, freq);
-// 	ercd = rsi_spi_ptr->spi_open(DEV_MASTER_MODE, freq);
-// 	if ((ercd == E_OPNED) || (ercd == E_OK)) {
-// 		ercd = rsi_spi_ptr->spi_control(SPI_CMD_SET_CLK_MODE, CONV2VOID(clk_mode));
-// 	}
-// error_exit:
-// 	return ercd;
-// }
-
 int32_t rsi_spi_close(void)
 {
 	int32_t ercd = E_OK;
@@ -76,56 +61,27 @@ int32_t rsi_spi_close(void)
  * @section description
  * This API is used to tranfer/receive data to the Wi-Fi module through the SPI interface.
  */
-int16_t rsi_spi_transfer(uint8_t *tx_buff, uint8_t *rx_buff, uint16_t transfer_length,uint8_t mode)
+int16_t rsi_spi_transfer(uint8_t *tx_buff, uint8_t *rx_buff, uint16_t transfer_length, uint8_t mode)
 {
 	int32_t ercd = E_OK;
-	uint32_t tx_cnt = transfer_length;
-	uint32_t rx_cnt = transfer_length;
 	uint32_t cs_line = BOARD_RSI_SPI_CS;
 	DEV_SPI_PTR rsi_spi_ptr = spi_get_dev(BOARD_RSI_SPI_ID);
 	RSI_CHECK_EXP(rsi_spi_ptr != NULL, E_OBJ);
 
 	if(mode != RSI_MODE_8BIT){
 		DBG("rsi_spi_transfer mode = %d\r\n", mode);
 	}
-	if(tx_buff == NULL){
-		tx_cnt = 0;
-	}
-	if(rx_buff == NULL){
-		rx_cnt = 0;
-	}
-	// //! Assert the chip select pin
-	// rsi_spi_cs(1);
-
-	// for(i=0; i<transfer_length; i++)
-	// {
-	// 	//! Transfer the data
-	// 	if(tx_buff!=NULL){
-	// 		ercd = rsi_spi_ptr -> spi_write(tx_buff+i, 1);
-	// 		RSI_CHECK_EXP(ercd >= E_OK, ercd);
-	// 	} else {
-	// 		//tx_buff is NULL, send dummy data instead
-	// 		ercd = rsi_spi_ptr -> spi_write(0x00, 1);
-	// 	}
-	// 	//! Receive the data
-	// 	if(rx_buff!=NULL){
-	// 		ercd = rsi_spi_ptr -> spi_read(rx_buff+i, 1);
-	// 		RSI_CHECK_EXP(ercd >= E_OK, ercd);
-	// 	}
-	// }
-
-	// //! Deassert the chip select pin
-	// rsi_spi_cs(0);
-	// ercd = E_OK;
 
 	DEV_SPI_TRANSFER spi_xfer;
 	/* Master and Slave transmit */
-	DEV_SPI_XFER_SET_TXBUF(&spi_xfer, tx_buff, 0, tx_cnt);
-	DEV_SPI_XFER_SET_RXBUF(&spi_xfer, rx_buff, 0, rx_cnt);
+	DEV_SPI_XFER_SET_TXBUF(&spi_xfer, tx_buff, 0, (tx_buff == NULL) ? 0 : transfer_length);
+	DEV_SPI_XFER_SET_RXBUF(&spi_xfer, rx_buff, 0, (rx_buff == NULL) ? 0 : transfer_length);
 	DEV_SPI_XFER_SET_NEXT(&spi_xfer, NULL);
 
 	ercd = rsi_spi_ptr->spi_control(SPI_CMD_MST_SEL_DEV, CONV2VOID(cs_line));
+	uint32_t status = cpu_lock_save();
 	ercd = rsi_spi_ptr->spi_control(SPI_CMD_TRANSFER_POLLING, CONV2VOID(&spi_xfer));
+	cpu_unlock_restore(status);
 	ercd = rsi_spi_ptr->spi_control(SPI_CMD_MST_DSEL_DEV, CONV2VOID(cs_line));
 
 error_exit:

device/peripheral/wifi/rs9113/rs9113_adapter.c

@@ -164,7 +164,7 @@ int32_t rs9113_wnic_init(DEV_WNIC_PTR rs9113_wnic, uint32_t network_type)
 	rs9113_info->network_type = network_type; /* set network type used next */
 	rswifi_if_ptr = (WIFI_IF_PTR)(rs9113_info->extra);
 
-	ercd = _rs9113_spi_open(BOARD_SPI_FREQ, SPI_CLK_MODE_0);
+	ercd = _rs9113_spi_open(10000000, SPI_CLK_MODE_0);
 	dbg_printf(DBG_MORE_INFO, "_rs9113_spi_open return 0x%x\r\n", ercd);
 	RS9113_CHECK_EXP(ercd == E_OK, E_SYS);
 	//! Driver initialization