sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

S32K3XX RAM fixes MPU Dcache ECC

Browse Source
This commit is contained in:
Peter van der Perk 2022-11-30 15:15:41 +01:00 committed by David Sidrane
parent 3aac6a1a3b
commit ec5030ebe6
6 changed files with 143 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/s32k3xx/Kconfig
View File

@ -193,6 +193,14 @@ config S32K3XX_HAVE_ENET
select ARCH_PHY_INTERRUPT select ARCH_PHY_INTERRUPT
select ARCH_HAVE_NETDEV_STATISTICS select ARCH_HAVE_NETDEV_STATISTICS
# Select MPU when D-cache is enabled for ARM errata 1624041
config S32K3XX_NEEDS_MPU
bool
default y
depends on ARMV7M_DCACHE
select ARM_MPU
config S32K3XX_HAVE_FLEXCAN3 config S32K3XX_HAVE_FLEXCAN3
bool bool
default n default n

5
arch/arm/src/s32k3xx/s32k3xx_serial.c
View File

@ -2463,7 +2463,10 @@ static int s32k3xx_ioctl(struct file *filep, int cmd, unsigned long arg)
stat &= ~LPUART_STAT_RXINV; stat &= ~LPUART_STAT_RXINV;
} }
if (arg & SER_INVERT_ENABLED_TX) /* Do not invert TX when in TIOCSSINGLEWIRE */
if ((arg & SER_INVERT_ENABLED_TX) &&
((ctrl & LPUART_CTRL_LOOPS) != LPUART_CTRL_LOOPS))
{ {
ctrl |= LPUART_CTRL_TXINV; ctrl |= LPUART_CTRL_TXINV;
} }

146
arch/arm/src/s32k3xx/s32k3xx_start.c
View File

