Message ID | 20210714153039.28373-13-srinivas.kandagatla@linaro.org (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | ASoC: qcom: Add AudioReach support | expand |
> +static int q6prm_send_cmd_sync(struct q6prm *prm, struct gpr_pkt *pkt, > + uint32_t rsp_opcode) > +{ > + gpr_device_t *gdev = prm->gdev; > + struct gpr_hdr *hdr = &pkt->hdr; > + int rc; > + > + mutex_lock(&prm->lock); > + prm->result.opcode = 0; > + prm->result.status = 0; > + > + rc = gpr_send_pkt(prm->gdev, pkt); > + if (rc < 0) > + goto err; > + > + if (rsp_opcode) > + rc = wait_event_timeout(prm->wait, > + (prm->result.opcode == hdr->opcode) || > + (prm->result.opcode == rsp_opcode), > + 5 * HZ); > + else > + rc = wait_event_timeout(prm->wait, > + (prm->result.opcode == hdr->opcode), > + 5 * HZ); > + > + if (!rc) { > + dev_err(&gdev->dev, "CMD timeout for [%x] opcode\n", > + hdr->opcode); > + rc = -ETIMEDOUT; > + } else if (prm->result.status > 0) { > + dev_err(&gdev->dev, "DSP returned error[%x] %x\n", hdr->opcode, > + prm->result.status); > + rc = -EINVAL; > + } else { > + dev_err(&gdev->dev, "DSP returned [%x]\n", > + prm->result.status); > + rc = 0; > + } > + > +err: > + mutex_unlock(&prm->lock); > + return rc; > +} In patch7 you had more or less the same code. can a helper be used? +int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, + struct gpr_pkt *pkt, uint32_t rsp_opcode) +{ + + struct device *dev = graph->dev; + struct gpr_hdr *hdr = &pkt->hdr; + int rc; + + mutex_lock(&graph->cmd_lock); + graph->result.opcode = 0; + graph->result.status = 0; + + rc = gpr_send_port_pkt(graph->port, pkt); + if (rc < 0) + goto err; + + if (rsp_opcode) + rc = wait_event_timeout(graph->cmd_wait, + (graph->result.opcode == hdr->opcode) || + (graph->result.opcode == rsp_opcode), + 5 * HZ); + else + rc = wait_event_timeout(graph->cmd_wait, + (graph->result.opcode == hdr->opcode), + 5 * HZ); + + if (!rc) { + dev_err(dev, "CMD timeout for [%x] opcode\n", hdr->opcode); + rc = -ETIMEDOUT; + } else if (graph->result.status > 0) { + dev_err(dev, "DSP returned error[%x] %x\n", hdr->opcode, + graph->result.status); + rc = -EINVAL; + } else { + dev_err(dev, "DSP returned [%x]\n", graph->result.status); + rc = 0; + } + +err: + mutex_unlock(&graph->cmd_lock); + return rc; +} +EXPORT_SYMBOL_GPL(audioreach_graph_send_cmd_sync); > +static int q6prm_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool enable) > +{ > + struct prm_cmd_request_hw_core *req; > + struct apm_module_param_data *param_data; > + struct gpr_pkt *pkt; > + struct q6prm *prm = dev_get_drvdata(dev); > + gpr_device_t *gdev = prm->gdev; > + void *p; > + int rc = 0; > + uint32_t opcode, rsp_opcode; > + > + if (enable) { > + opcode = PRM_CMD_REQUEST_HW_RSC; > + rsp_opcode = PRM_CMD_RSP_REQUEST_HW_RSC; > + } else { > + opcode = PRM_CMD_RELEASE_HW_RSC; > + rsp_opcode = PRM_CMD_RSP_RELEASE_HW_RSC; > + } > + > + p = audioreach_alloc_cmd_pkt(sizeof(*req), opcode, 0, gdev->svc.id, > + GPR_PRM_MODULE_IID); > + if (IS_ERR(p)) > + return -ENOMEM; > + > + pkt = p; > + req = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; > + > + param_data = &req->param_data; > + > + param_data->module_instance_id = GPR_PRM_MODULE_IID; > + param_data->error_code = 0; > + param_data->param_id = PARAM_ID_RSC_HW_CORE; > + param_data->param_size = sizeof(*req) - APM_MODULE_PARAM_DATA_SIZE; > + > + req->hw_clk_id = hw_block_id; > + > + q6prm_send_cmd_sync(prm, pkt, rsp_opcode); > + > + kfree(pkt); > + > + return rc; rc is not assigned, should this not trap the result of sending a command? > +} > + > +static int q6prm_set_lpass_clock(struct device *dev, int clk_id, int clk_attr, > + int clk_root, unsigned int freq) > +{ > + struct prm_cmd_request_rsc *req; > + struct apm_module_param_data *param_data; > + struct gpr_pkt *pkt; > + struct q6prm *prm = dev_get_drvdata(dev); > + gpr_device_t *gdev = prm->gdev; > + void *p; > + int rc = 0; > + > + p = audioreach_alloc_cmd_pkt(sizeof(*req), PRM_CMD_REQUEST_HW_RSC, > + 0, gdev->svc.id, GPR_PRM_MODULE_IID); > + if (IS_ERR(p)) > + return -ENOMEM; > + > + pkt = p; > + req = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; > + > + param_data = &req->param_data; > + > + param_data->module_instance_id = GPR_PRM_MODULE_IID; > + param_data->error_code = 0; > + param_data->param_id = PARAM_ID_RSC_AUDIO_HW_CLK; > + param_data->param_size = sizeof(*req) - APM_MODULE_PARAM_DATA_SIZE; > + > + req->num_clk_id = 1; > + req->clock_ids[0].clock_id = clk_id; > + req->clock_ids[0].clock_freq = freq; > + req->clock_ids[0].clock_attri = clk_attr; > + req->clock_ids[0].clock_root = clk_root; > + > + q6prm_send_cmd_sync(prm, pkt, PRM_CMD_RSP_REQUEST_HW_RSC); rc = q6prm_send_cmd_sync(prm, pkt, PRM_CMD_RSP_REQUEST_HW_RSC); ? > + > + kfree(pkt); > + > + return rc; > +} > +
Hi Srinivas, I love your patch! Yet something to improve: [auto build test ERROR on asoc/for-next] [also build test ERROR on robh/for-next sound/for-next linus/master v5.14-rc1 next-20210715] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Srinivas-Kandagatla/ASoC-qcom-Add-AudioReach-support/20210714-233339 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gcc (GCC) 9.3.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/35523398d3578485b21933796d33e6e65aa988d9 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Srinivas-Kandagatla/ASoC-qcom-Add-AudioReach-support/20210714-233339 git checkout 35523398d3578485b21933796d33e6e65aa988d9 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sh If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>, old ones prefixed by <<): >> ERROR: modpost: "of_clk_add_hw_provider" [sound/soc/qcom/audioreach/snd-prm.ko] undefined! ERROR: modpost: "audioreach_alloc_cmd_pkt" [sound/soc/qcom/audioreach/snd-prm.ko] undefined! >> ERROR: modpost: "devm_clk_hw_register" [sound/soc/qcom/audioreach/snd-prm.ko] undefined! ERROR: modpost: "q6apm_graph_stop" [sound/soc/qcom/audioreach/snd-apm-bedai.ko] undefined! ERROR: modpost: "q6apm_graph_close" [sound/soc/qcom/audioreach/snd-apm-bedai.ko] undefined! ERROR: modpost: "q6apm_graph_start" [sound/soc/qcom/audioreach/snd-apm-bedai.ko] undefined! ERROR: modpost: "q6apm_graph_open" [sound/soc/qcom/audioreach/snd-apm-bedai.ko] undefined! ERROR: modpost: "q6apm_graph_prepare" [sound/soc/qcom/audioreach/snd-apm-bedai.ko] undefined! ERROR: modpost: "q6apm_graph_stop" [sound/soc/qcom/audioreach/snd-apm-dai.ko] undefined! ERROR: modpost: "q6apm_graph_close" [sound/soc/qcom/audioreach/snd-apm-dai.ko] undefined! WARNING: modpost: suppressed 6 unresolved symbol warnings because there were too many) --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
On 14/07/2021 18:09, Pierre-Louis Bossart wrote: > > > >> +static int q6prm_send_cmd_sync(struct q6prm *prm, struct gpr_pkt *pkt, >> + uint32_t rsp_opcode) >> +{ >> + gpr_device_t *gdev = prm->gdev; >> + struct gpr_hdr *hdr = &pkt->hdr; >> + int rc; >> + >> + mutex_lock(&prm->lock); >> + prm->result.opcode = 0; >> + prm->result.status = 0; >> + >> + rc = gpr_send_pkt(prm->gdev, pkt); >> + if (rc < 0) >> + goto err; >> + >> + if (rsp_opcode) >> + rc = wait_event_timeout(prm->wait, >> + (prm->result.opcode == hdr->opcode) || >> + (prm->result.opcode == rsp_opcode), >> + 5 * HZ); >> + else >> + rc = wait_event_timeout(prm->wait, >> + (prm->result.opcode == hdr->opcode), >> + 5 * HZ); >> + >> + if (!rc) { >> + dev_err(&gdev->dev, "CMD timeout for [%x] opcode\n", >> + hdr->opcode); >> + rc = -ETIMEDOUT; >> + } else if (prm->result.status > 0) { >> + dev_err(&gdev->dev, "DSP returned error[%x] %x\n", hdr->opcode, >> + prm->result.status); >> + rc = -EINVAL; >> + } else { >> + dev_err(&gdev->dev, "DSP returned [%x]\n", >> + prm->result.status); >> + rc = 0; >> + } >> + >> +err: >> + mutex_unlock(&prm->lock); >> + return rc; >> +} > > In patch7 you had more or less the same code. can a helper be used? Its possible, will abstract this out in audioreach.c. > > +int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, > + struct gpr_pkt *pkt, uint32_t rsp_opcode) > +{ > + > + struct device *dev = graph->dev; > + struct gpr_hdr *hdr = &pkt->hdr; > + int rc; > + > + mutex_lock(&graph->cmd_lock); > + graph->result.opcode = 0; > + graph->result.status = 0; > + > + rc = gpr_send_port_pkt(graph->port, pkt); > + if (rc < 0) > + goto err; > + > + if (rsp_opcode) > + rc = wait_event_timeout(graph->cmd_wait, > + (graph->result.opcode == hdr->opcode) || > + (graph->result.opcode == rsp_opcode), > + 5 * HZ); > + else > + rc = wait_event_timeout(graph->cmd_wait, > + (graph->result.opcode == hdr->opcode), > + 5 * HZ); > + > + if (!rc) { > + dev_err(dev, "CMD timeout for [%x] opcode\n", hdr->opcode); > + rc = -ETIMEDOUT; > + } else if (graph->result.status > 0) { > + dev_err(dev, "DSP returned error[%x] %x\n", hdr->opcode, > + graph->result.status); > + rc = -EINVAL; > + } else { > + dev_err(dev, "DSP returned [%x]\n", graph->result.status); > + rc = 0; > + } > + > +err: > + mutex_unlock(&graph->cmd_lock); > + return rc; > +} > +EXPORT_SYMBOL_GPL(audioreach_graph_send_cmd_sync); > > >> +static int q6prm_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool enable) >> +{ >> + struct prm_cmd_request_hw_core *req; >> + struct apm_module_param_data *param_data; >> + struct gpr_pkt *pkt; >> + struct q6prm *prm = dev_get_drvdata(dev); >> + gpr_device_t *gdev = prm->gdev; >> + void *p; >> + int rc = 0; >> + uint32_t opcode, rsp_opcode; >> + >> + if (enable) { >> + opcode = PRM_CMD_REQUEST_HW_RSC; >> + rsp_opcode = PRM_CMD_RSP_REQUEST_HW_RSC; >> + } else { >> + opcode = PRM_CMD_RELEASE_HW_RSC; >> + rsp_opcode = PRM_CMD_RSP_RELEASE_HW_RSC; >> + } >> + >> + p = audioreach_alloc_cmd_pkt(sizeof(*req), opcode, 0, gdev->svc.id, >> + GPR_PRM_MODULE_IID); >> + if (IS_ERR(p)) >> + return -ENOMEM; >> + >> + pkt = p; >> + req = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; >> + >> + param_data = &req->param_data; >> + >> + param_data->module_instance_id = GPR_PRM_MODULE_IID; >> + param_data->error_code = 0; >> + param_data->param_id = PARAM_ID_RSC_HW_CORE; >> + param_data->param_size = sizeof(*req) - APM_MODULE_PARAM_DATA_SIZE; >> + >> + req->hw_clk_id = hw_block_id; >> + >> + q6prm_send_cmd_sync(prm, pkt, rsp_opcode); >> + >> + kfree(pkt); >> + >> + return rc; > > rc is not assigned, should this not trap the result of sending a command? My bad! will fix such instances. --srini
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig index eb4446206710..5f7d7d956355 100644 --- a/sound/soc/qcom/Kconfig +++ b/sound/soc/qcom/Kconfig @@ -109,12 +109,16 @@ config SND_SOC_QCOM_APM_DAI config SND_SOC_QCOM_APM_BEDAI tristate +config SND_SOC_QCOM_PRM + tristate + config SND_SOC_QCOM_AUDIOREACH tristate "SoC ALSA audio drives for Qualcomm AUDIOREACH" depends on QCOM_GPR select SND_SOC_TOPOLOGY select SND_SOC_QCOM_APM_DAI select SND_SOC_QCOM_APM_BEDAI + select SND_SOC_QCOM_PRM help Support for AudioReach in QDSP diff --git a/sound/soc/qcom/audioreach/Makefile b/sound/soc/qcom/audioreach/Makefile index e8651455b206..d9904201ccf0 100644 --- a/sound/soc/qcom/audioreach/Makefile +++ b/sound/soc/qcom/audioreach/Makefile @@ -2,9 +2,11 @@ snd-ar-objs := audioreach.o q6apm.o topology.o snd-apm-dai-objs := q6apm-dai.o snd-apm-bedai-objs := q6apm-bedai.o +snd-prm-objs := q6prm.o obj-$(CONFIG_SND_SOC_QCOM_AUDIOREACH) += snd-ar.o obj-$(CONFIG_SND_SOC_QCOM_APM_DAI) += snd-apm-dai.o obj-$(CONFIG_SND_SOC_QCOM_APM_BEDAI) += snd-apm-bedai.o +obj-$(CONFIG_SND_SOC_QCOM_PRM) += snd-prm.o diff --git a/sound/soc/qcom/audioreach/q6prm.c b/sound/soc/qcom/audioreach/q6prm.c new file mode 100644 index 000000000000..2cadb7b28a1c --- /dev/null +++ b/sound/soc/qcom/audioreach/q6prm.c @@ -0,0 +1,414 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2021, Linaro Limited + +#include <linux/slab.h> +#include <linux/wait.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/delay.h> +#include <linux/of_platform.h> +#include <linux/clk-provider.h> +#include <linux/jiffies.h> +#include <linux/soc/qcom/apr.h> +#include <dt-bindings/soc/qcom,gpr.h> +#include <dt-bindings/sound/qcom,q6apm.h> +#include "audioreach.h" + +#define Q6PRM_MAX_CLK_ID 104 + +#define Q6PRM_CLK(id) &(struct q6prm_clk) { \ + .clk_id = id, \ + .afe_clk_id = Q6PRM_##id, \ + .name = #id, \ + .attributes = LPASS_CLK_ATTRIBUTE_COUPLE_NO, \ + .rate = 19200000, \ + .hw.init = &(struct clk_init_data) { \ + .ops = &clk_q6prm_ops, \ + .name = #id, \ + }, \ + } + +#define Q6PRM_VOTE_CLK(id, blkid) &(struct q6prm_clk) { \ + .clk_id = id, \ + .afe_clk_id = blkid, \ + .hw.init = &(struct clk_init_data) { \ + .ops = &clk_vote_q6prm_ops, \ + .name = #id, \ + }, \ + } + +struct q6prm_clk { + struct device *dev; + int clk_id; + int afe_clk_id; + char *name; + int attributes; + int rate; + uint32_t handle; + struct clk_hw hw; +}; +#define to_q6prm_clk(_hw) container_of(_hw, struct q6prm_clk, hw) + +struct q6prm { + struct device *dev; + gpr_device_t *gdev; + wait_queue_head_t wait; + struct gpr_ibasic_rsp_result_t result; + struct mutex lock; + struct q6prm_clk **clks; + int num_clks; +}; + +#define PRM_CMD_REQUEST_HW_RSC 0x0100100F +#define PRM_CMD_RSP_REQUEST_HW_RSC 0x02001002 +#define PRM_CMD_RELEASE_HW_RSC 0x01001010 +#define PRM_CMD_RSP_RELEASE_HW_RSC 0x02001003 + +#define PARAM_ID_RSC_HW_CORE 0x08001032 +#define PARAM_ID_RSC_LPASS_CORE 0x0800102B +#define PARAM_ID_RSC_AUDIO_HW_CLK 0x0800102C + +#define Q6PRM_LPASS_CLK_ID_WSA_CORE_MCLK 0x305 +#define Q6PRM_LPASS_CLK_ID_WSA_CORE_NPL_MCLK 0x306 + +#define Q6PRM_LPASS_CLK_ID_VA_CORE_MCLK 0x307 +#define Q6PRM_LPASS_CLK_ID_VA_CORE_2X_MCLK 0x308 + +#define Q6PRM_LPASS_CLK_ID_TX_CORE_MCLK 0x30c +#define Q6PRM_LPASS_CLK_ID_TX_CORE_NPL_MCLK 0x30d + +#define Q6PRM_LPASS_CLK_ID_RX_CORE_MCLK 0x30e +#define Q6PRM_LPASS_CLK_ID_RX_CORE_NPL_MCLK 0x30f + +#define Q6PRM_LPASS_CLK_SRC_INTERNAL 1 +#define Q6PRM_LPASS_CLK_ROOT_DEFAULT 0 +#define Q6PRM_HW_CORE_ID_LPASS 1 +#define Q6PRM_HW_CORE_ID_DCODEC 2 + +struct prm_cmd_request_hw_core { + struct apm_module_param_data param_data; + uint32_t hw_clk_id; +} __packed; + +struct prm_cmd_request_rsc { + struct apm_module_param_data param_data; + uint32_t num_clk_id; + struct audio_hw_clk_cfg clock_ids[1]; +} __packed; + +struct prm_cmd_release_rsc { + struct apm_module_param_data param_data; + uint32_t num_clk_id; + struct audio_hw_clk_cfg clock_ids[1]; +} __packed; + +static int q6prm_send_cmd_sync(struct q6prm *prm, struct gpr_pkt *pkt, + uint32_t rsp_opcode) +{ + gpr_device_t *gdev = prm->gdev; + struct gpr_hdr *hdr = &pkt->hdr; + int rc; + + mutex_lock(&prm->lock); + prm->result.opcode = 0; + prm->result.status = 0; + + rc = gpr_send_pkt(prm->gdev, pkt); + if (rc < 0) + goto err; + + if (rsp_opcode) + rc = wait_event_timeout(prm->wait, + (prm->result.opcode == hdr->opcode) || + (prm->result.opcode == rsp_opcode), + 5 * HZ); + else + rc = wait_event_timeout(prm->wait, + (prm->result.opcode == hdr->opcode), + 5 * HZ); + + if (!rc) { + dev_err(&gdev->dev, "CMD timeout for [%x] opcode\n", + hdr->opcode); + rc = -ETIMEDOUT; + } else if (prm->result.status > 0) { + dev_err(&gdev->dev, "DSP returned error[%x] %x\n", hdr->opcode, + prm->result.status); + rc = -EINVAL; + } else { + dev_err(&gdev->dev, "DSP returned [%x]\n", + prm->result.status); + rc = 0; + } + +err: + mutex_unlock(&prm->lock); + return rc; +} + +static int q6prm_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool enable) +{ + struct prm_cmd_request_hw_core *req; + struct apm_module_param_data *param_data; + struct gpr_pkt *pkt; + struct q6prm *prm = dev_get_drvdata(dev); + gpr_device_t *gdev = prm->gdev; + void *p; + int rc = 0; + uint32_t opcode, rsp_opcode; + + if (enable) { + opcode = PRM_CMD_REQUEST_HW_RSC; + rsp_opcode = PRM_CMD_RSP_REQUEST_HW_RSC; + } else { + opcode = PRM_CMD_RELEASE_HW_RSC; + rsp_opcode = PRM_CMD_RSP_RELEASE_HW_RSC; + } + + p = audioreach_alloc_cmd_pkt(sizeof(*req), opcode, 0, gdev->svc.id, + GPR_PRM_MODULE_IID); + if (IS_ERR(p)) + return -ENOMEM; + + pkt = p; + req = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; + + param_data = &req->param_data; + + param_data->module_instance_id = GPR_PRM_MODULE_IID; + param_data->error_code = 0; + param_data->param_id = PARAM_ID_RSC_HW_CORE; + param_data->param_size = sizeof(*req) - APM_MODULE_PARAM_DATA_SIZE; + + req->hw_clk_id = hw_block_id; + + q6prm_send_cmd_sync(prm, pkt, rsp_opcode); + + kfree(pkt); + + return rc; +} + +static int q6prm_set_lpass_clock(struct device *dev, int clk_id, int clk_attr, + int clk_root, unsigned int freq) +{ + struct prm_cmd_request_rsc *req; + struct apm_module_param_data *param_data; + struct gpr_pkt *pkt; + struct q6prm *prm = dev_get_drvdata(dev); + gpr_device_t *gdev = prm->gdev; + void *p; + int rc = 0; + + p = audioreach_alloc_cmd_pkt(sizeof(*req), PRM_CMD_REQUEST_HW_RSC, + 0, gdev->svc.id, GPR_PRM_MODULE_IID); + if (IS_ERR(p)) + return -ENOMEM; + + pkt = p; + req = p + GPR_HDR_SIZE + APM_CMD_HDR_SIZE; + + param_data = &req->param_data; + + param_data->module_instance_id = GPR_PRM_MODULE_IID; + param_data->error_code = 0; + param_data->param_id = PARAM_ID_RSC_AUDIO_HW_CLK; + param_data->param_size = sizeof(*req) - APM_MODULE_PARAM_DATA_SIZE; + + req->num_clk_id = 1; + req->clock_ids[0].clock_id = clk_id; + req->clock_ids[0].clock_freq = freq; + req->clock_ids[0].clock_attri = clk_attr; + req->clock_ids[0].clock_root = clk_root; + + q6prm_send_cmd_sync(prm, pkt, PRM_CMD_RSP_REQUEST_HW_RSC); + + kfree(pkt); + + return rc; +} + +static int prm_callback(struct gpr_resp_pkt *data, void *priv, int op) +{ + gpr_device_t *gdev = priv; + struct q6prm *prm = dev_get_drvdata(&gdev->dev); + struct gpr_ibasic_rsp_result_t *result; + struct gpr_hdr *hdr = &data->hdr; + + result = data->payload; + + switch (hdr->opcode) { + case PRM_CMD_RSP_REQUEST_HW_RSC: + case PRM_CMD_RSP_RELEASE_HW_RSC: + prm->result.opcode = hdr->opcode; + prm->result.status = result->status; + wake_up(&prm->wait); + break; + default: + break; + } + + return 0; +} + +static int clk_q6prm_prepare(struct clk_hw *hw) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + return q6prm_set_lpass_clock(clk->dev, clk->afe_clk_id, clk->attributes, + Q6PRM_LPASS_CLK_ROOT_DEFAULT, clk->rate); +} + +static void clk_q6prm_unprepare(struct clk_hw *hw) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + q6prm_set_lpass_clock(clk->dev, clk->afe_clk_id, clk->attributes, + Q6PRM_LPASS_CLK_ROOT_DEFAULT, 0); +} + +static int clk_q6prm_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + clk->rate = rate; + + return 0; +} + +static unsigned long clk_q6prm_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + return clk->rate; +} + +static long clk_q6prm_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *parent_rate) +{ + return rate; +} + +static const struct clk_ops clk_q6prm_ops = { + .prepare = clk_q6prm_prepare, + .unprepare = clk_q6prm_unprepare, + .set_rate = clk_q6prm_set_rate, + .round_rate = clk_q6prm_round_rate, + .recalc_rate = clk_q6prm_recalc_rate, +}; + +static int clk_vote_q6prm_block(struct clk_hw *hw) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + return q6prm_set_hw_core_req(clk->dev, clk->afe_clk_id, true); +} + +static void clk_unvote_q6prm_block(struct clk_hw *hw) +{ + struct q6prm_clk *clk = to_q6prm_clk(hw); + + q6prm_set_hw_core_req(clk->dev, clk->afe_clk_id, false); +} + +static const struct clk_ops clk_vote_q6prm_ops = { + .prepare = clk_vote_q6prm_block, + .unprepare = clk_unvote_q6prm_block, +}; + +static struct q6prm_clk *q6prm_clks[Q6PRM_MAX_CLK_ID] = { + [LPASS_CLK_ID_WSA_CORE_MCLK] = Q6PRM_CLK(LPASS_CLK_ID_WSA_CORE_MCLK), + [LPASS_CLK_ID_WSA_CORE_NPL_MCLK] = + Q6PRM_CLK(LPASS_CLK_ID_WSA_CORE_NPL_MCLK), + [LPASS_CLK_ID_VA_CORE_MCLK] = Q6PRM_CLK(LPASS_CLK_ID_VA_CORE_MCLK), + [LPASS_CLK_ID_TX_CORE_MCLK] = Q6PRM_CLK(LPASS_CLK_ID_TX_CORE_MCLK), + [LPASS_CLK_ID_TX_CORE_NPL_MCLK] = + Q6PRM_CLK(LPASS_CLK_ID_TX_CORE_NPL_MCLK), + [LPASS_CLK_ID_RX_CORE_MCLK] = Q6PRM_CLK(LPASS_CLK_ID_RX_CORE_MCLK), + [LPASS_CLK_ID_RX_CORE_NPL_MCLK] = + Q6PRM_CLK(LPASS_CLK_ID_RX_CORE_NPL_MCLK), + [LPASS_CLK_ID_VA_CORE_2X_MCLK] = + Q6PRM_CLK(LPASS_CLK_ID_VA_CORE_2X_MCLK), + [LPASS_HW_MACRO_VOTE] = Q6PRM_VOTE_CLK(LPASS_HW_MACRO_VOTE, + Q6PRM_HW_CORE_ID_LPASS), + [LPASS_HW_DCODEC_VOTE] = Q6PRM_VOTE_CLK(LPASS_HW_DCODEC_VOTE, + Q6PRM_HW_CORE_ID_DCODEC), +}; + +static struct clk_hw *q6prm_of_clk_hw_get(struct of_phandle_args *clkspec, + void *data) +{ + struct q6prm *cc = data; + unsigned int idx = clkspec->args[0]; + unsigned int attr = clkspec->args[1]; + + if (idx >= cc->num_clks || attr > LPASS_CLK_ATTRIBUTE_COUPLE_DIVISOR) { + dev_err(cc->dev, "Invalid clk specifier (%d, %d)\n", idx, attr); + return ERR_PTR(-EINVAL); + } + + if (cc->clks[idx]) { + cc->clks[idx]->attributes = attr; + return &cc->clks[idx]->hw; + } + + return ERR_PTR(-ENOENT); +} + +static int prm_probe(gpr_device_t *gdev) +{ + struct device *dev = &gdev->dev; + struct q6prm *cc; + int i, ret; + + cc = devm_kzalloc(dev, sizeof(*cc), GFP_KERNEL); + if (!cc) + return -ENOMEM; + + cc->dev = dev; + cc->gdev = gdev; + mutex_init(&cc->lock); + init_waitqueue_head(&cc->wait); + cc->clks = &q6prm_clks[0]; + cc->num_clks = ARRAY_SIZE(q6prm_clks); + for (i = 0; i < ARRAY_SIZE(q6prm_clks); i++) { + if (!q6prm_clks[i]) + continue; + + q6prm_clks[i]->dev = dev; + + ret = devm_clk_hw_register(dev, &q6prm_clks[i]->hw); + if (ret) + return ret; + } + + ret = of_clk_add_hw_provider(dev->of_node, q6prm_of_clk_hw_get, cc); + if (ret) + return ret; + + dev_set_drvdata(dev, cc); + + return 0; +} + +static const struct of_device_id prm_device_id[] = { + { .compatible = "qcom,q6prm" }, + {}, +}; +MODULE_DEVICE_TABLE(of, prm_device_id); + +static gpr_driver_t prm_driver = { + .probe = prm_probe, + .gpr_callback = prm_callback, + .driver = { + .name = "qcom-prm", + .of_match_table = of_match_ptr(prm_device_id), + }, +}; + +module_gpr_driver(prm_driver); +MODULE_DESCRIPTION("Audio Process Manager"); +MODULE_LICENSE("GPL v2");
Add support to q6prm (Proxy Resource Manager) module used for clock resources Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- sound/soc/qcom/Kconfig | 4 + sound/soc/qcom/audioreach/Makefile | 2 + sound/soc/qcom/audioreach/q6prm.c | 414 +++++++++++++++++++++++++++++ 3 files changed, 420 insertions(+) create mode 100644 sound/soc/qcom/audioreach/q6prm.c