- Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] SOF 1.1 Release
by Liam Girdwood 05 Apr '18

05 Apr '18

Sound Open Firmware 1.1 has now been released and available here :- git://git.alsa-project.org/sound-open-firmware.git git://git.alsa-project.org/sound-open-firmware-tools.git Significant changes since 1.0 :- o Support for Playback/Capture on Intel Apollolake and Cannonlake platforms. o Initial support for Intel Haswell and Broadwell platforms. o Support for DMA based firmware tracing to host userspace. o SIMD optimisations for SRC on xtensa ISA. o Initial support for running firmware components on host. Plans for 1.2 :- o Playback/Capture on Haswell/Broadwell. o SIMD optimisations for volume and mixer. o Improved host based component testing. o Initial runtime module support. SOF Linux driver dependencies for ALSA/ASoC have also started to upstream. Driver patches will continue to flow in anticipation for base SOF driver in 4.18. Thanks Liam

1 0

[Sound-open-firmware] [PATCH] soft: global rename from reef to sof
by Pierre-Louis Bossart 05 Apr '18

05 Apr '18

no functionality change, just string replacement Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- README | 2 +- topology/Makefile.am | 56 +++++++++++----------- .../{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} | 0 .../{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} | 0 topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} | 0 topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} | 0 .../{reef-bxt-nocodec.m4 => sof-bxt-nocodec.m4} | 0 topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} | 0 .../{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} | 0 topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} | 0 topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} | 0 topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} | 0 .../{reef-cht-max98090.m4 => sof-cht-max98090.m4} | 0 .../{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} | 0 topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} | 0 topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} | 0 16 files changed, 29 insertions(+), 29 deletions(-) rename topology/{reef-apl-nocodec.m4 => sof-apl-nocodec.m4} (100%) rename topology/{reef-apl-tdf8532.m4 => sof-apl-tdf8532.m4} (100%) rename topology/{reef-bdw-rt286.m4 => sof-bdw-rt286.m4} (100%) rename topology/{reef-bdw-rt5640.m4 => sof-bdw-rt5640.m4} (100%) rename topology/{reef-bxt-nocodec.m4 => sof-bxt-nocodec.m4} (100%) rename topology/{reef-byt-da7213.m4 => sof-byt-da7213.m4} (100%) rename topology/{reef-byt-nocodec.m4 => sof-byt-nocodec.m4} (100%) rename topology/{reef-byt-rt5640.m4 => sof-byt-rt5640.m4} (100%) rename topology/{reef-byt-rt5645.m4 => sof-byt-rt5645.m4} (100%) rename topology/{reef-byt-rt5651.m4 => sof-byt-rt5651.m4} (100%) rename topology/{reef-cht-max98090.m4 => sof-cht-max98090.m4} (100%) rename topology/{reef-cht-nocodec.m4 => sof-cht-nocodec.m4} (100%) rename topology/{reef-cnl-rt274.m4 => sof-cnl-rt274.m4} (100%) rename topology/{reef-hsw-rt5640.m4 => sof-hsw-rt5640.m4} (100%) diff --git a/README b/README index 4eca4b5..d5134e9 100644 --- a/README +++ b/README @@ -28,7 +28,7 @@ assist in debugging :- e.g. convert to flat binary, then ELF then dissasemble -rimage -i /lib/firmware/intel/reef-byt.ri -o image.bin -b -m byt +rimage -i /lib/firmware/intel/sof-byt.ri -o image.bin -b -m byt xtensa-byt-elf-objcopy -I binary -O elf32-xtensa-le -B xtensa image.bin image.bin.elf diff --git a/topology/Makefile.am b/topology/Makefile.am index a7e86fd..db15223 100644 --- a/topology/Makefile.am +++ b/topology/Makefile.am @@ -16,20 +16,20 @@ DEPS = \ # MACHINES = \ - reef-cht-nocodec.tplg \ - reef-cht-max98090.tplg \ - reef-apl-nocodec.tplg \ - reef-bxt-nocodec.tplg \ - reef-byt-nocodec.tplg \ - reef-bdw-rt286.tplg \ - reef-bdw-rt5640.tplg \ - reef-byt-rt5640.tplg \ - reef-byt-rt5645.tplg \ - reef-byt-rt5651.tplg \ - reef-byt-da7213.tplg \ - reef-cnl-rt274.tplg \ - reef-hsw-rt5640.tplg \ - reef-apl-tdf8532.tplg + sof-cht-nocodec.tplg \ + sof-cht-max98090.tplg \ + sof-apl-nocodec.tplg \ + sof-bxt-nocodec.tplg \ + sof-byt-nocodec.tplg \ + sof-bdw-rt286.tplg \ + sof-bdw-rt5640.tplg \ + sof-byt-rt5640.tplg \ + sof-byt-rt5645.tplg \ + sof-byt-rt5651.tplg \ + sof-byt-da7213.tplg \ + sof-cnl-rt274.tplg \ + sof-hsw-rt5640.tplg \ + sof-apl-tdf8532.tplg # Uncomment the following line if you want to debug conf files .PRECIOUS: %.conf @@ -47,17 +47,17 @@ clean: rm -f *.tplg EXTRA_DIST = \ - reef-cht-nocodec.m4 \ - reef-cht-max98090.m4 \ - reef-apl-nocodec.m4 \ - reef-bxt-nocodec.m4 \ - reef-byt-nocodec.m4 \ - reef-bdw-rt286.m4 \ - reef-bdw-rt5640.m4 \ - reef-byt-rt5640.m4 \ - reef-byt-rt5645.m4 \ - reef-byt-rt5651.m4 \ - reef-byt-da7213.m4 \ - reef-cnl-rt274.m4 \ - reef-hsw-rt5640.m4 \ - reef-apl-tdf8532.m4 + sof-cht-nocodec.m4 \ + sof-cht-max98090.m4 \ + sof-apl-nocodec.m4 \ + sof-bxt-nocodec.m4 \ + sof-byt-nocodec.m4 \ + sof-bdw-rt286.m4 \ + sof-bdw-rt5640.m4 \ + sof-byt-rt5640.m4 \ + sof-byt-rt5645.m4 \ + sof-byt-rt5651.m4 \ + sof-byt-da7213.m4 \ + sof-cnl-rt274.m4 \ + sof-hsw-rt5640.m4 \ + sof-apl-tdf8532.m4 diff --git a/topology/reef-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 similarity index 100% rename from topology/reef-apl-nocodec.m4 rename to topology/sof-apl-nocodec.m4 diff --git a/topology/reef-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 similarity index 100% rename from topology/reef-apl-tdf8532.m4 rename to topology/sof-apl-tdf8532.m4 diff --git a/topology/reef-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 similarity index 100% rename from topology/reef-bdw-rt286.m4 rename to topology/sof-bdw-rt286.m4 diff --git a/topology/reef-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 similarity index 100% rename from topology/reef-bdw-rt5640.m4 rename to topology/sof-bdw-rt5640.m4 diff --git a/topology/reef-bxt-nocodec.m4 b/topology/sof-bxt-nocodec.m4 similarity index 100% rename from topology/reef-bxt-nocodec.m4 rename to topology/sof-bxt-nocodec.m4 diff --git a/topology/reef-byt-da7213.m4 b/topology/sof-byt-da7213.m4 similarity index 100% rename from topology/reef-byt-da7213.m4 rename to topology/sof-byt-da7213.m4 diff --git a/topology/reef-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 similarity index 100% rename from topology/reef-byt-nocodec.m4 rename to topology/sof-byt-nocodec.m4 diff --git a/topology/reef-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 similarity index 100% rename from topology/reef-byt-rt5640.m4 rename to topology/sof-byt-rt5640.m4 diff --git a/topology/reef-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 similarity index 100% rename from topology/reef-byt-rt5645.m4 rename to topology/sof-byt-rt5645.m4 diff --git a/topology/reef-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 similarity index 100% rename from topology/reef-byt-rt5651.m4 rename to topology/sof-byt-rt5651.m4 diff --git a/topology/reef-cht-max98090.m4 b/topology/sof-cht-max98090.m4 similarity index 100% rename from topology/reef-cht-max98090.m4 rename to topology/sof-cht-max98090.m4 diff --git a/topology/reef-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 similarity index 100% rename from topology/reef-cht-nocodec.m4 rename to topology/sof-cht-nocodec.m4 diff --git a/topology/reef-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 similarity index 100% rename from topology/reef-cnl-rt274.m4 rename to topology/sof-cnl-rt274.m4 diff --git a/topology/reef-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 similarity index 100% rename from topology/reef-hsw-rt5640.m4 rename to topology/sof-hsw-rt5640.m4 -- 2.14.1

