ASoC: Intel: Catpt - Lynx and Wildcat point
Subsystems (3)
Cezary Rojewski
maintainerv10 cover ASoC: Intel: Catpt - Lynx and Wildcat point
Implement support for Lynxpoint and Wildcat Point AudioDSP. Catpt solution deprecates existing sound/soc/intel/haswell which is removed in the following series.
Due to high range of errors and desynchronization from recommendations set by Windows solution, re-write came as a lower-cost solution compared to refactoring /haswell/ with several series of patches.
Series is dependent on linux-spi change:
spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers
https://www.spinics.net/lists/linux-spi/msg23885.html
which has been already merged and is now part of linux-spi tree.
Bulk of series content is device driver core code - everything up to patch 7/14 - with fs entries and trace macros introduced right after. While each core patch is shaped in such a way that no unavailable members are ever called, until patch 14/14 is applied, no code compilation can occur as no Makefile is present. Once said patch is added, Makefile and Kconfig are implemented and driver module compiles as expected.
Special thanks go to Marcin Barlik and Piotr Papierkowski for sharing their LPT/WPT AudioDSP architecture expertise as well as helping backtrack its historical background.
My thanks go to Amadeusz Slawinski for reviews and improvements proposed on and off the internal list. Most of internal diff below is his contribution.
Krzysztof Hejmowski helped me setup my own Xtensa environment and recompile LPT/WPT FW binary sources what sped up the development greatly.
This would not have been possible without help from these champions, especially considering how quickly the catpt was written: 2 weeks features, 3 weeks optimizations. Thank you.
Userspace-exposed members are compatible with what is exposed by deprecated solution as well as FW binary being re-used thus no harm is done. The only visible differences are: the newly added 'Loopback Mute' kcontrol and volume support extending to quad from stereo.
On top of fixing erros and design flows, catpt also adds module reload, dynamic SRAM memory allocation during PCM runtime and exposes missing userspace API: 'Loopback Mute' kcontrol, quad volume controls and sysfs fw-version entries. Event tracing is provided to ease solution debugging.
Following are not included in this update and are scheduled as later addition:
- fw logging
- module (library) support
Note: LPT power up/down sequences might get aligned with WPT once enough testing is done as capabilities are shared for both DSPs. Note #2: Both LPT and WPT power up/down sequences may get optimized in future updates as thanks to help from the Windows team, most of nuances behind why/what/when in regard to hw registers have been backtracked and reviewed again.
Link to developer's deep dive message:
https://www.spinics.net/lists/alsa-devel/msg113563.html
Changes in v10:
- reverted DUAL_MONO case relocation from v9
- indented all constants of enum catpt_module_id to the same column
- new newline appended for return path of catpt_dsp_do_send_msg()
Changes in v9:
https://www.spinics.net/lists/alsa-devel/msg116305.html
- fixed newlines in sysfs as requested by Andy, left tags as no other changes done
- removed volume_map and replaced by simple formulas for volume kcontrol calculations
- removed redundant parentheses in catpt_get_channel_map() and relocated DUAL_MONO case
- runtime suspend no longer called during module unload
- removed redundant size checks for catpt_dsp_send_tx() and catpt_dsp_copy_rx()
Changes in v8:
https://www.spinics.net/lists/alsa-devel/msg116168.html
- updated catpt_arrange_page_table() with GENMASK and U32_MAX usage
- made use of PFN_DOWN() replacing explicit right shitfs by PAGE_SIZE
- made fw hash dumping in catpt_coredump() more readable and removed hardcodes
- catpt_coredump() dumps fw hash now only if said segment has been found within fw_info
- shortened _MSECS suffixes to _MS
- IPC structs no longer contain enum members
- simplified definition of catpt_set_dspvol()
Changes in v7:
https://www.spinics.net/lists/alsa-devel/msg116019.html
- fixed licence header for fs.c
- renamed fs.c to sysfs.c to better match its purpose
- added documentation within Documentation/ABI/testing for entries exposed by catpt
- bin_attribute fw_build replaced by attribute fw_info:
fw_info contains full FW information and after successful handshake, it's always available (stored in driver data) so no need to invoke GET_FW_VERSION IPC again, just dump the stored information
- rather than manually creating and removing sysfs files, now makes use of dev_groups member of struct device_driver
- patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has been moved to the back of the list: enable catpt after machine boards have been prepared for it first
- improved readability of several goto labels
Changes in v6:
https://www.spinics.net/lists/alsa-devel/msg115765.html
- reordered and reorganized code for patches 1/13 - 8/13 of v5, so each patches makes use of no member or function which is unavailable to it. Series size increased from 13 to 14 patches: addition of base members e.g.: registers has been split from addition of device.c file which describes acpi device behavior
Changes in v5:
https://www.spinics.net/lists/alsa-devel/msg115621.html
Basically everything below is result of Andy's review. Thank you Andy for taking time into this detailed review
- catpt now makes use of common linux/pxa2xx_ssp.h header file, removing redundant SSP register declarations in the process. As stated in the opening, this is dependent upon linux-spi change:
spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers
- updated Kconfig by removing DMADEVICES and adding COMPILE_TEST as optional depends-on
- updated all register macros definitions to be more safe against common arithmetics when specifying macro's parameters
- removed CONFIG_PM and CONFIG_PM_SLEEP usage in favor of __maybe_unused
- all 'if (ret < 0)' converted to simple 'if (ret)' whenever possible
- fixed erroneous check for platform_device_register_data within catpt_register_board()
- _SLAVE/_MASTER replaced with more inclusive _CONSUMER/_PROVIDER for enum catpt_ssp_mode
- catpt_acpi_probe() is now making use of high-level wrappers for ioremapping and resource assignment, reducing function's code size
- due to improved catpt_acpi_probe() behavior, catpt_acpi_remove() needs not to cast dma_free_coherent() any longer
- DMA source and destrination maxburst now of value 16, see:
https://www.spinics.net/lists/alsa-devel/msg114394.html
- simplified catpt_dsp_update_lpclock() as list_for_each_entry() is empty-safe by default
- dropped '_SSP_' from all names of all CATPT_SSP_SSXXX_DEFAULT macros
- catpt_updatel_pci now makes use of linux/pci.h and uapi/linux/pci.h constants such as: PCI_PM_CTRL_STATE_MASK and PCI_D3hot
Changes in v4:
https://www.spinics.net/lists/alsa-devel/msg113762.html
- fixed compilation with i386 kconfig (conflicting names)
- streamlined naming for SHIM and PCI registers to match SSP ones (SHIM_REG -> SHIM)
- catpt_component_probe removed and kcontrols again initializzed statically via snd_kcontrol_new array: this is to remove kctl->id.device shenanigans
- renamed catpt_set_ctlvol to catpt_set_dspvol - function name wasn't matching its purpose
Changes in v3:
- fixed IRAM mask usage in lpt_dsp_power_up (dsp.c)
- updated dbg message formatting in catpt_restore_fwimage as suggested by Andy
- fixed alignment for struct catpt_ssp_device_format
- catpt_set_ctlvol now verifies all-equal scenario based on all channels rather than just first two as requested by Amadeo
- fixed SPDX for registers.h
Changes in v2:
https://www.spinics.net/lists/alsa-devel/msg113660.html
- fixed SPDX formatting for all header files as well as pcm.c
- fixed size provided to memcpy() in fw_build_read() as reported by Mark
- renamed struct catpt_pdata to struct catpt_spec (cosmetic)
- fixed erroneous path in catpt_load_block: region is properly released
- trace.h events for updating registers have been removed and usages replaced by dev_dbg (SRAMPGE/ LPCS)
- as requested by Andy, struct resource has replaced struct catpt_mbank and struct catpt_mregion. This change cascaded into:
- catpt_mbank_size and catpt_mregion_size replaced by resource_size
- catpt_mregion_intersects replaced by resource_overlaps
- all catpt_mbank_ and catpt_mregion_ handlers found in loader.c (_request, _reserve, _release, _extract, _split, _join) have been removed
- __request_region and __release_region have been enlisted in their place
- catpt_mregion_intersecting renamed to catpt_resource_overlapping
- catpt_request_region helper has been provided to deal with -size based requests
o haven't found direct replacements in resource.c/ ioport.h for both functions
- catpt_mbank_create and catpt_mbank_remove renamed to catpt_sram_init and catpt_sram_free respectively
- catpt_sram_init now returns void instead of int and has been converted to simple initialized. This change ultimately cascaded into:
o both SRAM banks initialization being moved to catpt_dev_init from catpt_acpi_probe (device.c)
o catpt_dev::spec is now initialized first, with catpt_dev_init following it soon after
o catpt_acpi_probe erroneous path has been simplified as SRAM banks no longer need to be freed
- catpt_sram_free now frees all resources via child -> sibling enumeration rather than region_list iteration
- catpt_dsp_update_srampge and catpt_dsp_set_srampge now accept new
argument: unsigned long mask. Caused by removal of catpt_mbank - mask is taken directly from catpt_dev::spec::d/iram_mask
- trace.h events for catpt_mbank and catpt_mregion have been removed
Diff against last drop on internal list:
https://www.spinics.net/lists/alsa-devel/msg113549.html
- replaced spinlock with mutex for mregion allocation and release to address sleeping in atomic context warnings
- fixed coredump fw_hash dumping
- kcontrol values are now always stored regardless of stream of interest is running or not
- kcontrol values are now applied after stream is prepared instead of ignoring what has been set by user initially
- catpt_pdata instances have been renamed from hsw_ and bdw_ to lpt_ and wpt_ respectively
- reordered Makefile .o(s) (cosmetic)
Cezary Rojewski (14):
ASoC: Intel: Add catpt base members
ASoC: Intel: catpt: Implement IPC protocol
ASoC: Intel: catpt: Add IPC message handlers
ASoC: Intel: catpt: Define DSP operations
ASoC: Intel: catpt: Firmware loading and context restore
ASoC: Intel: catpt: PCM operations
ASoC: Intel: catpt: Device driver lifecycle
ASoC: Intel: catpt: Event tracing
ASoC: Intel: catpt: Simple sysfs attributes
ASoC: Intel: haswell: Remove haswell-solution specific code
ASoC: Intel: broadwell: Remove haswell-solution specific code
ASoC: Intel: bdw-5650: Remove haswell-solution specific code
ASoC: Intel: bdw-5677: Remove haswell-solution specific code
ASoC: Intel: Select catpt and deprecate haswell
.../ABI/testing/sysfs-bus-pci-devices-catpt | 16 + sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/boards/Kconfig | 8 +- sound/soc/intel/boards/bdw-rt5650.c | 36 - sound/soc/intel/boards/bdw-rt5677.c | 33 - sound/soc/intel/boards/broadwell.c | 33 - sound/soc/intel/boards/haswell.c | 28 +- sound/soc/intel/catpt/Makefile | 6 + sound/soc/intel/catpt/core.h | 188 +++ sound/soc/intel/catpt/device.c | 352 +++++ sound/soc/intel/catpt/dsp.c | 578 ++++++++ sound/soc/intel/catpt/ipc.c | 298 +++++ sound/soc/intel/catpt/loader.c | 671 ++++++++++ sound/soc/intel/catpt/messages.c | 313 +++++ sound/soc/intel/catpt/messages.h | 401 ++++++ sound/soc/intel/catpt/pcm.c | 1175 +++++++++++++++++ sound/soc/intel/catpt/registers.h | 178 +++ sound/soc/intel/catpt/sysfs.c | 55 + sound/soc/intel/catpt/trace.h | 83 ++ 20 files changed, 4335 insertions(+), 143 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-catpt create mode 100644 sound/soc/intel/catpt/Makefile create mode 100644 sound/soc/intel/catpt/core.h create mode 100644 sound/soc/intel/catpt/device.c create mode 100644 sound/soc/intel/catpt/dsp.c create mode 100644 sound/soc/intel/catpt/ipc.c create mode 100644 sound/soc/intel/catpt/loader.c create mode 100644 sound/soc/intel/catpt/messages.c create mode 100644 sound/soc/intel/catpt/messages.h create mode 100644 sound/soc/intel/catpt/pcm.c create mode 100644 sound/soc/intel/catpt/registers.h create mode 100644 sound/soc/intel/catpt/sysfs.c create mode 100644 sound/soc/intel/catpt/trace.h
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 1/14 ASoC: Intel: Add catpt base members
Declare base structures, registers and extension routines for the catpt solution.
--- sound/soc/intel/catpt/core.h | 86 ++++++++++++++ sound/soc/intel/catpt/dsp.c | 138 +++++++++++++++++++++++ sound/soc/intel/catpt/loader.c | 46 ++++++++ sound/soc/intel/catpt/registers.h | 179 ++++++++++++++++++++++++++++++ 4 files changed, 449 insertions(+) create mode 100644 sound/soc/intel/catpt/core.h create mode 100644 sound/soc/intel/catpt/dsp.c create mode 100644 sound/soc/intel/catpt/loader.c create mode 100644 sound/soc/intel/catpt/registers.h
sound/soc/intel/catpt/core.h new file +86 -0
@@ -0,0 +1,86 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright(c) 2020 Intel Corporation. All rights reserved. +* +* Author: Cezary Rojewski <[email protected]> +*/ + +#ifndef __SND_SOC_INTEL_CATPT_CORE_H +#define __SND_SOC_INTEL_CATPT_CORE_H + +#include <linux/dma/dw.h> +#include "registers.h" + +struct catpt_dev ; + +void catpt_sram_init (struct resource *sram,u32 start,u32 size); +void catpt_sram_free (struct resource *sram); +struct resource * +catpt_request_region (struct resource *root,resource_size_t size); + +static inline bool catpt_resource_overlapping (struct resource *r1, +struct resource *r2, +struct resource *ret) +{ +if (!resource_overlaps (r1, r2)) +return false; + ret->start =max (r1->start, r2->start); + ret->end =min (r1->end, r2->end); +return true; +} + +struct catpt_module_type { +bool loaded; +u32 entry_point; +u32 persistent_size; +u32 scratch_size; +/* DRAM, initial module state */ +u32 state_offset; +u32 state_size; + +struct list_head node; +}; + +struct catpt_spec { +struct snd_soc_acpi_mach *machines; +u8 core_id; +u32 host_dram_offset; +u32 host_iram_offset; +u32 host_shim_offset; +u32 host_dma_offset[CATPT_DMA_COUNT ]; +u32 host_ssp_offset[CATPT_SSP_COUNT ]; +u32 dram_mask; +u32 iram_mask; +void (*pll_shutdown)(struct catpt_dev *cdev,bool enable); +int (*power_up)(struct catpt_dev *cdev); +int (*power_down)(struct catpt_dev *cdev); +}; + +struct catpt_dev { +struct device *dev; +struct dw_dma_chip *dmac; + +void __iomem *pci_ba; +void __iomem *lpe_ba; +u32 lpe_base; +int irq; + +const struct catpt_spec *spec; +struct completion fw_ready; + +struct resource dram; +struct resource iram; +struct resource *scratch; +}; + +int catpt_dmac_probe (struct catpt_dev *cdev); +void catpt_dmac_remove (struct catpt_dev *cdev); +struct dma_chan *catpt_dma_request_config_chan (struct catpt_dev *cdev); +int catpt_dma_memcpy_todsp (struct catpt_dev *cdev,struct dma_chan *chan, +dma_addr_t dst_addr,dma_addr_t src_addr, +size_t size); +int catpt_dma_memcpy_fromdsp (struct catpt_dev *cdev,struct dma_chan *chan, +dma_addr_t dst_addr,dma_addr_t src_addr, +size_t size); + +#endif
sound/soc/intel/catpt/dsp.c new file +138 -0
138 lines not on this page · raw message
sound/soc/intel/catpt/loader.c new file +46 -0
46 lines not on this page · raw message
sound/soc/intel/catpt/registers.h new file +179 -0
179 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 2/14 ASoC: Intel: catpt: Implement IPC protocol
In reply to Cezary RojewskiImplement IRQ handlers for immediate and delayed replies and notifications. Communication is synchronous and allows for serialization of maximum one message at a time.
DSP may respond with ADSP_PENDING status for a request - known as delayed reply - and when situation occurs, framework keeps the lock and awaits upcoming response through IPCD channel which is handled in bottom-half. Immediate replies spawn no BH at all as their processing is very short.
--- sound/soc/intel/catpt/core.h | 44 ++++ sound/soc/intel/catpt/ipc.c | 246 ++++++++++++++++++ sound/soc/intel/catpt/messages.h | 401 ++++++++++++++++++++++++++++++ sound/soc/intel/catpt/registers.h | 1 - 4 files changed, 691 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/catpt/ipc.c create mode 100644 sound/soc/intel/catpt/messages.h
sound/soc/intel/catpt/core.h +44 -0
@@ -9,6 +9,8 @@#define __SND_SOC_INTEL_CATPT_CORE_H#include <linux/dma/dw.h> +#include <linux/irqreturn.h> +#include "messages.h" #include "registers.h" struct catpt_dev ;
@@ -29,6 +31,31 @@ static inline bool catpt_resource_overlapping(struct resource *r1,return true; } +struct catpt_ipc_msg { +union { +u32 header; +union catpt_global_msg rsp; + }; +void *data; +size_t size; +}; + +struct catpt_ipc { +struct device *dev; + +struct catpt_ipc_msg rx; +struct catpt_fw_ready config; +u32 default_timeout; +bool ready; + +spinlock_t lock; +struct mutex mutex; +struct completion done_completion; +struct completion busy_completion; +}; + +void catpt_ipc_init (struct catpt_ipc *ipc,struct device *dev); +struct catpt_module_type {bool loaded;u32 entry_point;
@@ -59,6 +86,7 @@ struct catpt_spec {struct catpt_dev {struct device *dev;struct dw_dma_chip *dmac; +struct catpt_ipc ipc;void __iomem *pci_ba;void __iomem *lpe_ba;
@@ -83,4 +111,20 @@ int catpt_dma_memcpy_fromdsp(struct catpt_dev *cdev, struct dma_chan *chan, dma_addr_t dst_addr, dma_addr_t src_addr, size_t size); +irqreturn_t catpt_dsp_irq_handler (int irq,void *dev_id); +irqreturn_t catpt_dsp_irq_thread (int irq,void *dev_id); + +/* +* IPC handlers may return positive values which denote successful +* HOST <-> DSP communication yet failure to process specific request. +* Use below macro to convert returned non-zero values appropriately +*/ +#define CATPT_IPC_ERROR (err) (((err) < 0) ? (err) : -EREMOTEIO) + +int catpt_dsp_send_msg_timeout (struct catpt_dev *cdev, +struct catpt_ipc_msg request, +struct catpt_ipc_msg *reply,int timeout); +int catpt_dsp_send_msg (struct catpt_dev *cdev,struct catpt_ipc_msg request, +struct catpt_ipc_msg *reply); +#endif
sound/soc/intel/catpt/ipc.c new file +246 -0
246 lines not on this page · raw message
sound/soc/intel/catpt/messages.h new file +401 -0
401 lines not on this page · raw message
sound/soc/intel/catpt/registers.h +0 -1
@@ -15,7 +15,6 @@#define CATPT_SHIM_REGS_SIZE 4096#define CATPT_DMA_REGS_SIZE 1024#define CATPT_DMA_COUNT 2 -#define CATPT_SSP_COUNT 2#define CATPT_SSP_REGS_SIZE 512/* DSP Shim registers */
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 3/14 ASoC: Intel: catpt: Add IPC message handlers
In reply to Cezary RojewskiDeclare global and stream IPC message handlers for all known message types.
--- sound/soc/intel/catpt/core.h | 2 + sound/soc/intel/catpt/dsp.c | 106 +++++++++++ sound/soc/intel/catpt/ipc.c | 4 + sound/soc/intel/catpt/messages.c | 313 +++++++++++++++++++++++++++++++ 4 files changed, 425 insertions(+) create mode 100644 sound/soc/intel/catpt/messages.c
sound/soc/intel/catpt/core.h +2 -0
@@ -127,4 +127,6 @@ int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev,int catpt_dsp_send_msg (struct catpt_dev *cdev,struct catpt_ipc_msg request,struct catpt_ipc_msg *reply); +int catpt_coredump (struct catpt_dev *cdev); +#endif
sound/soc/intel/catpt/dsp.c +106 -0
115 lines not on this page · raw message
sound/soc/intel/catpt/ipc.c +4 -0
@@ -168,6 +168,10 @@ static void catpt_dsp_process_response(struct catpt_dev *cdev, u32 header)switch (msg.global_msg_type) {case CATPT_GLB_REQUEST_CORE_DUMP : +dev_err (cdev->dev,"ADSP device coredump received\n" ); + ipc->ready = false; +catpt_coredump (cdev); +/* TODO: attempt recovery */ break ;case CATPT_GLB_STREAM_MESSAGE :
sound/soc/intel/catpt/messages.c new file +313 -0
313 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 4/14 ASoC: Intel: catpt: Define DSP operations
In reply to Cezary RojewskiImplement dsp lifecycle functions such as core RESET and STALL, SRAM power control and LP clock selection. This also adds functions for handling transport over DW DMA controller.
--- sound/soc/intel/catpt/core.h | 34 ++++ sound/soc/intel/catpt/dsp.c | 334 +++++++++++++++++++++++++++++++++++ 2 files changed, 368 insertions(+)
sound/soc/intel/catpt/core.h +34 -0
@@ -99,6 +99,10 @@ struct catpt_dev {struct resource dram;struct resource iram;struct resource *scratch; + +struct list_head stream_list; +spinlock_t list_lock; +struct mutex clk_mutex; };int catpt_dmac_probe (struct catpt_dev *cdev);
@@ -111,6 +115,16 @@ int catpt_dma_memcpy_fromdsp(struct catpt_dev *cdev, struct dma_chan *chan, dma_addr_t dst_addr, dma_addr_t src_addr, size_t size); +void lpt_dsp_pll_shutdown (struct catpt_dev *cdev,bool enable); +void wpt_dsp_pll_shutdown (struct catpt_dev *cdev,bool enable); +int lpt_dsp_power_up (struct catpt_dev *cdev); +int lpt_dsp_power_down (struct catpt_dev *cdev); +int wpt_dsp_power_up (struct catpt_dev *cdev); +int wpt_dsp_power_down (struct catpt_dev *cdev); +int catpt_dsp_stall (struct catpt_dev *cdev,bool stall); +void catpt_dsp_update_srampge (struct catpt_dev *cdev,struct resource *sram, +unsigned long mask); +int catpt_dsp_update_lpclock (struct catpt_dev *cdev);irqreturn_t catpt_dsp_irq_handler (int irq,void *dev_id);irqreturn_t catpt_dsp_irq_thread (int irq,void *dev_id);
@@ -129,4 +143,24 @@ int catpt_dsp_send_msg(struct catpt_dev *cdev, struct catpt_ipc_msg request,int catpt_coredump (struct catpt_dev *cdev); +#include <sound/memalloc.h> +#include <uapi/sound/asound.h> + +struct snd_pcm_substream ; +struct catpt_stream_template ; + +struct catpt_stream_runtime { +struct snd_pcm_substream *substream; + +struct catpt_stream_template *template; +struct catpt_stream_info info; +struct resource *persistent; +struct snd_dma_buffer pgtbl; + +bool allocated; +bool prepared; + +struct list_head node; +}; +#endif
sound/soc/intel/catpt/dsp.c +334 -0
347 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 5/14 ASoC: Intel: catpt: Firmware loading and context restore
In reply to Cezary RojewskiFor Lynxpoint and Wildcat Point solution, is it host's responsibility to allocate SRAM regions and ensure those already taken are not overwritten with other data until released. Blocks are transferred to SRAM - either IRAM or DRAM - via DW DMA controller. Once basefw is booted, ownership of DMA transfer is lost in favour of DSP.
Hosts reponsibilities don't end on initial block allocation and binary transfer. During Dx transitions host must store FW runtime context from DRAM before putting AudioDSP subsystem into lower power state. Said context gets flashed after D0 entry to bring DSP right where it was just before suspending.
Load and restore procedures are finalized with SRAM power gating and adequate clock level selection. This power gates unused EBBs and clock speed effectively reducing power consumption.
--- sound/soc/intel/catpt/core.h | 12 + sound/soc/intel/catpt/loader.c | 619 +++++++++++++++++++++++++++++++++ 2 files changed, 631 insertions(+)
sound/soc/intel/catpt/core.h +12 -0
@@ -100,9 +100,16 @@ struct catpt_dev {struct resource iram;struct resource *scratch; +struct catpt_mixer_stream_info mixer; +struct catpt_module_type modules[CATPT_MODULE_COUNT ]; +struct catpt_ssp_device_format devfmt[CATPT_SSP_COUNT ];struct list_head stream_list;spinlock_t list_lock;struct mutex clk_mutex; + +struct catpt_dx_context dx_ctx; +void *dxbuf_vaddr; +dma_addr_t dxbuf_paddr; };int catpt_dmac_probe (struct catpt_dev *cdev);
@@ -141,6 +148,11 @@ int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev,int catpt_dsp_send_msg (struct catpt_dev *cdev,struct catpt_ipc_msg request,struct catpt_ipc_msg *reply); +int catpt_first_boot_firmware (struct catpt_dev *cdev); +int catpt_boot_firmware (struct catpt_dev *cdev,bool restore); +int catpt_store_streams_context (struct catpt_dev *cdev,struct dma_chan *chan); +int catpt_store_module_states (struct catpt_dev *cdev,struct dma_chan *chan); +int catpt_store_memdumps (struct catpt_dev *cdev,struct dma_chan *chan);int catpt_coredump (struct catpt_dev *cdev);#include <sound/memalloc.h>
sound/soc/intel/catpt/loader.c +619 -0
630 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 6/14 ASoC: Intel: catpt: PCM operations
In reply to Cezary RojewskiDSP designed for Lynxpoint and Wildcat Point offers no dynamic topology i.e. all pipelines are already defined within firmware and host is relegated to allocing stream for predefined pins. This is represented by 'catpt_topology' member.
Implementation covers all available pin types:
- system playback and capture
- two offload streams
- loopback (reference)
- bluetooth playback and capture
PCM DAI operations differentiate between those pins as some (mainly offload) are to be handled differently - DSP expects wp updates on each notify_position notification.
System playback has no volume control capability as it is routed to mixer stream directly. Other primary streams - capture and two offloads
- offer individual volume controls.
Compared to sound/soc/intel/haswell this configures SSP device format automatically on pcm creation.
--- sound/soc/intel/catpt/core.h | 8 + sound/soc/intel/catpt/ipc.c | 37 + sound/soc/intel/catpt/loader.c | 6 + sound/soc/intel/catpt/pcm.c | 1175 ++++++++++++++++++++++++++++++++ 4 files changed, 1226 insertions(+) create mode 100644 sound/soc/intel/catpt/pcm.c
sound/soc/intel/catpt/core.h +8 -0
@@ -175,4 +175,12 @@ struct catpt_stream_runtime { struct list_head node; }; +int catpt_register_plat_component (struct catpt_dev *cdev); +void catpt_stream_update_position (struct catpt_dev *cdev, +struct catpt_stream_runtime *stream, +struct catpt_notify_position *pos); +struct catpt_stream_runtime * +catpt_stream_find (struct catpt_dev *cdev,u8 stream_hw_id); +int catpt_arm_stream_templates (struct catpt_dev *cdev); +#endif
sound/soc/intel/catpt/ipc.c +37 -0
@@ -138,6 +138,42 @@ int catpt_dsp_send_msg(struct catpt_dev *cdev, struct catpt_ipc_msg request, cdev->ipc.default_timeout); } +static void +catpt_dsp_notify_stream (struct catpt_dev *cdev,union catpt_notify_msg msg) +{ +struct catpt_stream_runtime *stream; +struct catpt_notify_position pos; +struct catpt_notify_glitch glitch; + + stream =catpt_stream_find (cdev, msg.stream_hw_id); +if (!stream) { +dev_warn (cdev->dev,"notify %d for non-existent stream %d\n" , + msg.notify_reason, msg.stream_hw_id); +return ; + } + +switch (msg.notify_reason) { +case CATPT_NOTIFY_POSITION_CHANGED : +memcpy_fromio (&pos,catpt_inbox_addr (cdev),sizeof (pos)); + +catpt_stream_update_position (cdev, stream, &pos); +break ; + +case CATPT_NOTIFY_GLITCH_OCCURRED : +memcpy_fromio (&glitch,catpt_inbox_addr (cdev),sizeof (glitch)); + +dev_warn (cdev->dev,"glitch %d at pos: 0x%08llx, wp: 0x%08x\n" , + glitch.type, glitch.presentation_pos, + glitch.write_pos); +break ; + +default : +dev_warn (cdev->dev,"unknown notification: %d received\n" , + msg.notify_reason); +break ; + } +} +static void catpt_dsp_copy_rx (struct catpt_dev *cdev,u32 header) {struct catpt_ipc *ipc = &cdev->ipc;
@@ -177,6 +213,7 @@ static void catpt_dsp_process_response(struct catpt_dev *cdev, u32 header)case CATPT_GLB_STREAM_MESSAGE :switch (msg.stream_msg_type) {case CATPT_STRM_NOTIFICATION : +catpt_dsp_notify_stream (cdev, msg);break ;default :catpt_dsp_copy_rx (cdev, header);
sound/soc/intel/catpt/loader.c +6 -0
@@ -658,6 +658,12 @@ int catpt_first_boot_firmware(struct catpt_dev *cdev)if (ret)return CATPT_IPC_ERROR (ret); + ret =catpt_arm_stream_templates (cdev); +if (ret) { +dev_err (cdev->dev,"arm templates failed: %d\n" , ret); +return ret; + } +/* update dram pg for scratch and restricted regions */ catpt_dsp_update_srampge (cdev, &cdev->dram, cdev->spec->dram_mask);
sound/soc/intel/catpt/pcm.c new file +1175 -0
1,175 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 7/14 ASoC: Intel: catpt: Device driver lifecycle
In reply to Cezary RojewskiImplement ACPI device probing and removal functions as well as handlers for its PM capabilities. Device probing also takes care of enumerating ADSP subsystem components.
--- sound/soc/intel/catpt/device.c | 348 +++++++++++++++++++++++++++++++++ 1 file changed, 348 insertions(+) create mode 100644 sound/soc/intel/catpt/device.c
sound/soc/intel/catpt/device.c new file +348 -0
@@ -0,0 +1,348 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// +// Author: Cezary Rojewski <[email protected]> +// +// Special thanks to: +// Marcin Barlik <[email protected]> +// Piotr Papierkowski <[email protected]> +// +// for sharing LPT-LP and WTP-LP AudioDSP architecture expertise and +// helping backtrack its historical background +// + +#include <linux/acpi.h> +#include <linux/dma-mapping.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/pci.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <sound/soc.h> +#include <sound/soc-acpi.h> +#include <sound/soc-acpi-intel-match.h> +#include "core.h" +#include "registers.h" + +static int __maybe_unused catpt_suspend (struct device *dev) +{ +struct catpt_dev *cdev =dev_get_drvdata (dev); +struct dma_chan *chan; +int ret; + + chan =catpt_dma_request_config_chan (cdev); +if (IS_ERR (chan)) +return PTR_ERR (chan); + +memset (&cdev->dx_ctx,0 ,sizeof (cdev->dx_ctx)); + ret =catpt_ipc_enter_dxstate (cdev,CATPT_DX_STATE_D3 , &cdev->dx_ctx); +if (ret) { + ret =CATPT_IPC_ERROR (ret); + goto release_dma_chan; + } + + ret =catpt_dsp_stall (cdev, true); +if (ret) + goto release_dma_chan; + + ret =catpt_store_memdumps (cdev, chan); +if (ret) { +dev_err (cdev->dev,"store memdumps failed: %d\n" , ret); + goto release_dma_chan; + } + + ret =catpt_store_module_states (cdev, chan); +if (ret) { +dev_err (cdev->dev,"store module states failed: %d\n" , ret); + goto release_dma_chan; + } + + ret =catpt_store_streams_context (cdev, chan); +if (ret) +dev_err (cdev->dev,"store streams ctx failed: %d\n" , ret); + +release_dma_chan: +dma_release_channel (chan); +if (ret) +return ret; +return cdev->spec->power_down (cdev); +} + +static int __maybe_unused catpt_resume (struct device *dev) +{ +struct catpt_dev *cdev =dev_get_drvdata (dev); +int ret, i; + + ret = cdev->spec->power_up (cdev); +if (ret) +return ret; + +if (!module_is_live (dev->driver->owner)) { +dev_info (dev,"module unloading, skipping fw boot\n" ); +return 0 ; + } + + ret =catpt_boot_firmware (cdev, true); +if (ret) { +dev_err (cdev->dev,"boot firmware failed: %d\n" , ret); +return ret; + } + +/* reconfigure SSP devices after Dx transition */ +for (i =0 ; i <CATPT_SSP_COUNT ; i++) { +if (cdev->devfmt[i].iface ==UINT_MAX ) +continue ; + + ret =catpt_ipc_set_device_format (cdev, &cdev->devfmt[i]); +if (ret) +return CATPT_IPC_ERROR (ret); + } + +return 0 ; +} + +static int __maybe_unused catpt_runtime_suspend (struct device *dev) +{ +if (!module_is_live (dev->driver->owner)) { +dev_info (dev,"module unloading, skipping suspend\n" ); +return 0 ; + } +return catpt_suspend (dev); +} + +static int __maybe_unused catpt_runtime_resume (struct device *dev) +{ +return catpt_resume (dev); +} + +static const struct dev_pm_ops catpt_dev_pm = { + SET_SYSTEM_SLEEP_PM_OPS(catpt_suspend, catpt_resume) +SET_RUNTIME_PM_OPS (catpt_runtime_suspend, catpt_runtime_resume,NULL ) +}; + +/* machine board owned by CATPT is removed with this hook */ +static void board_pdev_unregister (void *data) +{ +platform_device_unregister (data); +} + +static int catpt_register_board (struct catpt_dev *cdev) +{ +const struct catpt_spec *spec = cdev->spec; +struct snd_soc_acpi_mach *mach; +struct platform_device *board; + + mach =snd_soc_acpi_find_machine (spec->machines); +if (!mach) { +dev_info (cdev->dev,"no machines present\n" ); +return 0 ; + } + + mach->mach_params.platform ="catpt-platform" ; + board =platform_device_register_data (NULL , mach->drv_name, +PLATFORM_DEVID_NONE , + (const void *)mach,sizeof (*mach)); +if (IS_ERR (board)) { +dev_err (cdev->dev,"board register failed\n" ); +return PTR_ERR (board); + } + +return devm_add_action_or_reset (cdev->dev, board_pdev_unregister, + board); +} + +static int catpt_probe_components (struct catpt_dev *cdev) +{ +int ret; + + ret = cdev->spec->power_up (cdev); +if (ret) +return ret; + + ret =catpt_dmac_probe (cdev); +if (ret) { +dev_err (cdev->dev,"DMAC probe failed: %d\n" , ret); + goto err_dmac_probe; + } + + ret =catpt_first_boot_firmware (cdev); +if (ret) { +dev_err (cdev->dev,"first fw boot failed: %d\n" , ret); + goto err_boot_fw; + } + + ret =catpt_register_plat_component (cdev); +if (ret) { +dev_err (cdev->dev,"register plat comp failed: %d\n" , ret); + goto err_boot_fw; + } + + ret =catpt_register_board (cdev); +if (ret) { +dev_err (cdev->dev,"register board failed: %d\n" , ret); + goto err_reg_board; + } + +/* reflect actual ADSP state in pm_runtime */ +pm_runtime_set_active (cdev->dev); + +pm_runtime_set_autosuspend_delay (cdev->dev,2000 ); +pm_runtime_use_autosuspend (cdev->dev); +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_enable (cdev->dev); +return 0 ; + +err_reg_board: +snd_soc_unregister_component (cdev->dev); +err_boot_fw: +catpt_dmac_remove (cdev); +err_dmac_probe: + cdev->spec->power_down (cdev); + +return ret; +} + +static void catpt_dev_init (struct catpt_dev *cdev,struct device *dev, +const struct catpt_spec *spec) +{ + cdev->dev = dev; + cdev->spec = spec; +init_completion (&cdev->fw_ready); +INIT_LIST_HEAD (&cdev->stream_list); +spin_lock_init (&cdev->list_lock); +mutex_init (&cdev->clk_mutex); + +/* +* Mark both device formats as uninitialized. Once corresponding +* cpu_dai's pcm is created, proper values are assigned. +*/ + cdev->devfmt[CATPT_SSP_IFACE_0 ].iface =UINT_MAX ; + cdev->devfmt[CATPT_SSP_IFACE_1 ].iface =UINT_MAX ; + +catpt_ipc_init (&cdev->ipc, dev); + +catpt_sram_init (&cdev->dram, spec->host_dram_offset, +catpt_dram_size (cdev)); +catpt_sram_init (&cdev->iram, spec->host_iram_offset, +catpt_iram_size (cdev)); +} + +static int catpt_acpi_probe (struct platform_device *pdev) +{ +const struct catpt_spec *spec; +struct catpt_dev *cdev; +struct device *dev = &pdev->dev; +struct resource *res; +int ret; + + spec =device_get_match_data (dev); +if (!spec) +return -ENODEV ; + + cdev =devm_kzalloc (dev,sizeof (*cdev),GFP_KERNEL ); +if (!cdev) +return -ENOMEM ; + +catpt_dev_init (cdev, dev, spec); + +/* map DSP bar address */ + cdev->lpe_ba =devm_platform_get_and_ioremap_resource (pdev,0 , &res); +if (IS_ERR (cdev->lpe_ba)) +return PTR_ERR (cdev->lpe_ba); + cdev->lpe_base = res->start; + +/* map PCI bar address */ + cdev->pci_ba =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (cdev->pci_ba)) +return PTR_ERR (cdev->pci_ba); + +/* alloc buffer for storing DRAM context during dx transitions */ + cdev->dxbuf_vaddr =dmam_alloc_coherent (dev,catpt_dram_size (cdev), + &cdev->dxbuf_paddr,GFP_KERNEL ); +if (!cdev->dxbuf_vaddr) +return -ENOMEM ; + + ret =platform_get_irq (pdev,0 ); +if (ret <0 ) +return ret; + cdev->irq = ret; + +platform_set_drvdata (pdev, cdev); + + ret =devm_request_threaded_irq (dev, cdev->irq, catpt_dsp_irq_handler, + catpt_dsp_irq_thread, +IRQF_SHARED ,"AudioDSP" , cdev); +if (ret) +return ret; + +return catpt_probe_components (cdev); +} + +static int catpt_acpi_remove (struct platform_device *pdev) +{ +struct catpt_dev *cdev =platform_get_drvdata (pdev); + +pm_runtime_disable (cdev->dev); + +snd_soc_unregister_component (cdev->dev); +catpt_dmac_remove (cdev); + cdev->spec->power_down (cdev); + +catpt_sram_free (&cdev->iram); +catpt_sram_free (&cdev->dram); + +return 0 ; +} + +static struct catpt_spec lpt_desc = { + .machines = snd_soc_acpi_intel_haswell_machines, + .core_id =0x01 , + .host_dram_offset =0x000000 , + .host_iram_offset =0x080000 , + .host_shim_offset =0x0E7000 , + .host_dma_offset = {0x0F0000 ,0x0F8000 }, + .host_ssp_offset = {0x0E8000 ,0x0E9000 }, + .dram_mask =LPT_VDRTCTL0_DSRAMPGE_MASK , + .iram_mask =LPT_VDRTCTL0_ISRAMPGE_MASK , + .pll_shutdown = lpt_dsp_pll_shutdown, + .power_up = lpt_dsp_power_up, + .power_down = lpt_dsp_power_down, +}; + +static struct catpt_spec wpt_desc = { + .machines = snd_soc_acpi_intel_broadwell_machines, + .core_id =0x02 , + .host_dram_offset =0x000000 , + .host_iram_offset =0x0A0000 , + .host_shim_offset =0x0FB000 , + .host_dma_offset = {0x0FE000 ,0x0FF000 }, + .host_ssp_offset = {0x0FC000 ,0x0FD000 }, + .dram_mask =WPT_VDRTCTL0_DSRAMPGE_MASK , + .iram_mask =WPT_VDRTCTL0_ISRAMPGE_MASK , + .pll_shutdown = wpt_dsp_pll_shutdown, + .power_up = wpt_dsp_power_up, + .power_down = wpt_dsp_power_down, +}; + +static const struct acpi_device_id catpt_ids[] = { + {"INT33C8" , (unsigned long )&lpt_desc }, + {"INT3438" , (unsigned long )&wpt_desc }, + { } +}; +MODULE_DEVICE_TABLE (acpi, catpt_ids); + +static struct platform_driver catpt_acpi_driver = { + .probe = catpt_acpi_probe, + .remove = catpt_acpi_remove, + .driver = { + .name ="intel_catpt" , + .acpi_match_table = catpt_ids, + .pm = &catpt_dev_pm, + }, +}; +module_platform_driver (catpt_acpi_driver); + +MODULE_AUTHOR ("Cezary Rojewski <[email protected]>" ); +MODULE_DESCRIPTION ("Intel LPT/WPT AudioDSP driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 8/14 ASoC: Intel: catpt: Event tracing
In reply to Cezary RojewskiDefine tracing macros for easy catpt debug. These cover all IPC message
types: requests, replies and notifications.
---
Changes in v6:
- trace usage now part of this patch instead of being separated from it
Changes in v2:
- trace.h events for updating registers have been removed and usages replaced by dev_dbg (SRAMPGE/ LPCS)
- trace.h events for catpt_mbank and catpt_mregion have been removed
sound/soc/intel/catpt/device.c | 3 ++ sound/soc/intel/catpt/ipc.c | 11 +++++ sound/soc/intel/catpt/trace.h | 83 ++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 sound/soc/intel/catpt/trace.h
sound/soc/intel/catpt/device.c +3 -0
@@ -25,6 +25,9 @@#include "core.h" #include "registers.h" +#define CREATE_TRACE_POINTS +#include "trace.h" +static int __maybe_unused catpt_suspend (struct device *dev) {struct catpt_dev *cdev =dev_get_drvdata (dev);
sound/soc/intel/catpt/ipc.c +11 -0
@@ -9,6 +9,7 @@#include "core.h" #include "messages.h" #include "registers.h" +#include "trace.h" #define CATPT_IPC_TIMEOUT_MS 300
@@ -56,6 +57,9 @@ static void catpt_dsp_send_tx(struct catpt_dev *cdev, {u32 header = tx->header |CATPT_IPCC_BUSY ; +trace_catpt_ipc_request (header); +trace_catpt_ipc_payload (tx->data, tx->size); +memcpy_toio (catpt_outbox_addr (cdev), tx->data, tx->size);catpt_writel_shim (cdev,IPCC , header); }
@@ -155,12 +159,14 @@ catpt_dsp_notify_stream(struct catpt_dev *cdev, union catpt_notify_msg msg)switch (msg.notify_reason) {case CATPT_NOTIFY_POSITION_CHANGED :memcpy_fromio (&pos,catpt_inbox_addr (cdev),sizeof (pos)); +trace_catpt_ipc_payload ((u8 *)&pos,sizeof (pos));catpt_stream_update_position (cdev, stream, &pos);break ;case CATPT_NOTIFY_GLITCH_OCCURRED :memcpy_fromio (&glitch,catpt_inbox_addr (cdev),sizeof (glitch)); +trace_catpt_ipc_payload ((u8 *)&glitch,sizeof (glitch)); dev_warn(cdev->dev, "glitch %d at pos: 0x%08llx, wp: 0x%08x\n", glitch.type, glitch.presentation_pos,
@@ -183,6 +189,7 @@ static void catpt_dsp_copy_rx(struct catpt_dev *cdev, u32 header)return ;memcpy_fromio (ipc->rx.data,catpt_outbox_addr (cdev), ipc->rx.size); +trace_catpt_ipc_payload (ipc->rx.data, ipc->rx.size); }static void catpt_dsp_process_response (struct catpt_dev *cdev,u32 header)
@@ -196,6 +203,7 @@ static void catpt_dsp_process_response(struct catpt_dev *cdev, u32 header)u32 off = msg.mailbox_address <<3 ;memcpy_fromio (&config, cdev->lpe_ba + off,sizeof (config)); +trace_catpt_ipc_payload ((u8 *)&config,sizeof (config));catpt_ipc_arm (ipc, &config);complete (&cdev->fw_ready);
@@ -236,6 +244,7 @@ irqreturn_t catpt_dsp_irq_thread(int irq, void *dev_id)u32 ipcd; ipcd =catpt_readl_shim (cdev,IPCD ); +trace_catpt_ipc_notify (ipcd);/* ensure there is delayed reply or notification to process */ if (!(ipcd &CATPT_IPCD_BUSY ))
@@ -259,6 +268,7 @@ irqreturn_t catpt_dsp_irq_handler(int irq, void *dev_id)u32 isc, ipcc; isc =catpt_readl_shim (cdev,ISC ); +trace_catpt_irq (isc);/* immediate reply */ if (isc &CATPT_ISC_IPCCD ) {
@@ -266,6 +276,7 @@ irqreturn_t catpt_dsp_irq_handler(int irq, void *dev_id)catpt_updatel_shim (cdev,IMC ,CATPT_IMC_IPCCD ,CATPT_IMC_IPCCD ); ipcc =catpt_readl_shim (cdev,IPCC ); +trace_catpt_ipc_reply (ipcc);catpt_dsp_copy_rx (cdev, ipcc);complete (&cdev->ipc.done_completion);
sound/soc/intel/catpt/trace.h new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 9/14 ASoC: Intel: catpt: Simple sysfs attributes
In reply to Cezary RojewskiAdd sysfs entries for displaying version of FW currently in use as well as dumping full FW information including build and log-providers hashes.
---
Changes in v9:
- fixed newlines in sysfs as requested by Andy, left tags as no other changes done
Changes in v7:
- fixed licence header for fs.c
- renamed fs.c to sysfs.c to better match its purpose
- added documentation within Documentation/ABI/testing for entries exposed by catpt
- bin_attribute fw_build replaced by attribute fw_info:
fw_info contains full FW information and after successful handshake, it's always available (stored in driver data) so no need to invoke GET_FW_VERSION IPC again, just dump the stored information
- rather than manually creating and removing sysfs files, now makes use of dev_groups member of struct device_driver
Changes in v6:
- functions declaration and usage now part of this patch instead of being separated from it
Changes in v2:
- fixed size provided to memcpy() in fw_build_read() as reported by Mark
.../ABI/testing/sysfs-bus-pci-devices-catpt | 16 ++++++ sound/soc/intel/catpt/core.h | 2 + sound/soc/intel/catpt/device.c | 1 + sound/soc/intel/catpt/sysfs.c | 55 +++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-catpt create mode 100644 sound/soc/intel/catpt/sysfs.c
Documentation/ABI/testing/sysfs-bus-pci-devices-catpt new file +16 -0
@@ -0,0 +1,16 @@ +What: /sys/devices/pci0000:00/<dev>/fw_version +Date: September 2020 +Contact: Cezary Rojewski <[email protected]> +Description: + Version of AudioDSP firmware ASoC catpt driver is + communicating with. + Format: %d.%d.%d.%d, type:major:minor:build. + +What: /sys/devices/pci0000:00/<dev>/fw_info +Date: September 2020 +Contact: Cezary Rojewski <[email protected]> +Description: + Detailed AudioDSP firmware build information including + build hash and log-providers hash. This information is + obtained during initial handshake with firmware. + Format: %s.
sound/soc/intel/catpt/core.h +2 -0
@@ -15,6 +15,8 @@struct catpt_dev ; +extern const struct attribute_group *catpt_attr_groups[]; +void catpt_sram_init (struct resource *sram,u32 start,u32 size);void catpt_sram_free (struct resource *sram); struct resource *
sound/soc/intel/catpt/device.c +1 -0
@@ -342,6 +342,7 @@ static struct platform_driver catpt_acpi_driver = { .name = "intel_catpt", .acpi_match_table = catpt_ids, .pm = &catpt_dev_pm, + .dev_groups = catpt_attr_groups, }, };module_platform_driver (catpt_acpi_driver);
sound/soc/intel/catpt/sysfs.c new file +55 -0
55 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 10/14 ASoC: Intel: haswell: Remove haswell-solution specific code
In reply to Cezary RojewskiRemove code specific to sound/soc/intel/haswell. Update BE dai_link definition to provide seamless transition to catpt solution.
---
No changes since initial version.
sound/soc/intel/boards/haswell.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-)
sound/soc/intel/boards/haswell.c +4 -24
@@ -13,9 +13,6 @@#include <sound/soc-acpi.h> #include <sound/pcm_params.h> -#include "../common/sst-dsp.h" -#include "../haswell/sst-haswell-ipc.h" -#include "../../codecs/rt5640.h" /* Haswell ULT platforms have a Headphone and Mic jack */
@@ -77,25 +74,6 @@ static const struct snd_soc_ops haswell_rt5640_ops = { .hw_params = haswell_rt5640_hw_params, }; -static int haswell_rtd_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd,DRV_NAME ); -struct sst_pdata *pdata =dev_get_platdata (component->dev); -struct sst_hsw *haswell = pdata->dsp; -int ret; - -/* Set ADSP SSP port settings */ - ret =sst_hsw_device_set_config (haswell,SST_HSW_DEVICE_SSP_0 , -SST_HSW_DEVICE_MCLK_FREQ_24_MHZ , -SST_HSW_DEVICE_CLOCK_MASTER ,9 ); -if (ret <0 ) { -dev_err (rtd->dev,"failed to set device config\n" ); -return ret; - } - -return 0 ; -} -SND_SOC_DAILINK_DEF (dummy,DAILINK_COMP_ARRAY (COMP_DUMMY ()));
@@ -117,13 +95,15 @@ SND_SOC_DAILINK_DEF(codec,SND_SOC_DAILINK_DEF (platform,DAILINK_COMP_ARRAY (COMP_PLATFORM ("haswell-pcm-audio" ))); +SND_SOC_DAILINK_DEF (ssp0_port, +DAILINK_COMP_ARRAY (COMP_CPU ("ssp0-port" ))); +static struct snd_soc_dai_link haswell_rt5640_dais[] = {/* Front End DAI links */ { .name ="System" , .stream_name ="System Playback/Capture" , .dynamic =1 , - .init = haswell_rtd_init, .trigger = {SND_SOC_DPCM_TRIGGER_POST ,SND_SOC_DPCM_TRIGGER_POST }, .dpcm_playback =1 , .dpcm_capture =1 ,
@@ -167,7 +147,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { .ops = &haswell_rt5640_ops, .dpcm_playback = 1, .dpcm_capture = 1, - SND_SOC_DAILINK_REG(dummy, codec, dummy), + SND_SOC_DAILINK_REG(ssp0_port, codec, platform), }, };
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 11/14 ASoC: Intel: broadwell: Remove haswell-solution specific code
In reply to Cezary RojewskiRemove code specific to sound/soc/intel/haswell. Update BE dai_link definition to provide seamless transition to catpt solution.
---
No changes since initial version.
sound/soc/intel/boards/broadwell.c | 33 ------------------------------ 1 file changed, 33 deletions(-)
sound/soc/intel/boards/broadwell.c +0 -33
@@ -14,9 +14,6 @@#include <sound/pcm_params.h> #include <sound/soc-acpi.h> -#include "../common/sst-dsp.h" -#include "../haswell/sst-haswell-ipc.h" -#include "../../codecs/rt286.h" static struct snd_soc_jack broadwell_headset;
@@ -122,27 +119,6 @@ static const struct snd_soc_ops broadwell_rt286_ops = { .hw_params = broadwell_rt286_hw_params, }; -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -static int broadwell_rtd_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd,DRV_NAME ); -struct sst_pdata *pdata =dev_get_platdata (component->dev); -struct sst_hsw *broadwell = pdata->dsp; -int ret; - -/* Set ADSP SSP port settings */ - ret =sst_hsw_device_set_config (broadwell,SST_HSW_DEVICE_SSP_0 , -SST_HSW_DEVICE_MCLK_FREQ_24_MHZ , -SST_HSW_DEVICE_CLOCK_MASTER ,9 ); -if (ret <0 ) { -dev_err (rtd->dev,"error: failed to set device config\n" ); -return ret; - } - -return 0 ; -} -#endif -static const unsigned int channels[] = {2 , };
@@ -189,10 +165,8 @@ SND_SOC_DAILINK_DEF(platform,SND_SOC_DAILINK_DEF (codec,DAILINK_COMP_ARRAY (COMP_CODEC ("i2c-INT343A:00" ,"rt286-aif1" ))); -#if IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL )SND_SOC_DAILINK_DEF (ssp0_port,DAILINK_COMP_ARRAY (COMP_CPU ("ssp0-port" ))); -#endif /* broadwell digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
@@ -201,9 +175,6 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .name = "System PCM", .stream_name = "System Playback/Capture", .dynamic = 1, -#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) - .init = broadwell_rtd_init, -#endif .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .ops = &broadwell_fe_ops, .dpcm_playback = 1,
@@ -248,11 +219,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .ops = &broadwell_rt286_ops, .dpcm_playback = 1, .dpcm_capture = 1, -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -SND_SOC_DAILINK_REG (dummy, codec, dummy), -#else SND_SOC_DAILINK_REG(ssp0_port, codec, platform), -#endif }, };
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 12/14 ASoC: Intel: bdw-5650: Remove haswell-solution specific code
In reply to Cezary RojewskiRemove code specific to sound/soc/intel/haswell. Update BE dai_link definition to provide seamless transition to catpt solution.
---
No changes since initial version.
sound/soc/intel/boards/bdw-rt5650.c | 36 ----------------------------- 1 file changed, 36 deletions(-)
sound/soc/intel/boards/bdw-rt5650.c +0 -36
@@ -16,9 +16,6 @@#include <sound/soc.h> #include <sound/soc-acpi.h> -#include "../common/sst-dsp.h" -#include "../haswell/sst-haswell-ipc.h" -#include "../../codecs/rt5645.h" struct bdw_rt5650_priv {
@@ -138,30 +135,6 @@ static struct snd_soc_ops bdw_rt5650_ops = { .hw_params = bdw_rt5650_hw_params, }; -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -static int bdw_rt5650_rtd_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_component *component = -snd_soc_rtdcom_lookup (rtd,DRV_NAME ); -struct sst_pdata *pdata =dev_get_platdata (component->dev); -struct sst_hsw *broadwell = pdata->dsp; -int ret; - -/* Set ADSP SSP port settings -* clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz -*/ - ret =sst_hsw_device_set_config (broadwell,SST_HSW_DEVICE_SSP_0 , -SST_HSW_DEVICE_MCLK_FREQ_24_MHZ , -SST_HSW_DEVICE_TDM_CLOCK_MASTER ,4 ); -if (ret <0 ) { -dev_err (rtd->dev,"error: failed to set device config\n" ); -return ret; - } - -return 0 ; -} -#endif -static const unsigned int channels[] = {2 ,4 , };
@@ -251,10 +224,8 @@ SND_SOC_DAILINK_DEF(platform,SND_SOC_DAILINK_DEF (be,DAILINK_COMP_ARRAY (COMP_CODEC ("i2c-10EC5650:00" ,"rt5645-aif1" ))); -#if IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL )SND_SOC_DAILINK_DEF (ssp0_port,DAILINK_COMP_ARRAY (COMP_CPU ("ssp0-port" ))); -#endif static struct snd_soc_dai_link bdw_rt5650_dais[] = {/* Front End DAI links */
@@ -263,9 +234,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .stream_name = "System Playback", .dynamic = 1, .ops = &bdw_rt5650_fe_ops, -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) - .init = bdw_rt5650_rtd_init, -#endif .trigger = {SND_SOC_DPCM_TRIGGER_POST ,SND_SOC_DPCM_TRIGGER_POST
@@ -289,11 +257,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { .dpcm_playback = 1, .dpcm_capture = 1, .init = bdw_rt5650_init, -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -SND_SOC_DAILINK_REG (dummy, be, dummy), -#else SND_SOC_DAILINK_REG(ssp0_port, be, platform), -#endif }, };
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 13/14 ASoC: Intel: bdw-5677: Remove haswell-solution specific code
In reply to Cezary RojewskiRemove code specific to sound/soc/intel/haswell. Update BE dai_link definition to provide seamless transition to catpt solution.
---
No changes since initial version.
sound/soc/intel/boards/bdw-rt5677.c | 33 ----------------------------- 1 file changed, 33 deletions(-)
sound/soc/intel/boards/bdw-rt5677.c +0 -33
@@ -17,9 +17,6 @@#include <sound/jack.h> #include <sound/soc-acpi.h> -#include "../common/sst-dsp.h" -#include "../haswell/sst-haswell-ipc.h" -#include "../../codecs/rt5677.h" struct bdw_rt5677_priv {
@@ -201,27 +198,6 @@ static const struct snd_soc_ops bdw_rt5677_dsp_ops = { .hw_params = bdw_rt5677_dsp_hw_params, }; -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -static int bdw_rt5677_rtd_init (struct snd_soc_pcm_runtime *rtd) -{ -struct snd_soc_component *component =snd_soc_rtdcom_lookup (rtd,DRV_NAME ); -struct sst_pdata *pdata =dev_get_platdata (component->dev); -struct sst_hsw *broadwell = pdata->dsp; -int ret; - -/* Set ADSP SSP port settings */ - ret =sst_hsw_device_set_config (broadwell,SST_HSW_DEVICE_SSP_0 , -SST_HSW_DEVICE_MCLK_FREQ_24_MHZ , -SST_HSW_DEVICE_CLOCK_MASTER ,9 ); -if (ret <0 ) { -dev_err (rtd->dev,"error: failed to set device config\n" ); -return ret; - } - -return 0 ; -} -#endif -static const unsigned int channels[] = {2 , };
@@ -333,10 +309,8 @@ SND_SOC_DAILINK_DEF(platform,SND_SOC_DAILINK_DEF (be,DAILINK_COMP_ARRAY (COMP_CODEC ("i2c-RT5677CE:00" ,"rt5677-aif1" ))); -#if IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL )SND_SOC_DAILINK_DEF (ssp0_port,DAILINK_COMP_ARRAY (COMP_CPU ("ssp0-port" ))); -#endif /* Wake on voice interface */ SND_SOC_DAILINK_DEFS(dsp,
@@ -350,9 +324,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .name = "System PCM", .stream_name = "System Playback/Capture", .dynamic = 1, -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) - .init = bdw_rt5677_rtd_init, -#endif .trigger = {SND_SOC_DPCM_TRIGGER_POST ,SND_SOC_DPCM_TRIGGER_POST
@@ -387,11 +358,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { .dpcm_capture = 1, .init = bdw_rt5677_init, .exit = bdw_rt5677_exit, -#if !IS_ENABLED (CONFIG_SND_SOC_SOF_BROADWELL ) -SND_SOC_DAILINK_REG (dummy, be, dummy), -#else SND_SOC_DAILINK_REG(ssp0_port, be, platform), -#endif }, };
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v10 14/14 ASoC: Intel: Select catpt and deprecate haswell
In reply to Cezary RojewskiPrevent sound/soc/intel/haswell code compile and select catpt instead as a recommended solution. Userspace-exposed members are compatible with what is exposed by deprecated solution thus no harm is done. The only visible difference is the newly added 'Loopback Mute' kcontrol.
---
Changes in v7:
- patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has been moved to the back of the list: enable catpt after machine boards have been prepared for it first
Changes in v5:
- remove DMADEVICES depends on: DW_DMAC_CORE already covers that
- add optional COMPILE_TEST depends on
sound/soc/intel/Kconfig | 24 ++++++++++++------------ sound/soc/intel/Makefile | 2 +- sound/soc/intel/boards/Kconfig | 8 ++++---- sound/soc/intel/catpt/Makefile | 6 ++++++ 4 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 sound/soc/intel/catpt/Makefile
sound/soc/intel/Kconfig +12 -12
@@ -47,21 +47,21 @@ config SND_SOC_INTEL_SST_FIRMWARE # Haswell/Broadwell/Baytrail legacy and will be set # when these platforms are enabled -config SND_SOC_INTEL_HASWELL - tristate "Haswell/Broadwell Platforms" +config SND_SOC_INTEL_CATPT + tristate "Haswell and Broadwell" + depends on ACPI || COMPILE_TEST depends on SND_DMA_SGBUF - depends on DMADEVICES && ACPI - select SND_SOC_INTEL_SST - select SND_SOC_INTEL_SST_ACPI - select SND_SOC_INTEL_SST_FIRMWARE + select DW_DMAC_CORE select SND_SOC_ACPI_INTEL_MATCH help - If you have a Intel Haswell or Broadwell platform connected to - an I2S codec, then enable this option by saying Y or m. This is - typically used for Chromebooks. This is a recommended option. - This option is mutually exclusive with the SOF support on - Broadwell. If you want to enable SOF on Broadwell, you need to - deselect this option first. + Enable support for Intel(R) Haswell and Broadwell platforms + with I2S codec present. This is a recommended option. + Say Y or m if you have such device. + If unsure, say N. + +config SND_SOC_INTEL_HASWELL + tristate + select SND_SOC_INTEL_CATPT config SND_SOC_INTEL_BAYTRAIL tristate "Baytrail (legacy) Platforms"
sound/soc/intel/Makefile +1 -1
@@ -3,9 +3,9 @@ obj-$(CONFIG_SND_SOC) += common/ # Platform Support -obj-$(CONFIG_SND_SOC_INTEL_HASWELL) += haswell/ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += baytrail/ obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/ +obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/ obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/ obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/
sound/soc/intel/boards/Kconfig +4 -4
@@ -26,7 +26,7 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES interface. If unsure select N. -if SND_SOC_INTEL_HASWELL +if SND_SOC_INTEL_CATPT config SND_SOC_INTEL_HASWELL_MACH tristate "Haswell Lynxpoint"
@@ -40,9 +40,9 @@ config SND_SOC_INTEL_HASWELL_MACH Say Y or m if you have such a device. If unsure select "N". -endif ## SND_SOC_INTEL_HASWELL +endif ## SND_SOC_INTEL_CATPT -if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +if SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL config SND_SOC_INTEL_BDW_RT5650_MACH tristate "Broadwell with RT5650 codec"
@@ -83,7 +83,7 @@ config SND_SOC_INTEL_BROADWELL_MACH Ultrabook platforms. Say Y or m if you have such a device. This is a recommended option. If unsure select "N". -endif ## SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +endif ## SND_SOC_INTEL_CATPT || SND_SOC_SOF_BROADWELL if SND_SOC_INTEL_BAYTRAIL
sound/soc/intel/catpt/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +snd-soc-catpt-objs := device.o dsp.o loader.o ipc.o messages.o pcm.o sysfs.o + +# tell define_trace.h where to find the trace header +CFLAGS_device.o := -I$(src) + +obj-$(CONFIG_SND_SOC_INTEL_CATPT) += snd-soc-catpt.o
Signature · 1 line
2.17.1
Mark Brown
maintainerRe: [PATCH v10 14/14] ASoC: Intel: Select catpt and deprecate haswell
Quoted 4 lines · Cezary Rojewski
Prevent
sound/soc/intel/haswellcode compile and select catpt instead as a recommended solution. Userspace-exposed members are compatible with what is exposed by deprecated solution thus no harm is done. The only visible difference is the newly added 'Loopback Mute' kcontrol.
This doesn't build against current code with x86 allmodconfig, please check and resend:
In file included from /mnt/kernel/sound/soc/intel/catpt/core.h:14,
from /mnt/kernel/sound/soc/intel/catpt/dsp.c:13:/mnt/kernel/sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_regs_defaults':/mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: error: 'SSCR2' undeclared (first use in this function); did you mean 'SSCR0'?
catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT);
^~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
^~~
/mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: note: each undeclared identifier is reported only once for each function it appears in
catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT);
^~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
^~~
/mnt/kernel/sound/soc/intel/catpt/dsp.c:340:29: error: 'SSPSP2' undeclared (first use in this function); did you mean 'SSPSP'?
catpt_writel_ssp(cdev, i, SSPSP2, CATPT_SSPSP2_DEFAULT);
^~~~~~
/mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp'
writel(val, catpt_ssp_addr(cdev, ssp) + (reg))
^~~Re: [PATCH v10 14/14] ASoC: Intel: Select catpt and deprecate haswell
Quoted 8 lines · Mark Brown
Quoted 4 lines · Cezary Rojewski
Prevent
sound/soc/intel/haswellcode compile and select catpt instead as a recommended solution. Userspace-exposed members are compatible with what is exposed by deprecated solution thus no harm is done. The only visible difference is the newly added 'Loopback Mute' kcontrol.This doesn't build against current code with x86 allmodconfig, please check and resend:
This has a dependency from SPI tree. Can you merge (cherry-pick) one patch from there to ASoC tree, please?
a2bee00cccf4 ("spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers")
Quoted 22 lines
In file included from
/mnt/kernel/sound/soc/intel/catpt/core.h:14,
from/mnt/kernel/sound/soc/intel/catpt/dsp.c:13:/mnt/kernel/sound/soc/intel/catpt/dsp.c: In function 'catpt_dsp_set_regs_defaults':/mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: error: 'SSCR2' undeclared (first use in this function); did you mean 'SSCR0'?catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT); ^~~~~ /mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp' writel(val, catpt_ssp_addr(cdev, ssp) + (reg)) ^~~ /mnt/kernel/sound/soc/intel/catpt/dsp.c:339:29: note: each undeclared identifier is reported only once for each function it appears in catpt_writel_ssp(cdev, i, SSCR2, CATPT_SSCR2_DEFAULT); ^~~~~ /mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp' writel(val, catpt_ssp_addr(cdev, ssp) + (reg)) ^~~ /mnt/kernel/sound/soc/intel/catpt/dsp.c:340:29: error: 'SSPSP2' undeclared (first use in this function); did you mean 'SSPSP'? catpt_writel_ssp(cdev, i, SSPSP2, CATPT_SSPSP2_DEFAULT); ^~~~~~ /mnt/kernel/sound/soc/intel/catpt/registers.h:152:43: note: in definition of macro 'catpt_writel_ssp' writel(val, catpt_ssp_addr(cdev, ssp) + (reg)) ^~~
Signature · 2 lines
With Best Regards, Andy Shevchenko
Mark Brown
maintainerRe: [PATCH v10 14/14] ASoC: Intel: Select catpt and deprecate haswell
Quoted 4 lines · Andy Shevchenko
This has a dependency from SPI tree. Can you merge (cherry-pick) one patch from there to ASoC tree, please?
a2bee00cccf4("spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers")
Ah, right - that was actually mentioned in the cover letter but got missed (I think I didn't register that it was a SPI change and stopped at the "already merged" bit). It would have been helpful to highlight this with the SPI change so it could have been applied as a separate branch rather than on the main branch which would make this easier, this sort of stuff is why I like to have per driver branches.
Rojewski, Cezary
maintainerRE: [PATCH v10 14/14] ASoC: Intel: Select catpt and deprecate haswell
Quoted 5 lines · Mark Brown
Quoted 2 lines · Andy Shevchenko
This has a dependency from SPI tree. Can you merge (cherry-pick) one patch from there to ASoC tree, please?
Quoted 9 lines
Quoted 1 line
a2bee00cccf4("spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers")Ah, right - that was actually mentioned in the cover letter but got missed (I think I didn't register that it was a SPI change and stopped at the "already merged" bit). It would have been helpful to highlight this with the SPI change so it could have been applied as a separate branch rather than on the main branch which would make this easier, this sort of stuff is why I like to have per driver branches.
While catpt's cover-letter mentioned this, indeed the SPI change was devoid of such note. Sorry for that, Mark.
Is my action required?
Regards,
Czarek
Quoted 58 lines · Cezary Rojewski
Implement support for Lynxpoint and Wildcat Point AudioDSP. Catpt solution deprecates existing
sound/soc/intel/haswellwhich is removed in the following series.Due to high range of errors and desynchronization from recommendations set by Windows solution, re-write came as a lower-cost solution compared to refactoring /haswell/ with several series of patches.
Series is dependent on linux-spi change:
spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers
https://www.spinics.net/lists/linux-spi/msg23885.html
which has been already merged and is now part of linux-spi tree.Bulk of series content is device driver core code - everything up to patch 7/14 - with fs entries and trace macros introduced right after. While each core patch is shaped in such a way that no unavailable members are ever called, until patch 14/14 is applied, no code compilation can occur as no
Makefileis present. Once said patch is added,MakefileandKconfigare implemented and driver module compiles as expected.Special thanks go to Marcin Barlik and Piotr Papierkowski for sharing their LPT/WPT AudioDSP architecture expertise as well as helping backtrack its historical background.
My thanks go to Amadeusz Slawinski for reviews and improvements proposed on and off the internal list. Most of internal diff below is his contribution.
Krzysztof Hejmowski helped me setup my own Xtensa environment and recompile LPT/WPT FW binary sources what sped up the development greatly.This would not have been possible without help from these champions, especially considering how quickly the catpt was written: 2 weeks features, 3 weeks optimizations. Thank you.
Userspace-exposed members are compatible with what is exposed by deprecated solution as well as FW binary being re-used thus no harm is done. The only visible differences are: the newly added 'Loopback Mute' kcontrol and volume support extending to quad from stereo.
On top of fixing erros and design flows, catpt also adds module reload, dynamic SRAM memory allocation during PCM runtime and exposes missing userspace API: 'Loopback Mute' kcontrol, quad volume controls and sysfs fw-version entries. Event tracing is provided to ease solution debugging.
Following are not included in this update and are scheduled as later addition:
- fw logging
- module (library) supportNote: LPT power up/down sequences might get aligned with WPT once enough testing is done as capabilities are shared for both DSPs. Note #2: Both LPT and WPT power up/down sequences may get optimized in future updates as thanks to help from the Windows team, most of nuances behind why/what/when in regard to hw registers have been backtracked and reviewed again.
Quoted 2 lines
Link to developer's deep dive message:
https://www.spinics.net/lists/alsa-devel/msg113563.html
For all non-tagged, FWIW,
thanks!
Quoted 228 lines
Changes in v10:
- revertedDUAL_MONOcase relocation from v9
- indented all constants of enumcatpt_module_idto the same column
- new newline appended for return path ofcatpt_dsp_do_send_msg()Changes in v9:
https://www.spinics.net/lists/alsa-devel/msg116305.html
- fixed newlines in sysfs as requested by Andy, left tags as no other changes done
- removedvolume_mapand replaced by simple formulas for volume kcontrol calculations
- removed redundant parentheses incatpt_get_channel_map()and relocatedDUAL_MONOcase
- runtime suspend no longer called during module unload
- removed redundant size checks forcatpt_dsp_send_tx()andcatpt_dsp_copy_rx()Changes in v8:
https://www.spinics.net/lists/alsa-devel/msg116168.html
- updatedcatpt_arrange_page_table()with GENMASK andU32_MAXusage
- made use ofPFN_DOWN()replacing explicit right shitfs byPAGE_SIZE
- made fw hash dumping incatpt_coredump()more readable and removed hardcodes
-catpt_coredump()dumps fw hash now only if said segment has been found withinfw_info
- shortened_MSECSsuffixes to_MS
- IPC structs no longer contain enum members
- simplified definition ofcatpt_set_dspvol()Changes in v7:
https://www.spinics.net/lists/alsa-devel/msg116019.html
- fixed licence header forfs.c
- renamedfs.ctosysfs.cto better match its purpose
- added documentation withinDocumentation/ABI/testingfor entries exposed by catpt
-bin_attributefw_buildreplaced by attributefw_info:
fw_infocontains full FW information and after successful handshake, it's always available (stored in driver data) so no need to invokeGET_FW_VERSIONIPC again, just dump the stored information
- rather than manually creating and removing sysfs files, now makes use ofdev_groupsmember of structdevice_driver
- patch: 10/14 'ASoC: Intel: Select catpt and deprecate haswell' has been moved to the back of the list: enable catpt after machine boards have been prepared for it first
- improved readability of several goto labelsChanges in v6:
https://www.spinics.net/lists/alsa-devel/msg115765.html
- reordered and reorganized code for patches 1/13 - 8/13 of v5, so each patches makes use of no member or function which is unavailable to it. Series size increased from 13 to 14 patches: addition of base members e.g.: registers has been split from addition ofdevice.cfile which describes acpi device behaviorChanges in v5:
https://www.spinics.net/lists/alsa-devel/msg115621.html
Basically everything below is result of Andy's review. Thank you Andy for taking time into this detailed review- catpt now makes use of common
linux/pxa2xx_ssp.hheader file, removing redundant SSP register declarations in the process. As stated in the opening, this is dependent upon linux-spi change:
spi: pxa2xx: Add SSC2 and SSPSP2 SSP registers- updated
Kconfigby removing DMADEVICES and addingCOMPILE_TESTas optional depends-on
- updated all register macros definitions to be more safe against common arithmetics when specifying macro's parameters
- removedCONFIG_PMandCONFIG_PM_SLEEPusage in favor of__maybe_unused
- all 'if (ret < 0)' converted to simple 'if (ret)' whenever possible
- fixed erroneous check forplatform_device_register_datawithincatpt_register_board()
- _SLAVE/_MASTER replaced with more inclusive _CONSUMER/_PROVIDER for enumcatpt_ssp_mode
-catpt_acpi_probe()is now making use of high-level wrappers for ioremapping and resource assignment, reducing function's code size
- due to improvedcatpt_acpi_probe()behavior,catpt_acpi_remove()needs not to castdma_free_coherent()any longer
- DMA source and destrination maxburst now of value 16, see:
https://www.spinics.net/lists/alsa-devel/msg114394.html- simplified
catpt_dsp_update_lpclock()aslist_for_each_entry()is empty-safe by default
- dropped '_SSP_' from all names of allCATPT_SSP_SSXXX_DEFAULTmacros
-catpt_updatel_pcinow makes use oflinux/pci.handuapi/linux/pci.hconstants such as:PCI_PM_CTRL_STATE_MASKandPCI_D3hotChanges in v4:
https://www.spinics.net/lists/alsa-devel/msg113762.html
- fixed compilation with i386 kconfig (conflicting names)
- streamlined naming for SHIM and PCI registers to match SSP ones (SHIM_REG-> SHIM)
-catpt_component_proberemoved and kcontrols again initializzed statically viasnd_kcontrol_newarray: this is to removekctl->id.deviceshenanigans
- renamedcatpt_set_ctlvoltocatpt_set_dspvol- function name wasn't matching its purposeChanges in v3:
- fixed IRAM mask usage inlpt_dsp_power_up(dsp.c)
- updated dbg message formatting incatpt_restore_fwimageas suggested by Andy
- fixed alignment for structcatpt_ssp_device_format
-catpt_set_ctlvolnow verifies all-equal scenario based on all channels rather than just first two as requested by Amadeo
- fixed SPDX forregisters.hChanges in v2:
https://www.spinics.net/lists/alsa-devel/msg113660.html
- fixed SPDX formatting for all header files as well aspcm.c
- fixed size provided tomemcpy()infw_build_read()as reported by Mark
- renamed structcatpt_pdatato structcatpt_spec(cosmetic)
- fixed erroneous path incatpt_load_block: region is properly released
-trace.hevents for updating registers have been removed and usages replaced bydev_dbg(SRAMPGE/ LPCS)- as requested by Andy, struct resource has replaced struct
catpt_mbankand structcatpt_mregion. This change cascaded into:-
catpt_mbank_sizeandcatpt_mregion_sizereplaced byresource_size
-catpt_mregion_intersectsreplaced byresource_overlaps
- allcatpt_mbank_andcatpt_mregion_handlers found inloader.c(_request,_reserve,_release,_extract,_split,_join) have been removed
-__request_regionand__release_regionhave been enlisted in their place
-catpt_mregion_intersectingrenamed tocatpt_resource_overlapping
-catpt_request_regionhelper has been provided to deal with -size based requests
o haven't found direct replacements in resource.c/ioport.hfor both functions-
catpt_mbank_createandcatpt_mbank_removerenamed tocatpt_sram_initandcatpt_sram_freerespectively
-catpt_sram_initnow returns void instead of int and has been converted to simple initialized. This change ultimately cascaded into:
o both SRAM banks initialization being moved tocatpt_dev_initfromcatpt_acpi_probe(device.c)
ocatpt_dev::specis now initialized first, withcatpt_dev_initfollowing it soon after
ocatpt_acpi_probeerroneous path has been simplified as SRAM banks no longer need to be freed-
catpt_sram_freenow frees all resources via child -> sibling enumeration rather thanregion_listiteration
-catpt_dsp_update_srampgeandcatpt_dsp_set_srampgenow accept new
argument: unsigned long mask. Caused by removal ofcatpt_mbank- mask is taken directly from catpt_dev::spec::d/iram_mask
-trace.hevents forcatpt_mbankandcatpt_mregionhave been removedDiff against last drop on internal list:
https://www.spinics.net/lists/alsa-devel/msg113549.html
- replaced spinlock with mutex for mregion allocation and release to address sleeping in atomic context warnings
- fixed coredumpfw_hashdumping
- kcontrol values are now always stored regardless of stream of interest is running or not
- kcontrol values are now applied after stream is prepared instead of ignoring what has been set by user initially
-catpt_pdatainstances have been renamed fromhsw_andbdw_tolpt_andwpt_respectively
- reorderedMakefile.o(s) (cosmetic)Cezary Rojewski (14):
ASoC: Intel: Add catpt base members
ASoC: Intel: catpt: Implement IPC protocol
ASoC: Intel: catpt: Add IPC message handlers
ASoC: Intel: catpt: Define DSP operations
ASoC: Intel: catpt: Firmware loading and context restore
ASoC: Intel: catpt: PCM operations
ASoC: Intel: catpt: Device driver lifecycle
ASoC: Intel: catpt: Event tracing
ASoC: Intel: catpt: Simple sysfs attributes
ASoC: Intel: haswell: Remove haswell-solution specific code
ASoC: Intel: broadwell: Remove haswell-solution specific code
ASoC: Intel: bdw-5650: Remove haswell-solution specific code
ASoC: Intel: bdw-5677: Remove haswell-solution specific code
ASoC: Intel: Select catpt and deprecate haswell.../ABI/testing/sysfs-bus-pci-devices-catpt | 16 + sound/soc/intel/Kconfig | 24 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/boards/Kconfig | 8 +- sound/soc/intel/boards/bdw-rt5650.c | 36 - sound/soc/intel/boards/bdw-rt5677.c | 33 - sound/soc/intel/boards/broadwell.c | 33 - sound/soc/intel/boards/haswell.c | 28 +- sound/soc/intel/catpt/Makefile | 6 + sound/soc/intel/catpt/core.h | 188 +++ sound/soc/intel/catpt/device.c | 352 +++++ sound/soc/intel/catpt/dsp.c | 578 ++++++++ sound/soc/intel/catpt/ipc.c | 298 +++++ sound/soc/intel/catpt/loader.c | 671 ++++++++++ sound/soc/intel/catpt/messages.c | 313 +++++ sound/soc/intel/catpt/messages.h | 401 ++++++ sound/soc/intel/catpt/pcm.c | 1175 +++++++++++++++++ sound/soc/intel/catpt/registers.h | 178 +++ sound/soc/intel/catpt/sysfs.c | 55 + sound/soc/intel/catpt/trace.h | 83 ++ 20 files changed, 4335 insertions(+), 143 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-devices-catpt create mode 100644 sound/soc/intel/catpt/Makefile create mode 100644 sound/soc/intel/catpt/core.h create mode 100644 sound/soc/intel/catpt/device.c create mode 100644 sound/soc/intel/catpt/dsp.c create mode 100644 sound/soc/intel/catpt/ipc.c create mode 100644 sound/soc/intel/catpt/loader.c create mode 100644 sound/soc/intel/catpt/messages.c create mode 100644 sound/soc/intel/catpt/messages.h create mode 100644 sound/soc/intel/catpt/pcm.c create mode 100644 sound/soc/intel/catpt/registers.h create mode 100644 sound/soc/intel/catpt/sysfs.c create mode 100644 sound/soc/intel/catpt/trace.hSignature · 1 line
2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Mark Brown
maintainerQuoted 9 lines · Cezary Rojewski
Implement support for Lynxpoint and Wildcat Point AudioDSP. Catpt solution deprecates existing
sound/soc/intel/haswellwhich is removed in the following series.Due to high range of errors and desynchronization from recommendations set by Windows solution, re-write came as a lower-cost solution compared to refactoring /haswell/ with several series of patches.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[01/14] ASoC: Intel: Add catpt base members
commit: 4fac9b31d0b9d3b3e9dd1408f457139f94077bc5
[02/14] ASoC: Intel: catpt: Implement IPC protocol
commit: 92946c1d7ea8c5e19a4d7b4bd8896f04dc09c655
[03/14] ASoC: Intel: catpt: Add IPC message handlers
commit: 64b9b1b005743a7bb4443442347024fca56433ee
[04/14] ASoC: Intel: catpt: Define DSP operations
commit: ba202a7bc3da05ca4548c7247f9be769b4e8c9fa
[05/14] ASoC: Intel: catpt: Firmware loading and context restore
commit: a9aa6fb3eb6c7e0e7e117b3f2dfafef8c45b9ea6
[06/14] ASoC: Intel: catpt: PCM operations
commit: a126750fc86546bf86c7536923a77cfecc15e5e3
[07/14] ASoC: Intel: catpt: Device driver lifecycle
commit: 7a10b66a5df965ea4074aae265068b3483fa9fc6
[08/14] ASoC: Intel: catpt: Event tracing
commit: 8ba1edb9c245e63c6750c4c77bfdba1230442d4d
[09/14] ASoC: Intel: catpt: Simple sysfs attributes
commit: 8f80a834b909784c6e1ff7fcc819b1f8bd1651be
[10/14] ASoC: Intel: haswell: Remove haswell-solution specific code
commit: 0ce1610578bcb3b4a6824eb12f1a02cfc34a21e0
[11/14] ASoC: Intel: broadwell: Remove haswell-solution specific code
commit: e81a707a3935493ed04b62775943ae41ae254289
[12/14] ASoC: Intel: bdw-5650: Remove haswell-solution specific code
commit: 02f2442fb32a1f8bde7774bd58e1dbeabe7970bc
[13/14] ASoC: Intel: bdw-5677: Remove haswell-solution specific code
commit: 053743f0c49074e710401ce39dd6f7d767094f77
[14/14] ASoC: Intel: Select catpt and deprecate haswell
commit: 6cbfa11d2694b8a1e46d6834fb9705d5589e3ef1All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark