]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ALSA: hda: cs35l41: Add initial DSP support and firmware loading
authorVitaly Rodionov <vitaly.rodionov@cirrus.com>
Thu, 30 Jun 2022 00:23:25 +0000 (01:23 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 14 Jul 2022 09:22:55 +0000 (11:22 +0200)
This patch adds support for the CS35L41 DSP.
The DSP allows for extra features, such as running
speaker protection algorithms and hibernations.

To utilize these features, the driver must load
firmware into the DSP, as well as various tuning
files which allow for customization for specific
models.

[ Slightly simplified Kconfig changes by tiwai ]

Signed-off-by: Vitaly Rodionov <vitaly.rodionov@cirrus.com>
Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220630002335.366545-5-vitalyr@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
include/sound/cs35l41.h
sound/pci/hda/Kconfig
sound/pci/hda/cs35l41_hda.c
sound/pci/hda/cs35l41_hda.h

index 8972fa6976227084e710e9b9ef7200f623330141..8887087815a75ab32b1dbe60ceff2cbe77b3e26a 100644 (file)
 #define CS35L41_BST_EN_DEFAULT         0x2
 #define CS35L41_AMP_EN_SHIFT           0
 #define CS35L41_AMP_EN_MASK            1
+#define CS35L41_VMON_EN_MASK           0x1000
+#define CS35L41_VMON_EN_SHIFT          12
+#define CS35L41_IMON_EN_MASK           0x2000
+#define CS35L41_IMON_EN_SHIFT          13
 
 #define CS35L41_PDN_DONE_MASK          0x00800000
 #define CS35L41_PDN_DONE_SHIFT         23
index a17803953222ead709d7f4eaff696fb066b0cabd..44c33bc0740e078e63c6476974a9baa44c1637d6 100644 (file)
@@ -107,6 +107,7 @@ 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
        help
          Say Y or M here to include CS35L41 I2C HD-audio side codec support
          in snd-hda-intel driver, such as ALC287.
@@ -121,6 +122,7 @@ 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
        help
          Say Y or M here to include CS35L41 SPI HD-audio side codec support
          in snd-hda-intel driver, such as ALC287.
index 20d3ce8773dd4d3de4ac11785851014b872ffe52..d68d951c434ed84c90671d84def317318e5478ef 100644 (file)
@@ -9,12 +9,22 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <sound/hda_codec.h>
+#include <sound/soc.h>
 #include "hda_local.h"
 #include "hda_auto_parser.h"
 #include "hda_jack.h"
 #include "hda_generic.h"
 #include "hda_component.h"
 #include "cs35l41_hda.h"
+#include "hda_cs_dsp_ctl.h"
+
+#define CS35L41_FIRMWARE_ROOT "cirrus/"
+#define CS35L41_PART "cs35l41"
+#define FW_NAME "CSPL"
+
+#define HALO_STATE_DSP_CTL_NAME                "HALO_STATE"
+#define HALO_STATE_DSP_CTL_TYPE                5
+#define HALO_STATE_DSP_CTL_ALG         262308
 
 static const struct reg_sequence cs35l41_hda_config[] = {
        { CS35L41_PLL_CLK_CTRL,         0x00000430 }, // 3072000Hz, BCLK Input, PLL_REFCLK_EN = 1
@@ -27,11 +37,172 @@ static const struct reg_sequence cs35l41_hda_config[] = {
        { CS35L41_AMP_GAIN_CTRL,        0x00000084 }, // AMP_GAIN_PCM 4.5 dB
 };
 
+static const struct reg_sequence cs35l41_hda_config_dsp[] = {
+       { CS35L41_PLL_CLK_CTRL,         0x00000430 }, // 3072000Hz, BCLK Input, PLL_REFCLK_EN = 1
+       { CS35L41_DSP_CLK_CTRL,         0x00000003 }, // DSP CLK EN
+       { CS35L41_GLOBAL_CLK_CTRL,      0x00000003 }, // GLOBAL_FS = 48 kHz
+       { CS35L41_SP_ENABLES,           0x00010001 }, // ASP_RX1_EN = 1, ASP_TX1_EN = 1
+       { CS35L41_SP_RATE_CTRL,         0x00000021 }, // ASP_BCLK_FREQ = 3.072 MHz
+       { CS35L41_SP_FORMAT,            0x20200200 }, // 32 bits RX/TX slots, I2S, clk consumer
+       { CS35L41_SP_HIZ_CTRL,          0x00000003 }, // Hi-Z unused/disabled
+       { CS35L41_SP_TX_WL,             0x00000018 }, // 24 cycles/slot
+       { CS35L41_SP_RX_WL,             0x00000018 }, // 24 cycles/slot
+       { CS35L41_DAC_PCM1_SRC,         0x00000032 }, // DACPCM1_SRC = ERR_VOL
+       { CS35L41_ASP_TX1_SRC,          0x00000018 }, // ASPTX1 SRC = VMON
+       { CS35L41_ASP_TX2_SRC,          0x00000019 }, // ASPTX2 SRC = IMON
+       { CS35L41_ASP_TX3_SRC,          0x00000028 }, // ASPTX3 SRC = VPMON
+       { CS35L41_ASP_TX4_SRC,          0x00000029 }, // ASPTX4 SRC = VBSTMON
+       { CS35L41_DSP1_RX1_SRC,         0x00000008 }, // DSP1RX1 SRC = ASPRX1
+       { CS35L41_DSP1_RX2_SRC,         0x00000008 }, // DSP1RX2 SRC = ASPRX1
+       { CS35L41_DSP1_RX3_SRC,         0x00000018 }, // DSP1RX3 SRC = VMON
+       { CS35L41_DSP1_RX4_SRC,         0x00000019 }, // DSP1RX4 SRC = IMON
+       { CS35L41_DSP1_RX5_SRC,         0x00000029 }, // DSP1RX5 SRC = VBSTMON
+       { CS35L41_AMP_DIG_VOL_CTRL,     0x00000000 }, // AMP_VOL_PCM  0.0 dB
+       { CS35L41_AMP_GAIN_CTRL,        0x00000233 }, // AMP_GAIN_PCM = 17.5dB AMP_GAIN_PDM = 19.5dB
+};
+
 static const struct reg_sequence cs35l41_hda_mute[] = {
        { CS35L41_AMP_GAIN_CTRL,        0x00000000 }, // AMP_GAIN_PCM 0.5 dB
        { CS35L41_AMP_DIG_VOL_CTRL,     0x0000A678 }, // AMP_VOL_PCM Mute
 };
 
+static int cs35l41_control_add(struct cs_dsp_coeff_ctl *cs_ctl)
+{
+       struct cs35l41_hda *cs35l41 = container_of(cs_ctl->dsp, struct cs35l41_hda, cs_dsp);
+       struct hda_cs_dsp_ctl_info info;
+
+       info.device_name = cs35l41->amp_name;
+       info.fw_type = HDA_CS_DSP_FW_SPK_PROT;
+       info.card = cs35l41->codec->card;
+
+       return hda_cs_dsp_control_add(cs_ctl, &info);
+}
+
+static const struct cs_dsp_client_ops client_ops = {
+       .control_add = cs35l41_control_add,
+       .control_remove = hda_cs_dsp_control_remove,
+};
+
+static int cs35l41_request_firmware_file(struct cs35l41_hda *cs35l41,
+                                        const struct firmware **firmware, char **filename,
+                                        const char *dir, const char *filetype)
+{
+       const char * const dsp_name = cs35l41->cs_dsp.name;
+       char *s, c;
+       int ret = 0;
+
+       *filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s.%s", dir, CS35L41_PART, dsp_name, "spk-prot",
+                             filetype);
+
+       if (*filename == NULL)
+               return -ENOMEM;
+
+       /*
+        * Make sure that filename is lower-case and any non alpha-numeric
+        * characters except full stop and '/' are replaced with hyphens.
+        */
+       s = *filename;
+       while (*s) {
+               c = *s;
+               if (isalnum(c))
+                       *s = tolower(c);
+               else if (c != '.' && c != '/')
+                       *s = '-';
+               s++;
+       }
+
+       ret = firmware_request_nowarn(firmware, *filename, cs35l41->dev);
+       if (ret != 0) {
+               dev_dbg(cs35l41->dev, "Failed to request '%s'\n", *filename);
+               kfree(*filename);
+               *filename = NULL;
+       }
+
+       return ret;
+}
+
+static int cs35l41_request_firmware_files(struct cs35l41_hda *cs35l41,
+                                         const struct firmware **wmfw_firmware,
+                                         char **wmfw_filename,
+                                         const struct firmware **coeff_firmware,
+                                         char **coeff_filename)
+{
+       int ret;
+
+       /* cirrus/part-dspN-fwtype.wmfw */
+       ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,
+                                           CS35L41_FIRMWARE_ROOT, "wmfw");
+       if (!ret) {
+               cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,
+                                             CS35L41_FIRMWARE_ROOT, "bin");
+               return 0;
+       }
+
+       dev_warn(cs35l41->dev, "Failed to request firmware\n");
+
+       return ret;
+}
+
+static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41)
+{
+       const struct firmware *coeff_firmware = NULL;
+       const struct firmware *wmfw_firmware = NULL;
+       struct cs_dsp *dsp = &cs35l41->cs_dsp;
+       char *coeff_filename = NULL;
+       char *wmfw_filename = NULL;
+       int ret;
+
+       if (!cs35l41->halo_initialized) {
+               cs35l41_configure_cs_dsp(cs35l41->dev, cs35l41->regmap, dsp);
+               dsp->client_ops = &client_ops;
+
+               ret = cs_dsp_halo_init(&cs35l41->cs_dsp);
+               if (ret)
+                       return ret;
+               cs35l41->halo_initialized = true;
+       }
+
+       ret = cs35l41_request_firmware_files(cs35l41, &wmfw_firmware, &wmfw_filename,
+                                            &coeff_firmware, &coeff_filename);
+       if (ret < 0)
+               return ret;
+
+       dev_dbg(cs35l41->dev, "Loading WMFW Firmware: %s\n", wmfw_filename);
+       if (coeff_filename)
+               dev_dbg(cs35l41->dev, "Loading Coefficient File: %s\n", coeff_filename);
+       else
+               dev_warn(cs35l41->dev, "No Coefficient File available.\n");
+
+       ret = cs_dsp_power_up(dsp, wmfw_firmware, wmfw_filename, coeff_firmware, coeff_filename,
+                             FW_NAME);
+
+       release_firmware(wmfw_firmware);
+       release_firmware(coeff_firmware);
+       kfree(wmfw_filename);
+       kfree(coeff_filename);
+
+       return ret;
+}
+
+static void cs35l41_shutdown_dsp(struct cs35l41_hda *cs35l41)
+{
+       struct cs_dsp *dsp = &cs35l41->cs_dsp;
+
+       cs_dsp_stop(dsp);
+       cs_dsp_power_down(dsp);
+       cs35l41->firmware_running = false;
+       dev_dbg(cs35l41->dev, "Unloaded Firmware\n");
+}
+
+static void cs35l41_remove_dsp(struct cs35l41_hda *cs35l41)
+{
+       struct cs_dsp *dsp = &cs35l41->cs_dsp;
+
+       cs35l41_shutdown_dsp(cs35l41);
+       cs_dsp_remove(dsp);
+       cs35l41->halo_initialized = false;
+}
+
 /* Protection release cycle to get the speaker out of Safe-Mode */
 static void cs35l41_error_release(struct device *dev, struct regmap *regmap, unsigned int mask)
 {
@@ -53,9 +224,22 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
        struct regmap *reg = cs35l41->regmap;
        int ret = 0;
 
+       mutex_lock(&cs35l41->fw_mutex);
+
        switch (action) {
        case HDA_GEN_PCM_ACT_OPEN:
-               regmap_multi_reg_write(reg, cs35l41_hda_config, ARRAY_SIZE(cs35l41_hda_config));
+               if (cs35l41->firmware_running) {
+                       regmap_multi_reg_write(reg, cs35l41_hda_config_dsp,
+                                              ARRAY_SIZE(cs35l41_hda_config_dsp));
+                       regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
+                                          CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
+                                          1 << CS35L41_VMON_EN_SHIFT | 1 << CS35L41_IMON_EN_SHIFT);
+                       cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap,
+                                                 CSPL_MBOX_CMD_RESUME);
+               } else {
+                       regmap_multi_reg_write(reg, cs35l41_hda_config,
+                                              ARRAY_SIZE(cs35l41_hda_config));
+               }
                ret = regmap_update_bits(reg, CS35L41_PWR_CTRL2,
                                         CS35L41_AMP_EN_MASK, 1 << CS35L41_AMP_EN_SHIFT);
                if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST)
