Merge "ASoC: bg: pass calibiration data to BG" (a7a7b868) · Commits · e / devices / android_kernel_xiaomi_markw

include/uapi/sound/msmcal-hwdep.h

+5 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2015, 2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -20,9 +20,13 @@ enum wcd_cal_type {
		WCD9XXX_MAD_CAL,
		WCD9XXX_MBHC_CAL,
		WCD9XXX_VBAT_CAL,
		BG_CODEC_MIC_CAL,
		BG_CODEC_SPEAKER_CAL,
		WCD9XXX_MAX_CAL,
		};

		#define BG_CAL_SUPPORT BG_CODEC_SPEAKER_CAL

		struct wcdcal_ioctl_buffer {
		__u32 size;
		__u8 __user *buffer;

sound/soc/codecs/bg_codec.c

+127 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -31,7 +31,9 @@
		#include <sound/tlv.h>
		#include <sound/info.h>
		#include <soc/qcom/bg_glink.h>
		#include "bg_codec.h"
		#include "pktzr.h"
		#include "wcdcal-hwdep.h"

		#define SAMPLE_RATE_48KHZ 48000

		@@ -41,6 +43,7 @@
		#define BG_FORMATS_S16_S24_LE (SNDRV_PCM_FMTBIT_S16_LE \| \
		SNDRV_PCM_FMTBIT_S24_LE \| \
		SNDRV_PCM_FMTBIT_S24_3LE)
		#define BG_BLOB_DATA_SIZE 3136

		enum {
		BG_AIF1_PB = 0,
		@@ -78,8 +81,15 @@ struct bg_cdc_priv {
		struct delayed_work bg_cdc_pktzr_init_work;
		unsigned long status_mask;
		struct bg_hw_params hw_params;
		/* cal info for codec */
		struct fw_info *fw_data;
		struct firmware_cal *hwdep_spk_cal;
		struct firmware_cal *hwdep_mic_cal;
		/* Lock to protect init cal */
		struct mutex bg_cal_lock;
		int src[NUM_CODEC_DAIS];
		bool hwd_started;
		bool bg_cal_updated;
		};

		struct codec_ssn_rt_setup_t {
		@@ -138,12 +148,108 @@ static uint32_t get_active_session_id(int dai_id)
		return active_session;
		}

		static int bg_cdc_cal(struct bg_cdc_priv *bg_cdc)
		{
		u8 init_params = NULL, init_head = NULL;
		struct pktzr_cmd_rsp rsp;
		u32 mic_blob_size = sizeof(app_mic_init_params);
		u32 spk_blob_size = sizeof(smart_pa_init_params);
		int ret = 0;

		mutex_lock(&bg_cdc->bg_cal_lock);
		init_params = kzalloc(BG_BLOB_DATA_SIZE, GFP_KERNEL);
		if (!init_params) {
		ret = -ENOMEM;
		goto err2;
		}
		init_head = init_params;

		bg_cdc->hwdep_mic_cal = wcdcal_get_fw_cal(bg_cdc->fw_data,
		BG_CODEC_MIC_CAL);

		if (bg_cdc->hwdep_mic_cal &&
		(mic_blob_size < bg_cdc->hwdep_mic_cal->size))
		bg_cdc->hwdep_mic_cal = NULL;

		bg_cdc->hwdep_spk_cal = wcdcal_get_fw_cal(bg_cdc->fw_data,
		BG_CODEC_SPEAKER_CAL);
		if (bg_cdc->hwdep_spk_cal &&
		(spk_blob_size < bg_cdc->hwdep_spk_cal->size))
		bg_cdc->hwdep_spk_cal = NULL;

		if (bg_cdc->hwdep_mic_cal) {
		pr_debug("%s:mic cal size %d", __func__,
		bg_cdc->hwdep_mic_cal->size);
		memcpy(init_params, &bg_cdc->hwdep_mic_cal->size,
		sizeof(bg_cdc->hwdep_mic_cal->size));
		init_params += sizeof(bg_cdc->hwdep_mic_cal->size);
		memcpy(init_params, bg_cdc->hwdep_mic_cal->data,
		bg_cdc->hwdep_mic_cal->size);
		init_params += bg_cdc->hwdep_mic_cal->size;
		} else {
		pr_debug("%s:default mic cal size %d", __func__, mic_blob_size);
		memcpy(init_params, &mic_blob_size,
		sizeof(mic_blob_size));
		init_params += sizeof(mic_blob_size);
		memcpy(init_params, app_mic_init_params,
		sizeof(app_mic_init_params));
		init_params += sizeof(app_mic_init_params);
		}
		if (bg_cdc->hwdep_spk_cal) {
		pr_debug("%s: spk cal size %d", __func__,
		bg_cdc->hwdep_spk_cal->size);
		memcpy(init_params, &bg_cdc->hwdep_spk_cal->size,
		sizeof(bg_cdc->hwdep_spk_cal->size));
		init_params += sizeof(bg_cdc->hwdep_spk_cal->size);
		memcpy(init_params, bg_cdc->hwdep_spk_cal->data,
		bg_cdc->hwdep_spk_cal->size);
		} else {
		pr_debug("%s: default spk cal size %d", __func__,
		spk_blob_size);
		memcpy(init_params, &spk_blob_size,
		sizeof(spk_blob_size));
		init_params += sizeof(spk_blob_size);
		memcpy(init_params, smart_pa_init_params,
		sizeof(smart_pa_init_params));
		}
		rsp.buf_size = sizeof(struct graphite_basic_rsp_result);
		rsp.buf = kzalloc(rsp.buf_size, GFP_KERNEL);
		if (!rsp.buf) {
		ret = -ENOMEM;
		goto err1;
		}
		/* Send command to BG to init session */
		ret = pktzr_cmd_init_params(init_head, BG_BLOB_DATA_SIZE, &rsp);
		if (ret < 0) {
		pr_err("pktzr cmd set params failed\n");
		goto err;
		}
		bg_cdc->bg_cal_updated = true;
		err:
		kfree(rsp.buf);
		err1:
		kfree(init_head);
		err2:
		mutex_unlock(&bg_cdc->bg_cal_lock);
		return ret;
		}

		static int _bg_codec_hw_params(struct bg_cdc_priv *bg_cdc)
		{
		struct bg_hw_params hw_params;
		struct pktzr_cmd_rsp rsp;
		int ret = 0;

		if (!bg_cdc->bg_cal_updated) {
		ret = bg_cdc_cal(bg_cdc);
		if (ret < 0) {
		pr_err("%s:failed to send cal data", __func__);
		return ret;
		}
		} else {
		pr_debug("%s:cal data already sent to BG", __func__);
		}

		rsp.buf_size = sizeof(struct graphite_basic_rsp_result);
		rsp.buf = kzalloc(rsp.buf_size, GFP_KERNEL);
		if (!rsp.buf)
		@@ -636,7 +742,7 @@ static void bg_cdc_pktzr_init(struct work_struct *work)
		struct bg_cdc_priv *bg_cdc;
		struct delayed_work *dwork;
		int num_of_intents = 2;
		uint32_t size[2] = {2048, 2048};
		uint32_t size[2] = {4096, 4096};
		struct bg_glink_ch_cfg ch_info[1] = {
		{"CODEC_CHANNEL", num_of_intents, size}
		};
		@@ -670,17 +776,36 @@ static void bg_cdc_pktzr_init(struct work_struct *work)
		static int bg_cdc_codec_probe(struct snd_soc_codec *codec)
		{
		struct bg_cdc_priv *bg_cdc = dev_get_drvdata(codec->dev);
		int ret;

		schedule_delayed_work(&bg_cdc->bg_cdc_pktzr_init_work,
		msecs_to_jiffies(400));

		bg_cdc->fw_data = devm_kzalloc(codec->dev,
		sizeof(*(bg_cdc->fw_data)), GFP_KERNEL);

		bg_cdc->bg_cal_updated = false;
		mutex_init(&bg_cdc->bg_cal_lock);

		set_bit(BG_CODEC_MIC_CAL, bg_cdc->fw_data->cal_bit);
		set_bit(BG_CODEC_SPEAKER_CAL, bg_cdc->fw_data->cal_bit);

		ret = wcd_cal_create_hwdep(bg_cdc->fw_data,
		WCD9XXX_CODEC_HWDEP_NODE, codec);
		if (ret < 0) {
		dev_err(codec->dev, "%s hwdep failed %d\n", __func__, ret);
		devm_kfree(codec->dev, bg_cdc->fw_data);
		}
		return 0;
		}

		static int bg_cdc_codec_remove(struct snd_soc_codec *codec)
		{
		struct bg_cdc_priv *bg_cdc = dev_get_drvdata(codec->dev);
		pr_debug("In func %s\n", __func__);
		pktzr_deinit();
		mutex_destroy(&bg_cdc->bg_cal_lock);
		kfree(bg_cdc->fw_data);
		return 0;
		}

sound/soc/codecs/bg_codec.h

0 → 100644

+282 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/pktzr.c

+7 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017 The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -207,6 +207,12 @@ int pktzr_cmd_data(void payload, uint32_t size, void priv_data)
		return pktzr_send_pkt(payload, size, priv_data, PKTZR_CMD_DATA, false);
		}

		int pktzr_cmd_init_params(void *payload, uint32_t size,
		struct pktzr_cmd_rsp *rsp)
		{
		return pktzr_send_pkt(payload, size, rsp, PKTZR_CMD_INIT_PARAM, true);
		}

		int pktzr_init(void pdev, struct bg_glink_ch_cfg ch_info, int num_channels,
		pktzr_data_cmd_cb_fn func)
		{

sound/soc/codecs/pktzr.h

+4 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017 The Linux Foundation. All rights reserved.
		/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -37,7 +37,7 @@
		#define PKTZR_CMD_EVENT 0x000B
		#define PKTZR_CMD_DATA 0x000C
		#define PKTZR_CMDRSP_DATA 0x000D

		#define PKTZR_CMD_INIT_PARAM 0x0029

		typedef int (pktzr_data_cmd_cb_fn)(void buf, uint32_t len, void *priv_data,
		bool *is_basic_rsp);
		@@ -68,4 +68,6 @@ extern int pktzr_cmd_data(void payload, uint32_t size, void priv_data);

		extern int pktzr_cmd_set_params(void *payload, uint32_t size,
		struct pktzr_cmd_rsp *rsp);
		extern int pktzr_cmd_init_params(void *payload, uint32_t size,
		struct pktzr_cmd_rsp *rsp);
		#endif