mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
synced 2025-08-28 09:22:08 +00:00
ALSA: hda/hda_cs_dsp_ctl: Delete hda_cs_dsp_ctl module
Delete the hda_cs_dsp module and move the one array and one function that is used by the cs35l41_hda driver into that driver. The cs35l41 and cs35l56 drivers stopped creating ALSA controls to wrap firmware controls. The reasons are explained in: commit312c04cee4
("ALSA: hda: cs35l41: Stop creating ALSA Controls for firmware coefficients") and commit34e1b1bb73
("ALSA: hda: cs35l56: Stop creating ALSA controls for firmware coefficients") The cs35l56_hda driver now doesn't use hda_cs_dsp_ctl at all. The cs35l41_hda driver only uses the small array of firmware names and the function to read a control value. All other functions and data in hda_cs_dsp_ctl are unused. There is no need to keep a separate module for such a small amount of data and code that is only used by one driver, so remove the whole module. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://patch.msgid.link/20250424181214.66759-1-rf@opensource.cirrus.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
889dbe65c7
commit
bdd9ea9187
@ -5647,7 +5647,6 @@ F: include/sound/cs*
|
||||
F: sound/pci/hda/cirrus*
|
||||
F: sound/pci/hda/cs*
|
||||
F: sound/pci/hda/hda_component*
|
||||
F: sound/pci/hda/hda_cs_dsp_ctl.*
|
||||
F: sound/soc/codecs/cs*
|
||||
|
||||
CIRRUS LOGIC HAPTIC DRIVERS
|
||||
|
@ -110,10 +110,6 @@ config SND_HDA_SCODEC_CS35L41
|
||||
select SND_HDA_GENERIC
|
||||
select REGMAP_IRQ
|
||||
|
||||
config SND_HDA_CS_DSP_CONTROLS
|
||||
tristate
|
||||
select FW_CS_DSP
|
||||
|
||||
config SND_HDA_SCODEC_COMPONENT
|
||||
tristate
|
||||
|
||||
@ -125,7 +121,6 @@ config SND_HDA_SCODEC_CS35L41_I2C
|
||||
depends on SND_SOC
|
||||
select SND_SOC_CS35L41_LIB
|
||||
select SND_HDA_SCODEC_CS35L41
|
||||
select SND_HDA_CS_DSP_CONTROLS
|
||||
select SND_SOC_CS_AMP_LIB
|
||||
help
|
||||
Say Y or M here to include CS35L41 I2C HD-audio side codec support
|
||||
@ -142,7 +137,6 @@ config SND_HDA_SCODEC_CS35L41_SPI
|
||||
depends on SND_SOC
|
||||
select SND_SOC_CS35L41_LIB
|
||||
select SND_HDA_SCODEC_CS35L41
|
||||
select SND_HDA_CS_DSP_CONTROLS
|
||||
select SND_SOC_CS_AMP_LIB
|
||||
help
|
||||
Say Y or M here to include CS35L41 SPI HD-audio side codec support
|
||||
@ -165,7 +159,6 @@ config SND_HDA_SCODEC_CS35L56_I2C
|
||||
select SND_SOC_CS35L56_SHARED
|
||||
select SND_HDA_SCODEC_CS35L56
|
||||
select SND_HDA_CIRRUS_SCODEC
|
||||
select SND_HDA_CS_DSP_CONTROLS
|
||||
select SND_SOC_CS_AMP_LIB
|
||||
help
|
||||
Say Y or M here to include CS35L56 amplifier support with
|
||||
@ -182,7 +175,6 @@ config SND_HDA_SCODEC_CS35L56_SPI
|
||||
select SND_SOC_CS35L56_SHARED
|
||||
select SND_HDA_SCODEC_CS35L56
|
||||
select SND_HDA_CIRRUS_SCODEC
|
||||
select SND_HDA_CS_DSP_CONTROLS
|
||||
select SND_SOC_CS_AMP_LIB
|
||||
help
|
||||
Say Y or M here to include CS35L56 amplifier support with
|
||||
|
@ -37,7 +37,6 @@ snd-hda-scodec-cs35l41-spi-y := cs35l41_hda_spi.o
|
||||
snd-hda-scodec-cs35l56-y := cs35l56_hda.o
|
||||
snd-hda-scodec-cs35l56-i2c-y := cs35l56_hda_i2c.o
|
||||
snd-hda-scodec-cs35l56-spi-y := cs35l56_hda_spi.o
|
||||
snd-hda-cs-dsp-ctls-y := hda_cs_dsp_ctl.o
|
||||
snd-hda-scodec-component-y := hda_component.o
|
||||
snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o
|
||||
snd-hda-scodec-tas2781-spi-y := tas2781_hda_spi.o tas2781_spi_fwlib.o
|
||||
@ -70,7 +69,6 @@ obj-$(CONFIG_SND_HDA_SCODEC_CS35L41_SPI) += snd-hda-scodec-cs35l41-spi.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_CS35L56) += snd-hda-scodec-cs35l56.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_I2C) += snd-hda-scodec-cs35l56-i2c.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_CS35L56_SPI) += snd-hda-scodec-cs35l56-spi.o
|
||||
obj-$(CONFIG_SND_HDA_CS_DSP_CONTROLS) += snd-hda-cs-dsp-ctls.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_COMPONENT) += snd-hda-scodec-component.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_I2C) += snd-hda-scodec-tas2781-i2c.o
|
||||
obj-$(CONFIG_SND_HDA_SCODEC_TAS2781_SPI) += snd-hda-scodec-tas2781-spi.o
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "hda_generic.h"
|
||||
#include "hda_component.h"
|
||||
#include "cs35l41_hda.h"
|
||||
#include "hda_cs_dsp_ctl.h"
|
||||
#include "cs35l41_hda_property.h"
|
||||
|
||||
#define CS35L41_PART "cs35l41"
|
||||
@ -74,6 +73,21 @@ static const struct cirrus_amp_cal_controls cs35l41_calibration_controls = {
|
||||
.checksum = CAL_CHECKSUM_DSP_CTL_NAME,
|
||||
};
|
||||
|
||||
enum cs35l41_hda_fw_id {
|
||||
CS35L41_HDA_FW_SPK_PROT,
|
||||
CS35L41_HDA_FW_SPK_CALI,
|
||||
CS35L41_HDA_FW_SPK_DIAG,
|
||||
CS35L41_HDA_FW_MISC,
|
||||
CS35L41_HDA_NUM_FW
|
||||
};
|
||||
|
||||
static const char * const cs35l41_hda_fw_ids[CS35L41_HDA_NUM_FW] = {
|
||||
[CS35L41_HDA_FW_SPK_PROT] = "spk-prot",
|
||||
[CS35L41_HDA_FW_SPK_CALI] = "spk-cali",
|
||||
[CS35L41_HDA_FW_SPK_DIAG] = "spk-diag",
|
||||
[CS35L41_HDA_FW_MISC] = "misc",
|
||||
};
|
||||
|
||||
static bool firmware_autostart = 1;
|
||||
module_param(firmware_autostart, bool, 0444);
|
||||
MODULE_PARM_DESC(firmware_autostart, "Allow automatic firmware download on boot"
|
||||
@ -169,23 +183,23 @@ static int cs35l41_request_firmware_file(struct cs35l41_hda *cs35l41,
|
||||
|
||||
if (spkid > -1 && ssid && amp_name)
|
||||
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d-%s.%s", CS35L41_PART,
|
||||
dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],
|
||||
dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
|
||||
ssid, spkid, amp_name, filetype);
|
||||
else if (spkid > -1 && ssid)
|
||||
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d.%s", CS35L41_PART,
|
||||
dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],
|
||||
dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
|
||||
ssid, spkid, filetype);
|
||||
else if (ssid && amp_name)
|
||||
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-%s.%s", CS35L41_PART,
|
||||
dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],
|
||||
dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
|
||||
ssid, amp_name, filetype);
|
||||
else if (ssid)
|
||||
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s.%s", CS35L41_PART,
|
||||
dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],
|
||||
dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
|
||||
ssid, filetype);
|
||||
else
|
||||
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s.%s", CS35L41_PART,
|
||||
dsp_name, hda_cs_dsp_fw_ids[cs35l41->firmware_type],
|
||||
dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
|
||||
filetype);
|
||||
|
||||
if (*filename == NULL)
|
||||
@ -588,7 +602,7 @@ static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41)
|
||||
}
|
||||
|
||||
ret = cs_dsp_power_up(dsp, wmfw_firmware, wmfw_filename, coeff_firmware, coeff_filename,
|
||||
hda_cs_dsp_fw_ids[cs35l41->firmware_type]);
|
||||
cs35l41_hda_fw_ids[cs35l41->firmware_type]);
|
||||
if (ret)
|
||||
goto err;
|
||||
|
||||
@ -1108,6 +1122,18 @@ static int cs35l41_runtime_resume(struct device *dev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cs35l41_hda_read_ctl(struct cs_dsp *dsp, const char *name, int type,
|
||||
unsigned int alg, void *buf, size_t len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&dsp->pwr_lock);
|
||||
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);
|
||||
mutex_unlock(&dsp->pwr_lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
|
||||
{
|
||||
unsigned int fw_status;
|
||||
@ -1137,7 +1163,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
|
||||
goto clean_dsp;
|
||||
}
|
||||
|
||||
ret = read_poll_timeout(hda_cs_dsp_read_ctl, ret,
|
||||
ret = read_poll_timeout(cs35l41_hda_read_ctl, ret,
|
||||
be32_to_cpu(halo_sts) == HALO_STATE_CODE_RUN,
|
||||
1000, 15000, false, &cs35l41->cs_dsp, HALO_STATE_DSP_CTL_NAME,
|
||||
HALO_STATE_DSP_CTL_TYPE, HALO_STATE_DSP_CTL_ALG,
|
||||
@ -1174,7 +1200,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
|
||||
}
|
||||
|
||||
dev_info(cs35l41->dev, "Firmware Loaded - Type: %s, Gain: %d\n",
|
||||
hda_cs_dsp_fw_ids[cs35l41->firmware_type], cs35l41->tuning_gain);
|
||||
cs35l41_hda_fw_ids[cs35l41->firmware_type], cs35l41->tuning_gain);
|
||||
|
||||
return 0;
|
||||
|
||||
@ -1276,7 +1302,7 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
{
|
||||
struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);
|
||||
|
||||
if (ucontrol->value.enumerated.item[0] < HDA_CS_DSP_NUM_FW) {
|
||||
if (ucontrol->value.enumerated.item[0] < CS35L41_HDA_NUM_FW) {
|
||||
if (cs35l41->firmware_type != ucontrol->value.enumerated.item[0]) {
|
||||
cs35l41->firmware_type = ucontrol->value.enumerated.item[0];
|
||||
return 1;
|
||||
@ -1290,7 +1316,7 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,
|
||||
|
||||
static int cs35l41_fw_type_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(hda_cs_dsp_fw_ids), hda_cs_dsp_fw_ids);
|
||||
return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(cs35l41_hda_fw_ids), cs35l41_hda_fw_ids);
|
||||
}
|
||||
|
||||
static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)
|
||||
@ -1430,7 +1456,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
|
||||
|
||||
strscpy(comp->name, dev_name(dev), sizeof(comp->name));
|
||||
|
||||
cs35l41->firmware_type = HDA_CS_DSP_FW_SPK_PROT;
|
||||
cs35l41->firmware_type = CS35L41_HDA_FW_SPK_PROT;
|
||||
|
||||
if (firmware_autostart) {
|
||||
dev_dbg(cs35l41->dev, "Firmware Autostart.\n");
|
||||
@ -2055,7 +2081,6 @@ const struct dev_pm_ops cs35l41_hda_pm_ops = {
|
||||
EXPORT_SYMBOL_NS_GPL(cs35l41_hda_pm_ops, "SND_HDA_SCODEC_CS35L41");
|
||||
|
||||
MODULE_DESCRIPTION("CS35L41 HDA Driver");
|
||||
MODULE_IMPORT_NS("SND_HDA_CS_DSP_CONTROLS");
|
||||
MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");
|
||||
MODULE_AUTHOR("Lucas Tanure, Cirrus Logic Inc, <tanureal@opensource.cirrus.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include "cirrus_scodec.h"
|
||||
#include "cs35l56_hda.h"
|
||||
#include "hda_component.h"
|
||||
#include "hda_cs_dsp_ctl.h"
|
||||
#include "hda_generic.h"
|
||||
|
||||
/*
|
||||
@ -1118,7 +1117,6 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_hda_pm_ops, "SND_HDA_SCODEC_CS35L56");
|
||||
MODULE_DESCRIPTION("CS35L56 HDA Driver");
|
||||
MODULE_IMPORT_NS("FW_CS_DSP");
|
||||
MODULE_IMPORT_NS("SND_HDA_CIRRUS_SCODEC");
|
||||
MODULE_IMPORT_NS("SND_HDA_CS_DSP_CONTROLS");
|
||||
MODULE_IMPORT_NS("SND_SOC_CS35L56_SHARED");
|
||||
MODULE_IMPORT_NS("SND_SOC_CS_AMP_LIB");
|
||||
MODULE_AUTHOR("Richard Fitzgerald <rf@opensource.cirrus.com>");
|
||||
|
@ -1,249 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
//
|
||||
// HDA DSP ALSA Control Driver
|
||||
//
|
||||
// Copyright 2022 Cirrus Logic, Inc.
|
||||
//
|
||||
// Author: Stefan Binding <sbinding@opensource.cirrus.com>
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <sound/soc.h>
|
||||
#include <linux/cleanup.h>
|
||||
#include <linux/firmware/cirrus/cs_dsp.h>
|
||||
#include <linux/firmware/cirrus/wmfw.h>
|
||||
#include "hda_cs_dsp_ctl.h"
|
||||
|
||||
#define ADSP_MAX_STD_CTRL_SIZE 512
|
||||
|
||||
struct hda_cs_dsp_coeff_ctl {
|
||||
struct cs_dsp_coeff_ctl *cs_ctl;
|
||||
struct snd_card *card;
|
||||
struct snd_kcontrol *kctl;
|
||||
};
|
||||
|
||||
static const char * const hda_cs_dsp_fw_text[HDA_CS_DSP_NUM_FW] = {
|
||||
[HDA_CS_DSP_FW_SPK_PROT] = "Prot",
|
||||
[HDA_CS_DSP_FW_SPK_CALI] = "Cali",
|
||||
[HDA_CS_DSP_FW_SPK_DIAG] = "Diag",
|
||||
[HDA_CS_DSP_FW_MISC] = "Misc",
|
||||
};
|
||||
|
||||
const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW] = {
|
||||
[HDA_CS_DSP_FW_SPK_PROT] = "spk-prot",
|
||||
[HDA_CS_DSP_FW_SPK_CALI] = "spk-cali",
|
||||
[HDA_CS_DSP_FW_SPK_DIAG] = "spk-diag",
|
||||
[HDA_CS_DSP_FW_MISC] = "misc",
|
||||
};
|
||||
EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_fw_ids, "SND_HDA_CS_DSP_CONTROLS");
|
||||
|
||||
static int hda_cs_dsp_coeff_info(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *uinfo)
|
||||
{
|
||||
struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);
|
||||
struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;
|
||||
|
||||
uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
|
||||
uinfo->count = cs_ctl->len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hda_cs_dsp_coeff_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);
|
||||
struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;
|
||||
char *p = ucontrol->value.bytes.data;
|
||||
|
||||
return cs_dsp_coeff_lock_and_write_ctrl(cs_ctl, 0, p, cs_ctl->len);
|
||||
}
|
||||
|
||||
static int hda_cs_dsp_coeff_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol)
|
||||
{
|
||||
struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);
|
||||
struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;
|
||||
char *p = ucontrol->value.bytes.data;
|
||||
|
||||
return cs_dsp_coeff_lock_and_read_ctrl(cs_ctl, 0, p, cs_ctl->len);
|
||||
}
|
||||
|
||||
static unsigned int wmfw_convert_flags(unsigned int in)
|
||||
{
|
||||
unsigned int out, rd, wr, vol;
|
||||
|
||||
rd = SNDRV_CTL_ELEM_ACCESS_READ;
|
||||
wr = SNDRV_CTL_ELEM_ACCESS_WRITE;
|
||||
vol = SNDRV_CTL_ELEM_ACCESS_VOLATILE;
|
||||
|
||||
out = 0;
|
||||
|
||||
if (in) {
|
||||
out |= rd;
|
||||
if (in & WMFW_CTL_FLAG_WRITEABLE)
|
||||
out |= wr;
|
||||
if (in & WMFW_CTL_FLAG_VOLATILE)
|
||||
out |= vol;
|
||||
} else {
|
||||
out |= rd | wr | vol;
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
static void hda_cs_dsp_free_kcontrol(struct snd_kcontrol *kctl)
|
||||
{
|
||||
struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);
|
||||
struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;
|
||||
|
||||
/* NULL priv to prevent a double-free in hda_cs_dsp_control_remove() */
|
||||
cs_ctl->priv = NULL;
|
||||
kfree(ctl);
|
||||
}
|
||||
|
||||
static void hda_cs_dsp_add_kcontrol(struct cs_dsp_coeff_ctl *cs_ctl,
|
||||
const struct hda_cs_dsp_ctl_info *info,
|
||||
const char *name)
|
||||
{
|
||||
struct snd_kcontrol_new kcontrol = {0};
|
||||
struct snd_kcontrol *kctl;
|
||||
struct hda_cs_dsp_coeff_ctl *ctl __free(kfree) = NULL;
|
||||
int ret = 0;
|
||||
|
||||
if (cs_ctl->len > ADSP_MAX_STD_CTRL_SIZE) {
|
||||
dev_err(cs_ctl->dsp->dev, "KControl %s: length %zu exceeds maximum %d\n", name,
|
||||
cs_ctl->len, ADSP_MAX_STD_CTRL_SIZE);
|
||||
return;
|
||||
}
|
||||
|
||||
ctl = kzalloc(sizeof(*ctl), GFP_KERNEL);
|
||||
if (!ctl)
|
||||
return;
|
||||
|
||||
ctl->cs_ctl = cs_ctl;
|
||||
ctl->card = info->card;
|
||||
|
||||
kcontrol.name = name;
|
||||
kcontrol.info = hda_cs_dsp_coeff_info;
|
||||
kcontrol.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
|
||||
kcontrol.access = wmfw_convert_flags(cs_ctl->flags);
|
||||
kcontrol.get = hda_cs_dsp_coeff_get;
|
||||
kcontrol.put = hda_cs_dsp_coeff_put;
|
||||
|
||||
kctl = snd_ctl_new1(&kcontrol, (void *)ctl);
|
||||
if (!kctl)
|
||||
return;
|
||||
|
||||
kctl->private_free = hda_cs_dsp_free_kcontrol;
|
||||
ctl->kctl = kctl;
|
||||
|
||||
/* snd_ctl_add() calls our private_free on error, which will kfree(ctl) */
|
||||
cs_ctl->priv = no_free_ptr(ctl);
|
||||
ret = snd_ctl_add(info->card, kctl);
|
||||
if (ret) {
|
||||
dev_err(cs_ctl->dsp->dev, "Failed to add KControl %s = %d\n", kcontrol.name, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
dev_dbg(cs_ctl->dsp->dev, "Added KControl: %s\n", kcontrol.name);
|
||||
}
|
||||
|
||||
static void hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl,
|
||||
const struct hda_cs_dsp_ctl_info *info)
|
||||
{
|
||||
struct cs_dsp *cs_dsp = cs_ctl->dsp;
|
||||
char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
|
||||
const char *region_name;
|
||||
int ret;
|
||||
|
||||
region_name = cs_dsp_mem_region_name(cs_ctl->alg_region.type);
|
||||
if (!region_name) {
|
||||
dev_warn(cs_dsp->dev, "Unknown region type: %d\n", cs_ctl->alg_region.type);
|
||||
return;
|
||||
}
|
||||
|
||||
ret = scnprintf(name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s %s %.12s %x", info->device_name,
|
||||
cs_dsp->name, hda_cs_dsp_fw_text[info->fw_type], cs_ctl->alg_region.alg);
|
||||
|
||||
if (cs_ctl->subname) {
|
||||
int avail = SNDRV_CTL_ELEM_ID_NAME_MAXLEN - ret - 2;
|
||||
int skip = 0;
|
||||
|
||||
/* Truncate the subname from the start if it is too long */
|
||||
if (cs_ctl->subname_len > avail)
|
||||
skip = cs_ctl->subname_len - avail;
|
||||
|
||||
snprintf(name + ret, SNDRV_CTL_ELEM_ID_NAME_MAXLEN - ret,
|
||||
" %.*s", cs_ctl->subname_len - skip, cs_ctl->subname + skip);
|
||||
}
|
||||
|
||||
hda_cs_dsp_add_kcontrol(cs_ctl, info, name);
|
||||
}
|
||||
|
||||
void hda_cs_dsp_add_controls(struct cs_dsp *dsp, const struct hda_cs_dsp_ctl_info *info)
|
||||
{
|
||||
struct cs_dsp_coeff_ctl *cs_ctl;
|
||||
|
||||
/*
|
||||
* pwr_lock would cause mutex inversion with ALSA control lock compared
|
||||
* to the get/put functions.
|
||||
* It is safe to walk the list without holding a mutex because entries
|
||||
* are persistent and only cs_dsp_power_up() or cs_dsp_remove() can
|
||||
* change the list.
|
||||
*/
|
||||
lockdep_assert_not_held(&dsp->pwr_lock);
|
||||
|
||||
list_for_each_entry(cs_ctl, &dsp->ctl_list, list) {
|
||||
if (cs_ctl->flags & WMFW_CTL_FLAG_SYS)
|
||||
continue;
|
||||
|
||||
if (cs_ctl->priv)
|
||||
continue;
|
||||
|
||||
hda_cs_dsp_control_add(cs_ctl, info);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_add_controls, "SND_HDA_CS_DSP_CONTROLS");
|
||||
|
||||
void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl)
|
||||
{
|
||||
struct hda_cs_dsp_coeff_ctl *ctl = cs_ctl->priv;
|
||||
|
||||
/* ctl and kctl may already have been removed by ALSA private_free */
|
||||
if (ctl)
|
||||
snd_ctl_remove(ctl->card, ctl->kctl);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_control_remove, "SND_HDA_CS_DSP_CONTROLS");
|
||||
|
||||
int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type,
|
||||
unsigned int alg, const void *buf, size_t len)
|
||||
{
|
||||
struct cs_dsp_coeff_ctl *cs_ctl;
|
||||
int ret;
|
||||
|
||||
mutex_lock(&dsp->pwr_lock);
|
||||
cs_ctl = cs_dsp_get_ctl(dsp, name, type, alg);
|
||||
ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);
|
||||
mutex_unlock(&dsp->pwr_lock);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_write_ctl, "SND_HDA_CS_DSP_CONTROLS");
|
||||
|
||||
int hda_cs_dsp_read_ctl(struct cs_dsp *dsp, const char *name, int type,
|
||||
unsigned int alg, void *buf, size_t len)
|
||||
{
|
||||
int ret;
|
||||
|
||||
mutex_lock(&dsp->pwr_lock);
|
||||
ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp, name, type, alg), 0, buf, len);
|
||||
mutex_unlock(&dsp->pwr_lock);
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_read_ctl, "SND_HDA_CS_DSP_CONTROLS");
|
||||
|
||||
MODULE_DESCRIPTION("CS_DSP ALSA Control HDA Library");
|
||||
MODULE_AUTHOR("Stefan Binding, <sbinding@opensource.cirrus.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_IMPORT_NS("FW_CS_DSP");
|
@ -1,39 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0
|
||||
*
|
||||
* HDA DSP ALSA Control Driver
|
||||
*
|
||||
* Copyright 2022 Cirrus Logic, Inc.
|
||||
*
|
||||
* Author: Stefan Binding <sbinding@opensource.cirrus.com>
|
||||
*/
|
||||
|
||||
#ifndef __HDA_CS_DSP_CTL_H__
|
||||
#define __HDA_CS_DSP_CTL_H__
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include <linux/firmware/cirrus/cs_dsp.h>
|
||||
|
||||
enum hda_cs_dsp_fw_id {
|
||||
HDA_CS_DSP_FW_SPK_PROT,
|
||||
HDA_CS_DSP_FW_SPK_CALI,
|
||||
HDA_CS_DSP_FW_SPK_DIAG,
|
||||
HDA_CS_DSP_FW_MISC,
|
||||
HDA_CS_DSP_NUM_FW
|
||||
};
|
||||
|
||||
struct hda_cs_dsp_ctl_info {
|
||||
struct snd_card *card;
|
||||
enum hda_cs_dsp_fw_id fw_type;
|
||||
const char *device_name;
|
||||
};
|
||||
|
||||
extern const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW];
|
||||
|
||||
void hda_cs_dsp_add_controls(struct cs_dsp *dsp, const struct hda_cs_dsp_ctl_info *info);
|
||||
void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl);
|
||||
int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type,
|
||||
unsigned int alg, const void *buf, size_t len);
|
||||
int hda_cs_dsp_read_ctl(struct cs_dsp *dsp, const char *name, int type,
|
||||
unsigned int alg, void *buf, size_t len);
|
||||
|
||||
#endif /*__HDA_CS_DSP_CTL_H__*/
|
Loading…
Reference in New Issue
Block a user