rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved FSMC. 

SRAM configuration is much more flexible now.
This commit is contained in:
barthess 2015-08-04 13:30:01 +03:00
parent 8c8c0a0be4
commit e7a3df6c18
9 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
os/hal/ports/STM32/LLD/FSMCv1/fsmc.h
View File

@ -196,19 +196,31 @@ typedef struct {
/** /**
* @brief BCR register * @brief BCR register
*/ */
#define FSMC_BCR_MBKEN ((uint32_t)0x00000001) #define FSMC_BCR_MBKEN ((uint32_t)1 << 0)
#define FSMC_BCR_MUXEN ((uint32_t)0x00000002) #define FSMC_BCR_MUXEN ((uint32_t)1 << 1)
#define FSMC_BCR_MWID_0 ((uint32_t)0x00000010) #define FSMC_BCR_MTYP_SRAM ((uint32_t)0 << 2)
#define FSMC_BCR_FACCEN ((uint32_t)0x00000040) #define FSMC_BCR_MTYP_PSRAM ((uint32_t)1 << 2)
#define FSMC_BCR_BURSTEN ((uint32_t)0x00000100) #define FSMC_BCR_MTYP_NOR_NAND ((uint32_t)2 << 2)
#define FSMC_BCR_WAITPOL ((uint32_t)0x00000200) #define FSMC_BCR_MTYP_RESERVED ((uint32_t)3 << 2)
#define FSMC_BCR_WRAPMOD ((uint32_t)0x00000400) #define FSMC_BCR_MWID_8 ((uint32_t)0 << 4)
#define FSMC_BCR_WAITCFG ((uint32_t)0x00000800) #define FSMC_BCR_MWID_16 ((uint32_t)1 << 4)
#define FSMC_BCR_WREN ((uint32_t)0x00001000) #if (defined(STM32F427xx) || defined(STM32F437xx) || \
#define FSMC_BCR_WAITEN ((uint32_t)0x00002000) defined(STM32F429xx) || defined(STM32F439xx))
#define FSMC_BCR_EXTMOD ((uint32_t)0x00004000) #define FSMC_BCR_MWID_32 ((uint32_t)2 << 4)
#define FSMC_BCR_ASYNCWAIT ((uint32_t)0x00008000) #else
#define FSMC_BCR_CBURSTRW ((uint32_t)0x00080000) #define FSMC_BCR_MWID_RESERVED1 ((uint32_t)2 << 4)
#endif
#define FSMC_BCR_MWID_RESERVED2 ((uint32_t)3 << 4)
#define FSMC_BCR_FACCEN ((uint32_t)1 << 6)
#define FSMC_BCR_BURSTEN ((uint32_t)1 << 8)
#define FSMC_BCR_WAITPOL ((uint32_t)1 << 9)
#define FSMC_BCR_WRAPMOD ((uint32_t)1 << 10)
#define FSMC_BCR_WAITCFG ((uint32_t)1 << 11)
#define FSMC_BCR_WREN ((uint32_t)1 << 12)
#define FSMC_BCR_WAITEN ((uint32_t)1 << 13)
#define FSMC_BCR_EXTMOD ((uint32_t)1 << 14)
#define FSMC_BCR_ASYNCWAIT ((uint32_t)1 << 15)
#define FSMC_BCR_CBURSTRW ((uint32_t)1 << 19)
/*===========================================================================*/ /*===========================================================================*/
/* Driver pre-compile time settings. */ /* Driver pre-compile time settings. */

3
os/hal/ports/STM32/LLD/FSMCv1/fsmc_sram.c
View File

@ -128,8 +128,9 @@ void fsmcSramStart(SRAMDriver *sramp, const SRAMConfig *cfgp) {
"invalid state"); "invalid state");
if (sramp->state == SRAM_STOP) { if (sramp->state == SRAM_STOP) {
sramp->sram->BCR = FSMC_BCR_WREN | FSMC_BCR_MBKEN | FSMC_BCR_MWID_0; sramp->sram->BCR = cfgp->bcr | FSMC_BCR_MBKEN;
sramp->sram->BTR = cfgp->btr; sramp->sram->BTR = cfgp->btr;
sramp->sram->BWTR = cfgp->bwtr;
sramp->state = SRAM_READY; sramp->state = SRAM_READY;
} }
} }

