Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions audioreach-driver/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.*.cmd
.*.d

*.o
Module.symvers
modules.order

audioreach_driver.ko
audioreach_driver.mod
audioreach_driver.mod.c
10 changes: 5 additions & 5 deletions audioreach-driver/audioreach_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <sound/jack.h>
#include <linux/input-event-codes.h>
#include <sound/simple_card_utils.h>
#include "qdsp6/q6afe.h"
#include "q6afe.h"
#include "sdw.h"
#include "q6prm_audioreach.h"

Expand Down Expand Up @@ -64,7 +64,7 @@ static struct snd_soc_jack_pin qcs6490_headset_jack_pins[] = {
};


int qcs6490_snd_dp_jack_setup(struct snd_soc_pcm_runtime *rtd,
static int qcs6490_snd_dp_jack_setup(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_jack *dp_jack, int dp_pcm_id)
{
struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
Expand All @@ -88,7 +88,7 @@ int qcs6490_snd_dp_jack_setup(struct snd_soc_pcm_runtime *rtd,
return 0;
}

int qcs6490_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
static int qcs6490_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_jack *jack, bool *jack_setup)
{
struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
Expand Down Expand Up @@ -142,7 +142,7 @@ int qcs6490_snd_wcd_jack_setup(struct snd_soc_pcm_runtime *rtd,
}


void audioreach_get_link_name(const char **link_name, int dai_id)
static void audioreach_get_link_name(const char **link_name, int dai_id)
{
switch (dai_id) {
case WSA_CODEC_DMA_RX_0:
Expand Down Expand Up @@ -201,7 +201,7 @@ void audioreach_get_link_name(const char **link_name, int dai_id)
}
}

int qcs6490_snd_parse_of(struct snd_soc_card *card)
static int qcs6490_snd_parse_of(struct snd_soc_card *card)
{
struct device_node *np;
struct device_node *codec = NULL;
Expand Down
23 changes: 4 additions & 19 deletions audioreach-driver/q6apm_audio_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,19 +362,8 @@ static int msm_audio_mem_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
return rc;
}

void msm_audio_fd_list_debug(void)
{
struct msm_audio_fd_data *msm_audio_fd_data = NULL;

list_for_each_entry(msm_audio_fd_data,
&msm_audio_mem_fd_list.fd_list, list) {
pr_debug("%s fd %d handle %pK phy. addr %pK\n", __func__,
msm_audio_fd_data->fd, msm_audio_fd_data->handle,
(void *)msm_audio_fd_data->paddr);
}
}

void msm_audio_update_fd_list(struct msm_audio_fd_data *msm_audio_fd_data)
static void msm_audio_update_fd_list(struct msm_audio_fd_data *msm_audio_fd_data)
{
struct msm_audio_fd_data *msm_audio_fd_data1 = NULL;

Expand All @@ -392,7 +381,7 @@ void msm_audio_update_fd_list(struct msm_audio_fd_data *msm_audio_fd_data)
mutex_unlock(&(msm_audio_mem_fd_list.list_mutex));
}

void msm_audio_delete_fd_entry(void *handle)
static void msm_audio_delete_fd_entry(void *handle)
{
struct msm_audio_fd_data *msm_audio_fd_data = NULL;
struct list_head *ptr, *next;
Expand Down Expand Up @@ -439,9 +428,8 @@ int msm_audio_get_phy_addr(int fd, dma_addr_t *paddr, size_t *pa_len)
mutex_unlock(&(msm_audio_mem_fd_list.list_mutex));
return status;
}
EXPORT_SYMBOL_GPL(msm_audio_get_phy_addr);

int msm_audio_set_hyp_assign(int fd, bool assign)
static int msm_audio_set_hyp_assign(int fd, bool assign)
{
struct msm_audio_fd_data *msm_audio_fd_data = NULL;
int status = -EINVAL;
Expand All @@ -461,7 +449,7 @@ int msm_audio_set_hyp_assign(int fd, bool assign)
return status;
}

void msm_audio_get_handle(int fd, void **handle)
static void msm_audio_get_handle(int fd, void **handle)
{
struct msm_audio_fd_data *msm_audio_fd_data = NULL;

Expand Down Expand Up @@ -614,7 +602,6 @@ void msm_audio_mem_crash_handler(void)
}
mutex_unlock(&(msm_audio_mem_fd_list.list_mutex));
}
EXPORT_SYMBOL_GPL(msm_audio_mem_crash_handler);

static int msm_audio_mem_open(struct inode *inode, struct file *file)
{
Expand Down Expand Up @@ -805,8 +792,6 @@ static int q6apm_audio_mem_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct of_phandle_args iommuspec;
bool smmu_enabled = true;
const char *msm_audio_mem_dt = "qcom,smmu-enabled";
const char *msm_audio_mem_smmu_sid_mask = "qcom,smmu-sid-mask";
struct msm_audio_mem_private *msm_audio_mem_data = NULL;

if (dev->of_node == NULL) {
Expand Down
25 changes: 9 additions & 16 deletions audioreach-driver/q6apm_audio_pkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#define APM_CMD_SHARED_MEM_MAP_REGIONS 0x0100100C
#define APM_MEMORY_MAP_BIT_MASK_IS_OFFSET_MODE 0x00000004UL

static bool audio_pkt_probed;
/* Define Logging Macros */
static int audio_pkt_debug_mask;
enum {
Expand Down Expand Up @@ -180,7 +179,7 @@ static int fifo_pop(struct port_backup *backup)
return 0;
}

int q6apm_send_audio_cmd_sync(struct device *dev, gpr_device_t *gdev,
static int q6apm_send_audio_cmd_sync(struct device *dev, gpr_device_t *gdev,
struct gpr_ibasic_rsp_result_t *result, struct mutex *cmd_lock,
gpr_port_t *port, wait_queue_head_t *cmd_wait,
struct gpr_pkt *pkt, uint32_t rsp_opcode)
Expand Down Expand Up @@ -227,17 +226,15 @@ int q6apm_send_audio_cmd_sync(struct device *dev, gpr_device_t *gdev,
mutex_unlock(cmd_lock);
return rc;
}
EXPORT_SYMBOL_GPL(q6apm_send_audio_cmd_sync);


int q6apm_audio_send_cmd(struct q6apm_audio_pkt *apm, struct gpr_pkt *pkt, uint32_t rsp_opcode)
static int q6apm_audio_send_cmd(struct q6apm_audio_pkt *apm, struct gpr_pkt *pkt, uint32_t rsp_opcode)
{
gpr_device_t *gdev = apm->adev;

return q6apm_send_audio_cmd_sync(&gdev->dev, gdev, &apm->result, &apm->lock,
NULL, &apm->readq, pkt, rsp_opcode);
}
EXPORT_SYMBOL_GPL(q6apm_audio_send_cmd);

static void *__q6apm_audio_alloc_pkt(int payload_size, uint32_t opcode, uint32_t token,
uint32_t src_port, uint32_t dest_port, bool has_cmd_hdr)
Expand Down Expand Up @@ -276,12 +273,11 @@ static void *__q6apm_audio_alloc_pkt(int payload_size, uint32_t opcode, uint32_t
return pkt;
}

void *q6apm_audio_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token)
static void *q6apm_audio_alloc_apm_cmd_pkt(int pkt_size, uint32_t opcode, uint32_t token)
{
return __q6apm_audio_alloc_pkt(pkt_size, opcode, token, GPR_APM_MODULE_IID,
APM_MODULE_INSTANCE_ID, true);
}
EXPORT_SYMBOL_GPL(q6apm_audio_alloc_apm_cmd_pkt);

static int q6apm_audio_get_apm_state(struct q6apm_audio_pkt *apm)
{
Expand All @@ -305,9 +301,8 @@ bool q6apm_audio_is_adsp_ready(void)

return false;
}
EXPORT_SYMBOL_GPL(q6apm_audio_is_adsp_ready);

void q6apm_audio_close_all(void)
static void q6apm_audio_close_all(void)
{
struct gpr_pkt *pkt;

Expand All @@ -319,9 +314,8 @@ void q6apm_audio_close_all(void)

kfree(pkt);
}
EXPORT_SYMBOL_GPL(q6apm_audio_close_all);

int audio_pkt_open(struct inode *inode, struct file *file)
static int audio_pkt_open(struct inode *inode, struct file *file)
{
struct q6apm_audio_pkt *audpkt_dev = cdev_to_audpkt_dev(inode->i_cdev);
struct device *dev = audpkt_dev->dev;
Expand All @@ -343,7 +337,7 @@ int audio_pkt_open(struct inode *inode, struct file *file)
* userspace client do a close() system call. All input arguments are
* validated by the virtual file system before calling this function.
*/
int audio_pkt_release(struct inode *inode, struct file *file)
static int audio_pkt_release(struct inode *inode, struct file *file)
{
struct q6apm_audio_pkt *audpkt_dev = cdev_to_audpkt_dev(inode->i_cdev);
struct device *dev = audpkt_dev->dev;
Expand Down Expand Up @@ -379,7 +373,7 @@ int audio_pkt_release(struct inode *inode, struct file *file)
* userspace client do a read() system call. All input arguments are
* validated by the virtual file system before calling this function.
*/
ssize_t audio_pkt_read(struct file *file, char __user *buf,
static ssize_t audio_pkt_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
struct q6apm_audio_pkt *audpkt_dev = file->private_data;
Expand Down Expand Up @@ -427,7 +421,7 @@ ssize_t audio_pkt_read(struct file *file, char __user *buf,
* audpkt_update_physical_addr - Update physical address
* audpkt_hdr: Pointer to the file structure.
*/
int audpkt_chk_and_update_physical_addr(struct audio_gpr_pkt *gpr_pkt)
static int audpkt_chk_and_update_physical_addr(struct audio_gpr_pkt *gpr_pkt)
{
size_t pa_len = 0;
dma_addr_t paddr = 0;
Expand Down Expand Up @@ -465,7 +459,7 @@ int audpkt_chk_and_update_physical_addr(struct audio_gpr_pkt *gpr_pkt)
* userspace client do a write() system call. All input arguments are
* validated by the virtual file system before calling this function.
*/
ssize_t audio_pkt_write(struct file *file, const char __user *buf,
static ssize_t audio_pkt_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
struct q6apm_audio_pkt *audpkt_dev = file->private_data;
Expand Down Expand Up @@ -646,7 +640,6 @@ static int q6apm_audio_pkt_callback(struct gpr_resp_pkt *data, void *priv, int o
{
gpr_device_t *gdev = priv;
struct q6apm_audio_pkt *apm = dev_get_drvdata(&gdev->dev);
struct device *dev = &gdev->dev;
struct gpr_ibasic_rsp_result_t *result;
struct gpr_hdr *hdr = &data->hdr;
uint8_t *pkt = NULL;
Expand Down
2 changes: 2 additions & 0 deletions audioreach-driver/q6apm_lpass_dummy_dais.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "q6prm.h"
#include "q6dsp-lpass-clocks.h"

#include "q6prm_audioreach.h"

#define AUDIOREACH_BE_PCM_BASE 16

struct q6apm_lpass_dai_data {
Expand Down
9 changes: 2 additions & 7 deletions audioreach-driver/q6prm_audioreach.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct prm_cmd_release_rsc {
struct audio_hw_clk_rel_cfg clock_id;
} __packed;

int q6prm_audio_send_cmd_sync(struct device *dev, gpr_device_t *gdev,
static int q6prm_audio_send_cmd_sync(struct device *dev, gpr_device_t *gdev,
struct gpr_ibasic_rsp_result_t *result, struct mutex *cmd_lock,
gpr_port_t *port, wait_queue_head_t *cmd_wait,
struct gpr_pkt *pkt, uint32_t rsp_opcode)
Expand Down Expand Up @@ -95,7 +95,6 @@ int q6prm_audio_send_cmd_sync(struct device *dev, gpr_device_t *gdev,
mutex_unlock(cmd_lock);
return rc;
}
EXPORT_SYMBOL_GPL(q6prm_audio_send_cmd_sync);

static int q6prm_audioreach_send_cmd_sync(struct q6prm *prm, struct gpr_pkt *pkt, uint32_t rsp_opcode)
{
Expand Down Expand Up @@ -140,12 +139,11 @@ static void *__q6prm_audioreach_alloc_pkt(int payload_size, uint32_t opcode, uin
return pkt;
}

void *q6prm_audioreach_alloc_cmd_pkt(int payload_size, uint32_t opcode, uint32_t token,
static void *q6prm_audioreach_alloc_cmd_pkt(int payload_size, uint32_t opcode, uint32_t token,
uint32_t src_port, uint32_t dest_port)
{
return __q6prm_audioreach_alloc_pkt(payload_size, opcode, token, src_port, dest_port, true);
}
EXPORT_SYMBOL_GPL(q6prm_audioreach_alloc_cmd_pkt);

static int q6prm_audioreach_set_hw_core_req(struct device *dev, uint32_t hw_block_id, bool enable)
{
Expand Down Expand Up @@ -193,13 +191,11 @@ int q6prm_audioreach_vote_lpass_core_hw(struct device *dev, uint32_t hw_block_id
return q6prm_audioreach_set_hw_core_req(dev, hw_block_id, true);

}
EXPORT_SYMBOL_GPL(q6prm_audioreach_vote_lpass_core_hw);

int q6prm_audioreach_unvote_lpass_core_hw(struct device *dev, uint32_t hw_block_id, uint32_t client_handle)
{
return q6prm_audioreach_set_hw_core_req(dev, hw_block_id, false);
}
EXPORT_SYMBOL_GPL(q6prm_audioreach_unvote_lpass_core_hw);

static int q6prm_audioreach_request_lpass_clock(struct device *dev, int clk_id, int clk_attr, int clk_root,
unsigned int freq)
Expand Down Expand Up @@ -280,7 +276,6 @@ int q6prm_audioreach_set_lpass_clock(struct device *dev, int clk_id, int clk_att

return q6prm_audioreach_release_lpass_clock(dev, clk_id, clk_attr, clk_root, freq);
}
EXPORT_SYMBOL_GPL(q6prm_audioreach_set_lpass_clock);

static int prm_audioreach_callback(struct gpr_resp_pkt *data, void *priv, int op)
{
Expand Down
Loading