1 0

[Sound-open-firmware] [PATCH 1/3] clean: dos2unix: baytrail.x.in
by Liam Girdwood 04 Apr '18

04 Apr '18

Remove any DOS line termination. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/baytrail.x.in | 1026 +++++++++++++++++------------------ 1 file changed, 508 insertions(+), 518 deletions(-) diff --git a/src/platform/baytrail/baytrail.x.in b/src/platform/baytrail/baytrail.x.in index 6d4b084c..6692cf7a 100755 --- a/src/platform/baytrail/baytrail.x.in +++ b/src/platform/baytrail/baytrail.x.in @@ -1,518 +1,508 @@ -/* - * Linker Script for Baytrail. - * - * This script is run through the GNU C preprocessor to align the memory - * offsets with headers. - * - * Use spaces for formatting as cpp ignore tab sizes. - */ - -#include <platform/memory.h> -#include <xtensa/config/core-isa.h> - -OUTPUT_ARCH(xtensa) - -MEMORY -{ - vector_reset_text : - org = XCHAL_RESET_VECTOR0_PADDR, - len = REEF_MEM_RESET_TEXT_SIZE - vector_reset_lit : - org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, - len = REEF_MEM_RESET_LIT_SIZE - vector_base_text : - org = XCHAL_VECBASE_RESET_PADDR, - len = REEF_MEM_VECBASE_LIT_SIZE - vector_int2_lit : - org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int2_text : - org = XCHAL_INTLEVEL2_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int3_lit : - org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int3_text : - org = XCHAL_INTLEVEL3_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int4_lit : - org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int4_text : - org = XCHAL_INTLEVEL4_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int5_lit : - org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int5_text : - org = XCHAL_INTLEVEL5_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int6_lit : - org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int6_text : - org = XCHAL_INTLEVEL6_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_int7_lit : - org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_int7_text : - org = XCHAL_INTLEVEL7_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_kernel_lit : - org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_kernel_text : - org = XCHAL_KERNEL_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_user_lit : - org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_user_text : - org = XCHAL_USER_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - vector_double_lit : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, - len = REEF_MEM_VECT_LIT_SIZE - vector_double_text : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR, - len = REEF_MEM_VECT_TEXT_SIZE - reef_text_start : - org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, - len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) - reef_data_ro : - org = DRAM0_BASE, - len = REEF_MEM_RO_SIZE - reef_data : - org = DRAM0_BASE + REEF_MEM_RO_SIZE, - len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) - system_heap : - org = HEAP_SYSTEM_BASE, - len = HEAP_SYSTEM_SIZE - runtime_heap : - org = HEAP_RUNTIME_BASE, - len = HEAP_RUNTIME_SIZE - buffer_heap : - org = HEAP_BUFFER_BASE, - len = HEAP_BUFFER_SIZE - reef_stack : - org = REEF_STACK_END, - len = REEF_STACK_BASE - REEF_STACK_END -} - -PHDRS -{ - vector_reset_text_phdr PT_LOAD; - vector_reset_lit_phdr PT_LOAD; - vector_base_text_phdr PT_LOAD; - vector_base_lit_phdr PT_LOAD; - vector_int2_text_phdr PT_LOAD; - vector_int2_lit_phdr PT_LOAD; - vector_int3_text_phdr PT_LOAD; - vector_int3_lit_phdr PT_LOAD; - vector_int4_text_phdr PT_LOAD; - vector_int4_lit_phdr PT_LOAD; - vector_int5_text_phdr PT_LOAD; - vector_int5_lit_phdr PT_LOAD; - vector_int6_text_phdr PT_LOAD; - vector_int6_lit_phdr PT_LOAD; - vector_int7_text_phdr PT_LOAD; - vector_int7_lit_phdr PT_LOAD; - vector_kernel_text_phdr PT_LOAD; - vector_kernel_lit_phdr PT_LOAD; - vector_user_text_phdr PT_LOAD; - vector_user_lit_phdr PT_LOAD; - vector_double_text_phdr PT_LOAD; - vector_double_lit_phdr PT_LOAD; - reef_text_start_phdr PT_LOAD; - reef_data_ro_phdr PT_LOAD; - reef_data_phdr PT_LOAD; - reef_data_bss_phdr PT_LOAD; - system_heap_phdr PT_LOAD; - runtime_heap_phdr PT_LOAD; - buffer_heap_phdr PT_LOAD; - reef_stack_phdr PT_LOAD; -} - -/* Default entry point: */ -ENTRY(_ResetVector) -_rom_store_table = 0; - -/* ABI0 does not use Window base */ -PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); - -/* Various memory-map dependent cache attribute settings: */ -_memmap_cacheattr_wb_base = 0x44024000; -_memmap_cacheattr_wt_base = 0x11021000; -_memmap_cacheattr_bp_base = 0x22022000; -_memmap_cacheattr_unused_mask = 0x00F00FFF; -_memmap_cacheattr_wb_trapnull = 0x4422422F; -_memmap_cacheattr_wba_trapnull = 0x4422422F; -_memmap_cacheattr_wbna_trapnull = 0x25222222; -_memmap_cacheattr_wt_trapnull = 0x1122122F; -_memmap_cacheattr_bp_trapnull = 0x2222222F; -_memmap_cacheattr_wb_strict = 0x44F24FFF; -_memmap_cacheattr_wt_strict = 0x11F21FFF; -_memmap_cacheattr_bp_strict = 0x22F22FFF; -_memmap_cacheattr_wb_allvalid = 0x44224222; -_memmap_cacheattr_wt_allvalid = 0x11221222; -_memmap_cacheattr_bp_allvalid = 0x22222222; -PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); - -SECTIONS -{ - .ResetVector.text : ALIGN(4) - { - _ResetVector_text_start = ABSOLUTE(.); - KEEP (*(.ResetVector.text)) - _ResetVector_text_end = ABSOLUTE(.); - } >vector_reset_text :vector_reset_text_phdr - - .ResetVector.literal : ALIGN(4) - { - _ResetVector_literal_start = ABSOLUTE(.); - *(.ResetVector.literal) - _ResetVector_literal_end = ABSOLUTE(.); - } >vector_reset_lit :vector_reset_lit_phdr - - .WindowVectors.text : ALIGN(4) - { - _WindowVectors_text_start = ABSOLUTE(.); - KEEP (*(.WindowVectors.text)) - _WindowVectors_text_end = ABSOLUTE(.); - } >vector_base_text :vector_base_text_phdr - - .Level2InterruptVector.literal : ALIGN(4) - { - _Level2InterruptVector_literal_start = ABSOLUTE(.); - *(.Level2InterruptVector.literal) - _Level2InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int2_lit :vector_int2_lit_phdr - - .Level2InterruptVector.text : ALIGN(4) - { - _Level2InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level2InterruptVector.text)) - _Level2InterruptVector_text_end = ABSOLUTE(.); - } >vector_int2_text :vector_int2_text_phdr - - .Level3InterruptVector.literal : ALIGN(4) - { - _Level3InterruptVector_literal_start = ABSOLUTE(.); - *(.Level3InterruptVector.literal) - _Level3InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int3_lit :vector_int3_lit_phdr - - .Level3InterruptVector.text : ALIGN(4) - { - _Level3InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level3InterruptVector.text)) - _Level3InterruptVector_text_end = ABSOLUTE(.); - } >vector_int3_text :vector_int3_text_phdr - - .Level4InterruptVector.literal : ALIGN(4) - { - _Level4InterruptVector_literal_start = ABSOLUTE(.); - *(.Level4InterruptVector.literal) - _Level4InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int4_lit :vector_int4_lit_phdr - - .Level4InterruptVector.text : ALIGN(4) - { - _Level4InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level4InterruptVector.text)) - _Level4InterruptVector_text_end = ABSOLUTE(.); - } >vector_int4_text :vector_int4_text_phdr - - .Level5InterruptVector.literal : ALIGN(4) - { - _Level5InterruptVector_literal_start = ABSOLUTE(.); - *(.Level5InterruptVector.literal) - _Level5InterruptVector_literal_end = ABSOLUTE(.); - } >vector_int5_lit :vector_int5_lit_phdr - - .Level5InterruptVector.text : ALIGN(4) - { - _Level5InterruptVector_text_start = ABSOLUTE(.); - KEEP (*(.Level5InterruptVector.text)) - _Level5InterruptVector_text_end = ABSOLUTE(.); - } >vector_int5_text :vector_int5_text_phdr - - .DebugExceptionVector.literal : ALIGN(4) - { - _DebugExceptionVector_literal_start = ABSOLUTE(.); - *(.DebugExceptionVector.literal) - _DebugExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int6_lit :vector_int6_lit_phdr - - .DebugExceptionVector.text : ALIGN(4) - { - _DebugExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DebugExceptionVector.text)) - _DebugExceptionVector_text_end = ABSOLUTE(.); - } >vector_int6_text :vector_int6_text_phdr - - .NMIExceptionVector.literal : ALIGN(4) - { - _NMIExceptionVector_literal_start = ABSOLUTE(.); - *(.NMIExceptionVector.literal) - _NMIExceptionVector_literal_end = ABSOLUTE(.); - } >vector_int7_lit :vector_int7_lit_phdr - - .NMIExceptionVector.text : ALIGN(4) - { - _NMIExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.NMIExceptionVector.text)) - _NMIExceptionVector_text_end = ABSOLUTE(.); - } >vector_int7_text :vector_int7_text_phdr - - .KernelExceptionVector.literal : ALIGN(4) - { - _KernelExceptionVector_literal_start = ABSOLUTE(.); - *(.KernelExceptionVector.literal) - _KernelExceptionVector_literal_end = ABSOLUTE(.); - } >vector_kernel_lit :vector_kernel_lit_phdr - - .KernelExceptionVector.text : ALIGN(4) - { - _KernelExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.KernelExceptionVector.text)) - _KernelExceptionVector_text_end = ABSOLUTE(.); - } >vector_kernel_text :vector_kernel_text_phdr - - .UserExceptionVector.literal : ALIGN(4) - { - _UserExceptionVector_literal_start = ABSOLUTE(.); - *(.UserExceptionVector.literal) - _UserExceptionVector_literal_end = ABSOLUTE(.); - } >vector_user_lit :vector_user_lit_phdr - - .UserExceptionVector.text : ALIGN(4) - { - _UserExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.UserExceptionVector.text)) - _UserExceptionVector_text_end = ABSOLUTE(.); - } >vector_user_text :vector_user_text_phdr - - .DoubleExceptionVector.literal : ALIGN(4) - { - _DoubleExceptionVector_literal_start = ABSOLUTE(.); - *(.DoubleExceptionVector.literal) - _DoubleExceptionVector_literal_end = ABSOLUTE(.); - } >vector_double_lit :vector_double_lit_phdr - - .DoubleExceptionVector.text : ALIGN(4) - { - _DoubleExceptionVector_text_start = ABSOLUTE(.); - KEEP (*(.DoubleExceptionVector.text)) - _DoubleExceptionVector_text_end = ABSOLUTE(.); - } >vector_double_text :vector_double_text_phdr - - .text : ALIGN(4) - { - _stext = .; - _text_start = ABSOLUTE(.); - *(.entry.text) - *(.init.literal) - KEEP(*(.init)) - *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) - *(.fini.literal) - KEEP(*(.fini)) - *(.gnu.version) - _text_end = ABSOLUTE(.); - _etext = .; - } >reef_text_start :reef_text_start_phdr - - .reset.rodata : ALIGN(4) - { - _reset_rodata_start = ABSOLUTE(.); - *(.reset.rodata) - _reset_rodata_end = ABSOLUTE(.); - } >reef_data_ro :reef_data_ro_phdr - - .rodata : ALIGN(4) - { - _rodata_start = ABSOLUTE(.); - *(.rodata) - *(.rodata.*) - *(.gnu.linkonce.r.*) - *(.rodata1) - __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); - KEEP (*(.xt_except_table)) - KEEP (*(.gcc_except_table)) - *(.gnu.linkonce.e.*) - *(.gnu.version_r) - KEEP (*(.eh_frame)) - /* C++ constructor and destructor tables, properly ordered: */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - /* C++ exception handlers table: */ - __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); - *(.xt_except_desc) - *(.gnu.linkonce.h.*) - __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); - *(.xt_except_desc_end) - *(.dynamic) - *(.gnu.version_d) - . = ALIGN(4); /* this table MUST be 4-byte aligned */ - _bss_table_start = ABSOLUTE(.); - LONG(_bss_start) - LONG(_bss_end) - _bss_table_end = ABSOLUTE(.); - _rodata_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .data : ALIGN(4) - { - _data_start = ABSOLUTE(.); - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - KEEP(*(.gnu.linkonce.d.*personality*)) - *(.data1) - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - *(.sdata2) - *(.sdata2.*) - *(.gnu.linkonce.s2.*) - KEEP(*(.jcr)) - _symbol_strings_start = ABSOLUTE(.); - LONG(_symbol_strings_start) - *(._symbol_strings) - LONG(_symbol_strings_end) - _symbol_strings_end = ABSOLUTE(.); - _symbol_table_start = ABSOLUTE(.); - LONG(_symbol_table_start) - *(._symbol_table) - LONG(_symbol_table_end) - _symbol_table_end = ABSOLUTE(.); - _data_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .lit4 : ALIGN(4) - { - _lit4_start = ABSOLUTE(.); - *(*.lit4) - *(.lit4.*) - *(.gnu.linkonce.lit4.*) - _lit4_end = ABSOLUTE(.); - } >reef_data :reef_data_phdr - - .bss (NOLOAD) : ALIGN(8) - { - . = ALIGN (8); - _bss_start = ABSOLUTE(.); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - *(.sbss2) - *(.sbss2.*) - *(.gnu.linkonce.sb2.*) - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - . = ALIGN (8); - _bss_end = ABSOLUTE(.); - } >reef_data :reef_data_bss_phdr - - /* stack */ - _end = REEF_STACK_END; - PROVIDE(end = REEF_STACK_END); - _stack_sentry = REEF_STACK_END; - __stack = REEF_STACK_BASE; - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - - .xt.insn 0 : - { - KEEP (*(.xt.insn)) - KEEP (*(.gnu.linkonce.x.*)) - } - .xt.prop 0 : - { - KEEP (*(.xt.prop)) - KEEP (*(.xt.prop.*)) - KEEP (*(.gnu.linkonce.prop.*)) - } - .xt.lit 0 : - { - KEEP (*(.xt.lit)) - KEEP (*(.xt.lit.*)) - KEEP (*(.gnu.linkonce.p.*)) - } - .xt.profile_range 0 : - { - KEEP (*(.xt.profile_range)) - KEEP (*(.gnu.linkonce.profile_range.*)) - } - .xt.profile_ranges 0 : - { - KEEP (*(.xt.profile_ranges)) - KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) - } - .xt.profile_files 0 : - { - KEEP (*(.xt.profile_files)) - KEEP (*(.gnu.linkonce.xt.profile_files.*)) - } - - .system_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_SYSTEM_SIZE; - _system_heap_end = ABSOLUTE(.); - } >system_heap :system_heap_phdr - - .runtime_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _runtime_heap_start = ABSOLUTE(.); - . = . + HEAP_RUNTIME_SIZE; - _runtime_heap_end = ABSOLUTE(.); - } >runtime_heap :runtime_heap_phdr - - .buffer_heap (NOLOAD) : ALIGN(8) - { - . = ALIGN (32); - _system_heap_start = ABSOLUTE(.); - . = . + HEAP_BUFFER_SIZE; - _system_heap_end = ABSOLUTE(.); - } >buffer_heap :buffer_heap_phdr - - .reef_stack (NOLOAD) : ALIGN(8) - { - . = ALIGN (4096); - _reef_stack_start = ABSOLUTE(.); - . = . + REEF_STACK_SIZE; - _reef_stack_end = ABSOLUTE(.); - } >reef_stack :reef_stack_phdr -} - +/* + * Linker Script for Baytrail. + * + * This script is run through the GNU C preprocessor to align the memory + * offsets with headers. + * + * Use spaces for formatting as cpp ignore tab sizes. + */ + +#include <platform/memory.h> +#include <xtensa/config/core-isa.h> + +OUTPUT_ARCH(xtensa) + +MEMORY +{ + vector_reset_text : + org = XCHAL_RESET_VECTOR0_PADDR, + len = REEF_MEM_RESET_TEXT_SIZE + vector_reset_lit : + org = XCHAL_RESET_VECTOR0_PADDR + REEF_MEM_RESET_TEXT_SIZE, + len = REEF_MEM_RESET_LIT_SIZE + vector_base_text : + org = XCHAL_VECBASE_RESET_PADDR, + len = REEF_MEM_VECBASE_LIT_SIZE + vector_int2_lit : + org = XCHAL_INTLEVEL2_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int2_text : + org = XCHAL_INTLEVEL2_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int3_lit : + org = XCHAL_INTLEVEL3_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int3_text : + org = XCHAL_INTLEVEL3_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int4_lit : + org = XCHAL_INTLEVEL4_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int4_text : + org = XCHAL_INTLEVEL4_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int5_lit : + org = XCHAL_INTLEVEL5_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int5_text : + org = XCHAL_INTLEVEL5_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int6_lit : + org = XCHAL_INTLEVEL6_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int6_text : + org = XCHAL_INTLEVEL6_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_int7_lit : + org = XCHAL_INTLEVEL7_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_int7_text : + org = XCHAL_INTLEVEL7_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_kernel_lit : + org = XCHAL_KERNEL_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_kernel_text : + org = XCHAL_KERNEL_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_user_lit : + org = XCHAL_USER_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_user_text : + org = XCHAL_USER_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + vector_double_lit : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR - REEF_MEM_VECT_LIT_SIZE, + len = REEF_MEM_VECT_LIT_SIZE + vector_double_text : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR, + len = REEF_MEM_VECT_TEXT_SIZE + reef_text_start : + org = XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE, + len = (IRAM_BASE + IRAM_SIZE) - (XCHAL_DOUBLEEXC_VECTOR_PADDR + REEF_MEM_VECT_SIZE) + reef_data_ro : + org = DRAM0_BASE, + len = REEF_MEM_RO_SIZE + reef_data : + org = DRAM0_BASE + REEF_MEM_RO_SIZE, + len = HEAP_SYSTEM_BASE - (DRAM0_BASE + REEF_MEM_RO_SIZE) + system_heap : + org = HEAP_SYSTEM_BASE, + len = HEAP_SYSTEM_SIZE + runtime_heap : + org = HEAP_RUNTIME_BASE, + len = HEAP_RUNTIME_SIZE + buffer_heap : + org = HEAP_BUFFER_BASE, + len = HEAP_BUFFER_SIZE + reef_stack : + org = REEF_STACK_END, + len = REEF_STACK_BASE - REEF_STACK_END +} + +PHDRS +{ + vector_reset_text_phdr PT_LOAD; + vector_reset_lit_phdr PT_LOAD; + vector_base_text_phdr PT_LOAD; + vector_base_lit_phdr PT_LOAD; + vector_int2_text_phdr PT_LOAD; + vector_int2_lit_phdr PT_LOAD; + vector_int3_text_phdr PT_LOAD; + vector_int3_lit_phdr PT_LOAD; + vector_int4_text_phdr PT_LOAD; + vector_int4_lit_phdr PT_LOAD; + vector_int5_text_phdr PT_LOAD; + vector_int5_lit_phdr PT_LOAD; + vector_int6_text_phdr PT_LOAD; + vector_int6_lit_phdr PT_LOAD; + vector_int7_text_phdr PT_LOAD; + vector_int7_lit_phdr PT_LOAD; + vector_kernel_text_phdr PT_LOAD; + vector_kernel_lit_phdr PT_LOAD; + vector_user_text_phdr PT_LOAD; + vector_user_lit_phdr PT_LOAD; + vector_double_text_phdr PT_LOAD; + vector_double_lit_phdr PT_LOAD; + reef_text_start_phdr PT_LOAD; + reef_data_ro_phdr PT_LOAD; + reef_data_phdr PT_LOAD; + reef_data_bss_phdr PT_LOAD; + system_heap_phdr PT_LOAD; + runtime_heap_phdr PT_LOAD; + buffer_heap_phdr PT_LOAD; + reef_stack_phdr PT_LOAD; +} + +/* Default entry point: */ +ENTRY(_ResetVector) +_rom_store_table = 0; + +/* ABI0 does not use Window base */ +PROVIDE(_memmap_vecbase_reset = XCHAL_VECBASE_RESET_PADDR); + +/* Various memory-map dependent cache attribute settings: */ +_memmap_cacheattr_wb_base = 0x44024000; +_memmap_cacheattr_wt_base = 0x11021000; +_memmap_cacheattr_bp_base = 0x22022000; +_memmap_cacheattr_unused_mask = 0x00F00FFF; +_memmap_cacheattr_wb_trapnull = 0x4422422F; +_memmap_cacheattr_wba_trapnull = 0x4422422F; +_memmap_cacheattr_wbna_trapnull = 0x25222222; +_memmap_cacheattr_wt_trapnull = 0x1122122F; +_memmap_cacheattr_bp_trapnull = 0x2222222F; +_memmap_cacheattr_wb_strict = 0x44F24FFF; +_memmap_cacheattr_wt_strict = 0x11F21FFF; +_memmap_cacheattr_bp_strict = 0x22F22FFF; +_memmap_cacheattr_wb_allvalid = 0x44224222; +_memmap_cacheattr_wt_allvalid = 0x11221222; +_memmap_cacheattr_bp_allvalid = 0x22222222; +PROVIDE(_memmap_cacheattr_reset = _memmap_cacheattr_wbna_trapnull); + +SECTIONS +{ + .ResetVector.text : ALIGN(4) + { + _ResetVector_text_start = ABSOLUTE(.); + KEEP (*(.ResetVector.text)) + _ResetVector_text_end = ABSOLUTE(.); + } >vector_reset_text :vector_reset_text_phdr + + .ResetVector.literal : ALIGN(4) + { + _ResetVector_literal_start = ABSOLUTE(.); + *(.ResetVector.literal) + _ResetVector_literal_end = ABSOLUTE(.); + } >vector_reset_lit :vector_reset_lit_phdr + + .WindowVectors.text : ALIGN(4) + { + _WindowVectors_text_start = ABSOLUTE(.); + KEEP (*(.WindowVectors.text)) + _WindowVectors_text_end = ABSOLUTE(.); + } >vector_base_text :vector_base_text_phdr + + .Level2InterruptVector.literal : ALIGN(4) + { + _Level2InterruptVector_literal_start = ABSOLUTE(.); + *(.Level2InterruptVector.literal) + _Level2InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int2_lit :vector_int2_lit_phdr + + .Level2InterruptVector.text : ALIGN(4) + { + _Level2InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level2InterruptVector.text)) + _Level2InterruptVector_text_end = ABSOLUTE(.); + } >vector_int2_text :vector_int2_text_phdr + + .Level3InterruptVector.literal : ALIGN(4) + { + _Level3InterruptVector_literal_start = ABSOLUTE(.); + *(.Level3InterruptVector.literal) + _Level3InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int3_lit :vector_int3_lit_phdr + + .Level3InterruptVector.text : ALIGN(4) + { + _Level3InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level3InterruptVector.text)) + _Level3InterruptVector_text_end = ABSOLUTE(.); + } >vector_int3_text :vector_int3_text_phdr + + .Level4InterruptVector.literal : ALIGN(4) + { + _Level4InterruptVector_literal_start = ABSOLUTE(.); + *(.Level4InterruptVector.literal) + _Level4InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int4_lit :vector_int4_lit_phdr + + .Level4InterruptVector.text : ALIGN(4) + { + _Level4InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level4InterruptVector.text)) + _Level4InterruptVector_text_end = ABSOLUTE(.); + } >vector_int4_text :vector_int4_text_phdr + + .Level5InterruptVector.literal : ALIGN(4) + { + _Level5InterruptVector_literal_start = ABSOLUTE(.); + *(.Level5InterruptVector.literal) + _Level5InterruptVector_literal_end = ABSOLUTE(.); + } >vector_int5_lit :vector_int5_lit_phdr + + .Level5InterruptVector.text : ALIGN(4) + { + _Level5InterruptVector_text_start = ABSOLUTE(.); + KEEP (*(.Level5InterruptVector.text)) + _Level5InterruptVector_text_end = ABSOLUTE(.); + } >vector_int5_text :vector_int5_text_phdr + + .DebugExceptionVector.literal : ALIGN(4) + { + _DebugExceptionVector_literal_start = ABSOLUTE(.); + *(.DebugExceptionVector.literal) + _DebugExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int6_lit :vector_int6_lit_phdr + + .DebugExceptionVector.text : ALIGN(4) + { + _DebugExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DebugExceptionVector.text)) + _DebugExceptionVector_text_end = ABSOLUTE(.); + } >vector_int6_text :vector_int6_text_phdr + + .NMIExceptionVector.literal : ALIGN(4) + { + _NMIExceptionVector_literal_start = ABSOLUTE(.); + *(.NMIExceptionVector.literal) + _NMIExceptionVector_literal_end = ABSOLUTE(.); + } >vector_int7_lit :vector_int7_lit_phdr + + .NMIExceptionVector.text : ALIGN(4) + { + _NMIExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.NMIExceptionVector.text)) + _NMIExceptionVector_text_end = ABSOLUTE(.); + } >vector_int7_text :vector_int7_text_phdr + + .KernelExceptionVector.literal : ALIGN(4) + { + _KernelExceptionVector_literal_start = ABSOLUTE(.); + *(.KernelExceptionVector.literal) + _KernelExceptionVector_literal_end = ABSOLUTE(.); + } >vector_kernel_lit :vector_kernel_lit_phdr + + .KernelExceptionVector.text : ALIGN(4) + { + _KernelExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.KernelExceptionVector.text)) + _KernelExceptionVector_text_end = ABSOLUTE(.); + } >vector_kernel_text :vector_kernel_text_phdr + + .UserExceptionVector.literal : ALIGN(4) + { + _UserExceptionVector_literal_start = ABSOLUTE(.); + *(.UserExceptionVector.literal) + _UserExceptionVector_literal_end = ABSOLUTE(.); + } >vector_user_lit :vector_user_lit_phdr + + .UserExceptionVector.text : ALIGN(4) + { + _UserExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.UserExceptionVector.text)) + _UserExceptionVector_text_end = ABSOLUTE(.); + } >vector_user_text :vector_user_text_phdr + + .DoubleExceptionVector.literal : ALIGN(4) + { + _DoubleExceptionVector_literal_start = ABSOLUTE(.); + *(.DoubleExceptionVector.literal) + _DoubleExceptionVector_literal_end = ABSOLUTE(.); + } >vector_double_lit :vector_double_lit_phdr + + .DoubleExceptionVector.text : ALIGN(4) + { + _DoubleExceptionVector_text_start = ABSOLUTE(.); + KEEP (*(.DoubleExceptionVector.text)) + _DoubleExceptionVector_text_end = ABSOLUTE(.); + } >vector_double_text :vector_double_text_phdr + + .text : ALIGN(4) + { + _stext = .; + _text_start = ABSOLUTE(.); + *(.entry.text) + *(.init.literal) + KEEP(*(.init)) + *(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*) + *(.fini.literal) + KEEP(*(.fini)) + *(.gnu.version) + _text_end = ABSOLUTE(.); + _etext = .; + } >reef_text_start :reef_text_start_phdr + + .reset.rodata : ALIGN(4) + { + _reset_rodata_start = ABSOLUTE(.); + *(.reset.rodata) + _reset_rodata_end = ABSOLUTE(.); + } >reef_data_ro :reef_data_ro_phdr + + .rodata : ALIGN(4) + { + _rodata_start = ABSOLUTE(.); + *(.rodata) + *(.rodata.*) + *(.gnu.linkonce.r.*) + *(.rodata1) + __XT_EXCEPTION_TABLE__ = ABSOLUTE(.); + KEEP (*(.xt_except_table)) + KEEP (*(.gcc_except_table)) + *(.gnu.linkonce.e.*) + *(.gnu.version_r) + KEEP (*(.eh_frame)) + /* C++ constructor and destructor tables, properly ordered: */ + KEEP (*crtbegin.o(.ctors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + KEEP (*crtbegin.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + /* C++ exception handlers table: */ + __XT_EXCEPTION_DESCS__ = ABSOLUTE(.); + *(.xt_except_desc) + *(.gnu.linkonce.h.*) + __XT_EXCEPTION_DESCS_END__ = ABSOLUTE(.); + *(.xt_except_desc_end) + *(.dynamic) + *(.gnu.version_d) + . = ALIGN(4); /* this table MUST be 4-byte aligned */ + _bss_table_start = ABSOLUTE(.); + LONG(_bss_start) + LONG(_bss_end) + _bss_table_end = ABSOLUTE(.); + _rodata_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .data : ALIGN(4) + { + _data_start = ABSOLUTE(.); + *(.data) + *(.data.*) + *(.gnu.linkonce.d.*) + KEEP(*(.gnu.linkonce.d.*personality*)) + *(.data1) + *(.sdata) + *(.sdata.*) + *(.gnu.linkonce.s.*) + *(.sdata2) + *(.sdata2.*) + *(.gnu.linkonce.s2.*) + KEEP(*(.jcr)) + _data_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .lit4 : ALIGN(4) + { + _lit4_start = ABSOLUTE(.); + *(*.lit4) + *(.lit4.*) + *(.gnu.linkonce.lit4.*) + _lit4_end = ABSOLUTE(.); + } >reef_data :reef_data_phdr + + .bss (NOLOAD) : ALIGN(8) + { + . = ALIGN (8); + _bss_start = ABSOLUTE(.); + *(.dynsbss) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.sb.*) + *(.scommon) + *(.sbss2) + *(.sbss2.*) + *(.gnu.linkonce.sb2.*) + *(.dynbss) + *(.bss) + *(.bss.*) + *(.gnu.linkonce.b.*) + *(COMMON) + . = ALIGN (8); + _bss_end = ABSOLUTE(.); + } >reef_data :reef_data_bss_phdr + + /* stack */ + _end = REEF_STACK_END; + PROVIDE(end = REEF_STACK_END); + _stack_sentry = REEF_STACK_END; + __stack = REEF_STACK_BASE; + + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + .debug_info 0 : { *(.debug_info) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + + .xt.insn 0 : + { + KEEP (*(.xt.insn)) + KEEP (*(.gnu.linkonce.x.*)) + } + .xt.prop 0 : + { + KEEP (*(.xt.prop)) + KEEP (*(.xt.prop.*)) + KEEP (*(.gnu.linkonce.prop.*)) + } + .xt.lit 0 : + { + KEEP (*(.xt.lit)) + KEEP (*(.xt.lit.*)) + KEEP (*(.gnu.linkonce.p.*)) + } + .xt.profile_range 0 : + { + KEEP (*(.xt.profile_range)) + KEEP (*(.gnu.linkonce.profile_range.*)) + } + .xt.profile_ranges 0 : + { + KEEP (*(.xt.profile_ranges)) + KEEP (*(.gnu.linkonce.xt.profile_ranges.*)) + } + .xt.profile_files 0 : + { + KEEP (*(.xt.profile_files)) + KEEP (*(.gnu.linkonce.xt.profile_files.*)) + } + + .system_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_SYSTEM_SIZE; + _system_heap_end = ABSOLUTE(.); + } >system_heap :system_heap_phdr + + .runtime_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _runtime_heap_start = ABSOLUTE(.); + . = . + HEAP_RUNTIME_SIZE; + _runtime_heap_end = ABSOLUTE(.); + } >runtime_heap :runtime_heap_phdr + + .buffer_heap (NOLOAD) : ALIGN(8) + { + . = ALIGN (32); + _system_heap_start = ABSOLUTE(.); + . = . + HEAP_BUFFER_SIZE; + _system_heap_end = ABSOLUTE(.); + } >buffer_heap :buffer_heap_phdr + + .reef_stack (NOLOAD) : ALIGN(8) + { + . = ALIGN (4096); + _reef_stack_start = ABSOLUTE(.); + . = . + REEF_STACK_SIZE; + _reef_stack_end = ABSOLUTE(.); + } >reef_stack :reef_stack_phdr +} + -- 2.14.1