@ -36,6 +36,7 @@
#include <arch/irq.h> #include <arch/irq.h>
#include "arm_internal.h" #include "arm_internal.h"
#include "barriers.h"
#include "nvic.h" #include "nvic.h"
#ifdef CONFIG_BUILD_PROTECTED #ifdef CONFIG_BUILD_PROTECTED
@ -49,8 +50,8 @@
#include "s32k3xx_serial.h" #include "s32k3xx_serial.h"
#include "s32k3xx_swt.h" #include "s32k3xx_swt.h"
#include "s32k3xx_start.h" #include "s32k3xx_start.h"
#if defined(CONFIG_ARCH_USE_MPU) && defined(CONFIG_S32K3XX_ENET) #if defined(CONFIG_ARCH_USE_MPU)
#include "hardware/s32k3xx_mpu.h" #include "mpu.h"
#endif #endif
#ifdef CONFIG_S32K3XX_PROGMEM #ifdef CONFIG_S32K3XX_PROGMEM
@ -94,6 +95,31 @@
#define STARTUP_ECC_INITVALUE 0 #define STARTUP_ECC_INITVALUE 0
#ifndef CONFIG_ARMV7M_DCACHE
/* With Dcache off:
* Cacheable (MPU_RASR_C) and Bufferable (MPU_RASR_B) needs to be off
*/
# undef MPU_RASR_B
# define MPU_RASR_B 0
# define RASR_B_VALUE 0
# define RASR_C_VALUE 0
#else
# ifndef CONFIG_ARMV7M_DCACHE_WRITETHROUGH
/* With Dcache on:
* Cacheable (MPU_RASR_C) and Bufferable (MPU_RASR_B) needs to be on
*/
# define RASR_B_VALUE MPU_RASR_B
# define RASR_C_VALUE MPU_RASR_C
# else
/* With Dcache in WRITETHROUGH Bufferable (MPU_RASR_B)
* needs to be off, except for FLASH for alignment leniency
*/
# define RASR_B_VALUE 0
# define RASR_C_VALUE MPU_RASR_C
# endif
#endif
/**************************************************************************** /****************************************************************************
* Name: showprogress * Name: showprogress
* *
@ -113,11 +139,13 @@
****************************************************************************/ ****************************************************************************/
extern uint8_t SRAM_BASE_ADDR[]; extern uint8_t SRAM_BASE_ADDR[];
extern uint8_t SRAM_END_ADDR[]; extern uint8_t SRAM_INIT_END_ADDR[];
extern uint8_t ITCM_BASE_ADDR[]; extern uint8_t ITCM_BASE_ADDR[];
extern uint8_t ITCM_END_ADDR[]; extern uint8_t ITCM_END_ADDR[];
extern uint8_t DTCM_BASE_ADDR[]; extern uint8_t DTCM_BASE_ADDR[];
extern uint8_t DTCM_END_ADDR[]; extern uint8_t DTCM_END_ADDR[];
extern uint8_t FLASH_BASE_ADDR[];
extern uint8_t FLASH_END_ADDR[];
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -131,20 +159,95 @@ extern uint8_t DTCM_END_ADDR[];
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_ARCH_USE_MPU) && defined(CONFIG_S32K3XX_ENET) #if defined(CONFIG_ARCH_USE_MPU)
static inline void s32k3xx_mpu_config(void) static inline void s32k3xx_mpu_config(void)
{ {
uint32_t regval; uint32_t regval;
uint32_t region;
/* Bus masters 0-2 are already enabled r/w/x in supervisor and user modes /* Show MPU information */
* after reset. Enable also bus master 3 (ENET) in S/U modes in default
* region 0: User=r+w+x, Supervisor=same as used.
*/
regval = (MPU_RGDAAC_M3UM_XACCESS | MPU_RGDAAC_M3UM_WACCESS | mpu_showtype();
MPU_RGDAAC_M3UM_RACCESS | MPU_RGDAAC_M3SM_M3UM);
putreg32(regval, S32K3XX_MPU_RGDAAC(0)); #ifdef CONFIG_ARMV7M_DCACHE
/* Memory barrier */
ARM_DMB();
#endif
/* Reset MPU if enabled */
mpu_reset();
/* ARM errata 1013783-B Workaround */
region = mpu_allocregion();
DEBUGASSERT(region == 0);
/* Select the region */
putreg32(region, MPU_RNR);
/* Select the region base address */
putreg32(region | MPU_RBAR_VALID, MPU_RBAR);
/* The configure the region */
regval = MPU_RASR_ENABLE | /* Enable region */
MPU_RASR_SIZE_LOG2(32) | /* entire memory */
MPU_RASR_TEX_SO | /* Strongly ordered */
MPU_RASR_AP_RWRW | /* P:RW U:RW */
MPU_RASR_XN; /* Execute-never to prevent instruction fetch */
putreg32(regval, MPU_RASR);
mpu_configure_region((uintptr_t)FLASH_BASE_ADDR,
FLASH_END_ADDR - FLASH_BASE_ADDR,
MPU_RASR_TEX_SO | /* Strongly ordered */
RASR_C_VALUE | /* Cacheable */
MPU_RASR_B | /* Bufferable
* Not Shareable */
MPU_RASR_AP_RORO); /* P:RO U:RO
* Instruction access */
mpu_configure_region((uintptr_t)SRAM_BASE_ADDR,
SRAM_INIT_END_ADDR - SRAM_BASE_ADDR,
MPU_RASR_TEX_SO | /* Strongly ordered */
RASR_C_VALUE | /* Cacheable */
RASR_B_VALUE | /* Bufferable
* Not Shareable */
MPU_RASR_AP_RWRW); /* P:RW U:RW
* Instruction access */
mpu_configure_region((uintptr_t)ITCM_BASE_ADDR,
ITCM_END_ADDR - ITCM_BASE_ADDR,
MPU_RASR_TEX_SO | /* Strongly ordered */
RASR_C_VALUE | /* Cacheable */
RASR_B_VALUE | /* Bufferable
* Not Shareable */
MPU_RASR_AP_RWRW); /* P:RW U:RW
* Instruction access */
mpu_configure_region((uintptr_t)DTCM_BASE_ADDR,
DTCM_END_ADDR - DTCM_BASE_ADDR,
MPU_RASR_TEX_SO | /* Strongly ordered */
RASR_C_VALUE | /* Cacheable */
RASR_B_VALUE | /* Bufferable
* Not Shareable */
MPU_RASR_AP_RWRW); /* P:RW U:RW
* Instruction access */
mpu_configure_region(0x40000000, 3 * 2048 * 1024,
MPU_RASR_TEX_DEV | /* Device
* Not Cacheable
* Not Bufferable
* Not Shareable */
MPU_RASR_AP_RWRW); /* P:RW U:RW
* Instruction access */
/* Then enable the MPU */
mpu_control(true, false, true);
} }
#endif #endif
@ -160,9 +263,6 @@ static inline void s32k3xx_mpu_config(void)
* *
****************************************************************************/ ****************************************************************************/
#define STR(x) #x
#define XSTR(s) STR(s)
void s32k3xx_start(void) void s32k3xx_start(void)
{ {
register uint64_t *src; register uint64_t *src;
@ -174,7 +274,7 @@ void s32k3xx_start(void)
*/ */
dest = (uint64_t *)SRAM_BASE_ADDR; dest = (uint64_t *)SRAM_BASE_ADDR;
while (dest < (uint64_t *)SRAM_END_ADDR) while (dest < (uint64_t *)SRAM_INIT_END_ADDR)
{ {
*dest++ = STARTUP_ECC_INITVALUE; *dest++ = STARTUP_ECC_INITVALUE;
} }
@ -248,6 +348,14 @@ void s32k3xx_start(void)
arm_fpuconfig(); arm_fpuconfig();
#if defined(CONFIG_ARCH_USE_MPU)
/* Config MPU regions */
s32k3xx_mpu_config();
showprogress('D');
#endif
/* Enable I- and D-Caches */ /* Enable I- and D-Caches */
up_enable_icache(); up_enable_icache();
@ -255,14 +363,6 @@ void s32k3xx_start(void)
showprogress('C'); showprogress('C');
#if defined(CONFIG_ARCH_USE_MPU) && defined(CONFIG_S32K3XX_ENET)
/* Enable all MPU bus masters */
s32k3xx_mpu_config();
showprogress('D');
#endif
/* Perform early serial initialization */ /* Perform early serial initialization */
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT

2
arch/arm/src/s32k3xx/startup.S
View File

@ -38,7 +38,7 @@ __start:
/* Initialize SRAM ECC */ /* Initialize SRAM ECC */
ldr r1, =SRAM_BASE_ADDR ldr r1, =SRAM_BASE_ADDR
ldr r2, =SRAM_END_ADDR ldr r2, =SRAM_INIT_END_ADDR
subs r2, r1 subs r2, r1
subs r2, #1 subs r2, #1

3
boards/arm/s32k3xx/mr-canhubk3/scripts/flash.ld
View File

@ -152,8 +152,11 @@ SECTIONS
SRAM_END_ADDR = ORIGIN(sram) + LENGTH(sram); SRAM_END_ADDR = ORIGIN(sram) + LENGTH(sram);
SRAM_STDBY_BASE_ADDR = ORIGIN(sram0_stdby); SRAM_STDBY_BASE_ADDR = ORIGIN(sram0_stdby);
SRAM_STDBY_END_ADDR = ORIGIN(sram0_stdby) + LENGTH(sram0_stdby); SRAM_STDBY_END_ADDR = ORIGIN(sram0_stdby) + LENGTH(sram0_stdby);
SRAM_INIT_END_ADDR = ORIGIN(sram) + 320K;
ITCM_BASE_ADDR = ORIGIN(itcm); ITCM_BASE_ADDR = ORIGIN(itcm);
ITCM_END_ADDR = ORIGIN(itcm) + LENGTH(itcm); ITCM_END_ADDR = ORIGIN(itcm) + LENGTH(itcm);
DTCM_BASE_ADDR = ORIGIN(dtcm); DTCM_BASE_ADDR = ORIGIN(dtcm);
DTCM_END_ADDR = ORIGIN(dtcm) + LENGTH(dtcm); DTCM_END_ADDR = ORIGIN(dtcm) + LENGTH(dtcm);
FLASH_BASE_ADDR = ORIGIN(BOOT_HEADER);
FLASH_END_ADDR = ORIGIN(flash) + LENGTH(flash);
} }

