michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc/xtensa: Misc. checkpatch fixups

Browse source 
Code style fixes.  Kept separate from the original changes to permit
easier rebasing.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2020-10-06 11:39:48 -07:00 • committed by Anas Nashif
commit a8d5437799
17 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/xtensa/include/kernel_arch_func.h
View file

@ -69,9 +69,9 @@ static inline void arch_switch(void *switch_to, void **switched_from)
#ifdef CONFIG_SOC_FAMILY_INTEL_ADSP #ifdef CONFIG_SOC_FAMILY_INTEL_ADSP
static inline bool arch_mem_coherent(void *ptr) static inline bool arch_mem_coherent(void *ptr)
{ {
size_t addr = (size_t) ptr; size_t addr = (size_t) ptr;
return addr >= 0x80000000 && addr < 0xa0000000; return addr >= 0x80000000 && addr < 0xa0000000;
} }
#endif #endif

5
boards/xtensa/up_squared_adsp/tools/adsplog.py
View file

@ -2,6 +2,7 @@
# #
# Copyright (c) 2020 Intel Corporation # Copyright (c) 2020 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import sys import sys
import time import time
import struct import struct
@ -73,8 +74,8 @@ while True:
break break
msgbytes.append(b) msgbytes.append(b)
msg = bytearray(len(msgbytes)) msg = bytearray(len(msgbytes))
for i in range(len(msgbytes)): for i, elem in enumerate(msgbytes):
msg[i] = msgbytes[i] msg[i] = elem
sys.stdout.write(msg.decode(encoding="utf-8", errors="ignore")) sys.stdout.write(msg.decode(encoding="utf-8", errors="ignore"))
next_slot = int((next_slot + 1) % (MAP_SIZE / SLOT_SIZE)) next_slot = int((next_slot + 1) % (MAP_SIZE / SLOT_SIZE))

3
dts/xtensa/intel/intel_byt_adsp.dtsi
View file

