Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some fixes to MR comments

Browse source
This commit is contained in:
Jeroen Domburg 2017-02-21 17:18:47 +08:00
parent b3a526536c
commit 84b728e7fd
5 changed files with 201 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esp32/cpu_start.c
View file

@ -283,8 +283,6 @@ void start_cpu0_default(void)
vTaskStartScheduler(); vTaskStartScheduler();
} }
#if !CONFIG_FREERTOS_UNICORE #if !CONFIG_FREERTOS_UNICORE
void start_cpu1_default(void) void start_cpu1_default(void)
{ {

6
components/esp32/include/esp_psram.h
View file

@ -19,9 +19,9 @@
#include "esp_err.h" #include "esp_err.h"
typedef enum { typedef enum {
PSRAM_CACHE_F80M_S40M = 0, //DO NOT USE FOR NOW PSRAM_CACHE_F80M_S40M = 0, ///< DO NOT USE FOR NOW
PSRAM_CACHE_F40M_S40M, //SUPPORTED PSRAM_CACHE_F40M_S40M, ///< SUPPORTED
PSRAM_CACHE_F80M_S80M, //DO NOT USE FOR NOW PSRAM_CACHE_F80M_S80M, ///< DO NOT USE FOR NOW
PSRAM_CACHE_MAX, PSRAM_CACHE_MAX,
} psram_cache_mode_t; } psram_cache_mode_t;

251
components/esp32/psram.c
View file

@ -27,7 +27,9 @@
#include "string.h" #include "string.h"
#include "rom/spi_flash.h" #include "rom/spi_flash.h"
#include "esp_err.h" #include "esp_err.h"
#incl;ude "rom/cache.h"
//Commands for PSRAM chip
#define PSRAM_READ 0x03 #define PSRAM_READ 0x03
#define PSRAM_FAST_READ 0x0B #define PSRAM_FAST_READ 0x0B
#define PSRAM_FAST_READ_QUAD 0xEB #define PSRAM_FAST_READ_QUAD 0xEB
@ -47,8 +49,7 @@ typedef enum {
PSRAM_SPI_MAX , PSRAM_SPI_MAX ,
} psram_spi_num_t; } psram_spi_num_t;
static psram_cache_mode_t g_PsramMode = PSRAM_CACHE_MAX; static psram_cache_mode_t s_psram_mode = PSRAM_CACHE_MAX;
extern void Cache_Flush(int);
//For now, we only use F40M + S40M, and we don't have to go through gpio matrix //For now, we only use F40M + S40M, and we don't have to go through gpio matrix
#define GPIO_MATRIX_FOR_40M 0 #define GPIO_MATRIX_FOR_40M 0
@ -85,34 +86,34 @@ static void psram_clear_spi_fifo(psram_spi_num_t spiNum)
//set basic SPI write mode //set basic SPI write mode
static void psram_set_basic_write_mode(psram_spi_num_t spiNum) static void psram_set_basic_write_mode(psram_spi_num_t spiNum)
{ {
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QIO); //F WRITE QIO CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QIO);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DIO); //F WRITE DIO CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DIO);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QUAD); //F WRITE QUAD CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QUAD);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DUAL); //F WRITE DUAL CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DUAL);
} }
//set QPI write mode //set QPI write mode
static void psram_set_qio_write_mode(psram_spi_num_t spiNum) static void psram_set_qio_write_mode(psram_spi_num_t spiNum)
{ {
SET_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QIO); //F WRITE QIO SET_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QIO);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DIO); //F WRITE DIO CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DIO);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QUAD); //F WRITE QUAD CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_QUAD);
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DUAL); //F WRITE DUAL CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum),SPI_FWRITE_DUAL);
} }
//set QPI read mode //set QPI read mode
static void psram_set_qio_read_mode(psram_spi_num_t spiNum) static void psram_set_qio_read_mode(psram_spi_num_t spiNum)
{ {
SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QIO); //f read qio SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QIO);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QUAD); //f read quad CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QUAD);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DUAL); //f read dual CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DUAL);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DIO); //f read dio CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DIO);
} }
//set SPI read mode //set SPI read mode
static void psram_set_basic_read_mode(psram_spi_num_t spiNum) static void psram_set_basic_read_mode(psram_spi_num_t spiNum)
{ {
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QIO); //f read qio CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QIO);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QUAD); //f read quad CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_QUAD);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DUAL); //f read dual CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DUAL);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DIO); //f read dio CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum),SPI_FREAD_DIO);
} }
//start sending and wait for finishing //start sending and wait for finishing
@ -122,8 +123,8 @@ static IRAM_ATTR void psram_cmd_start(psram_spi_num_t spiNum, psram_cmd_mode_t c
CLEAR_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS1_DIS_M); CLEAR_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS1_DIS_M);
SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS0_DIS_M); SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS0_DIS_M);
uint32_t wr_mode_bkp = (READ_PERI_REG(SPI_USER_REG(spiNum)) >> SPI_FWRITE_DUAL_S) & 0xf; uint32_t wr_mode_backup = (READ_PERI_REG(SPI_USER_REG(spiNum)) >> SPI_FWRITE_DUAL_S) & 0xf;
uint32_t rd_mode_bkp = READ_PERI_REG(SPI_CTRL_REG(spiNum)) & (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M); uint32_t rd_mode_backup = READ_PERI_REG(SPI_CTRL_REG(spiNum)) & (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M);
if(cmd_mode == PSRAM_CMD_SPI) { if(cmd_mode == PSRAM_CMD_SPI) {
psram_set_basic_write_mode(spiNum); psram_set_basic_write_mode(spiNum);
psram_set_basic_read_mode(spiNum); psram_set_basic_read_mode(spiNum);
@ -146,9 +147,9 @@ static IRAM_ATTR void psram_cmd_start(psram_spi_num_t spiNum, psram_cmd_mode_t c
CLEAR_PERI_REG_MASK( DPORT_HOST_INF_SEL_REG, 1<<14); CLEAR_PERI_REG_MASK( DPORT_HOST_INF_SEL_REG, 1<<14);
//recover spi mode //recover spi mode
SET_PERI_REG_BITS(SPI_USER_REG(spiNum), 0xf, wr_mode_bkp, SPI_FWRITE_DUAL_S); SET_PERI_REG_BITS(SPI_USER_REG(spiNum), 0xf, wr_mode_backup, SPI_FWRITE_DUAL_S);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum), (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M)); CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum), (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M));
SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum), rd_mode_bkp); SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum), rd_mode_backup);
//return cs to cs0 //return cs to cs0
SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1),SPI_CS1_DIS_M); SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1),SPI_CS1_DIS_M);
@ -162,8 +163,8 @@ static void IRAM_ATTR psram_recv_start(psram_spi_num_t spiNum,uint32_t* pRxData,
CLEAR_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS1_DIS_M); CLEAR_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS1_DIS_M);
SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS0_DIS_M); SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1), SPI_CS0_DIS_M);
uint32_t cmd_mode_bkp = (READ_PERI_REG(SPI_USER_REG(spiNum)) >> SPI_FWRITE_DUAL_S) & 0xf; uint32_t cmd_mode_backup = (READ_PERI_REG(SPI_USER_REG(spiNum)) >> SPI_FWRITE_DUAL_S) & 0xf;
uint32_t rd_mode_bkp = READ_PERI_REG(SPI_CTRL_REG(spiNum)) & (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M); uint32_t rd_mode_backup = READ_PERI_REG(SPI_CTRL_REG(spiNum)) & (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M);
if(cmd_mode == PSRAM_CMD_SPI) { if(cmd_mode == PSRAM_CMD_SPI) {
psram_set_basic_write_mode(spiNum); psram_set_basic_write_mode(spiNum);
psram_set_basic_read_mode(spiNum); psram_set_basic_read_mode(spiNum);
@ -186,9 +187,9 @@ static void IRAM_ATTR psram_recv_start(psram_spi_num_t spiNum,uint32_t* pRxData,
CLEAR_PERI_REG_MASK( DPORT_HOST_INF_SEL_REG, 1<<14); CLEAR_PERI_REG_MASK( DPORT_HOST_INF_SEL_REG, 1<<14);
//recover spi mode //recover spi mode
SET_PERI_REG_BITS(SPI_USER_REG(spiNum), 0xf, cmd_mode_bkp, SPI_FWRITE_DUAL_S); SET_PERI_REG_BITS(SPI_USER_REG(spiNum), PI_FWRITE_DUAL_M, cmd_mode_backup, SPI_FWRITE_DUAL_S);
CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum), (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M)); CLEAR_PERI_REG_MASK(SPI_CTRL_REG(spiNum), (SPI_FREAD_DIO_M|SPI_FREAD_DUAL_M|SPI_FREAD_QUAD_M|SPI_FREAD_QIO_M));
SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum), rd_mode_bkp); SET_PERI_REG_MASK(SPI_CTRL_REG(spiNum), rd_mode_backup);
//return cs to cs0 //return cs to cs0
SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1),SPI_CS1_DIS_M); SET_PERI_REG_MASK(SPI_PIN_REG(PSRAM_SPI_1),SPI_CS1_DIS_M);
@ -228,13 +229,13 @@ static int psram_cmd_config(psram_spi_num_t spiNum, psram_cmd_t* pInData)
//SET_PERI_REG_BITS(SPI_ADDR_REG(spiNum), SPI_USR_ADDR_VALUE, *pInData->addr, SPI_USR_ADDR_VALUE_S); //SET_PERI_REG_BITS(SPI_ADDR_REG(spiNum), SPI_USR_ADDR_VALUE, *pInData->addr, SPI_USR_ADDR_VALUE_S);
WRITE_PERI_REG(SPI_ADDR_REG(spiNum), *pInData->addr); WRITE_PERI_REG(SPI_ADDR_REG(spiNum), *pInData->addr);
} else{ } else {
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_ADDR); CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_ADDR);
SET_PERI_REG_BITS(SPI_USER1_REG(spiNum), SPI_USR_ADDR_BITLEN,0, SPI_USR_ADDR_BITLEN_S); SET_PERI_REG_BITS(SPI_USER1_REG(spiNum), SPI_USR_ADDR_BITLEN,0, SPI_USR_ADDR_BITLEN_S);
} }
// Set data by user. // Set data by user.
uint32_t* pTxVal = pInData->txData; uint32_t* pTxVal = pInData->txData;
if (pInData->txDataBitLen != 0 ) { if ( pInData->txDataBitLen != 0 ) {
// Enable MOSI // Enable MOSI
SET_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MOSI); SET_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MOSI);
// Load send buffer // Load send buffer
@ -251,7 +252,7 @@ static int psram_cmd_config(psram_spi_num_t spiNum, psram_cmd_t* pInData)
SET_PERI_REG_BITS(SPI_MOSI_DLEN_REG(spiNum), SPI_USR_MOSI_DBITLEN,0, SPI_USR_MOSI_DBITLEN_S); SET_PERI_REG_BITS(SPI_MOSI_DLEN_REG(spiNum), SPI_USR_MOSI_DBITLEN,0, SPI_USR_MOSI_DBITLEN_S);
} }
// Set rx data by user. // Set rx data by user.
if (pInData->rxDataBitLen != 0 ) { if ( pInData->rxDataBitLen != 0 ) {
// Enable MOSI // Enable MOSI
SET_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MISO); SET_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MISO);
// Set data send buffer length.Max data length 64 bytes. // Set data send buffer length.Max data length 64 bytes.
@ -260,10 +261,10 @@ static int psram_cmd_config(psram_spi_num_t spiNum, psram_cmd_t* pInData)
CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MISO); CLEAR_PERI_REG_MASK(SPI_USER_REG(spiNum), SPI_USR_MISO);
SET_PERI_REG_BITS(SPI_MISO_DLEN_REG(spiNum), SPI_USR_MISO_DBITLEN, 0, SPI_USR_MISO_DBITLEN_S); SET_PERI_REG_BITS(SPI_MISO_DLEN_REG(spiNum), SPI_USR_MISO_DBITLEN, 0, SPI_USR_MISO_DBITLEN_S);
} }
if(pInData->dummyBitLen != 0){ if( pInData->dummyBitLen != 0 ){
SET_PERI_REG_MASK(SPI_USER_REG(PSRAM_SPI_1),SPI_USR_DUMMY); // dummy en SET_PERI_REG_MASK(SPI_USER_REG(PSRAM_SPI_1),SPI_USR_DUMMY); // dummy en
SET_PERI_REG_BITS(SPI_USER1_REG(PSRAM_SPI_1),SPI_USR_DUMMY_CYCLELEN_V,pInData->dummyBitLen-1,SPI_USR_DUMMY_CYCLELEN_S); //DUMMY SET_PERI_REG_BITS(SPI_USER1_REG(PSRAM_SPI_1),SPI_USR_DUMMY_CYCLELEN_V,pInData->dummyBitLen-1,SPI_USR_DUMMY_CYCLELEN_S); //DUMMY
}else{ } else {
CLEAR_PERI_REG_MASK(SPI_USER_REG(PSRAM_SPI_1),SPI_USR_DUMMY); // dummy en CLEAR_PERI_REG_MASK(SPI_USER_REG(PSRAM_SPI_1),SPI_USR_DUMMY); // dummy en
SET_PERI_REG_BITS(SPI_USER1_REG(PSRAM_SPI_1),SPI_USR_DUMMY_CYCLELEN_V,0,SPI_USR_DUMMY_CYCLELEN_S); //DUMMY SET_PERI_REG_BITS(SPI_USER1_REG(PSRAM_SPI_1),SPI_USR_DUMMY_CYCLELEN_V,0,SPI_USR_DUMMY_CYCLELEN_S); //DUMMY
} }
@ -277,54 +278,54 @@ static int psram_cmd_config(psram_spi_num_t spiNum, psram_cmd_t* pInData)
static void psram_dma_cmd_write_config(uint32_t dst, uint32_t len, uint32_t dummy_bits) static void psram_dma_cmd_write_config(uint32_t dst, uint32_t len, uint32_t dummy_bits)
{ {
uint32_t addr = (PSRAM_QUAD_WRITE << 24) | dst; uint32_t addr = (PSRAM_QUAD_WRITE << 24) | dst;
psram_cmd_t pDat; psram_cmd_t ps_cmd;
switch(g_PsramMode) { switch(s_psram_mode) {
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
pDat.cmdBitLen = 0; ps_cmd.cmdBitLen = 0;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
pDat.cmdBitLen = 2; ps_cmd.cmdBitLen = 2;
break; break;
} }
pDat.cmd = 0; ps_cmd.cmd = 0;
pDat.addr = &addr; ps_cmd.addr = &addr;
pDat.addrBitLen = 32; ps_cmd.addrBitLen = 32;
pDat.txData = NULL; ps_cmd.txData = NULL;
pDat.txDataBitLen = len * 8; ps_cmd.txDataBitLen = len * 8;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.rxDataBitLen = 0; ps_cmd.rxDataBitLen = 0;
pDat.dummyBitLen = dummy_bits; ps_cmd.dummyBitLen = dummy_bits;
psram_cmd_config(PSRAM_SPI_1, &pDat); psram_cmd_config(PSRAM_SPI_1, &ps_cmd);
} }
static void psram_dma_qio_read_config(psram_spi_num_t spiNum, uint32_t src, uint32_t len) static void psram_dma_qio_read_config(psram_spi_num_t spiNum, uint32_t src, uint32_t len)
{ {
uint32_t addr = (PSRAM_FAST_READ_QUAD <<24) | src; uint32_t addr = (PSRAM_FAST_READ_QUAD <<24) | src;
uint32_t dummy_bits = 0; uint32_t dummy_bits = 0;
psram_cmd_t pDat; psram_cmd_t ps_cmd;
switch(g_PsramMode){ switch(s_psram_mode){
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
dummy_bits = 6+extra_dummy; dummy_bits = 6+extra_dummy;
pDat.cmdBitLen = 0; ps_cmd.cmdBitLen = 0;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
dummy_bits = 6+extra_dummy; dummy_bits = 6+extra_dummy;
pDat.cmdBitLen = 2; ps_cmd.cmdBitLen = 2;
break; break;
} }
pDat.cmd = 0; ps_cmd.cmd = 0;
pDat.addr = &addr; ps_cmd.addr = &addr;
pDat.addrBitLen = 4*8; ps_cmd.addrBitLen = 4*8;
pDat.txDataBitLen = 0; ps_cmd.txDataBitLen = 0;
pDat.txData = NULL; ps_cmd.txData = NULL;
pDat.rxDataBitLen = len*8 ; ps_cmd.rxDataBitLen = len*8 ;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.dummyBitLen = dummy_bits; ps_cmd.dummyBitLen = dummy_bits;
psram_cmd_config(spiNum,&pDat); psram_cmd_config(spiNum,&ps_cmd);
// psram_clear_spi_fifo(spiNum); // psram_clear_spi_fifo(spiNum);
} }
@ -333,27 +334,27 @@ static void psram_dma_qio_read_config(psram_spi_num_t spiNum, uint32_t src, uint
//but they sent us a correction doc and told us it is 32 bytes for these samples //but they sent us a correction doc and told us it is 32 bytes for these samples
static void psram_set_burst_length(psram_spi_num_t spiNum) static void psram_set_burst_length(psram_spi_num_t spiNum)
{ {
psram_cmd_t pDat; psram_cmd_t ps_cmd;
switch(g_PsramMode){ switch(s_psram_mode){
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
pDat.cmd = 0xC0; ps_cmd.cmd = 0xC0;
pDat.cmdBitLen = 8; ps_cmd.cmdBitLen = 8;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
pDat.cmd = 0x0030; ps_cmd.cmd = 0x0030;
pDat.cmdBitLen = 10; ps_cmd.cmdBitLen = 10;
break; break;
} }
pDat.addr = 0; ps_cmd.addr = 0;
pDat.addrBitLen = 0; ps_cmd.addrBitLen = 0;
pDat.txData = NULL; ps_cmd.txData = NULL;
pDat.txDataBitLen = 0; ps_cmd.txDataBitLen = 0;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.rxDataBitLen = 0; ps_cmd.rxDataBitLen = 0;
pDat.dummyBitLen = 0; ps_cmd.dummyBitLen = 0;
psram_cmd_config(spiNum, &pDat); psram_cmd_config(spiNum, &ps_cmd);
psram_cmd_start(spiNum, PSRAM_CMD_QPI); psram_cmd_start(spiNum, PSRAM_CMD_QPI);
} }
@ -361,47 +362,47 @@ static void psram_set_burst_length(psram_spi_num_t spiNum)
//seems not working //seems not working
static void psram_reset_mode(psram_spi_num_t spiNum) static void psram_reset_mode(psram_spi_num_t spiNum)
{ {
psram_cmd_t pDat; psram_cmd_t ps_cmd;
uint32_t cmd_rst = 0x99066; uint32_t cmd_rst = 0x99066;
pDat.txData = &cmd_rst; ps_cmd.txData = &cmd_rst;
pDat.txDataBitLen = 20; ps_cmd.txDataBitLen = 20;
pDat.addr = NULL; ps_cmd.addr = NULL;
pDat.addrBitLen = 0; ps_cmd.addrBitLen = 0;
pDat.cmd = 0; ps_cmd.cmd = 0;
pDat.cmdBitLen = 0; ps_cmd.cmdBitLen = 0;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.rxDataBitLen = 0; ps_cmd.rxDataBitLen = 0;
pDat.dummyBitLen = 0; ps_cmd.dummyBitLen = 0;
psram_cmd_config(spiNum, &pDat); psram_cmd_config(spiNum, &ps_cmd);
psram_cmd_start(spiNum, PSRAM_CMD_QPI); psram_cmd_start(spiNum, PSRAM_CMD_QPI);
} }
//exit QPI mode(set back to SPI mode) //exit QPI mode(set back to SPI mode)
static void psram_disable_qio_mode(psram_spi_num_t spiNum) static void psram_disable_qio_mode(psram_spi_num_t spiNum)
{ {
psram_cmd_t pDat; psram_cmd_t ps_cmd;
uint32_t cmd_exit_qpi; uint32_t cmd_exit_qpi;
switch(g_PsramMode){ switch(s_psram_mode){
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
cmd_exit_qpi = PSRAM_EXIT_QMODE; cmd_exit_qpi = PSRAM_EXIT_QMODE;
pDat.txDataBitLen = 8; ps_cmd.txDataBitLen = 8;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
cmd_exit_qpi = PSRAM_EXIT_QMODE<<8; cmd_exit_qpi = PSRAM_EXIT_QMODE<<8;
pDat.txDataBitLen = 16; ps_cmd.txDataBitLen = 16;
break; break;
} }
pDat.txData = &cmd_exit_qpi; ps_cmd.txData = &cmd_exit_qpi;
pDat.cmd = 0; ps_cmd.cmd = 0;
pDat.cmdBitLen = 0; ps_cmd.cmdBitLen = 0;
pDat.addr = 0; ps_cmd.addr = 0;
pDat.addrBitLen = 0; ps_cmd.addrBitLen = 0;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.rxDataBitLen = 0; ps_cmd.rxDataBitLen = 0;
pDat.dummyBitLen = 0; ps_cmd.dummyBitLen = 0;
psram_cmd_config(spiNum, &pDat); psram_cmd_config(spiNum, &ps_cmd);
psram_cmd_start(spiNum, PSRAM_CMD_QPI); psram_cmd_start(spiNum, PSRAM_CMD_QPI);
} }
@ -455,61 +456,59 @@ static void IRAM_ATTR psram_gpio_config(psram_cache_mode_t mode)
static void psram_read_id(uint32_t* dev_id) static void psram_read_id(uint32_t* dev_id)
{ {
psram_spi_num_t spiNum = PSRAM_SPI_1; psram_spi_num_t spiNum = PSRAM_SPI_1;
// psram_set_basic_write_mode(spiNum);
// psram_set_basic_read_mode(spiNum);
uint32_t addr = (PSRAM_DEVICE_ID <<24) | 0; uint32_t addr = (PSRAM_DEVICE_ID <<24) | 0;
uint32_t dummy_bits = 0; uint32_t dummy_bits = 0;
psram_cmd_t pDat; psram_cmd_t ps_cmd;
switch(g_PsramMode){ switch(s_psram_mode){
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
dummy_bits = 0+extra_dummy; dummy_bits = 0+extra_dummy;
pDat.cmdBitLen = 0; ps_cmd.cmdBitLen = 0;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
dummy_bits = 0+extra_dummy; dummy_bits = 0+extra_dummy;
pDat.cmdBitLen = 2; //this two bits is used for delay one byte in qio mode ps_cmd.cmdBitLen = 2; //this two bits is used for delay one byte in qio mode
break; break;
} }
pDat.cmd = 0; ps_cmd.cmd = 0;
pDat.addr = &addr; ps_cmd.addr = &addr;
pDat.addrBitLen = 4*8; ps_cmd.addrBitLen = 4*8;
pDat.txDataBitLen = 0; ps_cmd.txDataBitLen = 0;
pDat.txData = NULL; ps_cmd.txData = NULL;
pDat.rxDataBitLen = 4*8 ; ps_cmd.rxDataBitLen = 4*8 ;
pDat.rxData = dev_id; ps_cmd.rxData = dev_id;
pDat.dummyBitLen = dummy_bits; ps_cmd.dummyBitLen = dummy_bits;
psram_cmd_config(spiNum,&pDat); psram_cmd_config(spiNum,&ps_cmd);
psram_clear_spi_fifo(spiNum); psram_clear_spi_fifo(spiNum);
psram_recv_start(spiNum,pDat.rxData,pDat.rxDataBitLen/8, PSRAM_CMD_SPI); psram_recv_start(spiNum,ps_cmd.rxData,ps_cmd.rxDataBitLen/8, PSRAM_CMD_SPI);
} }
//enter QPI mode //enter QPI mode
static void IRAM_ATTR psram_enable_qio_mode(psram_spi_num_t spiNum) static void IRAM_ATTR psram_enable_qio_mode(psram_spi_num_t spiNum)
{ {
psram_cmd_t pDat; psram_cmd_t ps_cmd;
switch(g_PsramMode){ switch(s_psram_mode){
case PSRAM_CACHE_F80M_S80M: case PSRAM_CACHE_F80M_S80M:
pDat.cmd = PSRAM_ENTER_QMODE; ps_cmd.cmd = PSRAM_ENTER_QMODE;
pDat.cmdBitLen = 8; ps_cmd.cmdBitLen = 8;
break; break;
case PSRAM_CACHE_F80M_S40M: case PSRAM_CACHE_F80M_S40M:
case PSRAM_CACHE_F40M_S40M: case PSRAM_CACHE_F40M_S40M:
default: default:
pDat.cmd = 0x400d; ps_cmd.cmd = 0x400d;
pDat.cmdBitLen = 10; ps_cmd.cmdBitLen = 10;
break; break;
} }
pDat.addr = 0; ps_cmd.addr = 0;
pDat.addrBitLen = 0; ps_cmd.addrBitLen = 0;
pDat.txData = NULL; ps_cmd.txData = NULL;
pDat.txDataBitLen = 0; ps_cmd.txDataBitLen = 0;
pDat.rxData = NULL; ps_cmd.rxData = NULL;
pDat.rxDataBitLen = 0; ps_cmd.rxDataBitLen = 0;
pDat.dummyBitLen = 0; ps_cmd.dummyBitLen = 0;
psram_cmd_config(spiNum, &pDat); psram_cmd_config(spiNum, &ps_cmd);
psram_cmd_start(spiNum, PSRAM_CMD_SPI); psram_cmd_start(spiNum, PSRAM_CMD_SPI);
} }
@ -565,7 +564,7 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad
assert(mode==PSRAM_CACHE_F40M_S40M); //we don't support any other mode for now. assert(mode==PSRAM_CACHE_F40M_S40M); //we don't support any other mode for now.
g_PsramMode = mode; s_psram_mode = mode;
SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG,BIT16);//DPORT_SPI_CLK_EN SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG,BIT16);//DPORT_SPI_CLK_EN
CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG,BIT16);//DPORT_SPI_RST CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG,BIT16);//DPORT_SPI_RST

