Add support for a separate CCM memory allocator for members of the STM32 family that support CCM memory
This commit is contained in:
Gregory Nutt
parent
22c3d49807
commit
e00a8397bc
@ -486,7 +486,7 @@ config SAM34_RCFAST8M
|
||||
bool "8MHz"
|
||||
|
||||
config SAM34_RCFAST4M
|
||||
bool "4MHz
|
||||
bool "4MHz"
|
||||
|
||||
endchoice
|
||||
endif
|
||||
|
||||
@ -93,6 +93,7 @@ CHIP_CSRCS = stm32_allocateheap.c stm32_start.c stm32_rcc.c stm32_lse.c
|
||||
CHIP_CSRCS += stm32_lsi.c stm32_gpio.c stm32_exti_gpio.c stm32_flash.c stm32_irq.c
|
||||
CHIP_CSRCS += stm32_timerisr.c stm32_dma.c stm32_lowputc.c stm32_serial.c
|
||||
CHIP_CSRCS += stm32_spi.c stm32_sdio.c stm32_tim.c stm32_i2c.c stm32_waste.c
|
||||
CHIP_CSRCS += stm32_ccm.c
|
||||
|
||||
ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
|
||||
CHIP_ASRCS += stm32_vectors.S
|
||||
|
||||
65
arch/arm/src/stm32/stm32_ccm.c
Executable file
65
arch/arm/src/stm32/stm32_ccm.c
Executable file
@ -0,0 +1,65 @@
|
||||
/****************************************************************************
|
||||
* arch/arm/src/common/stm32_ccm.c
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
* Based on a prototype by Petteri Amimonen
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include "stm32_ccm.h"
|
||||
|
||||
#ifdef HAVE_CCM_HEAP
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Private Types
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
struct mm_heap_s g_ccm_heap;
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
#endif /* HAVE_CCM_HEAP */
|
||||
136
arch/arm/src/stm32/stm32_ccm.h
Executable file
136
arch/arm/src/stm32/stm32_ccm.h
Executable file
@ -0,0 +1,136 @@
|
||||
/****************************************************************************
|
||||
* arch/arm/src/common/stm32_ccm.h
|
||||
*
|
||||
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
* Based on a prototype by Petteri Amimonen
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
* 3. Neither the name NuttX nor the names of its contributors may be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
||||
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __ARCH_ARM_SRC_STM32_STM32_CCM_H
|
||||
#define __ARCH_ARM_SRC_STM32_STM32_CCM_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <nuttx/mm.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
/* Configuration ************************************************************/
|
||||
/* Assume that we can support the CCM heap */
|
||||
|
||||
#define HAVE_CCM_HEAP 1
|
||||
|
||||
/* Only the STM32 F2, F3, and F4 have CCM memory */
|
||||
|
||||
#if defined(CONFIG_STM32_STM32F30XX)
|
||||
# define CCM_START 0x10000000
|
||||
# define CCM_END 0x10002000
|
||||
#elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX)
|
||||
# define CCM_START 0x10000000
|
||||
# define CCM_END 0x10010000
|
||||
#else
|
||||
# undef HAVE_CCM_HEAP
|
||||
#endif
|
||||
|
||||
/* In order to use the CCM heap, it had to have been excluded from the main
|
||||
* heap and support for multiple heaps must have been enabled.
|
||||
*/
|
||||
|
||||
#if !defined(CONFIG_STM32_CCMEXCLUDE) || !defined(CONFIG_MM_MULTIHEAP)
|
||||
# undef HAVE_CCM_HEAP
|
||||
#endif
|
||||
|
||||
/* Can we support the CCM heap? */
|
||||
|
||||
#ifdef HAVE_CCM_HEAP
|
||||
|
||||
/* ccm_initialize must be called early in initialization in order to
|
||||
* initialize the CCM heap.
|
||||
*/
|
||||
|
||||
#define ccm_initialize() \
|
||||
mm_initialize(&g_ccm_heap, (uintptr_t)CCM_START, CCM_END-CCM_START)
|
||||
|
||||
/* The ccm_addregion interface could be used if, for example, you want to
|
||||
* add some other memory region to the CCM heap. I don't really know why
|
||||
* you might want to do that, but the functionality is essentially free.
|
||||
*/
|
||||
|
||||
#define ccm_addregion(b,s) mm_addregion(&g_ccm_heap, b, s);
|
||||
|
||||
/* Then, once g_ccm_heap has been setup by ccm_initialize(), these memory
|
||||
* allocators can be used just like the standard memory allocators.
|
||||
*/
|
||||
|
||||
#define ccm_malloc(s) mm_malloc(&g_ccm_heap, s)
|
||||
#define ccm_zalloc(s) mm_zalloc(&g_ccm_heap, s)
|
||||
#define ccm_calloc(n,s) mm_calloc(&g_ccm_heap, n,s)
|
||||
#define ccm_free(p) mm_free(&g_ccm_heap, p)
|
||||
#define ccm_realloc(p,s) mm_realloc(&g_ccm_heap, p, s)
|
||||
#define ccm_memalign(a,s) mm_memalign(&g_ccm_heap, a, s)
|
||||
|
||||
/****************************************************************************
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
/****************************************************************************
|
||||
* Public Data
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN extern "C"
|
||||
extern "C"
|
||||
{
|
||||
#else
|
||||
#define EXTERN extern
|
||||
#endif
|
||||
|
||||
EXTERN struct mm_heap_s g_ccm_heap;
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
#undef EXTERN
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#endif /* HAVE_CCM_HEAP */
|
||||
#endif /* __ARCH_ARM_SRC_STM32_STM32_CCM_H */
|
||||
Loading…
Reference in New Issue
Block a user