michaelh/zephyr
1
0
Fork 0
Code Releases Activity

nios2: get CPU features from ALT_CPU_* namespace

Browse source 
NIOS2_* namespace is deprecated.

Change-Id: I5a9b07ee33b20aa18509e9d789837f48199ab25d
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2016-07-11 12:42:02 -07:00 • committed by Inaky Perez-Gonzalez
commit 0b6c4febf1
7 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
arch/nios2/core/cache.c
View file

@ -31,12 +31,12 @@
* See Chapter 9 of the Nios II Gen 2 Software Developer's Handbook for more * See Chapter 9 of the Nios II Gen 2 Software Developer's Handbook for more
* information on cache considerations. * information on cache considerations.
*/ */
#if NIOS2_ICACHE_SIZE > 0 #if ALT_CPU_ICACHE_SIZE > 0
void _nios2_icache_flush_all(void) void _nios2_icache_flush_all(void)
{ {
uint32_t i; uint32_t i;
for (i = 0; i < NIOS2_ICACHE_SIZE; i += NIOS2_ICACHE_LINE_SIZE) { for (i = 0; i < ALT_CPU_ICACHE_SIZE; i += ALT_CPU_ICACHE_LINE_SIZE) {
_nios2_icache_flush(i); _nios2_icache_flush(i);
} }
@ -60,12 +60,12 @@ void _nios2_icache_flush_all(void)
* See Chapter 9 of the Nios II Gen 2 Software Developer's Handbook for more * See Chapter 9 of the Nios II Gen 2 Software Developer's Handbook for more
* information on cache considerations. * information on cache considerations.
*/ */
#if NIOS2_DCACHE_SIZE > 0 #if ALT_CPU_DCACHE_SIZE > 0
void _nios2_dcache_flush_all(void) void _nios2_dcache_flush_all(void)
{ {
uint32_t i; uint32_t i;
for (i = 0; i < NIOS2_DCACHE_SIZE; i += NIOS2_DCACHE_LINE_SIZE) { for (i = 0; i < ALT_CPU_DCACHE_SIZE; i += ALT_CPU_DCACHE_LINE_SIZE) {
_nios2_dcache_flush(i); _nios2_dcache_flush(i);
} }
} }

28
arch/nios2/core/crt0.S
View file

@ -43,7 +43,7 @@ GTEXT(_interrupt_stack)
*/ */
SECTION_FUNC(reset, __reset) SECTION_FUNC(reset, __reset)
#if NIOS2_ICACHE_SIZE > 0 #if ALT_CPU_ICACHE_SIZE > 0
/* Aside from the instruction cache line associated with the reset /* Aside from the instruction cache line associated with the reset
* vector, the contents of the cache memories are indeterminate after * vector, the contents of the cache memories are indeterminate after
* reset. To ensure cache coherency after reset, the reset handler * reset. To ensure cache coherency after reset, the reset handler
@ -53,23 +53,23 @@ SECTION_FUNC(reset, __reset)
* *
* The cache memory sizes are *always* a power of 2. * The cache memory sizes are *always* a power of 2.
*/ */
#if NIOS2_ICACHE_SIZE > 0x8000 #if ALT_CPU_ICACHE_SIZE > 0x8000
movhi r2, %hi(NIOS2_ICACHE_SIZE) movhi r2, %hi(ALT_CPU_ICACHE_SIZE)
#else #else
movui r2, NIOS2_ICACHE_SIZE movui r2, ALT_CPU_ICACHE_SIZE
#endif #endif
0: 0:
/* If ECC present, need to execute initd for each word address /* If ECC present, need to execute initd for each word address
* to ensure ECC parity bits in data RAM get initialized * to ensure ECC parity bits in data RAM get initialized
*/ */
#if NIOS2_ECC_PRESENT #ifdef ALT_CPU_ECC_PRESENT
subi r2, r2, 4 subi r2, r2, 4
#else #else
subi r2, r2, NIOS2_ICACHE_LINE_SIZE subi r2, r2, ALT_CPU_ICACHE_LINE_SIZE
#endif #endif
initi r2 initi r2
bgt r2, zero, 0b bgt r2, zero, 0b
#endif /* NIOS2_ICACHE_SIZE > 0 */ #endif /* ALT_CPU_ICACHE_SIZE > 0 */
/* Done all we need to do here, jump to __text_start */ /* Done all we need to do here, jump to __text_start */
movhi r1, %hi(__start) movhi r1, %hi(__start)
@ -90,25 +90,25 @@ SECTION_FUNC(TEXT, __start)
* we're not booting from our reset vector, either by a bootloader * we're not booting from our reset vector, either by a bootloader
* or JTAG, assume caches already initialized. * or JTAG, assume caches already initialized.
*/ */
#if NIOS2_DCACHE_SIZE > 0 && defined(CONFIG_INCLUDE_RESET_VECTOR) #if ALT_CPU_DCACHE_SIZE > 0 && defined(CONFIG_INCLUDE_RESET_VECTOR)
/* Per documentation data cache size is always a power of two. */ /* Per documentation data cache size is always a power of two. */
#if NIOS2_DCACHE_SIZE > 0x8000 #if ALT_CPU_DCACHE_SIZE > 0x8000
movhi r2, %hi(NIOS2_DCACHE_SIZE) movhi r2, %hi(ALT_CPU_DCACHE_SIZE)
#else #else
movui r2, NIOS2_DCACHE_SIZE movui r2, ALT_CPU_DCACHE_SIZE
#endif #endif
0: 0:
/* If ECC present, need to execute initd for each word address /* If ECC present, need to execute initd for each word address
* to ensure ECC parity bits in data RAM get initialized * to ensure ECC parity bits in data RAM get initialized
*/ */
#if NIOS2_ECC_PRESENT #ifdef ALT_CPU_ECC_PRESENT
subi r2, r2, 4 subi r2, r2, 4
#else #else
subi r2, r2, NIOS2_DCACHE_LINE_SIZE subi r2, r2, ALT_CPU_DCACHE_LINE_SIZE
#endif #endif
initd 0(r2) initd 0(r2)
bgt r2, zero, 0b bgt r2, zero, 0b
#endif /* NIOS2_DCACHE_SIZE && defined(CONFIG_INCLUDE_RESET_VECTOR) */ #endif /* ALT_CPU_DCACHE_SIZE && defined(CONFIG_INCLUDE_RESET_VECTOR) */
#ifdef CONFIG_INIT_STACKS #ifdef CONFIG_INIT_STACKS
/* Pre-populate all bytes in _interrupt_stack with 0xAA */ /* Pre-populate all bytes in _interrupt_stack with 0xAA */

6
arch/nios2/core/fatal.c
View file

@ -109,7 +109,7 @@ FUNC_NORETURN void _Fault(const NANO_ESF *esf)
{ {
#ifdef CONFIG_PRINTK #ifdef CONFIG_PRINTK
/* Unfortunately, completely unavailable on Nios II/e cores */ /* Unfortunately, completely unavailable on Nios II/e cores */
#ifdef NIOS2_HAS_EXTRA_EXCEPTION_INFO #ifdef ALT_CPU_HAS_EXTRA_EXCEPTION_INFO
uint32_t exc_reg, badaddr_reg, eccftl; uint32_t exc_reg, badaddr_reg, eccftl;
enum nios2_exception_cause cause; enum nios2_exception_cause cause;
@ -126,7 +126,7 @@ FUNC_NORETURN void _Fault(const NANO_ESF *esf)
badaddr_reg = _nios2_creg_read(NIOS2_CR_BADADDR); badaddr_reg = _nios2_creg_read(NIOS2_CR_BADADDR);
printk("Badaddr: 0x%x\n", badaddr_reg); printk("Badaddr: 0x%x\n", badaddr_reg);
} }
#endif /* NIOS2_HAS_EXTRA_EXCEPTION_INFO */ #endif /* ALT_CPU_HAS_EXTRA_EXCEPTION_INFO */
#endif /* CONFIG_PRINTK */ #endif /* CONFIG_PRINTK */
_NanoFatalErrorHandler(_NANO_ERR_CPU_EXCEPTION, esf); _NanoFatalErrorHandler(_NANO_ERR_CPU_EXCEPTION, esf);
@ -181,7 +181,7 @@ FUNC_NORETURN void _SysFatalErrorHandler(unsigned int reason,
? "ISR" ? "ISR"
: curCtx == NANO_CTX_FIBER ? "essential fiber" : curCtx == NANO_CTX_FIBER ? "essential fiber"
: "essential task"); : "essential task");
#ifdef NIOS2_HAS_DEBUG_STUB #ifdef ALT_CPU_HAS_DEBUG_STUB
_nios2_break(); _nios2_break();
#endif #endif
for (;;) for (;;)

2
arch/nios2/core/prep_c.c
View file

@ -50,7 +50,7 @@ void _PrepC(void)
* to flush instruction cache. * to flush instruction cache.
*/ */
_nios2_icache_flush_all(); _nios2_icache_flush_all();
#if NIOS2_ICACHE_SIZE > 0 #if ALT_CPU_ICACHE_SIZE > 0
/* Only need to flush the data cache here if there actually is an /* Only need to flush the data cache here if there actually is an
* instruction cache, so that the cached instruction data written is * instruction cache, so that the cached instruction data written is
* actually committed. * actually committed.

8
arch/nios2/core/swap.S
View file

@ -108,10 +108,10 @@ BRANCH_LABEL(next_chosen)
* key was supplied as argument to _Swap() * key was supplied as argument to _Swap()
*/ */
ldw r3, __tTCS_coopReg_OFFSET + __t_coop_key_OFFSET(r11) ldw r3, __tTCS_coopReg_OFFSET + __t_coop_key_OFFSET(r11)
#if (NIOS2_NUM_OF_SHADOW_REG_SETS > 0) || \ #if (ALT_CPU_NUM_OF_SHADOW_REG_SETS > 0) || \
(defined NIOS2_EIC_PRESENT) || \ (defined ALT_CPU_EIC_PRESENT) || \
(defined NIOS2_MMU_PRESENT) || \ (defined ALT_CPU_MMU_PRESENT) || \
(defined NIOS2_MPU_PRESENT) (defined ALT_CPU_MPU_PRESENT)
andi r3, r3, NIOS2_STATUS_PIE_MSK andi r3, r3, NIOS2_STATUS_PIE_MSK
beq r3, zero, no_unlock beq r3, zero, no_unlock
rdctl r3, status rdctl r3, status

4
arch/nios2/include/nano_private.h
View file

@ -200,13 +200,13 @@ static ALWAYS_INLINE int _IS_IN_ISR(void)
void _irq_do_offload(void); void _irq_do_offload(void);
#endif #endif
#if NIOS2_ICACHE_SIZE > 0 #if ALT_CPU_ICACHE_SIZE > 0
void _nios2_icache_flush_all(void); void _nios2_icache_flush_all(void);
#else #else
#define _nios2_icache_flush_all() do { } while (0) #define _nios2_icache_flush_all() do { } while (0)
#endif #endif
#if NIOS2_DCACHE_SIZE > 0 #if ALT_CPU_DCACHE_SIZE > 0
void _nios2_dcache_flush_all(void); void _nios2_dcache_flush_all(void);
#else #else
#define _nios2_dcache_flush_all() do { } while (0) #define _nios2_dcache_flush_all() do { } while (0)

8
include/arch/nios2/arch.h
View file

@ -114,10 +114,10 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
* specifically flip just that bit. * specifically flip just that bit.
*/ */
#if (NIOS2_NUM_OF_SHADOW_REG_SETS > 0) || \ #if (ALT_CPU_NUM_OF_SHADOW_REG_SETS > 0) || \
(defined NIOS2_EIC_PRESENT) || \ (defined ALT_CPU_EIC_PRESENT) || \
(defined NIOS2_MMU_PRESENT) || \ (defined ALT_CPU_MMU_PRESENT) || \
(defined NIOS2_MPU_PRESENT) (defined ALT_CPU_MPU_PRESENT)
uint32_t status_reg; uint32_t status_reg;
/* Interrupts were already locked when irq_lock() was called, /* Interrupts were already locked when irq_lock() was called,