@@ -73,6 +257,13 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
                                         CS35L41_AMP_EN_MASK, 0 << CS35L41_AMP_EN_SHIFT);
                if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST)
                        regmap_write(reg, CS35L41_GPIO1_CTRL1, 0x00000001);
+               if (cs35l41->firmware_running) {
+                       cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap,
+                                                 CSPL_MBOX_CMD_PAUSE);
+                       regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
+                                          CS35L41_VMON_EN_MASK | CS35L41_IMON_EN_MASK,
+                                          0 << CS35L41_VMON_EN_SHIFT | 0 << CS35L41_IMON_EN_SHIFT);
+               }
                cs35l41_irq_release(cs35l41);
                break;
        default:
@@ -80,6 +271,8 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action)
                break;
        }
 
+       mutex_unlock(&cs35l41->fw_mutex);
+
        if (ret)
                dev_err(cs35l41->dev, "Regmap access fail: %d\n", ret);
 }
@@ -104,6 +297,51 @@ static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsi
                                    rx_slot);
 }
 
+static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
+{
+       int halo_sts;
+       int ret;
+
+       ret = cs35l41_init_dsp(cs35l41);
+       if (ret) {
+               dev_warn(cs35l41->dev, "Cannot Initialize Firmware. Error: %d\n", ret);
+               goto clean_dsp;
+       }
+
+       ret = cs35l41_write_fs_errata(cs35l41->dev, cs35l41->regmap);
+       if (ret) {
+               dev_err(cs35l41->dev, "Cannot Write FS Errata: %d\n", ret);
+               goto clean_dsp;
+       }
+
+       ret = cs_dsp_run(&cs35l41->cs_dsp);
+       if (ret) {
+               dev_err(cs35l41->dev, "Fail to start dsp: %d\n", ret);
+               goto clean_dsp;
+       }
+
+       ret = read_poll_timeout(hda_cs_dsp_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,
+                               &halo_sts, sizeof(halo_sts));
+
+       if (ret) {
+               dev_err(cs35l41->dev, "Timeout waiting for HALO Core to start. State: %d\n",
+                        halo_sts);
+               goto clean_dsp;
+       }
+
+       cs35l41_set_cspl_mbox_cmd(cs35l41->dev, cs35l41->regmap, CSPL_MBOX_CMD_PAUSE);
+       cs35l41->firmware_running = true;
+
+       return 0;
+
+clean_dsp:
+       cs35l41_shutdown_dsp(cs35l41);
+       return ret;
+}
+
 static int cs35l41_hda_bind(struct device *dev, struct device *master, void *master_data)
 {
        struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
@@ -121,6 +359,11 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
        strscpy(comps->name, dev_name(dev), sizeof(comps->name));
        comps->playback_hook = cs35l41_hda_playback_hook;
 
+       mutex_lock(&cs35l41->fw_mutex);
+       if (cs35l41_smart_amp(cs35l41) < 0)
+               dev_warn(cs35l41->dev, "Cannot Run Firmware, reverting to dsp bypass...\n");
+       mutex_unlock(&cs35l41->fw_mutex);
+
        return 0;
 }
 