@ -33,14 +33,13 @@
}; };
soc { soc {
core_intc: core_intc@0 { core_intc: core_intc@0 {
compatible = "xtensa,core-intc"; compatible = "xtensa,core-intc";
reg = <0x00 0x400>; reg = <0x00 0x400>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
}; };
mailbox: mailbox@ff340018 { mailbox: mailbox@ff340018 {
compatible = "intel,intel-adsp-mailbox"; compatible = "intel,intel-adsp-mailbox";
reg = <0xFF340018 0x30>; reg = <0xFF340018 0x30>;

4
include/sys/arch_interface.h
View file

@ -755,8 +755,8 @@ static inline bool arch_mem_coherent(void *ptr)
*/ */
#ifndef CONFIG_KERNEL_COHERENCE #ifndef CONFIG_KERNEL_COHERENCE
static inline void arch_cohere_stacks(struct k_thread *old_thread, static inline void arch_cohere_stacks(struct k_thread *old_thread,
void *old_switch_handle, void *old_switch_handle,
struct k_thread *new_thread) struct k_thread *new_thread)
{ {
ARG_UNUSED(old_thread); ARG_UNUSED(old_thread);
ARG_UNUSED(old_switch_handle); ARG_UNUSED(old_switch_handle);

5
kernel/thread.c
View file

@ -566,8 +566,9 @@ char *z_setup_new_thread(struct k_thread *new_thread,
stack_ptr = setup_thread_stack(new_thread, stack, stack_size); stack_ptr = setup_thread_stack(new_thread, stack, stack_size);
#ifdef KERNEL_COHERENCE #ifdef KERNEL_COHERENCE
/* Check that the thread object is safe, but that the stack is /* Check that the thread object is safe, but that the stack is
* still cached! */ * still cached!
*/
__ASSERT_NO_MSG(arch_mem_coherent(new_thread)); __ASSERT_NO_MSG(arch_mem_coherent(new_thread));
__ASSERT_NO_MSG(!arch_mem_coherent(stack)); __ASSERT_NO_MSG(!arch_mem_coherent(stack));
#endif #endif

4
soc/xtensa/intel_adsp/cavs_v15/Kconfig.defconfig.series
View file

@ -12,7 +12,7 @@ config SOC
default "intel_apl_adsp" if SOC_INTEL_CAVS_APL default "intel_apl_adsp" if SOC_INTEL_CAVS_APL
config SMP config SMP
default y default y
config MP_NUM_CPUS config MP_NUM_CPUS
default 2 default 2
@ -59,7 +59,7 @@ config IPM_CAVS_IDC
default y default y
config IPM config IPM
default y default y
if LOG if LOG

8
soc/xtensa/intel_adsp/cavs_v15/include/soc/memory.h
View file

@ -14,8 +14,8 @@
SRAM_DEBUG_SIZE + \ SRAM_DEBUG_SIZE + \
SRAM_TRACE_SIZE) SRAM_TRACE_SIZE)
#define L2_SRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram0))) #define L2_SRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram0)))
#define L2_SRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram0))) #define L2_SRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram0)))
#ifdef CONFIG_BOOTLOADER_MCUBOOT #ifdef CONFIG_BOOTLOADER_MCUBOOT
#define SRAM_BASE (L2_SRAM_BASE + CONFIG_BOOTLOADER_SRAM_SIZE * 1K) #define SRAM_BASE (L2_SRAM_BASE + CONFIG_BOOTLOADER_SRAM_SIZE * 1K)
@ -98,8 +98,8 @@
#define IDT_SIZE 0x2000 #define IDT_SIZE 0x2000
/* low power ram where DMA buffers are typically placed */ /* low power ram where DMA buffers are typically placed */
#define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1))) #define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1)))
#define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1))) #define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1)))
/* bootloader */ /* bootloader */

3
soc/xtensa/intel_adsp/cavs_v18/include/soc/memory.h
View file

@ -213,7 +213,8 @@
/* SRAM window 0 FW "registers" */ /* SRAM window 0 FW "registers" */
#define SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE 0x14 #define SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE 0x14
#define SRAM_REG_FW_END \ #define SRAM_REG_FW_END \
(SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE + (PLATFORM_CORE_COUNT - 1) * 0x4) (SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE + \
(PLATFORM_CORE_COUNT - 1) * 0x4)
/* Host page size */ /* Host page size */
#define HOST_PAGE_SIZE 4096 #define HOST_PAGE_SIZE 4096

1
soc/xtensa/intel_adsp/cavs_v18/include/soc/shim.h
View file

@ -1,5 +1,4 @@
/* SPDX-License-Identifier: Apache-2.0 /* SPDX-License-Identifier: Apache-2.0
* *
* Copyright(c) 2017 Intel Corporation. All rights reserved. * Copyright(c) 2017 Intel Corporation. All rights reserved.
* *

4
soc/xtensa/intel_adsp/cavs_v20/include/soc/memory.h
View file

@ -95,8 +95,8 @@
#define IDT_SIZE 0x2000 #define IDT_SIZE 0x2000
/* low power ram where DMA buffers are typically placed */ /* low power ram where DMA buffers are typically placed */
#define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1))) #define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1)))
#define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1))) #define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1)))
/* bootloader */ /* bootloader */

2
soc/xtensa/intel_adsp/cavs_v20/include/soc/shim.h
View file

@ -253,7 +253,7 @@
#define DSP_INIT_IOPO 0x71A68 #define DSP_INIT_IOPO 0x71A68
#define IOPO_DMIC_FLAG BIT(0) #define IOPO_DMIC_FLAG BIT(0)
#define IOPO_I2S_FLAG GENMASK(DAI_NUM_SSP_BASE + DAI_NUM_SSP_EXT + 7, 8) #define IOPO_I2S_FLAG GENMASK(DAI_NUM_SSP_BASE + DAI_NUM_SSP_EXT + 7, 8)
#define DSP_INIT_GENO 0x71A6C #define DSP_INIT_GENO 0x71A6C
#define GENO_MDIVOSEL BIT(1) #define GENO_MDIVOSEL BIT(1)

9
soc/xtensa/intel_adsp/cavs_v25/include/soc/memory.h
View file

@ -1,4 +1,4 @@
s/* /*
* Copyright (c) 2019 Intel Corporation * Copyright (c) 2019 Intel Corporation
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -95,8 +95,8 @@ s/*
#define IDT_SIZE 0x2000 #define IDT_SIZE 0x2000
/* low power ram where DMA buffers are typically placed */ /* low power ram where DMA buffers are typically placed */
#define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1))) #define LPRAM_BASE (DT_REG_ADDR(DT_NODELABEL(sram1)))
#define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1))) #define LPRAM_SIZE (DT_REG_SIZE(DT_NODELABEL(sram1)))
/* bootloader */ /* bootloader */
@ -213,7 +213,8 @@ s/*
/* SRAM window 0 FW "registers" */ /* SRAM window 0 FW "registers" */
#define SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE 0x14 #define SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE 0x14
#define SRAM_REG_FW_END \ #define SRAM_REG_FW_END \
(SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE + (PLATFORM_CORE_COUNT - 1) * 0x4) (SRAM_REG_FW_TRACEP_SLAVE_CORE_BASE + \
(PLATFORM_CORE_COUNT - 1) * 0x4)
/* Host page size */ /* Host page size */
#define HOST_PAGE_SIZE 4096 #define HOST_PAGE_SIZE 4096

2
soc/xtensa/intel_adsp/cavs_v25/include/soc/shim.h
View file

@ -262,7 +262,7 @@
#define DSP_INIT_IOPO 0x71A68 #define DSP_INIT_IOPO 0x71A68
#define IOPO_DMIC_FLAG BIT(0) #define IOPO_DMIC_FLAG BIT(0)
#define IOPO_I2S_FLAG GENMASK(DAI_NUM_SSP_BASE + DAI_NUM_SSP_EXT + 7, 8) #define IOPO_I2S_FLAG GENMASK(DAI_NUM_SSP_BASE + DAI_NUM_SSP_EXT + 7, 8)
#define DSP_INIT_GENO 0x71A6C #define DSP_INIT_GENO 0x71A6C
#define GENO_MDIVOSEL BIT(1) #define GENO_MDIVOSEL BIT(1)

2
soc/xtensa/intel_adsp/cavs_v25/linker.ld
View file

@ -154,7 +154,7 @@ PHDRS
static_uuid_entries_phdr PT_NOTE; static_uuid_entries_phdr PT_NOTE;
static_log_entries_phdr PT_NOTE; static_log_entries_phdr PT_NOTE;
lpsram_mem_phdr PT_LOAD; lpsram_mem_phdr PT_LOAD;
sram_alt_fw_reset_vec_phdr PT_LOAD; sram_alt_fw_reset_vec_phdr PT_LOAD;
sram_alt_fw_reset_vec_int_phdr PT_LOAD; sram_alt_fw_reset_vec_int_phdr PT_LOAD;

4
soc/xtensa/intel_adsp/common/bootloader/boot_loader.c
View file

@ -195,7 +195,7 @@ static int32_t hp_sram_pm_banks(uint32_t banks)
ebb_avail_mask0 = (uint32_t)GENMASK(EBB_SEGMENT_SIZE - 1, 0); ebb_avail_mask0 = (uint32_t)GENMASK(EBB_SEGMENT_SIZE - 1, 0);
ebb_avail_mask1 = (uint32_t)GENMASK(total_banks_count - ebb_avail_mask1 = (uint32_t)GENMASK(total_banks_count -
EBB_SEGMENT_SIZE - 1, 0); EBB_SEGMENT_SIZE - 1, 0);
} else{ } else {
ebb_avail_mask0 = (uint32_t)GENMASK(total_banks_count - 1, ebb_avail_mask0 = (uint32_t)GENMASK(total_banks_count - 1,
0); 0);
ebb_avail_mask1 = 0; ebb_avail_mask1 = 0;
@ -206,7 +206,7 @@ static int32_t hp_sram_pm_banks(uint32_t banks)
ebb_mask0 = (uint32_t)GENMASK(EBB_SEGMENT_SIZE - 1, 0); ebb_mask0 = (uint32_t)GENMASK(EBB_SEGMENT_SIZE - 1, 0);
ebb_mask1 = (uint32_t)GENMASK(banks - EBB_SEGMENT_SIZE - 1, ebb_mask1 = (uint32_t)GENMASK(banks - EBB_SEGMENT_SIZE - 1,
0); 0);
} else{ } else {
/* assumption that ebb_in_use is > 0 */ /* assumption that ebb_in_use is > 0 */
ebb_mask0 = (uint32_t)GENMASK(banks - 1, 0); ebb_mask0 = (uint32_t)GENMASK(banks - 1, 0);
ebb_mask1 = 0; ebb_mask1 = 0;

2
soc/xtensa/intel_adsp/common/fix_elf_addrs.py
View file

@ -32,7 +32,7 @@ with open(elffile, "rb") as fd:
elf = ELFFile(fd) elf = ELFFile(fd)
for s in elf.iter_sections(): for s in elf.iter_sections():
addr = s.header.sh_addr addr = s.header.sh_addr
if addr >= 0x80000000 and addr < 0xa0000000: if 0x80000000 <= addr < 0xa0000000:
print(f"fix_elf_addrs.py: Moving section {s.name} to cached SRAM region") print(f"fix_elf_addrs.py: Moving section {s.name} to cached SRAM region")
fixup.append(s.name) fixup.append(s.name)

2
soc/xtensa/intel_adsp/common/printk_out.c
View file

@ -30,7 +30,7 @@
/* Translates a SRAM pointer into an address of the same memory in the /* Translates a SRAM pointer into an address of the same memory in the
* uncached region from 0x80000000-0x9fffffff * uncached region from 0x80000000-0x9fffffff
*/ */
#define UNCACHED_PTR(p) ((void*)(((int)p) & ~0x20000000)) #define UNCACHED_PTR(p) ((void *)(((int)p) & ~0x20000000))
struct slot_hdr { struct slot_hdr {
uint16_t magic; uint16_t magic;