130
components/esp32/test/test_psram_silicon_bug.c
View file

@ -23,10 +23,10 @@ This code triggers a psram-related silicon bug in rev0 silicon. The bug is fixed
typedef struct { typedef struct {
char name[9]; char name[9];
int dummy[4]; int dummy[4];
int *wadfile; int *wadfile;
int dummy2[2]; int dummy2[2];
} xlumpinfo_t; } xlumpinfo_t;
@ -34,91 +34,91 @@ static xlumpinfo_t *xlumpinfo=(xlumpinfo_t*)0x3f80002c;
static int xnumlumps=5500; static int xnumlumps=5500;
static int isValidPtr(void *ptr) { static int isValidPtr(void *ptr) {
if (((int)ptr&0xff000000)==0x3f000000) return 1; if (((int)ptr&0xff000000)==0x3f000000) return 1;
return 0; return 0;
} }
int test_weird_corruption() { int test_weird_corruption() {
int err=0; int err=0;
xlumpinfo_t *marked = (xlumpinfo_t*)0x3fff2824; xlumpinfo_t *marked = (xlumpinfo_t*)0x3fff2824;
size_t i, num_marked = 0, num_unmarked = 0; size_t i, num_marked = 0, num_unmarked = 0;
// int is_marked = 0, mark_end = 0; // int is_marked = 0, mark_end = 0;
xlumpinfo_t *lump = xlumpinfo; xlumpinfo_t *lump = xlumpinfo;
int x; int x;
for (x=0; x<xnumlumps; x++) { for (x=0; x<xnumlumps; x++) {
if (xlumpinfo[x].wadfile && !isValidPtr(xlumpinfo[x].wadfile)) { if (xlumpinfo[x].wadfile && !isValidPtr(xlumpinfo[x].wadfile)) {
ets_printf("Lump wad before error!"); ets_printf("Lump wad before error!");
} }
} }
for (i=xnumlumps; i--; lump++) { for (i=xnumlumps; i--; lump++) {
xlumpinfo[num_unmarked]=*lump; // else move down THIS list xlumpinfo[num_unmarked]=*lump; // else move down THIS list
num_unmarked++; num_unmarked++;
} }
// Append marked list to end of unmarked list // Append marked list to end of unmarked list
memcpy(&xlumpinfo[num_unmarked], marked, num_marked * sizeof(*marked)); memcpy(&xlumpinfo[num_unmarked], marked, num_marked * sizeof(*marked));
// free(marked); // free marked list // free(marked); // free marked list
xnumlumps = num_unmarked + num_marked; // new total number of lumps xnumlumps = num_unmarked + num_marked; // new total number of lumps
for (x=0; x<xnumlumps; x++) { for (x=0; x<xnumlumps; x++) {
if (xlumpinfo[x].wadfile && !isValidPtr(xlumpinfo[x].wadfile)) { if (xlumpinfo[x].wadfile && !isValidPtr(xlumpinfo[x].wadfile)) {
ets_printf("Lump wad error for %s at addr %p! Index=%d unmarked=%d marked=%d Should be %p is %p\n", ets_printf("Lump wad error for %s at addr %p! Index=%d unmarked=%d marked=%d Should be %p is %p\n",
xlumpinfo[x].name, &xlumpinfo[x].wadfile, x, num_unmarked, num_marked, xlumpinfo[x+1].wadfile,xlumpinfo[x].wadfile); xlumpinfo[x].name, &xlumpinfo[x].wadfile, x, num_unmarked, num_marked, xlumpinfo[x+1].wadfile,xlumpinfo[x].wadfile);
int j; int j;
for (j=0; j<10; j++) { for (j=0; j<10; j++) {
ets_printf("%08x ", ((uint32_t*)&xlumpinfo[x])[j]); ets_printf("%08x ", ((uint32_t*)&xlumpinfo[x])[j]);
} }
ets_printf("\n"); ets_printf("\n");
for (j=0; j<10; j++) { for (j=0; j<10; j++) {
ets_printf("%08x ", ((uint32_t*)&xlumpinfo[x-1])[j]); ets_printf("%08x ", ((uint32_t*)&xlumpinfo[x-1])[j]);
} }
ets_printf("\n"); ets_printf("\n");
err++; err++;
} }
} }
return err; return err;
} }
TEST_CASE("PSram bug in rev0 silicon (Doom bug)", "[psram][ignore]") TEST_CASE("PSram bug in rev0 silicon (Doom bug)", "[psram][ignore]")
{ {
int i, r=0; int i, r=0;
xlumpinfo_t *p; xlumpinfo_t *p;
#if CONFIG_MEMMAP_SMP #if CONFIG_MEMMAP_SMP
printf("WARNING\n"); printf("WARNING\n");
printf("WARNING - This bug sometimes doesn't show up unless MEMMAP_SMP is disabled. You have it enabled now, so the test may erroneously pass.\n"); printf("WARNING - This bug sometimes doesn't show up unless MEMMAP_SMP is disabled. You have it enabled now, so the test may erroneously pass.\n");
printf("WARNING\n"); printf("WARNING\n");
#endif #endif
#if !CONFIG_MEMMAP_SPIRAM_ENABLE #if !CONFIG_MEMMAP_SPIRAM_ENABLE
printf("WARNING\n"); printf("WARNING\n");
printf("WARNING - This test needs psram enabled. You don't seem to have that; the test is likely to crash.\n"); printf("WARNING - This test needs psram enabled. You don't seem to have that; the test is likely to crash.\n");
printf("WARNING\n"); printf("WARNING\n");
#endif #endif
printf("Stack ptr %p\n", &i); printf("Stack ptr %p\n", &i);
p=pvPortMallocCaps(sizeof(xlumpinfo_t)*5600, MALLOC_CAP_SPIRAM); p=pvPortMallocCaps(sizeof(xlumpinfo_t)*5600, MALLOC_CAP_SPIRAM);
xlumpinfo=p; xlumpinfo=p;
//Bug seems to only trigger when address ends in 2C //Bug seems to only trigger when address ends in 2C
while (((int)xlumpinfo&0xff)!=0x2c) xlumpinfo=(xlumpinfo_t*)(((char*)xlumpinfo)+1); while (((int)xlumpinfo&0xff)!=0x2c) xlumpinfo=(xlumpinfo_t*)(((char*)xlumpinfo)+1);
printf("lumpinfo ptr %p\n", xlumpinfo); printf("lumpinfo ptr %p\n", xlumpinfo);
for (i=0; i<xnumlumps; i++) { for (i=0; i<xnumlumps; i++) {
sprintf(xlumpinfo[i].name, "DIGD"); sprintf(xlumpinfo[i].name, "DIGD");
xlumpinfo[i].wadfile=(int*)0x3ffef664; xlumpinfo[i].wadfile=(int*)0x3ffef664;
} }
ets_printf("Running corruption test...\n"); ets_printf("Running corruption test...\n");
for (i=0; i<20; i++) { for (i=0; i<20; i++) {
r+=test_weird_corruption(); r+=test_weird_corruption();
} }
free(p); free(p);
TEST_ASSERT(r==0); TEST_ASSERT(r==0);
} }

10
tools/unit-test-app/sdkconfig
View file

@ -102,7 +102,6 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
# CONFIG_ESP32_ENABLE_STACK_WIFI is not set # CONFIG_ESP32_ENABLE_STACK_WIFI is not set
# CONFIG_ESP32_ENABLE_STACK_BT is not set # CONFIG_ESP32_ENABLE_STACK_BT is not set
CONFIG_ESP32_ENABLE_STACK_NONE=y
CONFIG_MEMMAP_SMP=y CONFIG_MEMMAP_SMP=y
# CONFIG_MEMMAP_TRACEMEM is not set # CONFIG_MEMMAP_TRACEMEM is not set
# CONFIG_MEMMAP_TRACEMEM_TWOBANKS is not set # CONFIG_MEMMAP_TRACEMEM_TWOBANKS is not set
@ -131,6 +130,12 @@ CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
CONFIG_MAIN_TASK_STACK_SIZE=4096 CONFIG_MAIN_TASK_STACK_SIZE=4096
CONFIG_NEWLIB_STDOUT_ADDCR=y CONFIG_NEWLIB_STDOUT_ADDCR=y
# CONFIG_NEWLIB_NANO_FORMAT is not set
CONFIG_CONSOLE_UART_DEFAULT=y
# CONFIG_CONSOLE_UART_CUSTOM is not set
# CONFIG_CONSOLE_UART_NONE is not set
CONFIG_CONSOLE_UART_NUM=0
CONFIG_CONSOLE_UART_BAUDRATE=115200
CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_ENABLED=y
CONFIG_ULP_COPROC_RESERVE_MEM=512 CONFIG_ULP_COPROC_RESERVE_MEM=512
# CONFIG_ESP32_PANIC_PRINT_HALT is not set # CONFIG_ESP32_PANIC_PRINT_HALT is not set
@ -265,8 +270,9 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
CONFIG_MBEDTLS_HARDWARE_AES=y CONFIG_MBEDTLS_HARDWARE_AES=y
CONFIG_MBEDTLS_HARDWARE_MPI=y CONFIG_MBEDTLS_HARDWARE_MPI=y
CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
CONFIG_MBEDTLS_MPI_INTERRUPT_NUM=18
CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_HARDWARE_SHA=y
CONFIG_MBEDTLS_HAVE_TIME=y
# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
# #
# SPI Flash driver # SPI Flash driver