jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'spi-thread-safe'

Browse Source 
* spi-thread-safe:
  remove unnecessary locks
  implement thread-safe spi
This commit is contained in:
me-no-dev 2016-10-17 15:41:15 +03:00
commit 9a9ef063ee
2 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
cores/esp32/esp32-hal-spi.c
View File

@ -13,20 +13,20 @@
// limitations under the License. // limitations under the License.
#include "esp32-hal-spi.h" #include "esp32-hal-spi.h"
#include "esp32-hal.h"
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "freertos/semphr.h"
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "esp_attr.h" #include "esp_attr.h"
#include "esp_intr.h" #include "esp_intr.h"
#include "rom/gpio.h" #include "rom/gpio.h"
#include "soc/spi_reg.h" #include "soc/spi_reg.h"
#include "soc/spi_struct.h"
#include "soc/io_mux_reg.h" #include "soc/io_mux_reg.h"
#include "soc/gpio_sig_map.h" #include "soc/gpio_sig_map.h"
#include "soc/dport_reg.h" #include "soc/dport_reg.h"
#define SPI_REG_BASE(p) ((p==0)?DR_REG_SPI0_BASE:((p==1)?DR_REG_SPI1_BASE:((p==2)?DR_REG_SPI2_BASE:((p==3)?DR_REG_SPI3_BASE:0))))
#define SPI_DEV(i) ((spi_dev_t *)(SPI_REG_BASE(i)))
#define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_MUX_IDX:0)))) #define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_MUX_IDX:0))))
#define SPI_MISO_IDX(p) ((p==0)?SPIQ_OUT_IDX:((p==1)?SPIQ_OUT_IDX:((p==2)?HSPIQ_OUT_IDX:((p==3)?VSPIQ_OUT_IDX:0)))) #define SPI_MISO_IDX(p) ((p==0)?SPIQ_OUT_IDX:((p==1)?SPIQ_OUT_IDX:((p==2)?HSPIQ_OUT_IDX:((p==3)?VSPIQ_OUT_IDX:0))))
#define SPI_MOSI_IDX(p) ((p==0)?SPID_IN_IDX:((p==1)?SPID_IN_IDX:((p==2)?HSPID_IN_IDX:((p==3)?VSPID_IN_IDX:0)))) #define SPI_MOSI_IDX(p) ((p==0)?SPID_IN_IDX:((p==1)?SPID_IN_IDX:((p==2)?HSPID_IN_IDX:((p==3)?VSPID_IN_IDX:0))))
@ -39,6 +39,22 @@
#define SPI_INUM(u) (2) #define SPI_INUM(u) (2)
#define SPI_INTR_SOURCE(u) ((u==0)?ETS_SPI0_INTR_SOURCE:((u==1)?ETS_SPI1_INTR_SOURCE:((u==2)?ETS_SPI2_INTR_SOURCE:((p==3)?ETS_SPI3_INTR_SOURCE:0)))) #define SPI_INTR_SOURCE(u) ((u==0)?ETS_SPI0_INTR_SOURCE:((u==1)?ETS_SPI1_INTR_SOURCE:((u==2)?ETS_SPI2_INTR_SOURCE:((p==3)?ETS_SPI3_INTR_SOURCE:0))))
struct spi_struct_t {
spi_dev_t * dev;
xSemaphoreHandle lock;
uint8_t num;
};
#define SPI_MUTEX_LOCK() do {} while (xSemaphoreTake(spi->lock, portMAX_DELAY) != pdPASS)
#define SPI_MUTEX_UNLOCK() xSemaphoreGive(spi->lock)
static spi_t _spi_bus_array[4] = {
{(volatile spi_dev_t *)(DR_REG_SPI0_BASE), NULL, 0},
{(volatile spi_dev_t *)(DR_REG_SPI1_BASE), NULL, 1},
{(volatile spi_dev_t *)(DR_REG_SPI2_BASE), NULL, 2},
{(volatile spi_dev_t *)(DR_REG_SPI3_BASE), NULL, 3}
};
void spiAttachSCK(spi_t * spi, int8_t sck) void spiAttachSCK(spi_t * spi, int8_t sck)
{ {
if(!spi) { if(!spi) {
@ -71,8 +87,10 @@ void spiAttachMISO(spi_t * spi, int8_t miso)
miso = 7; miso = 7;
} }
} }
SPI_MUTEX_LOCK();
pinMode(miso, INPUT); pinMode(miso, INPUT);
pinMatrixInAttach(miso, SPI_MISO_IDX(spi->num), false); pinMatrixInAttach(miso, SPI_MISO_IDX(spi->num), false);
SPI_MUTEX_UNLOCK();
} }
void spiAttachMOSI(spi_t * spi, int8_t mosi) void spiAttachMOSI(spi_t * spi, int8_t mosi)
@ -193,7 +211,9 @@ void spiEnableSSPins(spi_t * spi, uint8_t cs_mask)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->pin.val &= ~(cs_mask & SPI_CS_MASK_ALL); spi->dev->pin.val &= ~(cs_mask & SPI_CS_MASK_ALL);
SPI_MUTEX_UNLOCK();
} }
void spiDisableSSPins(spi_t * spi, uint8_t cs_mask) void spiDisableSSPins(spi_t * spi, uint8_t cs_mask)
@ -201,7 +221,9 @@ void spiDisableSSPins(spi_t * spi, uint8_t cs_mask)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->pin.val |= (cs_mask & SPI_CS_MASK_ALL); spi->dev->pin.val |= (cs_mask & SPI_CS_MASK_ALL);
SPI_MUTEX_UNLOCK();
} }
void spiSSEnable(spi_t * spi) void spiSSEnable(spi_t * spi)
@ -209,8 +231,10 @@ void spiSSEnable(spi_t * spi)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->user.cs_setup = 1; spi->dev->user.cs_setup = 1;
spi->dev->user.cs_hold = 1; spi->dev->user.cs_hold = 1;
SPI_MUTEX_UNLOCK();
} }
void spiSSDisable(spi_t * spi) void spiSSDisable(spi_t * spi)
@ -218,8 +242,10 @@ void spiSSDisable(spi_t * spi)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->user.cs_setup = 0; spi->dev->user.cs_setup = 0;
spi->dev->user.cs_hold = 0; spi->dev->user.cs_hold = 0;
SPI_MUTEX_UNLOCK();
} }
void spiSSSet(spi_t * spi) void spiSSSet(spi_t * spi)
@ -227,7 +253,9 @@ void spiSSSet(spi_t * spi)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->pin.cs_keep_active = 1; spi->dev->pin.cs_keep_active = 1;
SPI_MUTEX_UNLOCK();
} }
void spiSSClear(spi_t * spi) void spiSSClear(spi_t * spi)
@ -235,7 +263,9 @@ void spiSSClear(spi_t * spi)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->pin.cs_keep_active = 0; spi->dev->pin.cs_keep_active = 0;
SPI_MUTEX_UNLOCK();
} }
uint32_t spiGetClockDiv(spi_t * spi) uint32_t spiGetClockDiv(spi_t * spi)
@ -251,7 +281,9 @@ void spiSetClockDiv(spi_t * spi, uint32_t clockDiv)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->clock.val = clockDiv; spi->dev->clock.val = clockDiv;
SPI_MUTEX_UNLOCK();
} }
uint8_t spiGetDataMode(spi_t * spi) uint8_t spiGetDataMode(spi_t * spi)
@ -278,6 +310,7 @@ void spiSetDataMode(spi_t * spi, uint8_t dataMode)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
switch (dataMode) { switch (dataMode) {
case SPI_MODE1: case SPI_MODE1:
spi->dev->pin.ck_idle_edge = 0; spi->dev->pin.ck_idle_edge = 0;
@ -297,6 +330,7 @@ void spiSetDataMode(spi_t * spi, uint8_t dataMode)
spi->dev->user.ck_out_edge = 0; spi->dev->user.ck_out_edge = 0;
break; break;
} }
SPI_MUTEX_UNLOCK();
} }
uint8_t spiGetBitOrder(spi_t * spi) uint8_t spiGetBitOrder(spi_t * spi)
@ -312,6 +346,7 @@ void spiSetBitOrder(spi_t * spi, uint8_t bitOrder)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
if (SPI_MSBFIRST == bitOrder) { if (SPI_MSBFIRST == bitOrder) {
spi->dev->ctrl.wr_bit_order = 0; spi->dev->ctrl.wr_bit_order = 0;
spi->dev->ctrl.rd_bit_order = 0; spi->dev->ctrl.rd_bit_order = 0;
@ -319,6 +354,7 @@ void spiSetBitOrder(spi_t * spi, uint8_t bitOrder)
spi->dev->ctrl.wr_bit_order = 1; spi->dev->ctrl.wr_bit_order = 1;
spi->dev->ctrl.rd_bit_order = 1; spi->dev->ctrl.rd_bit_order = 1;
} }
SPI_MUTEX_UNLOCK();
} }
void spiStopBus(spi_t * spi) void spiStopBus(spi_t * spi)
@ -326,6 +362,7 @@ void spiStopBus(spi_t * spi)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
spi->dev->slave.trans_done = 0; spi->dev->slave.trans_done = 0;
spi->dev->slave.slave_mode = 0; spi->dev->slave.slave_mode = 0;
spi->dev->pin.val = 0; spi->dev->pin.val = 0;
@ -335,18 +372,23 @@ void spiStopBus(spi_t * spi)
spi->dev->ctrl1.val = 0; spi->dev->ctrl1.val = 0;
spi->dev->ctrl2.val = 0; spi->dev->ctrl2.val = 0;
spi->dev->clock.val = 0; spi->dev->clock.val = 0;
SPI_MUTEX_UNLOCK();
} }
spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_t bitOrder) spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_t bitOrder)
{ {
if(spi_num > 3){
spi_t* spi = (spi_t*) malloc(sizeof(spi_t));
if(spi == 0) {
return NULL; return NULL;
} }
spi->num = spi_num; spi_t * spi = &_spi_bus_array[spi_num];
spi->dev = (spi_dev_t *)SPI_DEV(spi_num);
if(spi->lock == NULL){
spi->lock = xSemaphoreCreateMutex();
if(spi->lock == NULL) {
return NULL;
}
}
if(spi_num == HSPI) { if(spi_num == HSPI) {
SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI_CLK_EN_1); SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI_CLK_EN_1);
@ -364,6 +406,7 @@ spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_
spiSetBitOrder(spi, bitOrder); spiSetBitOrder(spi, bitOrder);
spiSetClockDiv(spi, clockDiv); spiSetClockDiv(spi, clockDiv);
SPI_MUTEX_LOCK();
spi->dev->user.usr_mosi = 1; spi->dev->user.usr_mosi = 1;
spi->dev->user.usr_miso = 1; spi->dev->user.usr_miso = 1;
spi->dev->user.doutdin = 1; spi->dev->user.doutdin = 1;
@ -372,6 +415,7 @@ spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
spi->dev->data_buf[i] = 0x00000000; spi->dev->data_buf[i] = 0x00000000;
} }
SPI_MUTEX_UNLOCK();
return spi; return spi;
} }
@ -393,6 +437,7 @@ void spiWrite(spi_t * spi, uint32_t *data, uint8_t len)
if(len > 16) { if(len > 16) {
len = 16; len = 16;
} }
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
spi->dev->mosi_dlen.usr_mosi_dbitlen = (len * 32) - 1; spi->dev->mosi_dlen.usr_mosi_dbitlen = (len * 32) - 1;
spi->dev->miso_dlen.usr_miso_dbitlen = (len * 32) - 1; spi->dev->miso_dlen.usr_miso_dbitlen = (len * 32) - 1;
@ -400,6 +445,7 @@ void spiWrite(spi_t * spi, uint32_t *data, uint8_t len)
spi->dev->data_buf[i] = data[i]; spi->dev->data_buf[i] = data[i];
} }
spi->dev->cmd.usr = 1; spi->dev->cmd.usr = 1;
SPI_MUTEX_UNLOCK();
} }
void spiRead(spi_t * spi, uint32_t *data, uint8_t len) void spiRead(spi_t * spi, uint32_t *data, uint8_t len)
@ -411,10 +457,12 @@ void spiRead(spi_t * spi, uint32_t *data, uint8_t len)
if(len > 16) { if(len > 16) {
len = 16; len = 16;
} }
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
for(i=0; i<len; i++) { for(i=0; i<len; i++) {
data[i] = spi->dev->data_buf[i]; data[i] = spi->dev->data_buf[i];
} }
SPI_MUTEX_UNLOCK();
} }
void spiWriteByte(spi_t * spi, uint8_t data) void spiWriteByte(spi_t * spi, uint8_t data)
@ -422,11 +470,13 @@ void spiWriteByte(spi_t * spi, uint8_t data)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
spi->dev->mosi_dlen.usr_mosi_dbitlen = 7; spi->dev->mosi_dlen.usr_mosi_dbitlen = 7;
spi->dev->miso_dlen.usr_miso_dbitlen = 7; spi->dev->miso_dlen.usr_miso_dbitlen = 7;
spi->dev->data_buf[0] = data; spi->dev->data_buf[0] = data;
spi->dev->cmd.usr = 1; spi->dev->cmd.usr = 1;
SPI_MUTEX_UNLOCK();
} }
uint8_t spiReadByte(spi_t * spi) uint8_t spiReadByte(spi_t * spi)
@ -434,8 +484,12 @@ uint8_t spiReadByte(spi_t * spi)
if(!spi) { if(!spi) {
return 0; return 0;
} }
uint8_t data;
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
return spi->dev->data_buf[0] & 0xFF; data = spi->dev->data_buf[0] & 0xFF;
SPI_MUTEX_UNLOCK();
return data;
} }
uint32_t __spiTranslate16(uint16_t data, bool msb) uint32_t __spiTranslate16(uint16_t data, bool msb)
@ -480,11 +534,13 @@ void spiWriteWord(spi_t * spi, uint16_t data)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
spi->dev->mosi_dlen.usr_mosi_dbitlen = 15; spi->dev->mosi_dlen.usr_mosi_dbitlen = 15;
spi->dev->miso_dlen.usr_miso_dbitlen = 15; spi->dev->miso_dlen.usr_miso_dbitlen = 15;
spi->dev->data_buf[0] = __spiTranslate16(data, !spi->dev->ctrl.wr_bit_order); spi->dev->data_buf[0] = __spiTranslate16(data, !spi->dev->ctrl.wr_bit_order);
spi->dev->cmd.usr = 1; spi->dev->cmd.usr = 1;
SPI_MUTEX_UNLOCK();
} }
uint16_t spiReadWord(spi_t * spi) uint16_t spiReadWord(spi_t * spi)
@ -492,8 +548,12 @@ uint16_t spiReadWord(spi_t * spi)
if(!spi) { if(!spi) {
return 0; return 0;
} }
uint16_t data;
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
return __spiTranslate16(spi->dev->data_buf[0] & 0xFFFF, !spi->dev->ctrl.rd_bit_order); data = __spiTranslate16(spi->dev->data_buf[0] & 0xFFFF, !spi->dev->ctrl.rd_bit_order);
SPI_MUTEX_UNLOCK();
return data;
} }
void spiWriteLong(spi_t * spi, uint32_t data) void spiWriteLong(spi_t * spi, uint32_t data)
@ -501,11 +561,13 @@ void spiWriteLong(spi_t * spi, uint32_t data)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
spi->dev->mosi_dlen.usr_mosi_dbitlen = 31; spi->dev->mosi_dlen.usr_mosi_dbitlen = 31;
spi->dev->miso_dlen.usr_miso_dbitlen = 31; spi->dev->miso_dlen.usr_miso_dbitlen = 31;
spi->dev->data_buf[0] = __spiTranslate32(data, !spi->dev->ctrl.wr_bit_order); spi->dev->data_buf[0] = __spiTranslate32(data, !spi->dev->ctrl.wr_bit_order);
spi->dev->cmd.usr = 1; spi->dev->cmd.usr = 1;
SPI_MUTEX_UNLOCK();
} }
uint32_t spiReadLong(spi_t * spi) uint32_t spiReadLong(spi_t * spi)
@ -513,8 +575,12 @@ uint32_t spiReadLong(spi_t * spi)
if(!spi) { if(!spi) {
return 0; return 0;
} }
uint32_t data;
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
return __spiTranslate32(spi->dev->data_buf[0], !spi->dev->ctrl.rd_bit_order); data = __spiTranslate32(spi->dev->data_buf[0], !spi->dev->ctrl.rd_bit_order);
SPI_MUTEX_UNLOCK();
return data;
} }
void spiTransferBits(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits) void spiTransferBits(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits)
@ -529,6 +595,7 @@ void spiTransferBits(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits)
uint32_t bytes = (bits + 7) / 8;//64 max uint32_t bytes = (bits + 7) / 8;//64 max
uint32_t mask = (((uint64_t)1 << bits) - 1) & 0xFFFFFFFF; uint32_t mask = (((uint64_t)1 << bits) - 1) & 0xFFFFFFFF;
SPI_MUTEX_LOCK();
while(spi->dev->cmd.usr); while(spi->dev->cmd.usr);
spi->dev->mosi_dlen.usr_mosi_dbitlen = (bits - 1); spi->dev->mosi_dlen.usr_mosi_dbitlen = (bits - 1);
spi->dev->miso_dlen.usr_miso_dbitlen = (bits - 1); spi->dev->miso_dlen.usr_miso_dbitlen = (bits - 1);
@ -555,6 +622,7 @@ void spiTransferBits(spi_t * spi, uint32_t data, uint32_t * out, uint8_t bits)
*out = __spiTranslate32(spi->dev->data_buf[0] & mask, !spi->dev->ctrl.wr_bit_order); *out = __spiTranslate32(spi->dev->data_buf[0] & mask, !spi->dev->ctrl.wr_bit_order);
} }
} }
SPI_MUTEX_UNLOCK();
} }
void __spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t bytes) void __spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t bytes)
@ -605,6 +673,7 @@ void spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t size)
if(!spi) { if(!spi) {
return; return;
} }
SPI_MUTEX_LOCK();
while(size) { while(size) {
if(size > 64) { if(size > 64) {
__spiTransferBytes(spi, data, out, 64); __spiTransferBytes(spi, data, out, 64);
@ -620,6 +689,7 @@ void spiTransferBytes(spi_t * spi, uint8_t * data, uint8_t * out, uint32_t size)
size = 0; size = 0;
} }
} }
SPI_MUTEX_UNLOCK();
} }

10
cores/esp32/esp32-hal-spi.h
View File

@ -19,8 +19,8 @@
extern "C" { extern "C" {
#endif #endif
#include "esp32-hal.h" #include <stdint.h>
#include "soc/spi_struct.h" #include <stdbool.h>
#define SPI_HAS_TRANSACTION #define SPI_HAS_TRANSACTION
@ -51,10 +51,8 @@ extern "C" {
#define SPI_LSBFIRST 0 #define SPI_LSBFIRST 0
#define SPI_MSBFIRST 1 #define SPI_MSBFIRST 1
typedef struct { struct spi_struct_t;
spi_dev_t * dev; typedef struct spi_struct_t spi_t;
uint8_t num;
} spi_t;
spi_t * spiStartBus(uint8_t spi_num, uint32_t freq, uint8_t dataMode, uint8_t bitOrder); spi_t * spiStartBus(uint8_t spi_num, uint32_t freq, uint8_t dataMode, uint8_t bitOrder);
void spiStopBus(spi_t * spi); void spiStopBus(spi_t * spi);