@@ -535,6 +778,8 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
        if (ret)
                goto err;
 
+       mutex_init(&cs35l41->fw_mutex);
+
        ret = cs35l41_hda_apply_properties(cs35l41);
        if (ret)
                goto err;
@@ -562,6 +807,9 @@ void cs35l41_hda_remove(struct device *dev)
 {
        struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
 
+       if (cs35l41->halo_initialized)
+               cs35l41_remove_dsp(cs35l41);
+
        component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
 
        if (cs35l41_safe_reset(cs35l41->regmap, cs35l41->hw_cfg.bst_type))
@@ -571,5 +819,6 @@ void cs35l41_hda_remove(struct device *dev)
 EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, SND_HDA_SCODEC_CS35L41);
 
 MODULE_DESCRIPTION("CS35L41 HDA Driver");
+MODULE_IMPORT_NS(SND_HDA_CS_DSP_CONTROLS);
 MODULE_AUTHOR("Lucas Tanure, Cirrus Logic Inc, <tanureal@opensource.cirrus.com>");
 MODULE_LICENSE("GPL");
index aaf9e16684c267c2eb4024bf6aa6e3f14f53283f..5814af0509447a5a1c8eb3ed7c4e0e83468c1cc8 100644 (file)
@@ -15,6 +15,9 @@
 #include <linux/device.h>
 #include <sound/cs35l41.h>
 
+#include <linux/firmware/cirrus/cs_dsp.h>
+#include <linux/firmware/cirrus/wmfw.h>
+
 enum cs35l41_hda_spk_pos {
        CS35l41_LEFT,
        CS35l41_RIGHT,
@@ -39,7 +42,17 @@ struct cs35l41_hda {
        int channel_index;
        unsigned volatile long irq_errors;
        const char *amp_name;
+       struct mutex fw_mutex;
        struct regmap_irq_chip_data *irq_data;
+       bool firmware_running;
+       bool halo_initialized;
+       struct cs_dsp cs_dsp;
+};
+
+enum halo_state {
+       HALO_STATE_CODE_INIT_DOWNLOAD = 0,
+       HALO_STATE_CODE_START,
+       HALO_STATE_CODE_RUN
 };
 
 int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,