3
os/hal/ports/STM32/LLD/FSMCv1/fsmc_sram.h
View File

@ -109,9 +109,12 @@ typedef struct SRAMDriver SRAMDriver;
/** /**
* @brief Driver configuration structure. * @brief Driver configuration structure.
* @note It could be empty on some architectures. * @note It could be empty on some architectures.
* @note Some bits in BCR register will be forced by driver.
*/ */
typedef struct { typedef struct {
uint32_t bcr;
uint32_t btr; uint32_t btr;
uint32_t bwtr;
} SRAMConfig; } SRAMConfig;
/** /**

2
os/various/memtest.cpp
View File

@ -18,7 +18,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include "memtest.hpp" #include "memtest.h"
static unsigned int prng_seed = 42; static unsigned int prng_seed = 42;

8
os/various/memtest.hpp → os/various/memtest.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef MEMTEST_HPP_ #ifndef MEMTEST_H_
#define MEMTEST_HPP_ #define MEMTEST_H_
#define MEMTEST_WALKING_ONE (1 << 0) #define MEMTEST_WALKING_ONE (1 << 0)
#define MEMTEST_WALKING_ZERO (1 << 1) #define MEMTEST_WALKING_ZERO (1 << 1)
@ -37,7 +37,7 @@ typedef uint32_t testtype;
/* /*
* Error call back. * Error call back.
*/ */
typedef void (*memtestecb_t)(memtest_t *testp, testtype type, size_t offset, typedef void (*memtestecb_t)(memtest_t *testp, testtype type, size_t index,
size_t current_width, uint32_t got, uint32_t expect); size_t current_width, uint32_t got, uint32_t expect);
/* /*
@ -85,4 +85,4 @@ extern "C" {
} }
#endif #endif
#endif /* MEMTEST_HPP_ */ #endif /* MEMTEST_H_ */

2
testhal/STM32/STM32F4xx/FSMC_SDRAM/Makefile
View File

@ -15,7 +15,7 @@ endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).
ifeq ($(USE_CPPOPT),) ifeq ($(USE_CPPOPT),)
USE_CPPOPT = -fno-rtti USE_CPPOPT = -fno-rtti -std=c++11
endif endif
# Enable this if you want the linker to remove unused code and data # Enable this if you want the linker to remove unused code and data

21
testhal/STM32/STM32F4xx/FSMC_SDRAM/main.c
View File