5
boards/arm/s32k3xx/s32k344evb/scripts/flash.ld
View File

@ -38,7 +38,7 @@ MEMORY
BOOT_HEADER (R) : ORIGIN = 0x00400000, LENGTH = 0x00001000 /* 0x00400000 - 0x00400fff */ BOOT_HEADER (R) : ORIGIN = 0x00400000, LENGTH = 0x00001000 /* 0x00400000 - 0x00400fff */
flash (rx) : ORIGIN = 0x00401000, LENGTH = 0x003cffff /* 0x00401000 - (0x007fffff - 0x20000 (128 KB) = 0x007dffff) */ flash (rx) : ORIGIN = 0x00401000, LENGTH = 0x003cffff /* 0x00401000 - (0x007fffff - 0x20000 (128 KB) = 0x007dffff) */
sram0_stdby (rwx) : ORIGIN = 0x20400000, LENGTH = 32K sram0_stdby (rwx) : ORIGIN = 0x20400000, LENGTH = 32K
sram (rwx) : ORIGIN = 0x20408000, LENGTH = 240K sram (rwx) : ORIGIN = 0x20400000, LENGTH = 272K
itcm (rwx) : ORIGIN = 0x00000000, LENGTH = 64K itcm (rwx) : ORIGIN = 0x00000000, LENGTH = 64K
dtcm (rwx) : ORIGIN = 0x20000000, LENGTH = 128K dtcm (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
} }
@ -149,8 +149,11 @@ SECTIONS
SRAM_END_ADDR = ORIGIN(sram) + LENGTH(sram); SRAM_END_ADDR = ORIGIN(sram) + LENGTH(sram);
SRAM_STDBY_BASE_ADDR = ORIGIN(sram0_stdby); SRAM_STDBY_BASE_ADDR = ORIGIN(sram0_stdby);
SRAM_STDBY_END_ADDR = ORIGIN(sram0_stdby) + LENGTH(sram0_stdby); SRAM_STDBY_END_ADDR = ORIGIN(sram0_stdby) + LENGTH(sram0_stdby);
SRAM_INIT_END_ADDR = ORIGIN(sram) + 320K;
ITCM_BASE_ADDR = ORIGIN(itcm); ITCM_BASE_ADDR = ORIGIN(itcm);
ITCM_END_ADDR = ORIGIN(itcm) + LENGTH(itcm); ITCM_END_ADDR = ORIGIN(itcm) + LENGTH(itcm);
DTCM_BASE_ADDR = ORIGIN(dtcm); DTCM_BASE_ADDR = ORIGIN(dtcm);
DTCM_END_ADDR = ORIGIN(dtcm) + LENGTH(dtcm); DTCM_END_ADDR = ORIGIN(dtcm) + LENGTH(dtcm);
FLASH_BASE_ADDR = ORIGIN(BOOT_HEADER);
FLASH_END_ADDR = ORIGIN(flash) + LENGTH(flash);
} }