lkml.org 
[lkml]   [2024]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 24/53] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6
    Date
    Create a USB BE component that will register a new USB port to the ASoC USB
    framework. This will handle determination on if the requested audio
    profile is supported by the USB device currently selected.

    Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
    ---
    include/sound/q6usboffload.h | 20 ++++
    sound/soc/qcom/Kconfig | 4 +
    sound/soc/qcom/qdsp6/Makefile | 1 +
    sound/soc/qcom/qdsp6/q6usb.c | 218 ++++++++++++++++++++++++++++++++++
    sound/soc/soc-usb.c | 1 -
    5 files changed, 243 insertions(+), 1 deletion(-)
    create mode 100644 include/sound/q6usboffload.h
    create mode 100644 sound/soc/qcom/qdsp6/q6usb.c

    diff --git a/include/sound/q6usboffload.h b/include/sound/q6usboffload.h
    new file mode 100644
    index 000000000000..fdc1f5c53a3b
    --- /dev/null
    +++ b/include/sound/q6usboffload.h
    @@ -0,0 +1,20 @@
    +/* SPDX-License-Identifier: GPL-2.0
    + *
    + * linux/sound/q6usboffload.h -- QDSP6 USB offload
    + *
    + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +
    +/**
    + * struct q6usb_offload
    + * @dev - dev handle to usb be
    + * @sid - streamID for iommu
    + * @intr_num - usb interrupter number
    + * @domain - allocated iommu domain
    + **/
    +struct q6usb_offload {
    + struct device *dev;
    + long long sid;
    + u16 intr_num;
    + struct iommu_domain *domain;
    +};
    diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
    index 762491d6f2f2..b4eed01a2b2b 100644
    --- a/sound/soc/qcom/Kconfig
    +++ b/sound/soc/qcom/Kconfig
    @@ -114,6 +114,9 @@ config SND_SOC_QDSP6_APM
    config SND_SOC_QDSP6_PRM_LPASS_CLOCKS
    tristate

    +config SND_SOC_QDSP6_USB
    + tristate
    +
    config SND_SOC_QDSP6_PRM
    tristate
    select SND_SOC_QDSP6_PRM_LPASS_CLOCKS
    @@ -134,6 +137,7 @@ config SND_SOC_QDSP6
    select SND_SOC_TOPOLOGY
    select SND_SOC_QDSP6_APM
    select SND_SOC_QDSP6_PRM
    + select SND_SOC_QDSP6_USB
    help
    To add support for MSM QDSP6 Soc Audio.
    This will enable sound soc platform specific
    diff --git a/sound/soc/qcom/qdsp6/Makefile b/sound/soc/qcom/qdsp6/Makefile
    index 3963bf234664..c9457ee898d0 100644
    --- a/sound/soc/qcom/qdsp6/Makefile
    +++ b/sound/soc/qcom/qdsp6/Makefile
    @@ -17,3 +17,4 @@ obj-$(CONFIG_SND_SOC_QDSP6_APM_DAI) += q6apm-dai.o
    obj-$(CONFIG_SND_SOC_QDSP6_APM_LPASS_DAI) += q6apm-lpass-dais.o
    obj-$(CONFIG_SND_SOC_QDSP6_PRM) += q6prm.o
    obj-$(CONFIG_SND_SOC_QDSP6_PRM_LPASS_CLOCKS) += q6prm-clocks.o
    +obj-$(CONFIG_SND_SOC_QDSP6_USB) += q6usb.o
    diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
    new file mode 100644
    index 000000000000..00cba1021dc6
    --- /dev/null
    +++ b/sound/soc/qcom/qdsp6/q6usb.c
    @@ -0,0 +1,218 @@
    +// SPDX-License-Identifier: GPL-2.0
    +/*
    + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
    + */
    +
    +#include <linux/device.h>
    +#include <linux/dma-mapping.h>
    +#include <linux/dma-map-ops.h>
    +#include <linux/err.h>
    +#include <linux/init.h>
    +#include <linux/iommu.h>
    +#include <linux/module.h>
    +#include <linux/platform_device.h>
    +#include <linux/slab.h>
    +
    +#include <sound/asound.h>
    +#include <sound/pcm.h>
    +#include <sound/pcm_params.h>
    +#include <sound/q6usboffload.h>
    +#include <sound/soc.h>
    +#include <sound/soc-usb.h>
    +
    +#include <dt-bindings/sound/qcom,q6afe.h>
    +
    +#include "q6afe.h"
    +#include "q6dsp-lpass-ports.h"
    +
    +#define Q6_USB_SID_MASK 0xF
    +
    +struct q6usb_port_data {
    + struct q6afe_usb_cfg usb_cfg;
    + struct snd_soc_usb *usb;
    + struct q6usb_offload priv;
    + int active_usb_chip_idx;
    +};
    +
    +static const struct snd_soc_dapm_widget q6usb_dai_widgets[] = {
    + SND_SOC_DAPM_HP("USB_RX_BE", NULL),
    +};
    +
    +static const struct snd_soc_dapm_route q6usb_dapm_routes[] = {
    + {"USB Playback", NULL, "USB_RX_BE"},
    +};
    +
    +static int q6usb_hw_params(struct snd_pcm_substream *substream,
    + struct snd_pcm_hw_params *params,
    + struct snd_soc_dai *dai)
    +{
    + return 0;
    +}
    +
    +static const struct snd_soc_dai_ops q6usb_ops = {
    + .hw_params = q6usb_hw_params,
    +};
    +
    +static struct snd_soc_dai_driver q6usb_be_dais[] = {
    + {
    + .playback = {
    + .stream_name = "USB BE RX",
    + .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |
    + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |
    + SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |
    + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
    + SNDRV_PCM_RATE_192000,
    + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S16_BE |
    + SNDRV_PCM_FMTBIT_U16_LE | SNDRV_PCM_FMTBIT_U16_BE |
    + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_BE |
    + SNDRV_PCM_FMTBIT_U24_LE | SNDRV_PCM_FMTBIT_U24_BE,
    + .channels_min = 1,
    + .channels_max = 2,
    + .rate_max = 192000,
    + .rate_min = 8000,
    + },
    + .id = USB_RX,
    + .name = "USB_RX_BE",
    + .ops = &q6usb_ops,
    + },
    +};
    +
    +static int q6usb_audio_ports_of_xlate_dai_name(struct snd_soc_component *component,
    + const struct of_phandle_args *args,
    + const char **dai_name)
    +{
    + int id = args->args[0];
    + int ret = -EINVAL;
    + int i;
    +
    + for (i = 0; i < ARRAY_SIZE(q6usb_be_dais); i++) {
    + if (q6usb_be_dais[i].id == id) {
    + *dai_name = q6usb_be_dais[i].name;
    + ret = 0;
    + break;
    + }
    + }
    +
    + return ret;
    +}
    +
    +static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
    + struct snd_soc_usb_device *sdev, bool connected)
    +{
    + struct q6usb_port_data *data;
    +
    + if (!usb->component)
    + return -ENODEV;
    +
    + data = dev_get_drvdata(usb->component->dev);
    +
    + if (connected) {
    + /* We only track the latest USB headset plugged in */
    + data->active_usb_chip_idx = sdev->card_idx;
    + }
    +
    + return 0;
    +}
    +
    +static int q6usb_component_probe(struct snd_soc_component *component)
    +{
    + struct q6usb_port_data *data = dev_get_drvdata(component->dev);
    + struct snd_soc_usb *usb;
    + int ret;
    +
    + usb = snd_soc_usb_allocate_port(component, 1, &data->priv);
    + if (IS_ERR(usb))
    + return -ENOMEM;
    +
    + usb->connection_status_cb = q6usb_alsa_connection_cb;
    +
    + ret = snd_soc_usb_add_port(usb);
    + if (ret < 0) {
    + dev_err(component->dev, "failed to add usb port\n");
    + goto free_usb;
    + }
    +
    + data->usb = usb;
    +
    + return 0;
    +
    +free_usb:
    + snd_soc_usb_free_port(usb);
    +
    + return ret;
    +}
    +
    +static void q6usb_component_remove(struct snd_soc_component *component)
    +{
    + struct q6usb_port_data *data = dev_get_drvdata(component->dev);
    +
    + snd_soc_usb_remove_port(data->usb);
    + snd_soc_usb_free_port(data->usb);
    +}
    +
    +static const struct snd_soc_component_driver q6usb_dai_component = {
    + .probe = q6usb_component_probe,
    + .remove = q6usb_component_remove,
    + .name = "q6usb-dai-component",
    + .dapm_widgets = q6usb_dai_widgets,
    + .num_dapm_widgets = ARRAY_SIZE(q6usb_dai_widgets),
    + .dapm_routes = q6usb_dapm_routes,
    + .num_dapm_routes = ARRAY_SIZE(q6usb_dapm_routes),
    + .of_xlate_dai_name = q6usb_audio_ports_of_xlate_dai_name,
    +};
    +
    +static int q6usb_dai_dev_probe(struct platform_device *pdev)
    +{
    + struct device_node *node = pdev->dev.of_node;
    + struct q6usb_port_data *data;
    + struct device *dev = &pdev->dev;
    + struct of_phandle_args args;
    + int ret;
    +
    + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
    + if (!data)
    + return -ENOMEM;
    +
    + ret = of_property_read_u16(node, "qcom,usb-audio-intr-idx",
    + &data->priv.intr_num);
    + if (ret) {
    + dev_err(&pdev->dev, "failed to read intr idx.\n");
    + return ret;
    + }
    +
    + ret = of_parse_phandle_with_fixed_args(node, "iommus", 1, 0, &args);
    + if (ret < 0)
    + data->priv.sid = -1;
    + else
    + data->priv.sid = args.args[0] & Q6_USB_SID_MASK;
    +
    + data->priv.domain = iommu_get_domain_for_dev(&pdev->dev);
    +
    + data->priv.dev = dev;
    + dev_set_drvdata(dev, data);
    +
    + return devm_snd_soc_register_component(dev, &q6usb_dai_component,
    + q6usb_be_dais, ARRAY_SIZE(q6usb_be_dais));
    +}
    +
    +static const struct of_device_id q6usb_dai_device_id[] = {
    + { .compatible = "qcom,q6usb" },
    + {},
    +};
    +MODULE_DEVICE_TABLE(of, q6usb_dai_device_id);
    +
    +static struct platform_driver q6usb_dai_platform_driver = {
    + .driver = {
    + .name = "q6usb-dai",
    + .of_match_table = of_match_ptr(q6usb_dai_device_id),
    + },
    + .probe = q6usb_dai_dev_probe,
    + /*
    + * Remove not required as resources are cleaned up as part of
    + * component removal. Others are device managed resources.
    + */
    +};
    +module_platform_driver(q6usb_dai_platform_driver);
    +
    +MODULE_DESCRIPTION("Q6 USB backend dai driver");
    +MODULE_LICENSE("GPL");
    diff --git a/sound/soc/soc-usb.c b/sound/soc/soc-usb.c
    index ca92418501a3..a1e0363bd760 100644
    --- a/sound/soc/soc-usb.c
    +++ b/sound/soc/soc-usb.c
    @@ -101,7 +101,6 @@ struct snd_soc_usb *snd_soc_usb_allocate_port(struct snd_soc_component *componen

    usb->component = component;
    usb->priv_data = data;
    - usb->num_supported_streams = num_streams;

    return usb;
    }
    \
     
     \ /
      Last update: 2024-05-27 14:55    [W:7.520 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site