ASoC: Intel: Catpt - Lynx and Wildcat point
Subsystems (3)
Cezary Rojewski
maintainerv7 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 easy 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 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
- 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 | 187 +++ sound/soc/intel/catpt/device.c | 348 +++++ sound/soc/intel/catpt/dsp.c | 571 ++++++++ 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 | 1210 +++++++++++++++++ sound/soc/intel/catpt/registers.h | 178 +++ sound/soc/intel/catpt/sysfs.c | 58 + sound/soc/intel/catpt/trace.h | 83 ++ 20 files changed, 4361 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 v7 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 v7 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 | 43 ++++ sound/soc/intel/catpt/ipc.c | 246 ++++++++++++++++++ sound/soc/intel/catpt/messages.h | 401 ++++++++++++++++++++++++++++++ sound/soc/intel/catpt/registers.h | 1 - 4 files changed, 690 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 +43 -0
@@ -9,6 +9,7 @@#define __SND_SOC_INTEL_CATPT_CORE_H#include <linux/dma/dw.h> +#include "messages.h" #include "registers.h" struct catpt_dev ;
@@ -29,6 +30,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 +85,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 +110,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
Re: [PATCH v7 02/14] ASoC: Intel: catpt: Implement IPC protocol
Quoted 102 lines · Cezary Rojewski
Implement 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_PENDINGstatus 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.Signed-off-by Cezary Rojewski <[email protected]>--- sound/soc/intel/catpt/core.h | 43 ++++ sound/soc/intel/catpt/ipc.c | 246 ++++++++++++++++++ sound/soc/intel/catpt/messages.h | 401 ++++++++++++++++++++++++++++++ sound/soc/intel/catpt/registers.h | 1 - 4 files changed, 690 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/catpt/ipc.c create mode 100644 sound/soc/intel/catpt/messages.hsound/soc/intel/catpt/core.h +43
-0@@ -9,6 +9,7 @@#define __SND_SOC_INTEL_CATPT_CORE_H#include <linux/dma/dw.h> +#include "messages.h" #include "registers.h" struct catpt_dev ;@@ -29,6 +30,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 +85,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 +110,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 +3
-0@@ -0,0 +1,246 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2020 Intel Corporation. All rights reserved.
sound/soc/intel/catpt/ipc.c line 13
Quoted 10 lines
sound/soc/intel/catpt/ipc.c new file +10
-0+// +// Author: Cezary Rojewski <[email protected]> +// + +#include <linux/irqreturn.h> +#include "core.h" +#include "messages.h" +#include "registers.h" + +#define CATPT_IPC_TIMEOUT_MSECS 300
A nit-pick: _MS is enough.
Quoted 654 lines
sound/soc/intel/catpt/ipc.c new file +232
-0+void catpt_ipc_init (struct catpt_ipc *ipc,struct device *dev) +{ + ipc->dev = dev; + ipc->ready = false; + ipc->default_timeout =CATPT_IPC_TIMEOUT_MSECS ; +init_completion (&ipc->done_completion); +init_completion (&ipc->busy_completion); +spin_lock_init (&ipc->lock); +mutex_init (&ipc->mutex); +} + +static int catpt_ipc_arm (struct catpt_ipc *ipc,struct catpt_fw_ready *config) +{ +/* +* Both tx and rx are put into and received from outbox. Inbox is +* only used for notifications where payload size is known upfront, +* thus no separate buffer is allocated for it. +*/ + ipc->rx.data =devm_kzalloc (ipc->dev, config->outbox_size,GFP_KERNEL ); +if (!ipc->rx.data) +return -ENOMEM ; + +memcpy (&ipc->config, config,sizeof (*config)); + ipc->ready = true; + +return 0 ; +} + +static void catpt_ipc_msg_init (struct catpt_ipc *ipc, +struct catpt_ipc_msg *reply) +{ +lockdep_assert_held (&ipc->lock); + + ipc->rx.header =0 ; + ipc->rx.size = reply ? reply->size :0 ; +reinit_completion (&ipc->done_completion); +reinit_completion (&ipc->busy_completion); +} + +static void catpt_dsp_send_tx (struct catpt_dev *cdev, +const struct catpt_ipc_msg *tx) +{ +u32 header = tx->header |CATPT_IPCC_BUSY ; + +if (tx->size) +memcpy_toio (catpt_outbox_addr (cdev), tx->data, tx->size); +catpt_writel_shim (cdev,IPCC , header); +} + +static int catpt_wait_msg_completion (struct catpt_dev *cdev,int timeout) +{ +struct catpt_ipc *ipc = &cdev->ipc; +int ret; + + ret =wait_for_completion_timeout (&ipc->done_completion, +msecs_to_jiffies (timeout)); +if (!ret) +return -ETIMEDOUT ; +if (ipc->rx.rsp.status !=CATPT_REPLY_PENDING ) +return 0 ; + +/* wait for delayed reply */ + ret =wait_for_completion_timeout (&ipc->busy_completion, +msecs_to_jiffies (timeout)); +return ret ?0 : -ETIMEDOUT ; +} + +static int catpt_dsp_do_send_msg (struct catpt_dev *cdev, +struct catpt_ipc_msg request, +struct catpt_ipc_msg *reply,int timeout) +{ +struct catpt_ipc *ipc = &cdev->ipc; +unsigned long flags; +int ret; + +if (!ipc->ready) +return -EPERM ; +if (request.size > ipc->config.outbox_size || + (reply && reply->size > ipc->config.outbox_size)) +return -EINVAL ; + +spin_lock_irqsave (&ipc->lock, flags); +catpt_ipc_msg_init (ipc, reply); +catpt_dsp_send_tx (cdev, &request); +spin_unlock_irqrestore (&ipc->lock, flags); + + ret =catpt_wait_msg_completion (cdev, timeout); +if (ret) { +dev_crit (cdev->dev,"communication severed: %d, rebooting dsp..\n" , + ret); + ipc->ready = false; +/* TODO: attempt recovery */ +return ret; + } + + ret = ipc->rx.rsp.status; +if (reply) { + reply->header = ipc->rx.header; +if (!ret && reply->data && reply->size) +memcpy (reply->data, ipc->rx.data, ipc->rx.size); + } + +return ret; +} + +int catpt_dsp_send_msg_timeout (struct catpt_dev *cdev, +struct catpt_ipc_msg request, +struct catpt_ipc_msg *reply,int timeout) +{ +struct catpt_ipc *ipc = &cdev->ipc; +int ret; + +mutex_lock (&ipc->mutex); + ret =catpt_dsp_do_send_msg (cdev, request, reply, timeout); +mutex_unlock (&ipc->mutex); + +return ret; +} + +int catpt_dsp_send_msg (struct catpt_dev *cdev,struct catpt_ipc_msg request, +struct catpt_ipc_msg *reply) +{ +return catpt_dsp_send_msg_timeout (cdev, request, reply, + cdev->ipc.default_timeout); +} + +static void catpt_dsp_copy_rx (struct catpt_dev *cdev,u32 header) +{ +struct catpt_ipc *ipc = &cdev->ipc; + + ipc->rx.header = header; +if (ipc->rx.size && ipc->rx.rsp.status ==CATPT_REPLY_SUCCESS ) { +memcpy_fromio (ipc->rx.data,catpt_outbox_addr (cdev), + ipc->rx.size); + } +} + +static void catpt_dsp_process_response (struct catpt_dev *cdev,u32 header) +{ +union catpt_notify_msg msg =CATPT_MSG (header); +struct catpt_ipc *ipc = &cdev->ipc; + +if (msg.fw_ready) { +struct catpt_fw_ready config; +/* to fit 32b header original address is shifted right by 3 */ +u32 off = msg.mailbox_address <<3 ; + +memcpy_fromio (&config, cdev->lpe_ba + off,sizeof (config)); + +catpt_ipc_arm (ipc, &config); +complete (&cdev->fw_ready); +return ; + } + +switch (msg.type) { +case CATPT_GLB_REQUEST_CORE_DUMP : +break ; + +case CATPT_GLB_STREAM_MESSAGE : +switch (msg.subtype) { +case CATPT_STRM_NOTIFICATION : +break ; +default : +catpt_dsp_copy_rx (cdev, header); +/* signal completion of delayed reply */ +complete (&ipc->busy_completion); +break ; + } +break ; + +default : +dev_warn (cdev->dev,"unknown response: %d received\n" , + msg.type); +break ; + } +} + +irqreturn_t catpt_dsp_irq_thread (int irq,void *dev_id) +{ +struct catpt_dev *cdev = dev_id; +u32 ipcd; + + ipcd =catpt_readl_shim (cdev,IPCD ); + +/* ensure there is delayed reply or notification to process */ +if (!(ipcd &CATPT_IPCD_BUSY )) +return IRQ_NONE ; + +catpt_dsp_process_response (cdev, ipcd); + +/* tell DSP processing is completed */ +catpt_updatel_shim (cdev,IPCD ,CATPT_IPCD_BUSY |CATPT_IPCD_DONE , +CATPT_IPCD_DONE ); +/* unmask dsp BUSY interrupt */ +catpt_updatel_shim (cdev,IMC ,CATPT_IMC_IPCDB ,0 ); + +return IRQ_HANDLED ; +} + +irqreturn_t catpt_dsp_irq_handler (int irq,void *dev_id) +{ +struct catpt_dev *cdev = dev_id; +irqreturn_t ret =IRQ_NONE ; +u32 isc, ipcc; + + isc =catpt_readl_shim (cdev,ISC ); + +/* immediate reply */ +if (isc &CATPT_ISC_IPCCD ) { +/* mask host DONE interrupt */ +catpt_updatel_shim (cdev,IMC ,CATPT_IMC_IPCCD ,CATPT_IMC_IPCCD ); + + ipcc =catpt_readl_shim (cdev,IPCC ); +catpt_dsp_copy_rx (cdev, ipcc); +complete (&cdev->ipc.done_completion); + +/* tell DSP processing is completed */ +catpt_updatel_shim (cdev,IPCC ,CATPT_IPCC_DONE ,0 ); +/* unmask host DONE interrupt */ +catpt_updatel_shim (cdev,IMC ,CATPT_IMC_IPCCD ,0 ); + ret =IRQ_HANDLED ; + } + +/* delayed reply or notification */ +if (isc &CATPT_ISC_IPCDB ) { +/* mask dsp BUSY interrupt */ +catpt_updatel_shim (cdev,IMC ,CATPT_IMC_IPCDB ,CATPT_IMC_IPCDB ); + ret =IRQ_WAKE_THREAD ; + } + +return ret; +}sound/soc/intel/catpt/messages.h new file +401
-0@@ -0,0 +1,401 @@ +/* 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_MSG_H +#define __SND_SOC_INTEL_CATPT_MSG_H + +struct catpt_dev ; + +/* IPC messages base types */ + +enum catpt_reply_status { +CATPT_REPLY_SUCCESS =0 , +CATPT_REPLY_ERROR_INVALID_PARAM =1 , +CATPT_REPLY_UNKNOWN_MESSAGE_TYPE =2 , +CATPT_REPLY_OUT_OF_RESOURCES =3 , +CATPT_REPLY_BUSY =4 , +CATPT_REPLY_PENDING =5 , +CATPT_REPLY_FAILURE =6 , +CATPT_REPLY_INVALID_REQUEST =7 , +CATPT_REPLY_UNINITIALIZED =8 , +CATPT_REPLY_NOT_FOUND =9 , +CATPT_REPLY_SOURCE_NOT_STARTED =10 , +}; + +/* GLOBAL messages */ + +enum catpt_global_msg_type { +CATPT_GLB_GET_FW_VERSION =0 , +CATPT_GLB_ALLOCATE_STREAM =3 , +CATPT_GLB_FREE_STREAM =4 , +CATPT_GLB_STREAM_MESSAGE =6 , +CATPT_GLB_REQUEST_CORE_DUMP =7 , +CATPT_GLB_SET_DEVICE_FORMATS =10 , +CATPT_GLB_ENTER_DX_STATE =12 , +CATPT_GLB_GET_MIXER_STREAM_INFO =13 , +}; + +union catpt_global_msg { +u32 val; +struct { +enum catpt_reply_status status:5 ; +u32 context:19 ;/* stream or module specific */ +enum catpt_global_msg_type type:5 ; +u32 fw_ready:1 ; +u32 done:1 ; +u32 busy:1 ; + }; +} __packed; + +#define CATPT_MSG (hdr) { .val = hdr } +#define CATPT_GLOBAL_MSG (msg_type) \ + { .type = CATPT_GLB_##msg_type } + +#define BUILD_HASH_SIZE 40 + +struct catpt_fw_version { +u8 build; +u8 minor; +u8 major; +u8 type; +u8 build_hash[BUILD_HASH_SIZE ]; +u32 log_providers_hash; +} __packed; + +int catpt_ipc_get_fw_version (struct catpt_dev *cdev, +struct catpt_fw_version *version); + +enum catpt_pin_id { +CATPT_PIN_ID_SYSTEM =0 , +CATPT_PIN_ID_REFERENCE =1 , +CATPT_PIN_ID_CAPTURE1 =2 , +CATPT_PIN_ID_CAPTURE2 =3 , +CATPT_PIN_ID_OFFLOAD1 =4 , +CATPT_PIN_ID_OFFLOAD2 =5 , +CATPT_PIN_ID_MIXER =7 , +CATPT_PIN_ID_BLUETOOTH_CAPTURE =8 , +CATPT_PIN_ID_BLUETOOTH_RENDER =9 , +}; + +enum catpt_path_id { +CATPT_PATH_SSP0_OUT =0 , +CATPT_PATH_SSP0_IN =1 , +CATPT_PATH_SSP1_OUT =2 , +CATPT_PATH_SSP1_IN =3 , +/* duplicated audio in capture path */ +CATPT_PATH_SSP0_IN_DUP =4 , +}; + +enum catpt_stream_type { +CATPT_STRM_TYPE_RENDER =0 ,/* offload */ +CATPT_STRM_TYPE_SYSTEM =1 , +CATPT_STRM_TYPE_CAPTURE =2 , +CATPT_STRM_TYPE_LOOPBACK =3 , +CATPT_STRM_TYPE_BLUETOOTH_RENDER =4 , +CATPT_STRM_TYPE_BLUETOOTH_CAPTURE =5 , +}; + +enum catpt_format_id { +CATPT_FORMAT_PCM =0 , +CATPT_FORMAT_MP3 =1 , +CATPT_FORMAT_AAC =2 , +CATPT_FORMAT_WMA =3 , +}; + +enum catpt_channel_index { +CATPT_CHANNEL_LEFT =0x0 , +CATPT_CHANNEL_CENTER =0x1 , +CATPT_CHANNEL_RIGHT =0x2 , +CATPT_CHANNEL_LEFT_SURROUND =0x3 , +CATPT_CHANNEL_CENTER_SURROUND =0x3 , +CATPT_CHANNEL_RIGHT_SURROUND =0x4 , +CATPT_CHANNEL_LFE =0x7 , +CATPT_CHANNEL_INVALID =0xF , +}; + +enum catpt_channel_config { +CATPT_CHANNEL_CONFIG_MONO =0 ,/* One channel only */ +CATPT_CHANNEL_CONFIG_STEREO =1 ,/* L & R */ +CATPT_CHANNEL_CONFIG_2_POINT_1 =2 ,/* L, R & LFE; PCM only */ +CATPT_CHANNEL_CONFIG_3_POINT_0 =3 ,/* L, C & R; MP3 & AAC only */ +CATPT_CHANNEL_CONFIG_3_POINT_1 =4 ,/* L, C, R & LFE; PCM only */ +CATPT_CHANNEL_CONFIG_QUATRO =5 ,/* L, R, Ls & Rs; PCM only */ +CATPT_CHANNEL_CONFIG_4_POINT_0 =6 ,/* L, C, R & Cs; MP3 & AAC only */ +CATPT_CHANNEL_CONFIG_5_POINT_0 =7 ,/* L, C, R, Ls & Rs */ +CATPT_CHANNEL_CONFIG_5_POINT_1 =8 ,/* L, C, R, Ls, Rs & LFE */ +CATPT_CHANNEL_CONFIG_DUAL_MONO =9 ,/* One channel replicated in two */ +CATPT_CHANNEL_CONFIG_INVALID =10 , +}; + +enum catpt_interleaving_style { +CATPT_INTERLEAVING_PER_CHANNEL =0 , +CATPT_INTERLEAVING_PER_SAMPLE =1 , +}; + +struct catpt_audio_format { +u32 sample_rate; +u32 bit_depth; +u32 channel_map; +enum catpt_channel_config channel_config__aligned(4) ; +enum catpt_interleaving_style interleaving__aligned(4) ; +u8 num_channels; +u8 valid_bit_depth; +u8 reserved[2 ]; +} __packed; + +struct catpt_ring_info { +u32 page_table_addr; +u32 num_pages; +u32 size; +u32 offset; +u32 ring_first_page_pfn; +} __packed; + +#define CATPT_MODULE_COUNT (CATPT_MODID_LAST + 1) + +enum catpt_module_id { +CATPT_MODID_BASE_FW =0x0 , +CATPT_MODID_MP3 =0x1 , +CATPT_MODID_AAC_5_1 =0x2 , +CATPT_MODID_AAC_2_0 =0x3 , +CATPT_MODID_SRC =0x4 , +CATPT_MODID_WAVES =0x5 , +CATPT_MODID_DOLBY =0x6 , +CATPT_MODID_BOOST =0x7 , +CATPT_MODID_LPAL =0x8 , +CATPT_MODID_DTS =0x9 , +CATPT_MODID_PCM_CAPTURE =0xA , +CATPT_MODID_PCM_SYSTEM =0xB , +CATPT_MODID_PCM_REFERENCE =0xC , +CATPT_MODID_PCM =0xD ,/* offload */ +CATPT_MODID_BLUETOOTH_RENDER =0xE , +CATPT_MODID_BLUETOOTH_CAPTURE =0xF , +CATPT_MODID_LAST =CATPT_MODID_BLUETOOTH_CAPTURE , +}; + +struct catpt_module_entry { +enum catpt_module_id module_id__aligned(4) ; +u32 entry_point; +} __packed; + +struct catpt_module_map { +u8 num_entries; +struct catpt_module_entry entries[]; +} __packed; + +struct catpt_memory_info { +u32 offset; +u32 size; +} __packed; + +#define CATPT_CHANNELS_MAX 4 +#define CATPT_ALL_CHANNELS_MASK UINT_MAX + +struct catpt_stream_info { +u32 stream_hw_id; +u32 reserved; +u32 read_pos_regaddr; +u32 pres_pos_regaddr; +u32 peak_meter_regaddr[CATPT_CHANNELS_MAX ]; +u32 volume_regaddr[CATPT_CHANNELS_MAX ]; +} __packed; + +int catpt_ipc_alloc_stream (struct catpt_dev *cdev, +enum catpt_path_id path_id, +enum catpt_stream_type type, +struct catpt_audio_format *afmt, +struct catpt_ring_info *rinfo, +u8 num_modules, +struct catpt_module_entry *modules, +struct resource *persistent, +struct resource *scratch, +struct catpt_stream_info *sinfo); +int catpt_ipc_free_stream (struct catpt_dev *cdev,u8 stream_hw_id); + +enum catpt_ssp_iface { +CATPT_SSP_IFACE_0 =0 , +CATPT_SSP_IFACE_1 =1 , +CATPT_SSP_IFACE_LAST =CATPT_SSP_IFACE_1 , +}; + +#define CATPT_SSP_COUNT (CATPT_SSP_IFACE_LAST + 1) + +enum catpt_mclk_frequency { +CATPT_MCLK_OFF =0 , +CATPT_MCLK_FREQ_6_MHZ =1 , +CATPT_MCLK_FREQ_21_MHZ =2 , +CATPT_MCLK_FREQ_24_MHZ =3 , +}; + +enum catpt_ssp_mode { +CATPT_SSP_MODE_I2S_CONSUMER =0 , +CATPT_SSP_MODE_I2S_PROVIDER =1 , +CATPT_SSP_MODE_TDM_PROVIDER =2 , +}; + +struct catpt_ssp_device_format { +enum catpt_ssp_iface iface; +enum catpt_mclk_frequency mclk; +enum catpt_ssp_mode mode; +u16 clock_divider; +u8 channels; +} __packed; + +int catpt_ipc_set_device_format (struct catpt_dev *cdev, +struct catpt_ssp_device_format *devfmt); + +enum catpt_dx_state { +CATPT_DX_STATE_D3 =3 , +}; + +enum catpt_dx_type { +CATPT_DX_TYPE_FW_IMAGE =0 , +CATPT_DX_TYPE_MEMORY_DUMP =1 , +}; + +struct catpt_save_meminfo { +u32 offset; +u32 size; +enum catpt_dx_type source__aligned(4) ; +} __packed; + +#define SAVE_MEMINFO_MAX 14 + +struct catpt_dx_context { +u32 num_meminfo; +struct catpt_save_meminfo meminfo[SAVE_MEMINFO_MAX ]; +} __packed; + +int catpt_ipc_enter_dxstate (struct catpt_dev *cdev,enum catpt_dx_state state, +struct catpt_dx_context *context); + +struct catpt_mixer_stream_info { +u32 mixer_hw_id; +u32 peak_meter_regaddr[CATPT_CHANNELS_MAX ]; +u32 volume_regaddr[CATPT_CHANNELS_MAX ]; +} __packed; + +int catpt_ipc_get_mixer_stream_info (struct catpt_dev *cdev, +struct catpt_mixer_stream_info *info); + +/* STREAM messages */ + +enum catpt_stream_msg_type { +CATPT_STRM_RESET_STREAM =0 , +CATPT_STRM_PAUSE_STREAM =1 , +CATPT_STRM_RESUME_STREAM =2 , +CATPT_STRM_STAGE_MESSAGE =3 , +CATPT_STRM_NOTIFICATION =4 , +}; + +enum catpt_stage_action { +CATPT_STG_SET_VOLUME =1 , +CATPT_STG_SET_WRITE_POSITION =2 , +CATPT_STG_MUTE_LOOPBACK =3 , +}; + +union catpt_stream_msg { +u32 val; +struct { +enum catpt_reply_status status:5 ; +u32 reserved:7 ; +enum catpt_stage_action stage_action:4 ; +u32 stream_hw_id:4 ; +enum catpt_stream_msg_type subtype:4 ; +enum catpt_global_msg_type type:5 ; +u32 fw_ready:1 ; +u32 done:1 ; +u32 busy:1 ; + }; +} __packed; + +#define CATPT_STREAM_MSG (msg_type) \ +{ \ + .subtype = CATPT_STRM_##msg_type, \ + .type = CATPT_GLB_STREAM_MESSAGE } +#define CATPT_STAGE_MSG (msg_type) \ +{ \ + .stage_action = CATPT_STG_##msg_type, \ + .subtype = CATPT_STRM_STAGE_MESSAGE, \ + .type = CATPT_GLB_STREAM_MESSAGE } + +int catpt_ipc_reset_stream (struct catpt_dev *cdev,u8 stream_hw_id); +int catpt_ipc_pause_stream (struct catpt_dev *cdev,u8 stream_hw_id); +int catpt_ipc_resume_stream (struct catpt_dev *cdev,u8 stream_hw_id); + +/* STREAM messages - STAGE subtype */ + +enum catpt_audio_curve_type { +CATPT_AUDIO_CURVE_NONE =0 , +CATPT_AUDIO_CURVE_WINDOWS_FADE =1 , +}; + +int catpt_ipc_set_volume (struct catpt_dev *cdev,u8 stream_hw_id, +u32 channel,u32 volume, +u32 curve_duration, +enum catpt_audio_curve_type curve_type); + +int catpt_ipc_set_write_pos (struct catpt_dev *cdev,u8 stream_hw_id, +u32 pos,bool eob,bool ll); + +int catpt_ipc_mute_loopback (struct catpt_dev *cdev,u8 stream_hw_id,bool mute); + +/* NOTIFICATION messages */ + +enum catpt_notify_reason { +CATPT_NOTIFY_POSITION_CHANGED =0 , +CATPT_NOTIFY_GLITCH_OCCURRED =1 , +}; + +union catpt_notify_msg { +u32 val; +struct { +u32 mailbox_address:29 ; +u32 fw_ready:1 ; +u32 done:1 ; +u32 busy:1 ; + }; +struct { +enum catpt_reply_status status:5 ; +u32 reserved:7 ; +enum catpt_notify_reason notify_reason:4 ; +u32 stream_hw_id:4 ; +enum catpt_stream_msg_type subtype:4 ; +enum catpt_global_msg_type type:5 ; +u32 hdr:3 ;/* fw_ready, done, busy */ + }; +} __packed; + +#define FW_INFO_SIZE_MAX 100 + +struct catpt_fw_ready { +u32 inbox_offset; +u32 outbox_offset; +u32 inbox_size; +u32 outbox_size; +u32 fw_info_size; +char fw_info[FW_INFO_SIZE_MAX ]; +} __packed; + +struct catpt_notify_position { +u32 stream_position; +u32 fw_cycle_count; +} __packed; + +enum catpt_glitch_type { +CATPT_GLITCH_UNDERRUN =1 , +CATPT_GLITCH_DECODER_ERROR =2 , +CATPT_GLITCH_DOUBLED_WRITE_POS =3 , +}; + +struct catpt_notify_glitch { +enum catpt_glitch_type type__aligned(4) ; +u64 presentation_pos; +u32 write_pos; +} __packed; + +#endif 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
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 02/14] ASoC: Intel: catpt: Implement IPC protocol
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Cezary Rojewski
Implement 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_PENDINGstatus 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.Signed-off-by Cezary Rojewski <[email protected]>
...
Quoted 13 lines
Quoted 13 lines
sound/soc/intel/catpt/ipc.c new file +7
-0@@ -0,0 +1,246 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// +// Author: Cezary Rojewski <[email protected]> +// +
Quoted 9 lines
sound/soc/intel/catpt/ipc.c line 13
Quoted 6 lines
sound/soc/intel/catpt/ipc.c new file +6
-0+#include <linux/irqreturn.h> +#include "core.h" +#include "messages.h" +#include "registers.h" + +#define CATPT_IPC_TIMEOUT_MSECS 300A nit-pick:
_MSis enough.
Sure, will reword this and one _MSECS that is found within loader.c
Thanks!
Cezary Rojewski
maintainerPATCH v7 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 | 3 + sound/soc/intel/catpt/dsp.c | 99 ++++++++++ sound/soc/intel/catpt/ipc.c | 4 + sound/soc/intel/catpt/messages.c | 313 +++++++++++++++++++++++++++++++ 4 files changed, 419 insertions(+) create mode 100644 sound/soc/intel/catpt/messages.c
sound/soc/intel/catpt/core.h +3 -0
@@ -9,6 +9,7 @@#define __SND_SOC_INTEL_CATPT_CORE_H#include <linux/dma/dw.h> +#include <linux/irqreturn.h> #include "messages.h" #include "registers.h"
@@ -126,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 +99 -0
108 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.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
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 2 lines · Cezary Rojewski
Declare global and stream IPC message handlers for all known message types.
...
Quoted 5 lines
sound/soc/intel/catpt/dsp.c +5
-0+int catpt_coredump (struct catpt_dev *cdev) +{ +struct catpt_dump_section_hdr *hdr; +size_t dump_size, regs_size; +u8 *dump, *pos;
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 167
Quoted 10 lines
sound/soc/intel/catpt/dsp.c +9
-0+int i, j; + + regs_size =CATPT_SHIM_REGS_SIZE ; + regs_size +=CATPT_DMA_COUNT *CATPT_DMA_REGS_SIZE ; + regs_size +=CATPT_SSP_COUNT *CATPT_SSP_REGS_SIZE ; + dump_size =resource_size (&cdev->dram); + dump_size +=resource_size (&cdev->iram); + dump_size += regs_size; + dump_size +=4 *sizeof (*hdr) +20 ;/* hdrs and fw hash */
Function is full of hard coded 20s. Can you provide descriptive macro?
Quoted 9 lines
sound/soc/intel/catpt/dsp.c +9
-0+ dump =vzalloc (dump_size); +if (!dump) +return -ENOMEM ; + + pos = dump; + + hdr = (struct catpt_dump_section_hdr *)pos; + hdr->magic =CATPT_DUMP_MAGIC ; + hdr->core_id = cdev->spec->core_id;
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 186
Quoted 10 lines
sound/soc/intel/catpt/dsp.c +9
-0+ hdr->section_id =CATPT_DUMP_SECTION_ID_FILE ; + hdr->size = dump_size -sizeof (*hdr); + pos +=sizeof (*hdr); + +for (i = j =0 ; i <FW_INFO_SIZE_MAX ; i++) +if (cdev->ipc.config.fw_info[i] ==' ' ) +if (++j ==4 ) +break ; +for (j = ++i; j <FW_INFO_SIZE_MAX && j - i <20 ; j++) {
This should have static_assert() at the place where you define both constants (2nd is mentioned above 20).
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 191
Quoted 5 lines
sound/soc/intel/catpt/dsp.c +5
-0+if (cdev->ipc.config.fw_info[j] ==' ' ) +break ; + *(pos + j - i) = cdev->ipc.config.fw_info[j]; + } + pos +=20 ;
These two for-loops should have some comment to explain what's going on.
Quoted 45 lines
sound/soc/intel/catpt/dsp.c +45
-0+ hdr = (struct catpt_dump_section_hdr *)pos; + hdr->magic =CATPT_DUMP_MAGIC ; + hdr->core_id = cdev->spec->core_id; + hdr->section_id =CATPT_DUMP_SECTION_ID_IRAM ; + hdr->size =resource_size (&cdev->iram); + pos +=sizeof (*hdr); + +memcpy_fromio (pos, cdev->lpe_ba + cdev->iram.start, hdr->size); + pos += hdr->size; + + hdr = (struct catpt_dump_section_hdr *)pos; + hdr->magic =CATPT_DUMP_MAGIC ; + hdr->core_id = cdev->spec->core_id; + hdr->section_id =CATPT_DUMP_SECTION_ID_DRAM ; + hdr->size =resource_size (&cdev->dram); + pos +=sizeof (*hdr); + +memcpy_fromio (pos, cdev->lpe_ba + cdev->dram.start, hdr->size); + pos += hdr->size; + + hdr = (struct catpt_dump_section_hdr *)pos; + hdr->magic =CATPT_DUMP_MAGIC ; + hdr->core_id = cdev->spec->core_id; + hdr->section_id =CATPT_DUMP_SECTION_ID_REGS ; + hdr->size = regs_size; + pos +=sizeof (*hdr); + +memcpy_fromio (pos,catpt_shim_addr (cdev),CATPT_SHIM_REGS_SIZE ); + pos +=CATPT_SHIM_REGS_SIZE ; + +for (i =0 ; i <CATPT_SSP_COUNT ; i++) { +memcpy_fromio (pos,catpt_ssp_addr (cdev, i), +CATPT_SSP_REGS_SIZE ); + pos +=CATPT_SSP_REGS_SIZE ; + } +for (i =0 ; i <CATPT_DMA_COUNT ; i++) { +memcpy_fromio (pos,catpt_dma_addr (cdev, i), +CATPT_DMA_REGS_SIZE ); + pos +=CATPT_DMA_REGS_SIZE ; + } + +dev_coredumpv (cdev->dev, dump, dump_size,GFP_KERNEL ); + +return 0 ; +}
...
sound/soc/intel/catpt/messages.c line 236
Quoted 7 lines
sound/soc/intel/catpt/messages.c new file +6
-0+struct catpt_set_volume_input { +u32 channel; +u32 target_volume; +u64 curve_duration; +enum catpt_audio_curve_type curve_type__aligned(4) ; +} __packed;
How this __packed changes anything? In general __packed doesn't make sense for in-kernel data structures. Otherwise you have to use proper (POD) types for data. Ditto for all similar cases.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 9 lines · Andy Shevchenko
sound/soc/intel/catpt/messages.c line 236
Quoted 6 lines
sound/soc/intel/catpt/messages.c new file +6
-0+struct catpt_set_volume_input { +u32 channel; +u32 target_volume; +u64 curve_duration; +enum catpt_audio_curve_type curve_type__aligned(4) ; +} __packed;How this
__packedchanges anything? In general__packeddoesn't make sense for in-kernel data structures. Otherwise you have to use proper (POD) types for data. Ditto for all similar cases.
All of __packed use in code is done on structures used to communicate with FW, which is binary interface, so it is not kernel only structure, as it is also FW one. While we can expect compiler to do the right thing, I consider it is better to be explicit about what kind of data we are handling, so there aren't any surprises.
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 11 lines · Amadeusz Sławiński
Quoted 9 lines · Andy Shevchenko
sound/soc/intel/catpt/messages.c line 236
Quoted 6 lines
sound/soc/intel/catpt/messages.c new file +6
-0+struct catpt_set_volume_input { +u32 channel; +u32 target_volume; +u64 curve_duration; +enum catpt_audio_curve_type curve_type__aligned(4) ; +} __packed;How this
__packedchanges anything? In general__packeddoesn't make sense for in-kernel data structures. Otherwise you have to use proper (POD) types for data. Ditto for all similar cases.
Quoted 5 lines
All of
__packeduse in code is done on structures used to communicate with FW, which is binary interface, so it is not kernel only structure, as it is also FW one. While we can expect compiler to do the right thing, I consider it is better to be explicit about what kind of data we are handling, so there aren't any surprises.
Size of enum is compiler defined. It may not be used in the ABIs.
__uXX vs. uXX I dunno.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Amadeusz Sławiński
Quoted 9 lines · Andy Shevchenko
sound/soc/intel/catpt/messages.c line 236
Quoted 6 lines
sound/soc/intel/catpt/messages.c new file +6
-0+struct catpt_set_volume_input { +u32 channel; +u32 target_volume; +u64 curve_duration; +enum catpt_audio_curve_type curve_type__aligned(4) ; +} __packed;How this
__packedchanges anything? In general__packeddoesn't make sense for in-kernel data structures. Otherwise you have to use proper (POD) types for data. Ditto for all similar cases.
Quoted 7 lines
Quoted 5 lines
All of
__packeduse in code is done on structures used to communicate with FW, which is binary interface, so it is not kernel only structure, as it is also FW one. While we can expect compiler to do the right thing, I consider it is better to be explicit about what kind of data we are handling, so there aren't any surprises.Size of enum is compiler defined. It may not be used in the ABIs.
I have to elaborate that I'm talking in ABIs which implies different compilers and even may be run on different CPU architectures.
Quoted 1 line
__uXXvs. uXX I dunno.
And here I'm talking about FW <--> OS interface. It's not user visible ABI, but still some Ext <--> Int protocol. I saw uXX types in data structures of FW communication protocols.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 21 lines · Andy Shevchenko
Quoted 12 lines · Andy Shevchenko
Quoted 11 lines · Amadeusz Sławiński
Quoted 9 lines · Andy Shevchenko
sound/soc/intel/catpt/messages.c line 236
Quoted 6 lines
sound/soc/intel/catpt/messages.c new file +6
-0+struct catpt_set_volume_input { +u32 channel; +u32 target_volume; +u64 curve_duration; +enum catpt_audio_curve_type curve_type__aligned(4) ; +} __packed;How this
__packedchanges anything? In general__packeddoesn't make sense for in-kernel data structures. Otherwise you have to use proper (POD) types for data. Ditto for all similar cases.Quoted 7 lines
Quoted 5 lines
All of
__packeduse in code is done on structures used to communicate with FW, which is binary interface, so it is not kernel only structure, as it is also FW one. While we can expect compiler to do the right thing, I consider it is better to be explicit about what kind of data we are handling, so there aren't any surprises.Size of enum is compiler defined. It may not be used in the ABIs.
Quoted 9 lines
I have to elaborate that I'm talking in ABIs which implies different compilers and even may be run on different CPU architectures.
Quoted 1 line
__uXXvs. uXX I dunno.And here I'm talking about FW <--> OS interface. It's not user visible ABI, but still some Ext <--> Int protocol. I saw uXX types in data structures of FW communication protocols.
Will remove enum members from IPC structs in v8 as requested.
Thanks,
Czarek
Rojewski, Cezary
maintainerRE: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
In reply to Andy ShevchenkoQuoted 3 lines · Andy Shevchenko
Quoted 2 lines · Cezary Rojewski
Declare global and stream IPC message handlers for all known message types.
...
Quoted 14 lines
Quoted 13 lines
sound/soc/intel/catpt/dsp.c +13
-0+int catpt_coredump (struct catpt_dev *cdev) +{ +struct catpt_dump_section_hdr *hdr; +size_t dump_size, regs_size; +u8 *dump, *pos; +int i, j; + + regs_size =CATPT_SHIM_REGS_SIZE ; + regs_size +=CATPT_DMA_COUNT *CATPT_DMA_REGS_SIZE ; + regs_size +=CATPT_SSP_COUNT *CATPT_SSP_REGS_SIZE ; + dump_size =resource_size (&cdev->dram); + dump_size +=resource_size (&cdev->iram); + dump_size += regs_size;
Quoted 4 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 167
Quoted 1 line
sound/soc/intel/catpt/dsp.c +1
-0+ dump_size +=4 *sizeof (*hdr) +20 ;/* hdrs and fw hash */ Function is full of hard coded 20s. Can you provide descriptive macro?
Will declare CATPT_DUMP_HASH_SIZE instead of hardcodes, sure.
Quoted 23 lines
Quoted 9 lines
sound/soc/intel/catpt/dsp.c +9
-0+ dump =vzalloc (dump_size); +if (!dump) +return -ENOMEM ; + + pos = dump; + + hdr = (struct catpt_dump_section_hdr *)pos; + hdr->magic =CATPT_DUMP_MAGIC ; + hdr->core_id = cdev->spec->core_id;sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 186
Quoted 10 lines
sound/soc/intel/catpt/dsp.c +9
-0+ hdr->section_id =CATPT_DUMP_SECTION_ID_FILE ; + hdr->size = dump_size -sizeof (*hdr); + pos +=sizeof (*hdr); + +for (i = j =0 ; i <FW_INFO_SIZE_MAX ; i++) +if (cdev->ipc.config.fw_info[i] ==' ' ) +if (++j ==4 ) +break ; +for (j = ++i; j <FW_INFO_SIZE_MAX && j - i <20 ; j++) {This should have
static_assert()at the place where you define both constants (2nd is mentioned above 20).
Quoted 8 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 191
Quoted 5 lines
sound/soc/intel/catpt/dsp.c +5
-0+if (cdev->ipc.config.fw_info[j] ==' ' ) +break ; + *(pos + j - i) = cdev->ipc.config.fw_info[j]; + } + pos +=20 ;These two for-loops should have some comment to explain what's going on.
Actually, after poking my FW friends again I realized that it's just dumping 20chars from "hash" segment of fw_info (struct catpt_fw_ready,
field: fw_info[]).
So, this could be replaced by:
/* navigate to fifth info segment (fw hash) */ for (i = j = 0; i < FW_INFO_SIZE_MAX; i++) /* info segments are separated by space each */ if (cdev->ipc.config.fw_info[i] == ' ') if (++j == 4) break; memcpy(pos, &cdev->ipc.config.fw_info[++i], CATPT_DUMP_HASH_SIZE); pos += CATPT_DUMP_HASH_SIZE;
Existing for-loops were based on internal solution. Half of the code isn't needed afterall..
Czarek
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 2 lines · Cezary
Quoted 1 line · Andy Shevchenko
On Mon, Sep 21, 2020 at 01:54:13PM +0200, Cezary Rojewski wrote:
...
Quoted 26 lines
Quoted 10 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 186
Quoted 6 lines
sound/soc/intel/catpt/dsp.c +5
-0+for (i = j =0 ; i <FW_INFO_SIZE_MAX ; i++) +if (cdev->ipc.config.fw_info[i] ==' ' ) +if (++j ==4 ) +break ; +for (j = ++i; j <FW_INFO_SIZE_MAX && j - i <20 ; j++) {This should have
static_assert()at the place where you define both constants (2nd is mentioned above 20).Quoted 8 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 191
Quoted 5 lines
sound/soc/intel/catpt/dsp.c +5
-0+if (cdev->ipc.config.fw_info[j] ==' ' ) +break ; + *(pos + j - i) = cdev->ipc.config.fw_info[j]; + } + pos +=20 ;These two for-loops should have some comment to explain what's going on.
Actually, after poking my FW friends again I realized that it's just dumping 20chars from "hash" segment of
fw_info(structcatpt_fw_ready,
field: fw_info[]).So, this could be replaced by:
Quoted 6 lines
/* navigate to fifth info segment (fw hash) */ for (i = j = 0; i < FW_INFO_SIZE_MAX; i++) /* info segments are separated by space each */ if (cdev->ipc.config.fw_info[i] == ' ') if (++j == 4) break;
...and this is repeating strnchr() / strnchrnul().
With the questions "what if...":
- nul in the middle of this?
- less than 4 spaces found?
Quoted 6 lines
memcpy(pos, &cdev->ipc.config.fw_info[++i], CATPT_DUMP_HASH_SIZE); pos += CATPT_DUMP_HASH_SIZE;Existing for-loops were based on internal solution. Half of the code isn't needed afterall..
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 2 lines · Cezary
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Cezary Rojewski
...
Quoted 26 lines
Quoted 25 lines
Quoted 10 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 186
Quoted 6 lines
sound/soc/intel/catpt/dsp.c +5
-0+for (i = j =0 ; i <FW_INFO_SIZE_MAX ; i++) +if (cdev->ipc.config.fw_info[i] ==' ' ) +if (++j ==4 ) +break ; +for (j = ++i; j <FW_INFO_SIZE_MAX && j - i <20 ; j++) {This should have
static_assert()at the place where you define both constants (2nd is mentioned above 20).Quoted 8 lines
sound/soc/intel/catpt/dsp.c void catpt_dmac_remove(struct catpt_dev *cdev) · line 191
Quoted 5 lines
sound/soc/intel/catpt/dsp.c +5
-0+if (cdev->ipc.config.fw_info[j] ==' ' ) +break ; + *(pos + j - i) = cdev->ipc.config.fw_info[j]; + } + pos +=20 ;These two for-loops should have some comment to explain what's going on.
Actually, after poking my FW friends again I realized that it's just dumping 20chars from "hash" segment of
fw_info(structcatpt_fw_ready,
field: fw_info[]).So, this could be replaced by:
Quoted 9 lines
Quoted 6 lines
/* navigate to fifth info segment (fw hash) */ for (i = j = 0; i < FW_INFO_SIZE_MAX; i++) /* info segments are separated by space each */ if (cdev->ipc.config.fw_info[i] == ' ') if (++j == 4) break;...and this is repeating
strnchr()/strnchrnul().
Indeed, will incorporate into above.
Quoted 4 lines
With the questions "what if...":
- nul in the middle of this?
- less than 4 spaces found?
While this should never happen (means user is somehow not making use of officially released firmware binary), coredumps are useful only if you have access to debug tools. In cases you'd mentioned, invalid hash would have been dumped to coredump and crash reader simply wouldn't have been able to navigate to actual build for it. The rest of the coredump is still vital though.
memcpy() could be gated behind an 'if' for safety if needed:
info = cdev->ipc.config.fw_info; eof = info + FW_INFO_SIZE_MAX; /* navigate to fifth info segment (fw hash) */ for (i = 0; i < 4 && info < eof; i++, info++) /* info segments are separated by space each */ if ((info = strnchr(info, eof - info, ' ')) == NULL) break; if (i == 4 && info < eof) memcpy(pos, info, min(eof - info, CATPT_DUMP_HASH_SIZE));
Didn't compile this, some typecheck fixes might be in order and so on.
Quoted 7 lines
Quoted 6 lines
memcpy(pos, &cdev->ipc.config.fw_info[++i], CATPT_DUMP_HASH_SIZE); pos += CATPT_DUMP_HASH_SIZE;Existing for-loops were based on internal solution. Half of the code isn't needed afterall..
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 3 lines · Cezary
Quoted 2 lines · Cezary
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Cezary Rojewski
...
Quoted 9 lines
While this should never happen (means user is somehow not making use of officially released firmware binary), coredumps are useful only if you have access to debug tools. In cases you'd mentioned, invalid hash would have been dumped to coredump and crash reader simply wouldn't have been able to navigate to actual build for it. The rest of the coredump is still vital though.
memcpy()could be gated behind an 'if' for safety if needed:
Quoted 10 lines
info = cdev->ipc.config.fw_info; eof = info + FW_INFO_SIZE_MAX; /* navigate to fifth info segment (fw hash) */ for (i = 0; i < 4 && info < eof; i++, info++) /* info segments are separated by space each */ if ((info = strnchr(info, eof - info, ' ')) == NULL) break; if (i == 4 && info < eof) memcpy(pos, info, min(eof - info, CATPT_DUMP_HASH_SIZE));
And here basically enough check is info against NULL, right?
Just try to look at different possibilities how to make code simpler and neater.
Quoted 1 line
Didn't compile this, some typecheck fixes might be in order and so on.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Cezary
On 2020-09-21 8:41 PM, Andy Shevchenko wrote:
...
Quoted 17 lines
Quoted 16 lines
While this should never happen (means user is somehow not making use of officially released firmware binary), coredumps are useful only if you have access to debug tools. In cases you'd mentioned, invalid hash would have been dumped to coredump and crash reader simply wouldn't have been able to navigate to actual build for it. The rest of the coredump is still vital though.
memcpy()could be gated behind an 'if' for safety if needed:info = cdev->ipc.config.fw_info; eof = info + FW_INFO_SIZE_MAX; /* navigate to fifth info segment (fw hash) */ for (i = 0; i < 4 && info < eof; i++, info++) /* info segments are separated by space each */ if ((info = strnchr(info, eof - info, ' ')) == NULL) break;
Quoted 8 lines
Quoted 2 lines
if (i == 4 && info < eof) memcpy(pos, info, min(eof - info, CATPT_DUMP_HASH_SIZE));And here basically enough check is info against NULL, right?
Just try to look at different possibilities how to make code simpler and neater.Quoted 1 line
Didn't compile this, some typecheck fixes might be in order and so on.
What you meant is:
if (i == 4 && !info) // instead of 'info < eof'
right?
If 4th space is last char in this string then info would end up being non-NULL and equal to 'eof' and thus memcpy() would get invoked with size=eof-info=0.
catpt_coredump() is here to gather debug info for Intel folks to analyze in case of critical error. In ideal world, it should not be required at all as when we get here, there are bigger problems on our head. Above solution is simpler than what is prevent in v7 while also maintaining good readability - variable names - plus comments which you suggested.
Czarek
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 29 lines · Cezary
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Cezary
On 2020-09-21 8:41 PM, Andy Shevchenko wrote:
...
Quoted 23 lines
Quoted 9 lines
While this should never happen (means user is somehow not making use of officially released firmware binary), coredumps are useful only if you have access to debug tools. In cases you'd mentioned, invalid hash would have been dumped to coredump and crash reader simply wouldn't have been able to navigate to actual build for it. The rest of the coredump is still vital though.
memcpy()could be gated behind an 'if' for safety if needed:Quoted 10 lines
info = cdev->ipc.config.fw_info; eof = info + FW_INFO_SIZE_MAX; /* navigate to fifth info segment (fw hash) */ for (i = 0; i < 4 && info < eof; i++, info++) /* info segments are separated by space each */ if ((info = strnchr(info, eof - info, ' ')) == NULL) break; if (i == 4 && info < eof) memcpy(pos, info, min(eof - info, CATPT_DUMP_HASH_SIZE));And here basically enough check is info against NULL, right?
Just try to look at different possibilities how to make code simpler and neater.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Didn't compile this, some typecheck fixes might be in order and so on.
What you meant is:
if (i == 4 && !info) // instead of 'info < eof'right?
Simply if (!info)...
Quoted 3 lines
If 4th space is last char in this string then info would end up being non-NULL and equal to 'eof' and thus
memcpy()would get invoked with size=eof-info=0.
...which is not a problem.
Quoted 6 lines
catpt_coredump()is here to gather debug info for Intel folks to analyze in case of critical error. In ideal world, it should not be required at all as when we get here, there are bigger problems on our head. Above solution is simpler than what is prevent in v7 while also maintaining good readability - variable names - plus comments which you suggested.
Thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Cezary
Quoted 1 line · Andy Shevchenko
On Mon, Sep 21, 2020 at 08:48:12PM +0000, Rojewski, Cezary wrote:
...
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
And here basically enough check is info against NULL, right?
Just try to look at different possibilities how to make code simpler and neater.Quoted 1 line
Didn't compile this, some typecheck fixes might be in order and so on.
Quoted 6 lines
Quoted 4 lines
What you meant is:
if (i == 4 && !info) // instead of 'info < eof'right?
Simply if (!info)...
if (info) memcpy();
of course, otherwise it will crash.
Quoted 5 lines
Quoted 3 lines
If 4th space is last char in this string then info would end up being non-NULL and equal to 'eof' and thus
memcpy()would get invoked with size=eof-info=0....which is not a problem.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 03/14] ASoC: Intel: catpt: Add IPC message handlers
Quoted 4 lines · Andy Shevchenko
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Cezary
Quoted 1 line · Andy Shevchenko
On Mon, Sep 21, 2020 at 08:48:12PM +0000, Rojewski, Cezary wrote:
...
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 5 lines
And here basically enough check is info against NULL, right?
Just try to look at different possibilities how to make code simpler and neater.Quoted 1 line
Didn't compile this, some typecheck fixes might be in order and so on.
What you meant is:
if (i == 4 && !info) // instead of 'info < eof'
Quoted 9 lines
Quoted 3 lines
Quoted 1 line
right?
Simply if (!info)...
if (info) memcpy();of course, otherwise it will crash.
Indeed, sorry about the typo.
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
If 4th space is last char in this string then info would end up being non-NULL and equal to 'eof' and thus
memcpy()would get invoked with size=eof-info=0....which is not a problem.
And what about the case where 1st space is the last char?
We quit the loop afterward, 'info' will not be NULL, 'i' on the other hand certainly won't be 4.
TLDR: without checking 'i' how am I sure about whether or not cursor is actually at 5th segment?
Czarek
Cezary Rojewski
maintainerPATCH v7 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 v7 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 v7 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 | 1210 ++++++++++++++++++++++++++++++++ 4 files changed, 1261 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.subtype) {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 +1210 -0
1,210 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v7 06/14] ASoC: Intel: catpt: PCM operations
Quoted 282 lines · Cezary Rojewski
DSP 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 capturePCM DAI operations differentiate between those pins as some (mainly offload) are to be handled differently - DSP expects wp updates on each
notify_positionnotification.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/haswellthis configures SSP device format automatically on pcm creation.Signed-off-by Cezary Rojewski <[email protected]>--- 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 | 1210 ++++++++++++++++++++++++++++++++ 4 files changed, 1261 insertions(+) create mode 100644 sound/soc/intel/catpt/pcm.csound/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.subtype) {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 +156
-0@@ -0,0 +1,1210 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// +// Author: Cezary Rojewski <[email protected]> +// + +#include <linux/pm_runtime.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include <uapi/sound/tlv.h> +#include "core.h" +#include "messages.h" + +struct catpt_stream_template { +enum catpt_path_id path_id; +enum catpt_stream_type type; +u32 persistent_size; +u8 num_entries; +struct catpt_module_entry entries[]; +}; + +static struct catpt_stream_template system_pb = { + .path_id =CATPT_PATH_SSP0_OUT , + .type =CATPT_STRM_TYPE_SYSTEM , + .num_entries =1 , + .entries = {{CATPT_MODID_PCM_SYSTEM ,0 }}, +}; + +static struct catpt_stream_template system_cp = { + .path_id =CATPT_PATH_SSP0_IN , + .type =CATPT_STRM_TYPE_CAPTURE , + .num_entries =1 , + .entries = {{CATPT_MODID_PCM_CAPTURE ,0 }}, +}; + +static struct catpt_stream_template offload_pb = { + .path_id =CATPT_PATH_SSP0_OUT , + .type =CATPT_STRM_TYPE_RENDER , + .num_entries =1 , + .entries = {{CATPT_MODID_PCM ,0 }}, +}; + +static struct catpt_stream_template loopback_cp = { + .path_id =CATPT_PATH_SSP0_OUT , + .type =CATPT_STRM_TYPE_LOOPBACK , + .num_entries =1 , + .entries = {{CATPT_MODID_PCM_REFERENCE ,0 }}, +}; + +static struct catpt_stream_template bluetooth_pb = { + .path_id =CATPT_PATH_SSP1_OUT , + .type =CATPT_STRM_TYPE_BLUETOOTH_RENDER , + .num_entries =1 , + .entries = {{CATPT_MODID_BLUETOOTH_RENDER ,0 }}, +}; + +static struct catpt_stream_template bluetooth_cp = { + .path_id =CATPT_PATH_SSP1_IN , + .type =CATPT_STRM_TYPE_BLUETOOTH_CAPTURE , + .num_entries =1 , + .entries = {{CATPT_MODID_BLUETOOTH_CAPTURE ,0 }}, +}; + +static struct catpt_stream_template *catpt_topology[] = { + [CATPT_STRM_TYPE_RENDER ] = &offload_pb, + [CATPT_STRM_TYPE_SYSTEM ] = &system_pb, + [CATPT_STRM_TYPE_CAPTURE ] = &system_cp, + [CATPT_STRM_TYPE_LOOPBACK ] = &loopback_cp, + [CATPT_STRM_TYPE_BLUETOOTH_RENDER ] = &bluetooth_pb, + [CATPT_STRM_TYPE_BLUETOOTH_CAPTURE ] = &bluetooth_cp, +}; + +static struct catpt_stream_template * +catpt_get_stream_template (struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtm = substream->private_data; +struct snd_soc_dai *cpu_dai =asoc_rtd_to_cpu (rtm,0 ); +enum catpt_stream_type type; + + type = cpu_dai->driver->id; + +/* account for capture in bidirectional dais */ +switch (type) { +case CATPT_STRM_TYPE_SYSTEM : +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) + type =CATPT_STRM_TYPE_CAPTURE ; +break ; +case CATPT_STRM_TYPE_BLUETOOTH_RENDER : +if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) + type =CATPT_STRM_TYPE_BLUETOOTH_CAPTURE ; +break ; +default : +break ; + }; + +return catpt_topology[type]; +} + +struct catpt_stream_runtime * +catpt_stream_find (struct catpt_dev *cdev,u8 stream_hw_id) +{ +struct catpt_stream_runtime *pos, *result =NULL ; + +spin_lock (&cdev->list_lock); +list_for_each_entry (pos, &cdev->stream_list, node) { +if (pos->info.stream_hw_id == stream_hw_id) { + result = pos; +break ; + } + } + +spin_unlock (&cdev->list_lock); +return result; +} + +static u32 catpt_stream_read_position (struct catpt_dev *cdev, +struct catpt_stream_runtime *stream) +{ +u32 pos; + +memcpy_fromio (&pos, cdev->lpe_ba + stream->info.read_pos_regaddr, +sizeof (pos)); +return pos; +} + +static u32 catpt_stream_volume (struct catpt_dev *cdev, +struct catpt_stream_runtime *stream,u32 channel) +{ +u32 volume, offset; + +if (channel >=CATPT_CHANNELS_MAX ) + channel =0 ; + + offset = stream->info.volume_regaddr[channel]; +memcpy_fromio (&volume, cdev->lpe_ba + offset,sizeof (volume)); +return volume; +} + +static u32 catpt_mixer_volume (struct catpt_dev *cdev, +struct catpt_mixer_stream_info *info,u32 channel) +{ +u32 volume, offset; + +if (channel >=CATPT_CHANNELS_MAX ) + channel =0 ; + + offset = info->volume_regaddr[channel]; +memcpy_fromio (&volume, cdev->lpe_ba + offset,sizeof (volume)); +return volume; +} + +static void catpt_arrange_page_table (struct snd_pcm_substream *substream, +struct snd_dma_buffer *pgtbl) +{ +struct snd_pcm_runtime *rtm = substream->runtime;
sound/soc/intel/catpt/pcm.c line 166
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +10
-0+struct snd_dma_buffer *databuf =snd_pcm_get_dma_buf (substream); +int i, pages; + + pages =snd_sgbuf_aligned_pages (rtm->dma_bytes); + +for (i =0 ; i < pages; i++) { +u32 pfn, offset; +u32 *page_table; + + pfn =snd_sgbuf_get_addr (databuf, i *PAGE_SIZE ) >>PAGE_SHIFT ;
PFN_DOWN()
Quoted 61 lines
sound/soc/intel/catpt/pcm.c new file +61
-0+/* incrementing by 2 on even and 3 on odd */ + offset = ((i <<2 ) + i) >>1 ; + page_table = (u32 *)(pgtbl->area + offset); + +if (i &1 ) + *page_table |= (pfn <<4 ); +else + *page_table |= pfn; + } +} + +static u32 catpt_get_channel_map (enum catpt_channel_config config) +{ +switch (config) { +case CATPT_CHANNEL_CONFIG_MONO : +return (0xFFFFFFF0 |CATPT_CHANNEL_CENTER ); + +case CATPT_CHANNEL_CONFIG_STEREO : +return (0xFFFFFF00 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 )); + +case CATPT_CHANNEL_CONFIG_2_POINT_1 : +return (0xFFFFF000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 ) + | (CATPT_CHANNEL_LFE <<8 )); + +case CATPT_CHANNEL_CONFIG_3_POINT_0 : +return (0xFFFFF000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 )); + +case CATPT_CHANNEL_CONFIG_3_POINT_1 : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LFE <<12 )); + +case CATPT_CHANNEL_CONFIG_QUATRO : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 ) + | (CATPT_CHANNEL_LEFT_SURROUND <<8 ) + | (CATPT_CHANNEL_RIGHT_SURROUND <<12 )); + +case CATPT_CHANNEL_CONFIG_4_POINT_0 : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_CENTER_SURROUND <<12 )); + +case CATPT_CHANNEL_CONFIG_5_POINT_0 : +return (0xFFF00000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LEFT_SURROUND <<12 ) + | (CATPT_CHANNEL_RIGHT_SURROUND <<16 )); + +case CATPT_CHANNEL_CONFIG_5_POINT_1 : +return (0xFF000000 |CATPT_CHANNEL_CENTER + | (CATPT_CHANNEL_LEFT <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LEFT_SURROUND << 12)
sound/soc/intel/catpt/pcm.c line 237
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +10
-0+ | (CATPT_CHANNEL_RIGHT_SURROUND << 16) + | (CATPT_CHANNEL_LFE << 20)); + +case CATPT_CHANNEL_CONFIG_DUAL_MONO : +return (0xFFFFFF00 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_LEFT <<4 )); + +default : +return 0xFFFFFFFF ; + }
GENMASK() for all above?
Quoted 314 lines
sound/soc/intel/catpt/pcm.c new file +314
-0+} + +static enum catpt_channel_config catpt_get_channel_config (u32 num_channels) +{ +switch (num_channels) { +case 6 : +return CATPT_CHANNEL_CONFIG_5_POINT_1 ; +case 5 : +return CATPT_CHANNEL_CONFIG_5_POINT_0 ; +case 4 : +return CATPT_CHANNEL_CONFIG_QUATRO ; +case 3 : +return CATPT_CHANNEL_CONFIG_2_POINT_1 ; +case 1 : +return CATPT_CHANNEL_CONFIG_MONO ; +case 2 : +default : +return CATPT_CHANNEL_CONFIG_STEREO ; + } +} + +static int catpt_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_template *template; +struct catpt_stream_runtime *stream; +struct resource *res; +int ret; + + template =catpt_get_stream_template (substream); + + stream =kzalloc (sizeof (*stream),GFP_KERNEL ); +if (!stream) +return -ENOMEM ; + + ret =snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV , cdev->dev,PAGE_SIZE , + &stream->pgtbl); +if (ret) + goto err_pgtbl; + + res =catpt_request_region (&cdev->dram, template->persistent_size); +if (!res) { + ret = -EBUSY ; + goto err_request; + } + +catpt_dsp_update_srampge (cdev, &cdev->dram, cdev->spec->dram_mask); + + stream->template = template; + stream->persistent = res; + stream->substream = substream; +INIT_LIST_HEAD (&stream->node); +snd_soc_dai_set_dma_data (dai, substream, stream); + +spin_lock (&cdev->list_lock); +list_add_tail (&stream->node, &cdev->stream_list); +spin_unlock (&cdev->list_lock); + +return 0 ; + +err_request: +snd_dma_free_pages (&stream->pgtbl); +err_pgtbl: +kfree (stream); +return ret; +} + +static void catpt_dai_shutdown (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; + + stream =snd_soc_dai_get_dma_data (dai, substream); + +spin_lock (&cdev->list_lock); +list_del (&stream->node); +spin_unlock (&cdev->list_lock); + +release_resource (stream->persistent); +kfree (stream->persistent); +catpt_dsp_update_srampge (cdev, &cdev->dram, cdev->spec->dram_mask); + +snd_dma_free_pages (&stream->pgtbl); +kfree (stream); +snd_soc_dai_set_dma_data (dai, substream,NULL ); +} + +static int catpt_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +struct catpt_audio_format afmt; +struct catpt_ring_info rinfo; +struct snd_pcm_runtime *rtm = substream->runtime; +struct snd_dma_buffer *dmab; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (stream->allocated) +return 0 ; + +memset (&afmt,0 ,sizeof (afmt)); + afmt.sample_rate =params_rate (params); + afmt.bit_depth =params_physical_width (params); + afmt.valid_bit_depth =params_width (params); + afmt.num_channels =params_channels (params); + afmt.channel_config =catpt_get_channel_config (afmt.num_channels); + afmt.channel_map =catpt_get_channel_map (afmt.channel_config); + afmt.interleaving =CATPT_INTERLEAVING_PER_CHANNEL ; + + dmab =snd_pcm_get_dma_buf (substream); +catpt_arrange_page_table (substream, &stream->pgtbl); + +memset (&rinfo,0 ,sizeof (rinfo)); + rinfo.page_table_addr = stream->pgtbl.addr; + rinfo.num_pages =DIV_ROUND_UP (rtm->dma_bytes,PAGE_SIZE ); + rinfo.size = rtm->dma_bytes; + rinfo.offset =0 ; + rinfo.ring_first_page_pfn =snd_sgbuf_get_addr (dmab,0 ) >>PAGE_SHIFT ; + + ret =catpt_ipc_alloc_stream (cdev, stream->template->path_id, + stream->template->type, + &afmt, &rinfo, + stream->template->num_entries, + stream->template->entries, + stream->persistent, + cdev->scratch, + &stream->info); +if (ret) +return CATPT_IPC_ERROR (ret); + + stream->allocated = true; +return 0 ; +} + +static int catpt_dai_hw_free (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (!stream->allocated) +return 0 ; + +catpt_ipc_reset_stream (cdev, stream->info.stream_hw_id); +catpt_ipc_free_stream (cdev, stream->info.stream_hw_id); + + stream->allocated = false; +return 0 ; +} + +static int catpt_set_dspvol (struct catpt_dev *cdev,u8 stream_id,long *ctlvol); + +static int catpt_dai_apply_usettings (struct snd_soc_dai *dai, +struct catpt_stream_runtime *stream) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct snd_soc_component *component = dai->component; +struct snd_kcontrol *pos, *kctl =NULL ; +const char *name; +int ret; +u32 id = stream->info.stream_hw_id; + +/* only selected streams have individual controls */ +switch (id) { +case CATPT_PIN_ID_OFFLOAD1 : + name ="Media0 Playback Volume" ; +break ; +case CATPT_PIN_ID_OFFLOAD2 : + name ="Media1 Playback Volume" ; +break ; +case CATPT_PIN_ID_CAPTURE1 : + name ="Mic Capture Volume" ; +break ; +case CATPT_PIN_ID_REFERENCE : + name ="Loopback Mute" ; +break ; +default : +return 0 ; + }; + +list_for_each_entry (pos, &component->card->snd_card->controls, list) { +if (pos->private_data == component && + !strncmp (name, pos->id.name,sizeof (pos->id.name))) { + kctl = pos; +break ; + } + } +if (!kctl) +return -ENOENT ; + +if (stream->template->type !=CATPT_STRM_TYPE_LOOPBACK ) +return catpt_set_dspvol (cdev, id, (long *)kctl->private_value); + ret =catpt_ipc_mute_loopback (cdev, id, *(bool *)kctl->private_value); +if (ret) +return CATPT_IPC_ERROR (ret); +return 0 ; +} + +static int catpt_dai_prepare (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (stream->prepared) +return 0 ; + + ret =catpt_ipc_reset_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); + + ret =catpt_ipc_pause_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); + + ret =catpt_dsp_update_lpclock (cdev); +if (ret) +return ret; + + ret =catpt_dai_apply_usettings (dai, stream); +if (ret) +return ret; + + stream->prepared = true; +return 0 ; +} + +static int catpt_dai_trigger (struct snd_pcm_substream *substream,int cmd, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +struct snd_pcm_runtime *runtime = substream->runtime; +snd_pcm_uframes_t pos; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); + +switch (cmd) { +case SNDRV_PCM_TRIGGER_START : +/* only offload is set_write_pos driven */ +if (stream->template->type !=CATPT_STRM_TYPE_RENDER ) + goto resume_stream; + + pos =frames_to_bytes (runtime, runtime->start_threshold); +/* +* Dsp operates on buffer halves, thus max 2x set_write_pos +* (entire buffer filled) prior to stream start. +*/ + ret =catpt_ipc_set_write_pos (cdev, stream->info.stream_hw_id, + pos, false, false); +if (ret) +return CATPT_IPC_ERROR (ret); + fallthrough; +case SNDRV_PCM_TRIGGER_RESUME : +case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : + resume_stream: + ret =catpt_ipc_resume_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); +break ; + +case SNDRV_PCM_TRIGGER_STOP : + stream->prepared = false; +catpt_dsp_update_lpclock (cdev); + fallthrough; +case SNDRV_PCM_TRIGGER_SUSPEND : +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : + ret =catpt_ipc_pause_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); +break ; + +default : +break ; + } + +return 0 ; +} + +void catpt_stream_update_position (struct catpt_dev *cdev, +struct catpt_stream_runtime *stream, +struct catpt_notify_position *pos) +{ +struct snd_pcm_substream *substream = stream->substream; +struct snd_pcm_runtime *r = substream->runtime; +snd_pcm_uframes_t dsppos, newpos; +int ret; + + dsppos =bytes_to_frames (r, pos->stream_position); + +/* only offload is set_write_pos driven */ +if (stream->template->type !=CATPT_STRM_TYPE_RENDER ) + goto exit; + +if (dsppos >= r->buffer_size /2 ) + newpos = r->buffer_size /2 ; +else + newpos =0 ; +/* +* Dsp operates on buffer halves, thus on every notify position +* (buffer half consumed) update wp to allow stream progression. +*/ + ret =catpt_ipc_set_write_pos (cdev, stream->info.stream_hw_id, +frames_to_bytes (r, newpos), + false, false);
sound/soc/intel/catpt/pcm.c line 561
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +10
-0+if (ret) { +dev_err (cdev->dev,"update position for stream %d failed: %d\n" , + stream->info.stream_hw_id, ret); +return ; + } +exit: +snd_pcm_period_elapsed (substream); +} + +#define CATPT_BUFFER_MAX_SIZE 76800/* 200ms native format */
I don't understand 'native format'. Please, give clearer comment, like
/* 200ms for 8 8-bit channels at 48kHz (native format) */
Quoted 212 lines
sound/soc/intel/catpt/pcm.c new file +212
-0+#define CATPT_PCM_PERIODS_MAX 4 +#define CATPT_PCM_PERIODS_MIN 2 + +static const struct snd_pcm_hardware catpt_pcm_hardware = { + .info =SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME | +SNDRV_PCM_INFO_NO_PERIOD_WAKEUP , + .formats =SNDRV_PCM_FMTBIT_S16_LE | +SNDRV_PCM_FMTBIT_S24_LE | +SNDRV_PCM_FMTBIT_S32_LE , + .period_bytes_min =PAGE_SIZE , + .period_bytes_max =CATPT_BUFFER_MAX_SIZE /CATPT_PCM_PERIODS_MIN , + .periods_min =CATPT_PCM_PERIODS_MIN , + .periods_max =CATPT_PCM_PERIODS_MAX , + .buffer_bytes_max =CATPT_BUFFER_MAX_SIZE , +}; + +static int catpt_component_pcm_construct (struct snd_soc_component *component, +struct snd_soc_pcm_runtime *rtd) +{ +struct catpt_dev *cdev =dev_get_drvdata (component->dev); + +snd_pcm_set_managed_buffer_all (rtd->pcm,SNDRV_DMA_TYPE_DEV_SG , + cdev->dev, + catpt_pcm_hardware.buffer_bytes_max, + catpt_pcm_hardware.buffer_bytes_max); + +return 0 ; +} + +static int catpt_component_open (struct snd_soc_component *component, +struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtm = substream->private_data; + +if (rtm->dai_link->no_pcm) +return 0 ; +snd_soc_set_runtime_hwparams (substream, &catpt_pcm_hardware); +return 0 ; +} + +static snd_pcm_uframes_t +catpt_component_pointer (struct snd_soc_component *component, +struct snd_pcm_substream *substream) +{ +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +struct catpt_stream_runtime *stream; +struct snd_soc_pcm_runtime *rtm = substream->private_data; +struct snd_soc_dai *cpu_dai =asoc_rtd_to_cpu (rtm,0 ); +u32 pos; + +if (rtm->dai_link->no_pcm) +return 0 ; + + stream =snd_soc_dai_get_dma_data (cpu_dai, substream); + pos =catpt_stream_read_position (cdev, stream); + +return bytes_to_frames (substream->runtime, pos); +} + +static const struct snd_soc_dai_ops catpt_fe_dai_ops = { + .startup = catpt_dai_startup, + .shutdown = catpt_dai_shutdown, + .hw_params = catpt_dai_hw_params, + .hw_free = catpt_dai_hw_free, + .prepare = catpt_dai_prepare, + .trigger = catpt_dai_trigger, +}; + +static int catpt_dai_pcm_new (struct snd_soc_pcm_runtime *rtd, +struct snd_soc_dai *dai) +{ +struct snd_soc_dai *codec_dai =asoc_rtd_to_codec (rtd,0 ); +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_ssp_device_format devfmt; +int ret; + + devfmt.iface = dai->driver->id; + devfmt.channels = codec_dai->driver->capture.channels_max; + +switch (devfmt.iface) { +case CATPT_SSP_IFACE_0 : + devfmt.mclk =CATPT_MCLK_FREQ_24_MHZ ; + +switch (devfmt.channels) { +case 4 : + devfmt.mode =CATPT_SSP_MODE_TDM_PROVIDER ; + devfmt.clock_divider =4 ; +break ; +case 2 : +default : + devfmt.mode =CATPT_SSP_MODE_I2S_PROVIDER ; + devfmt.clock_divider =9 ; +break ; + } +break ; + +case CATPT_SSP_IFACE_1 : + devfmt.mclk =CATPT_MCLK_OFF ; + devfmt.mode =CATPT_SSP_MODE_I2S_CONSUMER ; + devfmt.clock_divider =0 ; +break ; + } + + ret =catpt_ipc_set_device_format (cdev, &devfmt); +if (ret) +return CATPT_IPC_ERROR (ret); + +/* store device format set for given SSP */ +memcpy (&cdev->devfmt[devfmt.iface], &devfmt,sizeof (devfmt)); +return 0 ; +} + +static struct snd_soc_dai_driver dai_drivers[] = { +/* FE DAIs */ +{ + .name ="System Pin" , + .id =CATPT_STRM_TYPE_SYSTEM , + .ops = &catpt_fe_dai_ops, + .playback = { + .stream_name ="System Playback" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE , + }, + .capture = { + .stream_name ="Analog Capture" , + .channels_min =2 , + .channels_max =4 , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Offload0 Pin" , + .id =CATPT_STRM_TYPE_RENDER , + .ops = &catpt_fe_dai_ops, + .playback = { + .stream_name ="Offload0 Playback" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_8000_192000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Offload1 Pin" , + .id =CATPT_STRM_TYPE_RENDER , + .ops = &catpt_fe_dai_ops, + .playback = { + .stream_name ="Offload1 Playback" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_8000_192000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Loopback Pin" , + .id =CATPT_STRM_TYPE_LOOPBACK , + .ops = &catpt_fe_dai_ops, + .capture = { + .stream_name ="Loopback Capture" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Bluetooth Pin" , + .id =CATPT_STRM_TYPE_BLUETOOTH_RENDER , + .ops = &catpt_fe_dai_ops, + .playback = { + .stream_name ="Bluetooth Playback" , + .channels_min =1 , + .channels_max =1 , + .rates =SNDRV_PCM_RATE_8000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE , + }, + .capture = { + .stream_name ="Bluetooth Capture" , + .channels_min =1 , + .channels_max =1 , + .rates =SNDRV_PCM_RATE_8000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE , + }, +}, +/* BE DAIs */ +{ + .name ="ssp0-port" , + .id =CATPT_SSP_IFACE_0 , + .pcm_new = catpt_dai_pcm_new, + .playback = { + .channels_min =1 , + .channels_max =8 , + }, + .capture = { + .channels_min =1 , + .channels_max =8 , + }, +}, +{ + .name ="ssp1-port" , + .id =CATPT_SSP_IFACE_1 , + .pcm_new = catpt_dai_pcm_new, + .playback = { + .channels_min =1 ,
sound/soc/intel/catpt/pcm.c line 783
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+ .channels_max = 8, + }, + .capture = { + .channels_min = 1, + .channels_max = 8, + }, +}, +}; +#define DSP_VOLUME_MAX 0x7FFFFFFF/* 0db */
S32_MAX ?
Quoted 23 lines
sound/soc/intel/catpt/pcm.c new file +23
-0+static const u32 volume_map[] = { +DSP_VOLUME_MAX >>30 , +DSP_VOLUME_MAX >>29 , +DSP_VOLUME_MAX >>28 , +DSP_VOLUME_MAX >>27 , +DSP_VOLUME_MAX >>26 , +DSP_VOLUME_MAX >>25 , +DSP_VOLUME_MAX >>24 , +DSP_VOLUME_MAX >>23 , +DSP_VOLUME_MAX >>22 , +DSP_VOLUME_MAX >>21 , +DSP_VOLUME_MAX >>20 , +DSP_VOLUME_MAX >>19 , +DSP_VOLUME_MAX >>18 , +DSP_VOLUME_MAX >>17 , +DSP_VOLUME_MAX >>16 , +DSP_VOLUME_MAX >>15 , +DSP_VOLUME_MAX >>14 , +DSP_VOLUME_MAX >>13 , +DSP_VOLUME_MAX >>12 , +DSP_VOLUME_MAX >>11 , +DSP_VOLUME_MAX >>10 , +DSP_VOLUME_MAX >>9 ,
sound/soc/intel/catpt/pcm.c line 817
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +10
-0+DSP_VOLUME_MAX >>8 , +DSP_VOLUME_MAX >>7 , +DSP_VOLUME_MAX >>6 , +DSP_VOLUME_MAX >>5 , +DSP_VOLUME_MAX >>4 , +DSP_VOLUME_MAX >>3 , +DSP_VOLUME_MAX >>2 , +DSP_VOLUME_MAX >>1 , + DSP_VOLUME_MAX >> 0, +};
Why do you have table? Does it have any gaps? Why can't be formula used?
Quoted 6 lines
sound/soc/intel/catpt/pcm.c new file +6
-0+static u32 ctlvol_to_dspvol (u32 value) +{ +if (value >=ARRAY_SIZE (volume_map)) + value =0 ; +return volume_map[value]; +}
sound/soc/intel/catpt/pcm.c line 833
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+ +static u32 dspvol_to_ctlvol (u32 volume) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (volume_map); i++) +if (volume_map[i] >= volume) +return i; +return i -1 ;
It seems okay in this case, but in general the code looks dangerous (for example, if ARRAY_SIZE is 0).
sound/soc/intel/catpt/pcm.c line 843
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+} + +static int catpt_set_dspvol (struct catpt_dev *cdev,u8 stream_id,long *ctlvol) +{ +bool all_equal = true; +u32 dspvol; +int ret, i; +for (i =1 ; all_equal && i <CATPT_CHANNELS_MAX ; i++) + all_equal = (ctlvol[i] == ctlvol[0 ]);
for (i = 1; i < CATPT_CHANNELS_MAX; i++) if (ctlvol[i] != ctlvol[0]) break;
sound/soc/intel/catpt/pcm.c line 845
Quoted 1 line
sound/soc/intel/catpt/pcm.c new file +1
-0+if (all_equal) {
if (i == _MAX)
and one variable less.
Quoted 5 lines
sound/soc/intel/catpt/pcm.c new file +5
-0+ dspvol =ctlvol_to_dspvol (ctlvol[0 ]); + + ret =catpt_ipc_set_volume (cdev, stream_id, +CATPT_ALL_CHANNELS_MASK , dspvol, +0 ,CATPT_AUDIO_CURVE_NONE );
sound/soc/intel/catpt/pcm.c line 859
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+ }else { +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) { + dspvol =ctlvol_to_dspvol (ctlvol[i]); + + ret =catpt_ipc_set_volume (cdev, stream_id, + i, dspvol, +0 ,CATPT_AUDIO_CURVE_NONE ); +if (ret) + goto exit;
Don't see necessity of this in this patch...
sound/soc/intel/catpt/pcm.c line 557
Quoted 4 lines
sound/soc/intel/catpt/pcm.c new file +3
-0+ } + } +exit:
...neither this.
Quoted 352 lines
sound/soc/intel/catpt/pcm.c new file +348
-0+if (ret) +return CATPT_IPC_ERROR (ret); +return 0 ; +} + +static int catpt_volume_info (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_info *uinfo) +{ + uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ; + uinfo->count =CATPT_CHANNELS_MAX ; + uinfo->value.integer.min =0 ; + uinfo->value.integer.max =ARRAY_SIZE (volume_map) -1 ; +return 0 ; +} + +static int catpt_mixer_volume_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component = +snd_soc_kcontrol_component (kcontrol); +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +u32 dspvol; +int i; + +pm_runtime_get_sync (cdev->dev); + +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) { + dspvol =catpt_mixer_volume (cdev, &cdev->mixer, i); + ucontrol->value.integer.value[i] =dspvol_to_ctlvol (dspvol); + } + +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_put_autosuspend (cdev->dev); + +return 0 ; +} + +static int catpt_mixer_volume_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component = +snd_soc_kcontrol_component (kcontrol); +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +int ret; + +pm_runtime_get_sync (cdev->dev); + + ret =catpt_set_dspvol (cdev, cdev->mixer.mixer_hw_id, + ucontrol->value.integer.value); + +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_put_autosuspend (cdev->dev); + +return ret; +} + +static int catpt_stream_volume_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol, +enum catpt_pin_id pin_id) +{ +struct snd_soc_component *component = +snd_soc_kcontrol_component (kcontrol); +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +struct catpt_stream_runtime *stream; +long *ctlvol = (long *)kcontrol->private_value; +u32 dspvol; +int i; + + stream =catpt_stream_find (cdev, pin_id); +if (!stream) { +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) + ucontrol->value.integer.value[i] = ctlvol[i]; +return 0 ; + } + +pm_runtime_get_sync (cdev->dev); + +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) { + dspvol =catpt_stream_volume (cdev, stream, i); + ucontrol->value.integer.value[i] =dspvol_to_ctlvol (dspvol); + } + +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_put_autosuspend (cdev->dev); + +return 0 ; +} + +static int catpt_stream_volume_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol, +enum catpt_pin_id pin_id) +{ +struct snd_soc_component *component = +snd_soc_kcontrol_component (kcontrol); +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +struct catpt_stream_runtime *stream; +long *ctlvol = (long *)kcontrol->private_value; +int ret, i; + + stream =catpt_stream_find (cdev, pin_id); +if (!stream) { +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) + ctlvol[i] = ucontrol->value.integer.value[i]; +return 0 ; + } + +pm_runtime_get_sync (cdev->dev); + + ret =catpt_set_dspvol (cdev, stream->info.stream_hw_id, + ucontrol->value.integer.value); + +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_put_autosuspend (cdev->dev); + +if (ret) +return ret; + +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) + ctlvol[i] = ucontrol->value.integer.value[i]; +return 0 ; +} + +static int catpt_offload1_volume_get (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_get (kctl, uctl,CATPT_PIN_ID_OFFLOAD1 ); +} + +static int catpt_offload1_volume_put (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_put (kctl, uctl,CATPT_PIN_ID_OFFLOAD1 ); +} + +static int catpt_offload2_volume_get (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_get (kctl, uctl,CATPT_PIN_ID_OFFLOAD2 ); +} + +static int catpt_offload2_volume_put (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_put (kctl, uctl,CATPT_PIN_ID_OFFLOAD2 ); +} + +static int catpt_capture_volume_get (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_get (kctl, uctl,CATPT_PIN_ID_CAPTURE1 ); +} + +static int catpt_capture_volume_put (struct snd_kcontrol *kctl, +struct snd_ctl_elem_value *uctl) +{ +return catpt_stream_volume_put (kctl, uctl,CATPT_PIN_ID_CAPTURE1 ); +} + +static int catpt_loopback_switch_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0 ] = *(bool *)kcontrol->private_value; +return 0 ; +} + +static int catpt_loopback_switch_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct snd_soc_component *component = +snd_soc_kcontrol_component (kcontrol); +struct catpt_dev *cdev =dev_get_drvdata (component->dev); +struct catpt_stream_runtime *stream; +bool mute; +int ret; + + mute = (bool )ucontrol->value.integer.value[0 ]; + stream =catpt_stream_find (cdev,CATPT_PIN_ID_REFERENCE ); +if (!stream) { + *(bool *)kcontrol->private_value = mute; +return 0 ; + } + +pm_runtime_get_sync (cdev->dev); + + ret =catpt_ipc_mute_loopback (cdev, stream->info.stream_hw_id, mute); + +pm_runtime_mark_last_busy (cdev->dev); +pm_runtime_put_autosuspend (cdev->dev); + +if (ret) +return CATPT_IPC_ERROR (ret); + + *(bool *)kcontrol->private_value = mute; +return 0 ; +} + +static int catpt_waves_switch_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +return 0 ; +} + +static int catpt_waves_switch_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +return 0 ; +} + +static int catpt_waves_param_get (struct snd_kcontrol *kcontrol, +unsigned int __user *bytes, +unsigned int size) +{ +return 0 ; +} + +static int catpt_waves_param_put (struct snd_kcontrol *kcontrol, +const unsigned int __user *bytes, +unsigned int size) +{ +return 0 ; +} + +static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(catpt_volume_tlv, -9000, 300, 1); + +#define CATPT_VOLUME_CTL (kname, sname) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \ + .name = (kname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .info = catpt_volume_info, \ + .get = catpt_##sname##_volume_get, \ + .put = catpt_##sname##_volume_put, \ + .tlv.p = catpt_volume_tlv, \ + .private_value = (unsigned long) \ + &(long[CATPT_CHANNELS_MAX]) {0} } + +static const struct snd_kcontrol_new component_kcontrols[] = { +/* Master volume (mixer stream) */ +CATPT_VOLUME_CTL ("Master Playback Volume" , mixer), +/* Individual volume controls for offload and capture */ +CATPT_VOLUME_CTL ("Media0 Playback Volume" , offload1), +CATPT_VOLUME_CTL ("Media1 Playback Volume" , offload2), +CATPT_VOLUME_CTL ("Mic Capture Volume" , capture), +SOC_SINGLE_BOOL_EXT ("Loopback Mute" , (unsigned long )&(bool [1 ]) {0 }, + catpt_loopback_switch_get, catpt_loopback_switch_put), +/* Enable or disable WAVES module */ +SOC_SINGLE_BOOL_EXT ("Waves Switch" ,0 , + catpt_waves_switch_get, catpt_waves_switch_put), +/* WAVES module parameter control */ +SND_SOC_BYTES_TLV ("Waves Set Param" ,128 , + catpt_waves_param_get, catpt_waves_param_put), +}; + +static const struct snd_soc_dapm_widget component_widgets[] = { +SND_SOC_DAPM_AIF_IN ("SSP0 CODEC IN" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SSP0 CODEC OUT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_IN ("SSP1 BT IN" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), +SND_SOC_DAPM_AIF_OUT ("SSP1 BT OUT" ,NULL ,0 ,SND_SOC_NOPM ,0 ,0 ), + +SND_SOC_DAPM_MIXER ("Playback VMixer" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +}; + +static const struct snd_soc_dapm_route component_routes[] = { + {"Playback VMixer" ,NULL ,"System Playback" }, + {"Playback VMixer" ,NULL ,"Offload0 Playback" }, + {"Playback VMixer" ,NULL ,"Offload1 Playback" }, + + {"SSP0 CODEC OUT" ,NULL ,"Playback VMixer" }, + + {"Analog Capture" ,NULL ,"SSP0 CODEC IN" }, + {"Loopback Capture" ,NULL ,"SSP0 CODEC IN" }, + + {"SSP1 BT OUT" ,NULL ,"Bluetooth Playback" }, + {"Bluetooth Capture" ,NULL ,"SSP1 BT IN" }, +}; + +static const struct snd_soc_component_driver catpt_comp_driver = { + .name ="catpt-platform" , + + .pcm_construct = catpt_component_pcm_construct, + .open = catpt_component_open, + .pointer = catpt_component_pointer, + + .controls = component_kcontrols, + .num_controls =ARRAY_SIZE (component_kcontrols), + .dapm_widgets = component_widgets, + .num_dapm_widgets =ARRAY_SIZE (component_widgets), + .dapm_routes = component_routes, + .num_dapm_routes =ARRAY_SIZE (component_routes), +}; + +int catpt_arm_stream_templates (struct catpt_dev *cdev) +{ +struct resource *res; +u32 scratch_size =0 ; +int i, j; + +for (i =0 ; i <ARRAY_SIZE (catpt_topology); i++) { +struct catpt_stream_template *template; +struct catpt_module_entry *entry; +struct catpt_module_type *type; + + template = catpt_topology[i]; + template->persistent_size =0 ; + +for (j =0 ; j < template->num_entries; j++) { + entry = &template->entries[j]; + type = &cdev->modules[entry->module_id]; + +if (!type->loaded) +return -ENOENT ; + + entry->entry_point = type->entry_point; + template->persistent_size += type->persistent_size; +if (type->scratch_size > scratch_size) + scratch_size = type->scratch_size; + } + } + +if (scratch_size) { +/* allocate single scratch area for all modules */ + res =catpt_request_region (&cdev->dram, scratch_size); +if (!res) +return -EBUSY ; + cdev->scratch = res; + } + +return 0 ; +} + +int catpt_register_plat_component (struct catpt_dev *cdev) +{ +struct snd_soc_component *component; +int ret; + + component =devm_kzalloc (cdev->dev,sizeof (*component),GFP_KERNEL ); +if (!component) +return -ENOMEM ; + + ret =snd_soc_component_initialize (component, &catpt_comp_driver, + cdev->dev); +if (ret) +return ret; + + component->name = catpt_comp_driver.name; +return snd_soc_add_component (component, dai_drivers, +ARRAY_SIZE (dai_drivers)); +}Signature · 1 line
2.17.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Rojewski, Cezary
maintainerRE: [PATCH v7 06/14] ASoC: Intel: catpt: PCM operations
Quoted 6 lines · Andy Shevchenko
Quoted 5 lines · Cezary Rojewski
DSP 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.
...
Quoted 9 lines
Quoted 9 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+ +static void catpt_arrange_page_table (struct snd_pcm_substream *substream, +struct snd_dma_buffer *pgtbl) +{ +struct snd_pcm_runtime *rtm = substream->runtime; +struct snd_dma_buffer *databuf =snd_pcm_get_dma_buf (substream); +int i, pages; + + pages =snd_sgbuf_aligned_pages (rtm->dma_bytes);
Quoted 9 lines
sound/soc/intel/catpt/pcm.c line 166
Quoted 6 lines
sound/soc/intel/catpt/pcm.c new file +6
-0+ +for (i =0 ; i < pages; i++) { +u32 pfn, offset; +u32 *page_table; + + pfn =snd_sgbuf_get_addr (databuf, i *PAGE_SIZE ) >>PAGE_SHIFT ;
PFN_DOWN()
Ack. Updating in both cases where explicit right shift by PAGE_SHIFT is used.
Quoted 65 lines
Quoted 65 lines
sound/soc/intel/catpt/pcm.c new file +65
-0+/* incrementing by 2 on even and 3 on odd */ + offset = ((i <<2 ) + i) >>1 ; + page_table = (u32 *)(pgtbl->area + offset); + +if (i &1 ) + *page_table |= (pfn <<4 ); +else + *page_table |= pfn; + } +} + +static u32 catpt_get_channel_map (enum catpt_channel_config config) +{ +switch (config) { +case CATPT_CHANNEL_CONFIG_MONO : +return (0xFFFFFFF0 |CATPT_CHANNEL_CENTER ); + +case CATPT_CHANNEL_CONFIG_STEREO : +return (0xFFFFFF00 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 )); + +case CATPT_CHANNEL_CONFIG_2_POINT_1 : +return (0xFFFFF000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 ) + | (CATPT_CHANNEL_LFE <<8 )); + +case CATPT_CHANNEL_CONFIG_3_POINT_0 : +return (0xFFFFF000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 )); + +case CATPT_CHANNEL_CONFIG_3_POINT_1 : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LFE <<12 )); + +case CATPT_CHANNEL_CONFIG_QUATRO : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_RIGHT <<4 ) + | (CATPT_CHANNEL_LEFT_SURROUND <<8 ) + | (CATPT_CHANNEL_RIGHT_SURROUND <<12 )); + +case CATPT_CHANNEL_CONFIG_4_POINT_0 : +return (0xFFFF0000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_CENTER_SURROUND <<12 )); + +case CATPT_CHANNEL_CONFIG_5_POINT_0 : +return (0xFFF00000 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_CENTER <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LEFT_SURROUND <<12 ) + | (CATPT_CHANNEL_RIGHT_SURROUND <<16 )); + +case CATPT_CHANNEL_CONFIG_5_POINT_1 : +return (0xFF000000 |CATPT_CHANNEL_CENTER + | (CATPT_CHANNEL_LEFT <<4 ) + | (CATPT_CHANNEL_RIGHT <<8 ) + | (CATPT_CHANNEL_LEFT_SURROUND <<12 ) + | (CATPT_CHANNEL_RIGHT_SURROUND <<16 ) + | (CATPT_CHANNEL_LFE <<20 )); + +case CATPT_CHANNEL_CONFIG_DUAL_MONO :
Quoted 9 lines
sound/soc/intel/catpt/pcm.c line 237
Quoted 6 lines
sound/soc/intel/catpt/pcm.c new file +6
-0+return (0xFFFFFF00 |CATPT_CHANNEL_LEFT + | (CATPT_CHANNEL_LEFT <<4 )); + +default : +return 0xFFFFFFFF ; + }
GENMASK()for all above?
Ack. GENMASK + U32_MAX for the 'default' label.
Quoted 327 lines
Quoted 314 lines
sound/soc/intel/catpt/pcm.c new file +314
-0+} + +static enum catpt_channel_config catpt_get_channel_config (u32 num_channels) +{ +switch (num_channels) { +case 6 : +return CATPT_CHANNEL_CONFIG_5_POINT_1 ; +case 5 : +return CATPT_CHANNEL_CONFIG_5_POINT_0 ; +case 4 : +return CATPT_CHANNEL_CONFIG_QUATRO ; +case 3 : +return CATPT_CHANNEL_CONFIG_2_POINT_1 ; +case 1 : +return CATPT_CHANNEL_CONFIG_MONO ; +case 2 : +default : +return CATPT_CHANNEL_CONFIG_STEREO ; + } +} + +static int catpt_dai_startup (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_template *template; +struct catpt_stream_runtime *stream; +struct resource *res; +int ret; + + template =catpt_get_stream_template (substream); + + stream =kzalloc (sizeof (*stream),GFP_KERNEL ); +if (!stream) +return -ENOMEM ; + + ret =snd_dma_alloc_pages (SNDRV_DMA_TYPE_DEV , cdev->dev,PAGE_SIZE , + &stream->pgtbl); +if (ret) + goto err_pgtbl; + + res =catpt_request_region (&cdev->dram, template->persistent_size); +if (!res) { + ret = -EBUSY ; + goto err_request; + } + +catpt_dsp_update_srampge (cdev, &cdev->dram, cdev->spec->dram_mask); + + stream->template = template; + stream->persistent = res; + stream->substream = substream; +INIT_LIST_HEAD (&stream->node); +snd_soc_dai_set_dma_data (dai, substream, stream); + +spin_lock (&cdev->list_lock); +list_add_tail (&stream->node, &cdev->stream_list); +spin_unlock (&cdev->list_lock); + +return 0 ; + +err_request: +snd_dma_free_pages (&stream->pgtbl); +err_pgtbl: +kfree (stream); +return ret; +} + +static void catpt_dai_shutdown (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; + + stream =snd_soc_dai_get_dma_data (dai, substream); + +spin_lock (&cdev->list_lock); +list_del (&stream->node); +spin_unlock (&cdev->list_lock); + +release_resource (stream->persistent); +kfree (stream->persistent); +catpt_dsp_update_srampge (cdev, &cdev->dram, cdev->spec->dram_mask); + +snd_dma_free_pages (&stream->pgtbl); +kfree (stream); +snd_soc_dai_set_dma_data (dai, substream,NULL ); +} + +static int catpt_dai_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +struct catpt_audio_format afmt; +struct catpt_ring_info rinfo; +struct snd_pcm_runtime *rtm = substream->runtime; +struct snd_dma_buffer *dmab; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (stream->allocated) +return 0 ; + +memset (&afmt,0 ,sizeof (afmt)); + afmt.sample_rate =params_rate (params); + afmt.bit_depth =params_physical_width (params); + afmt.valid_bit_depth =params_width (params); + afmt.num_channels =params_channels (params); + afmt.channel_config =catpt_get_channel_config (afmt.num_channels); + afmt.channel_map =catpt_get_channel_map (afmt.channel_config); + afmt.interleaving =CATPT_INTERLEAVING_PER_CHANNEL ; + + dmab =snd_pcm_get_dma_buf (substream); +catpt_arrange_page_table (substream, &stream->pgtbl); + +memset (&rinfo,0 ,sizeof (rinfo)); + rinfo.page_table_addr = stream->pgtbl.addr; + rinfo.num_pages =DIV_ROUND_UP (rtm->dma_bytes,PAGE_SIZE ); + rinfo.size = rtm->dma_bytes; + rinfo.offset =0 ; + rinfo.ring_first_page_pfn =snd_sgbuf_get_addr (dmab,0 ) >>PAGE_SHIFT ; + + ret =catpt_ipc_alloc_stream (cdev, stream->template->path_id, + stream->template->type, + &afmt, &rinfo, + stream->template->num_entries, + stream->template->entries, + stream->persistent, + cdev->scratch, + &stream->info); +if (ret) +return CATPT_IPC_ERROR (ret); + + stream->allocated = true; +return 0 ; +} + +static int catpt_dai_hw_free (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (!stream->allocated) +return 0 ; + +catpt_ipc_reset_stream (cdev, stream->info.stream_hw_id); +catpt_ipc_free_stream (cdev, stream->info.stream_hw_id); + + stream->allocated = false; +return 0 ; +} + +static int catpt_set_dspvol (struct catpt_dev *cdev,u8 stream_id,long *ctlvol); + +static int catpt_dai_apply_usettings (struct snd_soc_dai *dai, +struct catpt_stream_runtime *stream) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct snd_soc_component *component = dai->component; +struct snd_kcontrol *pos, *kctl =NULL ; +const char *name; +int ret; +u32 id = stream->info.stream_hw_id; + +/* only selected streams have individual controls */ +switch (id) { +case CATPT_PIN_ID_OFFLOAD1 : + name ="Media0 Playback Volume" ; +break ; +case CATPT_PIN_ID_OFFLOAD2 : + name ="Media1 Playback Volume" ; +break ; +case CATPT_PIN_ID_CAPTURE1 : + name ="Mic Capture Volume" ; +break ; +case CATPT_PIN_ID_REFERENCE : + name ="Loopback Mute" ; +break ; +default : +return 0 ; + }; + +list_for_each_entry (pos, &component->card->snd_card->controls, list) { +if (pos->private_data == component && + !strncmp (name, pos->id.name,sizeof (pos->id.name))) { + kctl = pos; +break ; + } + } +if (!kctl) +return -ENOENT ; + +if (stream->template->type !=CATPT_STRM_TYPE_LOOPBACK ) +return catpt_set_dspvol (cdev, id, (long *)kctl->private_value); + ret =catpt_ipc_mute_loopback (cdev, id, *(bool *)kctl->private_value); +if (ret) +return CATPT_IPC_ERROR (ret); +return 0 ; +} + +static int catpt_dai_prepare (struct snd_pcm_substream *substream, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); +if (stream->prepared) +return 0 ; + + ret =catpt_ipc_reset_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); + + ret =catpt_ipc_pause_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); + + ret =catpt_dsp_update_lpclock (cdev); +if (ret) +return ret; + + ret =catpt_dai_apply_usettings (dai, stream); +if (ret) +return ret; + + stream->prepared = true; +return 0 ; +} + +static int catpt_dai_trigger (struct snd_pcm_substream *substream,int cmd, +struct snd_soc_dai *dai) +{ +struct catpt_dev *cdev =dev_get_drvdata (dai->dev); +struct catpt_stream_runtime *stream; +struct snd_pcm_runtime *runtime = substream->runtime; +snd_pcm_uframes_t pos; +int ret; + + stream =snd_soc_dai_get_dma_data (dai, substream); + +switch (cmd) { +case SNDRV_PCM_TRIGGER_START : +/* only offload is set_write_pos driven */ +if (stream->template->type !=CATPT_STRM_TYPE_RENDER ) + goto resume_stream; + + pos =frames_to_bytes (runtime, runtime->start_threshold); +/* +* Dsp operates on buffer halves, thus max 2x set_write_pos +* (entire buffer filled) prior to stream start. +*/ + ret =catpt_ipc_set_write_pos (cdev, stream->info.stream_hw_id, + pos, false, false); +if (ret) +return CATPT_IPC_ERROR (ret); + fallthrough; +case SNDRV_PCM_TRIGGER_RESUME : +case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : + resume_stream: + ret =catpt_ipc_resume_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); +break ; + +case SNDRV_PCM_TRIGGER_STOP : + stream->prepared = false; +catpt_dsp_update_lpclock (cdev); + fallthrough; +case SNDRV_PCM_TRIGGER_SUSPEND : +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : + ret =catpt_ipc_pause_stream (cdev, stream->info.stream_hw_id); +if (ret) +return CATPT_IPC_ERROR (ret); +break ; + +default : +break ; + } + +return 0 ; +} + +void catpt_stream_update_position (struct catpt_dev *cdev, +struct catpt_stream_runtime *stream, +struct catpt_notify_position *pos) +{ +struct snd_pcm_substream *substream = stream->substream; +struct snd_pcm_runtime *r = substream->runtime; +snd_pcm_uframes_t dsppos, newpos; +int ret; + + dsppos =bytes_to_frames (r, pos->stream_position); + +/* only offload is set_write_pos driven */ +if (stream->template->type !=CATPT_STRM_TYPE_RENDER ) + goto exit; + +if (dsppos >= r->buffer_size /2 ) + newpos = r->buffer_size /2 ; +else + newpos =0 ; +/* +* Dsp operates on buffer halves, thus on every notify position +* (buffer half consumed) update wp to allow stream progression. +*/ + ret =catpt_ipc_set_write_pos (cdev, stream->info.stream_hw_id, +frames_to_bytes (r, newpos), + false, false);sound/soc/intel/catpt/pcm.c line 561
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +10
-0+if (ret) { +dev_err (cdev->dev,"update position for stream %d failed: %d\n" , + stream->info.stream_hw_id, ret); +return ; + } +exit: +snd_pcm_period_elapsed (substream); +} + +#define CATPT_BUFFER_MAX_SIZE 76800/* 200ms native format */ I don't understand 'native format'. Please, give clearer comment, like
Quoted 2 lines
/* 200ms for 8 8-bit channels at 48kHz (native format) */
Sure, will expand the description. Just so you know, it's 2/24(32)/48kHz for LPT/WPT solution.
Quoted 3 lines
Quoted 3 lines
sound/soc/intel/catpt/pcm.c new file +3
-0+#define CATPT_PCM_PERIODS_MAX 4 +#define CATPT_PCM_PERIODS_MIN 2 +
...
Quoted 5 lines
Quoted 2 lines
+#define
DSP_VOLUME_MAX0x7FFFFFFF/* 0db */
S32_MAX?
Ack.
Quoted 27 lines
Quoted 27 lines
sound/soc/intel/catpt/pcm.c new file +27
-0+static const u32 volume_map[] = { +DSP_VOLUME_MAX >>30 , +DSP_VOLUME_MAX >>29 , +DSP_VOLUME_MAX >>28 , +DSP_VOLUME_MAX >>27 , +DSP_VOLUME_MAX >>26 , +DSP_VOLUME_MAX >>25 , +DSP_VOLUME_MAX >>24 , +DSP_VOLUME_MAX >>23 , +DSP_VOLUME_MAX >>22 , +DSP_VOLUME_MAX >>21 , +DSP_VOLUME_MAX >>20 , +DSP_VOLUME_MAX >>19 , +DSP_VOLUME_MAX >>18 , +DSP_VOLUME_MAX >>17 , +DSP_VOLUME_MAX >>16 , +DSP_VOLUME_MAX >>15 , +DSP_VOLUME_MAX >>14 , +DSP_VOLUME_MAX >>13 , +DSP_VOLUME_MAX >>12 , +DSP_VOLUME_MAX >>11 , +DSP_VOLUME_MAX >>10 , +DSP_VOLUME_MAX >>9 , +DSP_VOLUME_MAX >>8 , +DSP_VOLUME_MAX >>7 , +DSP_VOLUME_MAX >>6 , +DSP_VOLUME_MAX >>5 ,
Quoted 9 lines
sound/soc/intel/catpt/pcm.c line 817
Quoted 6 lines
sound/soc/intel/catpt/pcm.c new file +6
-0+DSP_VOLUME_MAX >>4 , +DSP_VOLUME_MAX >>3 , +DSP_VOLUME_MAX >>2 , +DSP_VOLUME_MAX >>1 , + DSP_VOLUME_MAX >> 0, +};Why do you have table? Does it have any gaps? Why can't be formula used?
No gaps, just a lookup table. As catpt aims to keep 100% backward compatibility with what sound/soc/intel/haswell solution exposes, it is also useful for filling kcontrol info: catpt_volume_info() function.
Quoted 15 lines
Quoted 14 lines
sound/soc/intel/catpt/pcm.c new file +14
-0+static u32 ctlvol_to_dspvol (u32 value) +{ +if (value >=ARRAY_SIZE (volume_map)) + value =0 ; +return volume_map[value]; +} + +static u32 dspvol_to_ctlvol (u32 volume) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (volume_map); i++) +if (volume_map[i] >= volume) +return i;
Quoted 5 lines
sound/soc/intel/catpt/pcm.c line 833
Quoted 1 line
sound/soc/intel/catpt/pcm.c new file +1
-0+return i -1 ;It seems okay in this case, but in general the code looks dangerous (for example, if
ARRAY_SIZEis 0).
Agreed, although volume_map will never change so I've decided to drop additional safety.
...
Quoted 15 lines
sound/soc/intel/catpt/pcm.c line 843
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+} + +static int catpt_set_dspvol (struct catpt_dev *cdev,u8 stream_id,long *ctlvol) +{ +bool all_equal = true; +u32 dspvol; +int ret, i; +for (i =1 ; all_equal && i <CATPT_CHANNELS_MAX ; i++) + all_equal = (ctlvol[i] == ctlvol[0 ]);for (i = 1; i < CATPT_CHANNELS_MAX; i++) if (ctlvol[i] != ctlvol[0]) break;
Quoted 6 lines
sound/soc/intel/catpt/pcm.c line 845
Quoted 1 line
sound/soc/intel/catpt/pcm.c new file +1
-0+if (all_equal) {if (i ==
_MAX)and one variable less.
Keen eye, thanks for this tip! Ack.
...
Quoted 18 lines
Quoted 5 lines
sound/soc/intel/catpt/pcm.c new file +5
-0+ dspvol =ctlvol_to_dspvol (ctlvol[0 ]); + + ret =catpt_ipc_set_volume (cdev, stream_id, +CATPT_ALL_CHANNELS_MASK , dspvol, +0 ,CATPT_AUDIO_CURVE_NONE );sound/soc/intel/catpt/pcm.c line 859
Quoted 10 lines
sound/soc/intel/catpt/pcm.c new file +9
-0+ }else { +for (i =0 ; i <CATPT_CHANNELS_MAX ; i++) { + dspvol =ctlvol_to_dspvol (ctlvol[i]); + + ret =catpt_ipc_set_volume (cdev, stream_id, + i, dspvol, +0 ,CATPT_AUDIO_CURVE_NONE ); +if (ret) + goto exit;Don't see necessity of this in this patch...
Quoted 7 lines
sound/soc/intel/catpt/pcm.c line 557
Quoted 4 lines
sound/soc/intel/catpt/pcm.c new file +3
-0+ } + } +exit:...neither this.
Believe simple 'break' suffices. 'exit' label becomes redundant too.
Thanks,
Czarek
Cezary Rojewski
maintainerPATCH v7 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 | 344 +++++++++++++++++++++++++++++++++ 1 file changed, 344 insertions(+) create mode 100644 sound/soc/intel/catpt/device.c
sound/soc/intel/catpt/device.c new file +344 -0
@@ -0,0 +1,344 @@ +// 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) +{ +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 v7 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_MSECS 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); +if (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,
@@ -182,6 +188,7 @@ static void catpt_dsp_copy_rx(struct catpt_dev *cdev, u32 header)if (ipc->rx.size && ipc->rx.rsp.status ==CATPT_REPLY_SUCCESS ) {memcpy_fromio (ipc->rx.data,catpt_outbox_addr (cdev), ipc->rx.size); +trace_catpt_ipc_payload (ipc->rx.data, ipc->rx.size); } }
@@ -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 v7 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 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 | 1 + sound/soc/intel/catpt/device.c | 1 + sound/soc/intel/catpt/sysfs.c | 58 +++++++++++++++++++ 4 files changed, 76 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 +1 -0
@@ -14,6 +14,7 @@#include "registers.h" 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);
sound/soc/intel/catpt/device.c +1 -0
@@ -338,6 +338,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 +58 -0
58 lines not on this page · raw message
Signature · 1 line
2.17.1
Cezary Rojewski
maintainerPATCH v7 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 v7 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 v7 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 v7 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 v7 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