1 2

[Sound-open-firmware] [PATCH] core: atomic: Add atomic addition and subtraction APIs
by Liam Girdwood 04 Apr '18

04 Apr '18

Add APIs to allow atomic additions or subtractions. This API can be used to synchronize buffer W/R pointers between pipelines and components running on different DSP cores. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/arch/xtensa/include/arch/Makefile.am | 1 + src/arch/xtensa/include/arch/atomic.h | 77 ++++++++++++++++++++++++++++++++ src/include/reef/Makefile.am | 1 + src/include/reef/atomic.h | 53 ++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 src/arch/xtensa/include/arch/atomic.h create mode 100644 src/include/reef/atomic.h diff --git a/src/arch/xtensa/include/arch/Makefile.am b/src/arch/xtensa/include/arch/Makefile.am index 42b3b700..135ef64c 100644 --- a/src/arch/xtensa/include/arch/Makefile.am +++ b/src/arch/xtensa/include/arch/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ + atomic.h \ cache.h \ interrupt.h \ reef.h \ diff --git a/src/arch/xtensa/include/arch/atomic.h b/src/arch/xtensa/include/arch/atomic.h new file mode 100644 index 00000000..80c4522f --- /dev/null +++ b/src/arch/xtensa/include/arch/atomic.h @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of the Intel Corporation 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. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __ARCH_ATOMIC_H_ +#define __ARCH_ATOMIC_H_ + +#include <stdint.h> +#include <errno.h> + +typedef struct { + volatile int32_t value; +} atomic_t; + +static inline void arch_atomic_init(atomic_t *a, int32_t value) +{ + a->value = value; +} + +static inline void arch_atomic_add(atomic_t *a, int32_t value) +{ + int32_t result, current; + + __asm__ __volatile__( + "1: l32i %1, %2, 0\n" + " wsr %1, scompare1\n" + " add %0, %1, %3\n" + " s32c1i %0, %2, 0\n" + " bne %0, %1, 1b\n" + : "=&a" (result), "=&a" (current) + : "a" (&a->value), "a" (value) + : "memory"); +} + +static inline void arch_atomic_sub(atomic_t *a, int32_t value) +{ + int32_t result, current; + + __asm__ __volatile__( + "1: l32i %1, %2, 0\n" + " wsr %1, scompare1\n" + " sub %0, %1, %3\n" + " s32c1i %0, %2, 0\n" + " bne %0, %1, 1b\n" + : "=&a" (result), "=&a" (current) + : "a" (&a->value), "a" (value) + : "memory"); +} + +#endif diff --git a/src/include/reef/Makefile.am b/src/include/reef/Makefile.am index 8b47664d..f6f9bb29 100644 --- a/src/include/reef/Makefile.am +++ b/src/include/reef/Makefile.am @@ -7,6 +7,7 @@ includedir = $(prefix)/include/sof/reef include_HEADERS = \ alloc.h \ + atomic.h \ clock.h \ dai.h \ debug.h \ diff --git a/src/include/reef/atomic.h b/src/include/reef/atomic.h new file mode 100644 index 00000000..b26b7016 --- /dev/null +++ b/src/include/reef/atomic.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of the Intel Corporation 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. + * + * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> + * + */ + +#ifndef __INCLUDE_ATOMIC_H_ +#define __INCLUDE_ATOMIC_H_ + +#include <stdint.h> +#include <arch/atomic.h> + +static inline void atomic_init(atomic_t *a, int32_t value) +{ + arch_atomic_init(a, value); +} + +static inline void atomic_add(atomic_t *a, int32_t value) +{ + arch_atomic_add(a, value); +} + +static inline void atomic_sub(atomic_t *a, int32_t value) +{ + arch_atomic_sub(a, value); +} + +#endif -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] ipc: core: rename intel-ipc.c to handler.c
by Liam Girdwood 04 Apr '18

04 Apr '18

Rename as there is nothing Intel specific about the IPC. It's generic. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/Makefile.am | 12 ++++++------ src/ipc/{intel-ipc.c => handler.c} | 0 2 files changed, 6 insertions(+), 6 deletions(-) rename src/ipc/{intel-ipc.c => handler.c} (100%) diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am index 1d84dd00..7379217d 100644 --- a/src/ipc/Makefile.am +++ b/src/ipc/Makefile.am @@ -18,7 +18,7 @@ noinst_LIBRARIES = libsof_ipc.a if BUILD_BAYTRAIL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ byt-ipc.c \ pmc-ipc.c \ dma-copy.c @@ -27,7 +27,7 @@ endif if BUILD_CHERRYTRAIL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ byt-ipc.c \ pmc-ipc.c \ dma-copy.c @@ -36,7 +36,7 @@ endif if BUILD_BROADWELL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ hsw-ipc.c \ dma-copy.c endif @@ -44,7 +44,7 @@ endif if BUILD_HASWELL libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ hsw-ipc.c \ dma-copy.c endif @@ -53,7 +53,7 @@ endif if BUILD_APOLLOLAKE libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ apl-ipc.c \ dma-copy.c endif @@ -61,7 +61,7 @@ endif if BUILD_CANNONLAKE libsof_ipc_a_SOURCES = \ ipc.c \ - intel-ipc.c \ + handler.c \ cnl-ipc.c \ dma-copy.c endif diff --git a/src/ipc/intel-ipc.c b/src/ipc/handler.c similarity index 100% rename from src/ipc/intel-ipc.c rename to src/ipc/handler.c -- 2.14.1

1 2

[Sound-open-firmware] [PATCH] drivers: ssp: rename ssp.c to byt-ssp.c
by Liam Girdwood 04 Apr '18

04 Apr '18

Make way for hsw-ssp.c and make it easier to differentiate ssp drivers. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/drivers/Makefile.am | 2 +- src/drivers/{ssp.c => byt-ssp.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/drivers/{ssp.c => byt-ssp.c} (100%) diff --git a/src/drivers/Makefile.am b/src/drivers/Makefile.am index 345b6e4f..f4f0fa40 100644 --- a/src/drivers/Makefile.am +++ b/src/drivers/Makefile.am @@ -8,7 +8,7 @@ libdrivers_a_SOURCES += \ apl-ssp.c else libdrivers_a_SOURCES += \ - ssp.c + byt-ssp.c endif if BUILD_APOLLOLAKE diff --git a/src/drivers/ssp.c b/src/drivers/byt-ssp.c similarity index 100% rename from src/drivers/ssp.c rename to src/drivers/byt-ssp.c -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] sof: scripts: build rimage in xtensa scripts
by Pierre-Louis Bossart 04 Apr '18

04 Apr '18

rimage is not built by default, which can lead to disconnects and awful bugs when the memory layout changes. Add rimage build+install as default for xtensa scripts The BKM should be to rely on executing ./scripts/xtensa-build-all.sh [byt|cht|apl|cnl] instead of manual commands... Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- scripts/xtensa-build-all.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 227254f..35ff9d9 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -6,6 +6,12 @@ set -e pwd=`pwd` +# make sure rimage is built and aligned with code +./configure --enable-rimage +make +sudo make install + +# now build the firmware (depends on rimage) rm -fr src/arch/xtensa/*.ri SUPPORTED_PLATFORMS=(byt cht bdw hsw apl cnl) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 0/3] Long overdue minor fixes
by Pierre-Louis Bossart 03 Apr '18

