| Message ID | 20200923122508.3360-4-cezary.rojewski@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: Intel: Catpt - Lynx and Wildcat point | expand |
On Wed, Sep 23, 2020 at 02:24:57PM +0200, Cezary Rojewski wrote: > Declare global and stream IPC message handlers for all known message > types. FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> One nit below. > Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> > --- > sound/soc/intel/catpt/core.h | 2 + > sound/soc/intel/catpt/dsp.c | 106 +++++++++++ > sound/soc/intel/catpt/ipc.c | 4 + > sound/soc/intel/catpt/messages.c | 313 +++++++++++++++++++++++++++++++ > 4 files changed, 425 insertions(+) > create mode 100644 sound/soc/intel/catpt/messages.c > > diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h > index 8819d928e891..3c860c0645dc 100644 > --- a/sound/soc/intel/catpt/core.h > +++ b/sound/soc/intel/catpt/core.h > @@ -127,4 +127,6 @@ int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev, > int catpt_dsp_send_msg(struct catpt_dev *cdev, struct catpt_ipc_msg request, > struct catpt_ipc_msg *reply); > > +int catpt_coredump(struct catpt_dev *cdev); > + > #endif > diff --git a/sound/soc/intel/catpt/dsp.c b/sound/soc/intel/catpt/dsp.c > index b0a61fcca50c..9d988b05c8cf 100644 > --- a/sound/soc/intel/catpt/dsp.c > +++ b/sound/soc/intel/catpt/dsp.c > @@ -5,6 +5,7 @@ > // Author: Cezary Rojewski <cezary.rojewski@intel.com> > // > > +#include <linux/devcoredump.h> > #include <linux/dma-mapping.h> > #include <linux/firmware.h> > #include "core.h" > @@ -136,3 +137,108 @@ void catpt_dmac_remove(struct catpt_dev *cdev) > */ > dw_dma_remove(cdev->dmac); > } > + > +#define CATPT_DUMP_MAGIC 0xcd42 > +#define CATPT_DUMP_SECTION_ID_FILE 0x00 > +#define CATPT_DUMP_SECTION_ID_IRAM 0x01 > +#define CATPT_DUMP_SECTION_ID_DRAM 0x02 > +#define CATPT_DUMP_SECTION_ID_REGS 0x03 > +#define CATPT_DUMP_HASH_SIZE 20 > + > +struct catpt_dump_section_hdr { > + u16 magic; > + u8 core_id; > + u8 section_id; > + u32 size; > +}; > + > +int catpt_coredump(struct catpt_dev *cdev) > +{ > + struct catpt_dump_section_hdr *hdr; > + size_t dump_size, regs_size; > + u8 *dump, *pos; > + const char *eof; > + char *info; > + int i; > + > + 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; > + /* account for header of each section and hash chunk */ > + dump_size += 4 * sizeof(*hdr) + CATPT_DUMP_HASH_SIZE; > + > + 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; > + hdr->section_id = CATPT_DUMP_SECTION_ID_FILE; > + hdr->size = dump_size - sizeof(*hdr); > + pos += sizeof(*hdr); > + > + 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 */ > + info = strnchr(info, eof - info, ' '); > + if (!info) > + break; > + } > + > + if (i == 4 && info) > + memcpy(pos, info, min_t(u32, eof - info, CATPT_DUMP_HASH_SIZE)); > + pos += CATPT_DUMP_HASH_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_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; > +} > diff --git a/sound/soc/intel/catpt/ipc.c b/sound/soc/intel/catpt/ipc.c > index 7474bc73c73a..d5edf3eebdf8 100644 > --- a/sound/soc/intel/catpt/ipc.c > +++ b/sound/soc/intel/catpt/ipc.c > @@ -168,6 +168,10 @@ static void catpt_dsp_process_response(struct catpt_dev *cdev, u32 header) > > switch (msg.global_msg_type) { > case CATPT_GLB_REQUEST_CORE_DUMP: > + dev_err(cdev->dev, "ADSP device coredump received\n"); > + ipc->ready = false; > + catpt_coredump(cdev); > + /* TODO: attempt recovery */ > break; > > case CATPT_GLB_STREAM_MESSAGE: > diff --git a/sound/soc/intel/catpt/messages.c b/sound/soc/intel/catpt/messages.c > new file mode 100644 > index 000000000000..a793d114afa4 > --- /dev/null > +++ b/sound/soc/intel/catpt/messages.c > @@ -0,0 +1,313 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +// > +// Copyright(c) 2020 Intel Corporation. All rights reserved. > +// > +// Author: Cezary Rojewski <cezary.rojewski@intel.com> > +// > + > +#include <linux/slab.h> > +#include "core.h" > +#include "messages.h" > +#include "registers.h" > + > +int catpt_ipc_get_fw_version(struct catpt_dev *cdev, > + struct catpt_fw_version *version) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(GET_FW_VERSION); > + struct catpt_ipc_msg request = {{0}}, reply; > + int ret; > + > + request.header = msg.val; > + reply.size = sizeof(*version); > + reply.data = version; > + > + ret = catpt_dsp_send_msg(cdev, request, &reply); > + if (ret) > + dev_err(cdev->dev, "get fw version failed: %d\n", ret); > + > + return ret; > +} > + > +struct catpt_alloc_stream_input { > + enum catpt_path_id path_id:8; > + enum catpt_stream_type stream_type:8; > + enum catpt_format_id format_id:8; > + u8 reserved; > + struct catpt_audio_format input_format; > + struct catpt_ring_info ring_info; > + u8 num_entries; > + /* flex array with entries here */ > + struct catpt_memory_info persistent_mem; > + struct catpt_memory_info scratch_mem; > + u32 num_notifications; /* obsolete */ > +} __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) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(ALLOCATE_STREAM); > + struct catpt_alloc_stream_input input; > + struct catpt_ipc_msg request, reply; > + size_t size, arrsz; > + u8 *payload; > + off_t off; > + int ret; > + > + off = offsetof(struct catpt_alloc_stream_input, persistent_mem); > + arrsz = sizeof(*modules) * num_modules; > + size = sizeof(input) + arrsz; > + > + payload = kzalloc(size, GFP_KERNEL); > + if (!payload) > + return -ENOMEM; > + > + memset(&input, 0, sizeof(input)); > + input.path_id = path_id; > + input.stream_type = type; > + input.format_id = CATPT_FORMAT_PCM; > + input.input_format = *afmt; > + input.ring_info = *rinfo; > + input.num_entries = num_modules; > + input.persistent_mem.offset = catpt_to_dsp_offset(persistent->start); > + input.persistent_mem.size = resource_size(persistent); > + if (scratch) { > + input.scratch_mem.offset = catpt_to_dsp_offset(scratch->start); > + input.scratch_mem.size = resource_size(scratch); > + } > + > + /* re-arrange the input: account for flex array 'entries' */ > + memcpy(payload, &input, sizeof(input)); > + memmove(payload + off + arrsz, payload + off, sizeof(input) - off); > + memcpy(payload + off, modules, arrsz); > + > + request.header = msg.val; > + request.size = size; > + request.data = payload; > + reply.size = sizeof(*sinfo); > + reply.data = sinfo; > + > + ret = catpt_dsp_send_msg(cdev, request, &reply); > + if (ret) > + dev_err(cdev->dev, "alloc stream type %d failed: %d\n", > + type, ret); > + > + kfree(payload); > + return ret; > +} > + > +int catpt_ipc_free_stream(struct catpt_dev *cdev, u8 stream_hw_id) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(FREE_STREAM); > + struct catpt_ipc_msg request; > + int ret; > + > + request.header = msg.val; > + request.size = sizeof(stream_hw_id); > + request.data = &stream_hw_id; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "free stream %d failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +int catpt_ipc_set_device_format(struct catpt_dev *cdev, > + struct catpt_ssp_device_format *devfmt) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(SET_DEVICE_FORMATS); > + struct catpt_ipc_msg request; > + int ret; > + > + request.header = msg.val; > + request.size = sizeof(*devfmt); > + request.data = devfmt; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "set device format failed: %d\n", ret); > + > + return ret; > +} > + > +int catpt_ipc_enter_dxstate(struct catpt_dev *cdev, enum catpt_dx_state state, > + struct catpt_dx_context *context) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(ENTER_DX_STATE); > + struct catpt_ipc_msg request, reply; > + int ret; > + > + request.header = msg.val; > + request.size = sizeof(state); > + request.data = &state; > + reply.size = sizeof(*context); > + reply.data = context; > + > + ret = catpt_dsp_send_msg(cdev, request, &reply); > + if (ret) > + dev_err(cdev->dev, "enter dx state failed: %d\n", ret); > + > + return ret; > +} > + > +int catpt_ipc_get_mixer_stream_info(struct catpt_dev *cdev, > + struct catpt_mixer_stream_info *info) > +{ > + union catpt_global_msg msg = CATPT_GLOBAL_MSG(GET_MIXER_STREAM_INFO); > + struct catpt_ipc_msg request = {{0}}, reply; > + int ret; > + > + request.header = msg.val; > + reply.size = sizeof(*info); > + reply.data = info; > + > + ret = catpt_dsp_send_msg(cdev, request, &reply); > + if (ret) > + dev_err(cdev->dev, "get mixer info failed: %d\n", ret); > + > + return ret; > +} > + > +int catpt_ipc_reset_stream(struct catpt_dev *cdev, u8 stream_hw_id) > +{ > + union catpt_stream_msg msg = CATPT_STREAM_MSG(RESET_STREAM); > + struct catpt_ipc_msg request = {{0}}; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + request.header = msg.val; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "reset stream %d failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +int catpt_ipc_pause_stream(struct catpt_dev *cdev, u8 stream_hw_id) > +{ > + union catpt_stream_msg msg = CATPT_STREAM_MSG(PAUSE_STREAM); > + struct catpt_ipc_msg request = {{0}}; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + request.header = msg.val; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "pause stream %d failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +int catpt_ipc_resume_stream(struct catpt_dev *cdev, u8 stream_hw_id) > +{ > + union catpt_stream_msg msg = CATPT_STREAM_MSG(RESUME_STREAM); > + struct catpt_ipc_msg request = {{0}}; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + request.header = msg.val; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "resume stream %d failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +struct catpt_set_volume_input { > + u32 channel; > + u32 target_volume; > + u64 curve_duration; > + u32 curve_type; > +} __packed; > + > +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) > +{ > + union catpt_stream_msg msg = CATPT_STAGE_MSG(SET_VOLUME); > + struct catpt_ipc_msg request; > + struct catpt_set_volume_input input; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + input.channel = channel; > + input.target_volume = volume; > + input.curve_duration = curve_duration; > + input.curve_type = curve_type; > + > + request.header = msg.val; > + request.size = sizeof(input); > + request.data = &input; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "set stream %d volume failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +struct catpt_set_write_pos_input { > + u32 new_write_pos; > + bool end_of_buffer; > + bool low_latency; bool is compiler dependent type AFAIK. So, __packed here is a bit confusing. > +} __packed; > + > +int catpt_ipc_set_write_pos(struct catpt_dev *cdev, u8 stream_hw_id, > + u32 pos, bool eob, bool ll) > +{ > + union catpt_stream_msg msg = CATPT_STAGE_MSG(SET_WRITE_POSITION); > + struct catpt_ipc_msg request; > + struct catpt_set_write_pos_input input; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + input.new_write_pos = pos; > + input.end_of_buffer = eob; > + input.low_latency = ll; > + > + request.header = msg.val; > + request.size = sizeof(input); > + request.data = &input; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "set stream %d write pos failed: %d\n", > + stream_hw_id, ret); > + > + return ret; > +} > + > +int catpt_ipc_mute_loopback(struct catpt_dev *cdev, u8 stream_hw_id, bool mute) > +{ > + union catpt_stream_msg msg = CATPT_STAGE_MSG(MUTE_LOOPBACK); > + struct catpt_ipc_msg request; > + int ret; > + > + msg.stream_hw_id = stream_hw_id; > + request.header = msg.val; > + request.size = sizeof(mute); > + request.data = &mute; > + > + ret = catpt_dsp_send_msg(cdev, request, NULL); > + if (ret) > + dev_err(cdev->dev, "mute loopback failed: %d\n", ret); > + > + return ret; > +} > -- > 2.17.1 >
diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h index 8819d928e891..3c860c0645dc 100644 --- a/sound/soc/intel/catpt/core.h +++ b/sound/soc/intel/catpt/core.h @@ -127,4 +127,6 @@ int catpt_dsp_send_msg_timeout(struct catpt_dev *cdev, int catpt_dsp_send_msg(struct catpt_dev *cdev, struct catpt_ipc_msg request, struct catpt_ipc_msg *reply); +int catpt_coredump(struct catpt_dev *cdev); + #endif diff --git a/sound/soc/intel/catpt/dsp.c b/sound/soc/intel/catpt/dsp.c index b0a61fcca50c..9d988b05c8cf 100644 --- a/sound/soc/intel/catpt/dsp.c +++ b/sound/soc/intel/catpt/dsp.c @@ -5,6 +5,7 @@ // Author: Cezary Rojewski <cezary.rojewski@intel.com> // +#include <linux/devcoredump.h> #include <linux/dma-mapping.h> #include <linux/firmware.h> #include "core.h" @@ -136,3 +137,108 @@ void catpt_dmac_remove(struct catpt_dev *cdev) */ dw_dma_remove(cdev->dmac); } + +#define CATPT_DUMP_MAGIC 0xcd42 +#define CATPT_DUMP_SECTION_ID_FILE 0x00 +#define CATPT_DUMP_SECTION_ID_IRAM 0x01 +#define CATPT_DUMP_SECTION_ID_DRAM 0x02 +#define CATPT_DUMP_SECTION_ID_REGS 0x03 +#define CATPT_DUMP_HASH_SIZE 20 + +struct catpt_dump_section_hdr { + u16 magic; + u8 core_id; + u8 section_id; + u32 size; +}; + +int catpt_coredump(struct catpt_dev *cdev) +{ + struct catpt_dump_section_hdr *hdr; + size_t dump_size, regs_size; + u8 *dump, *pos; + const char *eof; + char *info; + int i; + + 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; + /* account for header of each section and hash chunk */ + dump_size += 4 * sizeof(*hdr) + CATPT_DUMP_HASH_SIZE; + + 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; + hdr->section_id = CATPT_DUMP_SECTION_ID_FILE; + hdr->size = dump_size - sizeof(*hdr); + pos += sizeof(*hdr); + + 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 */ + info = strnchr(info, eof - info, ' '); + if (!info) + break; + } + + if (i == 4 && info) + memcpy(pos, info, min_t(u32, eof - info, CATPT_DUMP_HASH_SIZE)); + pos += CATPT_DUMP_HASH_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_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; +} diff --git a/sound/soc/intel/catpt/ipc.c b/sound/soc/intel/catpt/ipc.c index 7474bc73c73a..d5edf3eebdf8 100644 --- a/sound/soc/intel/catpt/ipc.c +++ b/sound/soc/intel/catpt/ipc.c @@ -168,6 +168,10 @@ static void catpt_dsp_process_response(struct catpt_dev *cdev, u32 header) switch (msg.global_msg_type) { case CATPT_GLB_REQUEST_CORE_DUMP: + dev_err(cdev->dev, "ADSP device coredump received\n"); + ipc->ready = false; + catpt_coredump(cdev); + /* TODO: attempt recovery */ break; case CATPT_GLB_STREAM_MESSAGE: diff --git a/sound/soc/intel/catpt/messages.c b/sound/soc/intel/catpt/messages.c new file mode 100644 index 000000000000..a793d114afa4 --- /dev/null +++ b/sound/soc/intel/catpt/messages.c @@ -0,0 +1,313 @@ +// SPDX-License-Identifier: GPL-2.0-only +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// +// Author: Cezary Rojewski <cezary.rojewski@intel.com> +// + +#include <linux/slab.h> +#include "core.h" +#include "messages.h" +#include "registers.h" + +int catpt_ipc_get_fw_version(struct catpt_dev *cdev, + struct catpt_fw_version *version) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(GET_FW_VERSION); + struct catpt_ipc_msg request = {{0}}, reply; + int ret; + + request.header = msg.val; + reply.size = sizeof(*version); + reply.data = version; + + ret = catpt_dsp_send_msg(cdev, request, &reply); + if (ret) + dev_err(cdev->dev, "get fw version failed: %d\n", ret); + + return ret; +} + +struct catpt_alloc_stream_input { + enum catpt_path_id path_id:8; + enum catpt_stream_type stream_type:8; + enum catpt_format_id format_id:8; + u8 reserved; + struct catpt_audio_format input_format; + struct catpt_ring_info ring_info; + u8 num_entries; + /* flex array with entries here */ + struct catpt_memory_info persistent_mem; + struct catpt_memory_info scratch_mem; + u32 num_notifications; /* obsolete */ +} __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) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(ALLOCATE_STREAM); + struct catpt_alloc_stream_input input; + struct catpt_ipc_msg request, reply; + size_t size, arrsz; + u8 *payload; + off_t off; + int ret; + + off = offsetof(struct catpt_alloc_stream_input, persistent_mem); + arrsz = sizeof(*modules) * num_modules; + size = sizeof(input) + arrsz; + + payload = kzalloc(size, GFP_KERNEL); + if (!payload) + return -ENOMEM; + + memset(&input, 0, sizeof(input)); + input.path_id = path_id; + input.stream_type = type; + input.format_id = CATPT_FORMAT_PCM; + input.input_format = *afmt; + input.ring_info = *rinfo; + input.num_entries = num_modules; + input.persistent_mem.offset = catpt_to_dsp_offset(persistent->start); + input.persistent_mem.size = resource_size(persistent); + if (scratch) { + input.scratch_mem.offset = catpt_to_dsp_offset(scratch->start); + input.scratch_mem.size = resource_size(scratch); + } + + /* re-arrange the input: account for flex array 'entries' */ + memcpy(payload, &input, sizeof(input)); + memmove(payload + off + arrsz, payload + off, sizeof(input) - off); + memcpy(payload + off, modules, arrsz); + + request.header = msg.val; + request.size = size; + request.data = payload; + reply.size = sizeof(*sinfo); + reply.data = sinfo; + + ret = catpt_dsp_send_msg(cdev, request, &reply); + if (ret) + dev_err(cdev->dev, "alloc stream type %d failed: %d\n", + type, ret); + + kfree(payload); + return ret; +} + +int catpt_ipc_free_stream(struct catpt_dev *cdev, u8 stream_hw_id) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(FREE_STREAM); + struct catpt_ipc_msg request; + int ret; + + request.header = msg.val; + request.size = sizeof(stream_hw_id); + request.data = &stream_hw_id; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "free stream %d failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +int catpt_ipc_set_device_format(struct catpt_dev *cdev, + struct catpt_ssp_device_format *devfmt) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(SET_DEVICE_FORMATS); + struct catpt_ipc_msg request; + int ret; + + request.header = msg.val; + request.size = sizeof(*devfmt); + request.data = devfmt; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "set device format failed: %d\n", ret); + + return ret; +} + +int catpt_ipc_enter_dxstate(struct catpt_dev *cdev, enum catpt_dx_state state, + struct catpt_dx_context *context) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(ENTER_DX_STATE); + struct catpt_ipc_msg request, reply; + int ret; + + request.header = msg.val; + request.size = sizeof(state); + request.data = &state; + reply.size = sizeof(*context); + reply.data = context; + + ret = catpt_dsp_send_msg(cdev, request, &reply); + if (ret) + dev_err(cdev->dev, "enter dx state failed: %d\n", ret); + + return ret; +} + +int catpt_ipc_get_mixer_stream_info(struct catpt_dev *cdev, + struct catpt_mixer_stream_info *info) +{ + union catpt_global_msg msg = CATPT_GLOBAL_MSG(GET_MIXER_STREAM_INFO); + struct catpt_ipc_msg request = {{0}}, reply; + int ret; + + request.header = msg.val; + reply.size = sizeof(*info); + reply.data = info; + + ret = catpt_dsp_send_msg(cdev, request, &reply); + if (ret) + dev_err(cdev->dev, "get mixer info failed: %d\n", ret); + + return ret; +} + +int catpt_ipc_reset_stream(struct catpt_dev *cdev, u8 stream_hw_id) +{ + union catpt_stream_msg msg = CATPT_STREAM_MSG(RESET_STREAM); + struct catpt_ipc_msg request = {{0}}; + int ret; + + msg.stream_hw_id = stream_hw_id; + request.header = msg.val; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "reset stream %d failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +int catpt_ipc_pause_stream(struct catpt_dev *cdev, u8 stream_hw_id) +{ + union catpt_stream_msg msg = CATPT_STREAM_MSG(PAUSE_STREAM); + struct catpt_ipc_msg request = {{0}}; + int ret; + + msg.stream_hw_id = stream_hw_id; + request.header = msg.val; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "pause stream %d failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +int catpt_ipc_resume_stream(struct catpt_dev *cdev, u8 stream_hw_id) +{ + union catpt_stream_msg msg = CATPT_STREAM_MSG(RESUME_STREAM); + struct catpt_ipc_msg request = {{0}}; + int ret; + + msg.stream_hw_id = stream_hw_id; + request.header = msg.val; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "resume stream %d failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +struct catpt_set_volume_input { + u32 channel; + u32 target_volume; + u64 curve_duration; + u32 curve_type; +} __packed; + +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) +{ + union catpt_stream_msg msg = CATPT_STAGE_MSG(SET_VOLUME); + struct catpt_ipc_msg request; + struct catpt_set_volume_input input; + int ret; + + msg.stream_hw_id = stream_hw_id; + input.channel = channel; + input.target_volume = volume; + input.curve_duration = curve_duration; + input.curve_type = curve_type; + + request.header = msg.val; + request.size = sizeof(input); + request.data = &input; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "set stream %d volume failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +struct catpt_set_write_pos_input { + u32 new_write_pos; + bool end_of_buffer; + bool low_latency; +} __packed; + +int catpt_ipc_set_write_pos(struct catpt_dev *cdev, u8 stream_hw_id, + u32 pos, bool eob, bool ll) +{ + union catpt_stream_msg msg = CATPT_STAGE_MSG(SET_WRITE_POSITION); + struct catpt_ipc_msg request; + struct catpt_set_write_pos_input input; + int ret; + + msg.stream_hw_id = stream_hw_id; + input.new_write_pos = pos; + input.end_of_buffer = eob; + input.low_latency = ll; + + request.header = msg.val; + request.size = sizeof(input); + request.data = &input; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "set stream %d write pos failed: %d\n", + stream_hw_id, ret); + + return ret; +} + +int catpt_ipc_mute_loopback(struct catpt_dev *cdev, u8 stream_hw_id, bool mute) +{ + union catpt_stream_msg msg = CATPT_STAGE_MSG(MUTE_LOOPBACK); + struct catpt_ipc_msg request; + int ret; + + msg.stream_hw_id = stream_hw_id; + request.header = msg.val; + request.size = sizeof(mute); + request.data = &mute; + + ret = catpt_dsp_send_msg(cdev, request, NULL); + if (ret) + dev_err(cdev->dev, "mute loopback failed: %d\n", ret); + + return ret; +}
Declare global and stream IPC message handlers for all known message types. Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> --- sound/soc/intel/catpt/core.h | 2 + sound/soc/intel/catpt/dsp.c | 106 +++++++++++ sound/soc/intel/catpt/ipc.c | 4 + sound/soc/intel/catpt/messages.c | 313 +++++++++++++++++++++++++++++++ 4 files changed, 425 insertions(+) create mode 100644 sound/soc/intel/catpt/messages.c