asoc: Expose a sysfs node to notify device open/close.
Add support in kona machine driver to expose a sysfs node. Userspace uses this sysfs node to notify machine driver on which dai-link ( pcm id) is opened/closed. This information regarding device open/close is then compared against shutdown/ startup dai_link ops. If there is a mismatch we conclude that there has been a userspace service crash and we issue a close all session command to dsp and also clear all the dma buffers which were allocated by the service. Change-Id: I4fc13adf8cc527c87b822a3b189d4ff081539a3c Signed-off-by: Ashish Jain <ashishj@codeaurora.org>
This commit is contained in:
Ashish Jain
committed by
Gerrit - the friendly Code Review server
Gerrit - the friendly Code Review server
parent
4adf995c01
commit
de3e09d08d
@@ -15,9 +15,116 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of_device.h>
|
||||
#include "asoc/msm-cdc-pinctrl.h"
|
||||
#include <asoc/msm-cdc-pinctrl.h>
|
||||
#include <dsp/gecko-core.h>
|
||||
#include <dsp/msm_audio_ion.h>
|
||||
#include "msm_common.h"
|
||||
|
||||
#define to_asoc_mach_common_pdata(kobj) \
|
||||
container_of((kobj), struct msm_common_pdata, aud_dev_kobj)
|
||||
|
||||
#define DEVICE_ENABLE 1
|
||||
#define DEVICE_DISABLE 0
|
||||
|
||||
static struct attribute device_state_attr = {
|
||||
.name = "state",
|
||||
.mode = 0660,
|
||||
};
|
||||
|
||||
#define MAX_USR_INPUT 10
|
||||
|
||||
static ssize_t aud_dev_sysfs_store(struct kobject *kobj,
|
||||
struct attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
ssize_t ret = -EINVAL;
|
||||
struct msm_common_pdata *pdata = to_asoc_mach_common_pdata(kobj);
|
||||
uint32_t pcm_id, state = 0;
|
||||
|
||||
if (count > MAX_USR_INPUT) {
|
||||
pr_err("%s: invalid string written", __func__);
|
||||
goto done;
|
||||
}
|
||||
|
||||
sscanf(buf, "%d %d", &pcm_id, &state);
|
||||
|
||||
if ((pcm_id > pdata->num_aud_devs) || (pcm_id < 0)) {
|
||||
pr_err("%s: invalid pcm id %d \n", __func__, pcm_id);
|
||||
goto done;
|
||||
}
|
||||
|
||||
if ((state > DEVICE_ENABLE) || (state < DEVICE_DISABLE)) {
|
||||
pr_err("%s: invalid state %d \n", __func__, state);
|
||||
goto done;
|
||||
}
|
||||
pr_info("%s: pcm_id %d state %d \n", __func__, pcm_id, state);
|
||||
|
||||
pdata->aud_dev_state[pcm_id] = state;
|
||||
if ( state == DEVICE_ENABLE && (pdata->dsp_sessions_closed != 0))
|
||||
pdata->dsp_sessions_closed = 0;
|
||||
|
||||
ret = count;
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct sysfs_ops aud_dev_sysfs_ops = {
|
||||
.store = aud_dev_sysfs_store,
|
||||
};
|
||||
|
||||
static struct kobj_type aud_dev_ktype = {
|
||||
.sysfs_ops = &aud_dev_sysfs_ops,
|
||||
};
|
||||
|
||||
static int aud_dev_sysfs_init(struct msm_common_pdata *pdata)
|
||||
{
|
||||
int ret = 0;
|
||||
char dir[10] = "aud_dev";
|
||||
|
||||
ret = kobject_init_and_add(&pdata->aud_dev_kobj, &aud_dev_ktype,
|
||||
kernel_kobj, dir);
|
||||
if (ret < 0) {
|
||||
pr_err("%s: Failed to add kobject %s, err = %d\n",
|
||||
__func__, dir, ret);
|
||||
goto done;
|
||||
}
|
||||
|
||||
ret = sysfs_create_file(&pdata->aud_dev_kobj, &device_state_attr);
|
||||
if (ret < 0) {
|
||||
pr_err("%s: Failed to add wdsp_boot sysfs entry to %s\n",
|
||||
__func__, dir);
|
||||
goto fail_create_file;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
fail_create_file:
|
||||
kobject_put(&pdata->aud_dev_kobj);
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void check_userspace_service_state(struct snd_soc_pcm_runtime *rtd,
|
||||
struct msm_common_pdata *pdata)
|
||||
{
|
||||
dev_info(rtd->card->dev,"%s: pcm_id %d state %d\n", __func__,
|
||||
rtd->num, pdata->aud_dev_state[rtd->num]);
|
||||
|
||||
if (pdata->aud_dev_state[rtd->num] == DEVICE_ENABLE) {
|
||||
dev_info(rtd->card->dev, "%s userspace service crashed\n",
|
||||
__func__);
|
||||
if (pdata->dsp_sessions_closed == 0) {
|
||||
/*Issue close all graph cmd to DSP*/
|
||||
gecko_core_apm_close_all();
|
||||
/*unmap all dma mapped buffers*/
|
||||
msm_audio_ion_crash_handler();
|
||||
pdata->dsp_sessions_closed = 1;
|
||||
}
|
||||
/*Reset the state as sysfs node wont be triggred*/
|
||||
pdata->aud_dev_state[rtd->num] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static int get_intf_index(const char *stream_name)
|
||||
{
|
||||
if (strnstr(stream_name, "PRIMARY", strlen("PRIMARY")))
|
||||
@@ -54,27 +161,23 @@ int msm_common_snd_startup(struct snd_pcm_substream *substream)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (index < 0) {
|
||||
dev_err(rtd->card->dev,
|
||||
"%s: Invalid Backend interface %d\n", __func__, index);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mutex_lock(&pdata->lock[index]);
|
||||
if (pdata->mi2s_gpio_p[index]) {
|
||||
if (atomic_read(&(pdata->mi2s_gpio_ref_cnt[index])) == 0) {
|
||||
ret = msm_cdc_pinctrl_select_active_state(
|
||||
pdata->mi2s_gpio_p[index]);
|
||||
if (ret) {
|
||||
pr_err("%s: GPIO pinctrl set active failed with %d\n",
|
||||
__func__, ret);
|
||||
goto done;
|
||||
if (index >= 0) {
|
||||
mutex_lock(&pdata->lock[index]);
|
||||
if (pdata->mi2s_gpio_p[index]) {
|
||||
if (atomic_read(&(pdata->mi2s_gpio_ref_cnt[index])) == 0) {
|
||||
ret = msm_cdc_pinctrl_select_active_state(
|
||||
pdata->mi2s_gpio_p[index]);
|
||||
if (ret) {
|
||||
pr_err("%s:pinctrl set actve fail with %d\n",
|
||||
__func__, ret);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
atomic_inc(&(pdata->mi2s_gpio_ref_cnt[index]));
|
||||
}
|
||||
atomic_inc(&(pdata->mi2s_gpio_ref_cnt[index]));
|
||||
}
|
||||
done:
|
||||
mutex_unlock(&pdata->lock[index]);
|
||||
mutex_unlock(&pdata->lock[index]);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -95,24 +198,23 @@ void msm_common_snd_shutdown(struct snd_pcm_substream *substream)
|
||||
return;
|
||||
}
|
||||
|
||||
if (index < 0) {
|
||||
dev_err(card->dev,
|
||||
"%s: Invalid Backend interface %d\n", __func__, index);
|
||||
return;
|
||||
}
|
||||
check_userspace_service_state(rtd, pdata);
|
||||
|
||||
mutex_lock(&pdata->lock[index]);
|
||||
if (pdata->mi2s_gpio_p[index]) {
|
||||
atomic_dec(&pdata->mi2s_gpio_ref_cnt[index]);
|
||||
if (atomic_read(&pdata->mi2s_gpio_ref_cnt[index]) == 0) {
|
||||
ret = msm_cdc_pinctrl_select_active_state(
|
||||
pdata->mi2s_gpio_p[index]);
|
||||
if (ret)
|
||||
dev_err(card->dev, "%s: GPIO pinctrl set active failed with %d\n",
|
||||
__func__, ret);
|
||||
if (index >= 0) {
|
||||
mutex_lock(&pdata->lock[index]);
|
||||
if (pdata->mi2s_gpio_p[index]) {
|
||||
atomic_dec(&pdata->mi2s_gpio_ref_cnt[index]);
|
||||
if (atomic_read(&pdata->mi2s_gpio_ref_cnt[index]) == 0) {
|
||||
ret = msm_cdc_pinctrl_select_active_state(
|
||||
pdata->mi2s_gpio_p[index]);
|
||||
if (ret)
|
||||
dev_err(card->dev,
|
||||
"%s: pinctrl set actv fail %d\n",
|
||||
__func__, ret);
|
||||
}
|
||||
}
|
||||
mutex_unlock(&pdata->lock[index]);
|
||||
}
|
||||
mutex_unlock(&pdata->lock[index]);
|
||||
}
|
||||
|
||||
int msm_common_snd_init(struct platform_device *pdev, struct snd_soc_card *card)
|
||||
@@ -141,6 +243,12 @@ int msm_common_snd_init(struct platform_device *pdev, struct snd_soc_card *card)
|
||||
"qcom,quin-mi2s-gpios", 0);
|
||||
common_pdata->mi2s_gpio_p[SEN_MI2S_TDM_AUXPCM] = of_parse_phandle(pdev->dev.of_node,
|
||||
"qcom,sen-mi2s-gpios", 0);
|
||||
common_pdata->aud_dev_state = devm_kcalloc(&pdev->dev, card->num_links,
|
||||
sizeof(uint8_t), GFP_KERNEL);
|
||||
dev_info(&pdev->dev, "num_links %d \n", card->num_links);
|
||||
common_pdata->num_aud_devs = card->num_links;
|
||||
|
||||
aud_dev_sysfs_init(common_pdata);
|
||||
|
||||
msm_common_set_pdata(card, common_pdata);
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user