03 Apr '18

one patch to make the scripts more useful for people creating releases (i don't think we should use always-obsolete BKMs but working scripts) and two patches to fix coverity (was on the back burner since January...) Pierre-Louis Bossart (3): sof: scripts: force PATH to compile xtensa without environment dependencies sof: solve circular dependencies, move rmemcpy/arch_memcpy definitions mailbox: move multi-line macros to static inlines scripts/xtensa-build-all.sh | 1 + src/arch/xtensa/include/arch/reef.h | 5 --- src/arch/xtensa/include/arch/string.h | 40 ++++++++++++++++++++++++ src/include/reef/mailbox.h | 59 ++++++++++++++++++++++------------- src/include/reef/string.h | 47 ++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 27 deletions(-) create mode 100644 src/arch/xtensa/include/arch/string.h create mode 100644 src/include/reef/string.h -- 2.14.1

2 4

[Sound-open-firmware] [PATCH] Host: fix error return handlings for some dma invokings.
by Keyon Jie 03 Apr '18

03 Apr '18

Add hanle for error on dma_set_config(), dma_start() and dma_copy(). Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/host.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/audio/host.c b/src/audio/host.c index 930cace..d346b5e 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -462,14 +462,19 @@ static int host_trigger(struct comp_dev *dev, int cmd) ret = comp_set_state(dev, cmd); if (ret < 0) - return ret; + goto out; switch (cmd) { case COMP_TRIGGER_STOP: ret = host_stop(dev); break; case COMP_TRIGGER_START: - dma_start(hd->dma, hd->chan); + ret = dma_start(hd->dma, hd->chan); + if (ret < 0) { + trace_host_error("TsF"); + trace_error_value(ret); + goto out; + } /* preload first playback period for preloader task */ if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { @@ -485,6 +490,7 @@ static int host_trigger(struct comp_dev *dev, int cmd) break; } +out: return ret; } @@ -700,7 +706,12 @@ static int host_params(struct comp_dev *dev) trace_host_error("eDC"); return -ENODEV; } - dma_set_config(hd->dma, hd->chan, &hd->config); + err = dma_set_config(hd->dma, hd->chan, &hd->config); + if (err < 0) { + trace_host_error("eDc"); + dma_channel_put(hd->dma, hd->chan); + return err; + } #endif return 0; @@ -844,6 +855,7 @@ static int host_copy(struct comp_dev *dev) { struct host_data *hd = comp_get_drvdata(dev); struct dma_sg_elem *local_elem; + int ret; tracev_host("cpy"); @@ -888,13 +900,23 @@ static int host_copy(struct comp_dev *dev) host_gw_dma_update(dev); /* tell gateway to copy another period */ - dma_copy(hd->dma, hd->chan, hd->period_bytes); + ret = dma_copy(hd->dma, hd->chan, hd->period_bytes); + if (ret < 0) + goto out; #else /* do DMA transfer */ - dma_set_config(hd->dma, hd->chan, &hd->config); - dma_start(hd->dma, hd->chan); + ret = dma_set_config(hd->dma, hd->chan, &hd->config); + if (ret < 0) + goto out; + ret = dma_start(hd->dma, hd->chan); + if (ret < 0) + goto out; #endif return dev->frames; +out: + trace_host_error("CpF"); + trace_error_value(ret); + return ret; } struct comp_driver comp_host = { -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] Use tracev instead of trace for dai irq event.
by yan.wang＠linux.intel.com 02 Apr '18

02 Apr '18

From: Yan Wang <yan.wang(a)linux.intel.com> This event is in pipeline and will produce many trace data in a short time. It should use tracev to disable it by default. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Test with: Mininow max rt5651 and APL UP^2 nocodec and CNL nocodec SOF 1.1-stable: 7f9110c4c0ca26a67e0e4baa91e5f0bcc31a1c3e SOF-Tool 1.1-stable: 99c09871a85111e52d4fa68a4d6f96770d1aabbd https://github.com/plbossart/sound/tree/topic/sof-v4.14: c33cfed51fff5eb156dcf70ba849e6ffb3008377 --- src/audio/dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 1383c14..0a96ee1 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -79,7 +79,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) struct dai_data *dd = comp_get_drvdata(dev); struct comp_buffer *dma_buffer; - trace_dai("irq"); + tracev_dai("irq"); /* stop dma copy for pause/stop/xrun */ if (dev->state != COMP_STATE_ACTIVE || dd->xrun) { -- 2.14.3

3 2