Re: [PATCH 3/9] ASoC: amd: ps: add soundwire dma driver

From: Mukunda,Vijendar
Date: Wed May 17 2023 - 02:25:03 EST


On 16/05/23 22:20, Limonciello, Mario wrote:
>
> On 5/16/2023 9:40 AM, Pierre-Louis Bossart wrote:
>>
>> On 5/16/23 05:35, Vijendar Mukunda wrote:
>>> Soundwire DMA platform driver binds to the platform device created by
>>> ACP PCI device. Soundwire DMA driver registers ALSA DMA component
>>> with ASoC framework.
>>>
>>> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
>>> ---
>>>   sound/soc/amd/ps/acp63.h      |  5 +++
>>>   sound/soc/amd/ps/ps-sdw-dma.c | 71 +++++++++++++++++++++++++++++++++++
>>>   2 files changed, 76 insertions(+)
>>>   create mode 100644 sound/soc/amd/ps/ps-sdw-dma.c
>>>
>>> diff --git a/sound/soc/amd/ps/acp63.h b/sound/soc/amd/ps/acp63.h
>>> index faf7be4d77c2..f86c60cd1565 100644
>>> --- a/sound/soc/amd/ps/acp63.h
>>> +++ b/sound/soc/amd/ps/acp63.h
>>> @@ -111,6 +111,11 @@ struct pdm_dev_data {
>>>       struct snd_pcm_substream *capture_stream;
>>>   };
>>>   +struct sdw_dma_dev_data {
>>> +    void __iomem *acp_base;
>>> +    struct mutex *acp_lock; /* used to protect acp common register access */
>>> +};
>>> +
>>>   /**
>>>    * struct acp63_dev_data - acp pci driver context
>>>    * @acp63_base: acp mmio base
>>> diff --git a/sound/soc/amd/ps/ps-sdw-dma.c b/sound/soc/amd/ps/ps-sdw-dma.c
>>> new file mode 100644
>>> index 000000000000..0d0889842413
>>> --- /dev/null
>>> +++ b/sound/soc/amd/ps/ps-sdw-dma.c
>>> @@ -0,0 +1,71 @@
>>> +// SPDX-License-Identifier: GPL-2.0+
>>> +/*
>>> + * AMD ALSA SoC Pink Sardine Soundwire DMA Driver
>>> + *
>>> + * Copyright 2023 Advanced Micro Devices, Inc.
>>> + */
>>> +
>>> +#include <linux/err.h>
>>> +#include <linux/io.h>
>>> +#include <linux/module.h>
>>> +#include <linux/platform_device.h>
>>> +#include <sound/pcm_params.h>
>>> +#include <sound/soc.h>
>>> +#include <sound/soc-dai.h>
>>> +#include "acp63.h"
>>> +
>>> +#define DRV_NAME "amd_ps_sdw_dma"
>>> +
>>> +static const struct snd_soc_component_driver acp63_sdw_component = {
>>> +    .name        = DRV_NAME,
>>> +};
>>> +
>>> +static int acp63_sdw_platform_probe(struct platform_device *pdev)
>>> +{
>>> +    struct resource *res;
>>> +    struct sdw_dma_dev_data *sdw_data;
>>> +    int status;
>>> +
>>> +    if (!pdev->dev.platform_data) {
>>> +        dev_err(&pdev->dev, "platform_data not retrieved\n");
>>> +        return -ENODEV;
>>> +    }
>>> +    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>>> +    if (!res) {
>>> +        dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n");
>>> +        return -ENODEV;
>>> +    }
>>> +
>>> +    sdw_data = devm_kzalloc(&pdev->dev, sizeof(*sdw_data), GFP_KERNEL);
>>> +    if (!sdw_data)
>>> +        return -ENOMEM;
>>> +
>>> +    sdw_data->acp_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
>>> +    if (!sdw_data->acp_base)
>>> +        return -ENOMEM;
>>> +
>>> +    sdw_data->acp_lock = pdev->dev.platform_data;
>>> +    dev_set_drvdata(&pdev->dev, sdw_data);
>>> +    status = devm_snd_soc_register_component(&pdev->dev,
>>> +                         &acp63_sdw_component,
>>> +                         NULL, 0);
>>> +    if (status) {
>>> +        dev_err(&pdev->dev, "Fail to register sdw dma component\n");
>>> +        return -ENODEV;
>> return status;
>
> Remove the other return 0 too.
>
> IE:
>
> if (status)
>
>     dev_err(...)
>
> return status;

will fix it.
>
>>
>>> +    }
>>> +    return 0;
>>> +}
>>> +
>>> +static struct platform_driver acp63_sdw_dma_driver = {
>>> +    .probe = acp63_sdw_platform_probe,
>>> +    .driver = {
>>> +        .name = "amd_ps_sdw_dma",
>>> +    },
>>> +};
>>> +
>>> +module_platform_driver(acp63_sdw_dma_driver);
>>> +
>>> +MODULE_AUTHOR("Vijendar.Mukunda@xxxxxxx");
>>> +MODULE_DESCRIPTION("AMD ACP6.3 PS SDW DMA Driver");
>>> +MODULE_LICENSE("GPL");
>>> +MODULE_ALIAS("platform:" DRV_NAME);