@ -25,7 +25,7 @@
#include "fsmc_sdram.h" #include "fsmc_sdram.h"
#include "membench.h" #include "membench.h"
#include "memtest.hpp" #include "memtest.h"
/* /*
****************************************************************************** ******************************************************************************
@ -127,7 +127,8 @@
****************************************************************************** ******************************************************************************
*/ */
static void mem_error_cb(memtest_t *memp, testtype e, size_t address); static void mem_error_cb(memtest_t *memp, testtype type, size_t index,
size_t width, uint32_t got, uint32_t expect);
/* /*
****************************************************************************** ******************************************************************************
@ -176,9 +177,8 @@ static uint8_t int_buf[64*1024];
static memtest_t memtest_struct = { static memtest_t memtest_struct = {
SDRAM_START, SDRAM_START,
SDRAM_SIZE, SDRAM_SIZE,
MEMTEST_WIDTH_16, MEMTEST_WIDTH_32,
mem_error_cb, mem_error_cb
42
}; };
/* /*
@ -211,10 +211,14 @@ static membench_result_t membench_result_int2ext;
****************************************************************************** ******************************************************************************
*/ */
void mem_error_cb(memtest_t *memp, testtype e, size_t address) { static void mem_error_cb(memtest_t *memp, testtype type, size_t index,
size_t width, uint32_t got, uint32_t expect) {
(void)memp; (void)memp;
(void)e; (void)type;
(void)address; (void)index;
(void)width;
(void)got;
(void)expect;
osalSysHalt("Memory broken"); osalSysHalt("Memory broken");
} }
@ -225,7 +229,6 @@ void mem_error_cb(memtest_t *memp, testtype e, size_t address) {
static void memtest(void) { static void memtest(void) {
while (true) { while (true) {
memtest_struct.rand_seed = chSysGetRealtimeCounterX();
memtest_run(&memtest_struct, MEMTEST_RUN_ALL); memtest_run(&memtest_struct, MEMTEST_RUN_ALL);
} }
} }

2
testhal/STM32/STM32F4xx/FSMC_SRAM/Makefile
View File

@ -15,7 +15,7 @@ endif
# C++ specific options here (added to USE_OPT). # C++ specific options here (added to USE_OPT).
ifeq ($(USE_CPPOPT),) ifeq ($(USE_CPPOPT),)
USE_CPPOPT = -fno-rtti USE_CPPOPT = -fno-rtti -std=c++11
endif endif
# Enable this if you want the linker to remove unused code and data # Enable this if you want the linker to remove unused code and data

25
testhal/STM32/STM32F4xx/FSMC_SRAM/main.c
View File

@ -19,7 +19,7 @@
#include "fsmc_sram.h" #include "fsmc_sram.h"
#include "membench.h" #include "membench.h"
#include "memtest.hpp" #include "memtest.h"
/* /*
****************************************************************************** ******************************************************************************
@ -41,7 +41,8 @@
****************************************************************************** ******************************************************************************
*/ */
static void mem_error_cb(memtest_t *memp, testtype e, size_t address); static void mem_error_cb(memtest_t *memp, testtype type, size_t index,
size_t width, uint32_t got, uint32_t expect);
/* /*
****************************************************************************** ******************************************************************************
@ -60,7 +61,9 @@ static uint8_t int_buf[64*1024];
* SRAM driver configuration structure. * SRAM driver configuration structure.
*/ */
static const SRAMConfig sram_cfg = { static const SRAMConfig sram_cfg = {
(0 << 16) | (2 << 8) | (1 << 0) .bcr = (FSMC_BCR_MWID_16 | FSMC_BCR_MTYP_SRAM | FSMC_BCR_WREN),
.btr = (0 << 16) | (2 << 8) | (1 << 0),
.bwtr = (0 << 16) | (2 << 8) | (1 << 0)
}; };
/* /*
@ -69,9 +72,8 @@ static const SRAMConfig sram_cfg = {
static memtest_t memtest_struct = { static memtest_t memtest_struct = {
SRAM_START, SRAM_START,
SRAM_SIZE, SRAM_SIZE,
MEMTEST_WIDTH_16, MEMTEST_WIDTH_32,
mem_error_cb, mem_error_cb
42
}; };
/* /*
@ -110,10 +112,14 @@ static inline void green_led_on(void) {palSetPad(GPIOI, GPIOI_LED_G);}
static inline void green_led_off(void) {palClearPad(GPIOI, GPIOI_LED_G);} static inline void green_led_off(void) {palClearPad(GPIOI, GPIOI_LED_G);}
static inline void green_led_toggle(void) {palTogglePad(GPIOI, GPIOI_LED_G);} static inline void green_led_toggle(void) {palTogglePad(GPIOI, GPIOI_LED_G);}
void mem_error_cb(memtest_t *memp, testtype e, size_t address) { static void mem_error_cb(memtest_t *memp, testtype type, size_t index,
size_t width, uint32_t got, uint32_t expect) {
(void)memp; (void)memp;
(void)e; (void)type;
(void)address; (void)index;
(void)width;
(void)got;
(void)expect;
green_led_off(); green_led_off();
red_led_on(); red_led_on();
@ -130,7 +136,6 @@ static void memtest(void) {
red_led_off(); red_led_off();
while (true) { while (true) {
memtest_struct.rand_seed = chSysGetRealtimeCounterX();
memtest_run(&memtest_struct, MEMTEST_RUN_ALL); memtest_run(&memtest_struct, MEMTEST_RUN_ALL);
green_led_toggle(); green_led_toggle();
} }