From patchwork Mon Aug 7 07:43:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Andrushchenko X-Patchwork-Id: 9884849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 35CB7603F9 for ; Mon, 7 Aug 2017 09:29:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2973F28618 for ; Mon, 7 Aug 2017 09:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 187402861B; Mon, 7 Aug 2017 09:29:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF842860F for ; Mon, 7 Aug 2017 09:29:45 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B88E5267076; Mon, 7 Aug 2017 11:26:57 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6336726704B; Mon, 7 Aug 2017 09:43:45 +0200 (CEST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by alsa0.perex.cz (Postfix) with ESMTP id AF7E5267046 for ; Mon, 7 Aug 2017 09:43:41 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id t128so4875096lff.3 for ; Mon, 07 Aug 2017 00:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QWCk48QTFd8dRXRYWoHHo9AICyn/sa2qSIqYMNHKeCk=; b=vEMDmLIfdK9jTUFID34PvrPY4oQSdbhmRS08CIWUpYN330W1iS9TuZgK8oW2F4xCtR SITx+4vBz9GMSWzxONCTx9T8pVKZ55iAZ2gQ28jFPADtbUyulGzvxZ4nFUvF1V1XaTCK NxP/2xrWmFlLVa5/ZqSx8YfHA/I8EESFR7vkMBO4Hnn45JjZlmyFNxtiUAwK7hP1VkVK jj5cbVhvbWHgfGfAjmIuFQBU3BhcvGtE7Uo9WMOhcKtT+n0WfWdEdTdPrdQpAxRtmPLG 4qk14nT/hRvsoC1nRZtM+DKM4D17PZ+ZltyNu0jWRS5jiRSH1WSSHViGcGB/IZOa/zeG zlMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QWCk48QTFd8dRXRYWoHHo9AICyn/sa2qSIqYMNHKeCk=; b=sGiyDlXfS6DUXdMe/hV/DB69fmNhTXsxf5aGdl7CLxlgNtThxpASC+PX3eZE3amNv/ PT8YN0kOe3RaGbMgnY1eg7+xrlGKbcX3/AxCAMU3WpWhG6uv4jMM5h+TahTP7vMaHd5d 04W3+LL/jpwEDyN3HngOJZ6UGQ4xnifrqvTUvExwnAhcJwxa8WzbtjHKXwImoknsorXD cCAFaOnOvwbW6BJJpldpcdgkkx43pgTx6WGuCbXAH2kihn9Zlg/Zfo1qBv8qDEL0pazc WdR3ipEgiz7Ptzu+uIiwE+lbiW0+A08N0vcUc5pMKv2orruiwiHRaBIKuXVtGdPO45fe YMVQ== X-Gm-Message-State: AHYfb5ioUeLAWpN7OVpJskdhWj3RnXxkDk9L9GoLOnG8BhsvV9X/N3M9 jbgkWagoIBuAERDq X-Received: by 10.46.88.66 with SMTP id x2mr3420428ljd.126.1502091821038; Mon, 07 Aug 2017 00:43:41 -0700 (PDT) Received: from a2k-HP-ProDesk-600-G2-SFF.kyiv.epam.com (ll-52.209.223.85.sovam.net.ua. [85.223.209.52]) by smtp.gmail.com with ESMTPSA id f136sm399062lff.34.2017.08.07.00.43.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Aug 2017 00:43:40 -0700 (PDT) From: Oleksandr Andrushchenko To: alsa-devel@alsa-project.org, xen-devel@lists.xen.org, linux-kernel@vger.kernel.org Date: Mon, 7 Aug 2017 10:43:11 +0300 Message-Id: <1502091796-14413-7-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502091796-14413-1-git-send-email-andr2000@gmail.com> References: <1502091796-14413-1-git-send-email-andr2000@gmail.com> X-Mailman-Approved-At: Mon, 07 Aug 2017 11:26:50 +0200 Cc: andr2000@gmail.com, Oleksandr Andrushchenko , tiwai@suse.com Subject: [alsa-devel] [PATCH 06/11] ALSA: vsnd: Introduce ALSA virtual sound driver X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Andrushchenko Implement essential initialization of the sound driver: - introduce required data structures - handle driver registration - handle sound card registration - register sound driver on backend connection - remove sound driver on backend disconnect Signed-off-by: Oleksandr Andrushchenko --- sound/drivers/xen-front.c | 161 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 2 deletions(-) diff --git a/sound/drivers/xen-front.c b/sound/drivers/xen-front.c index 04ebc15757f4..f3e3f64f0aa6 100644 --- a/sound/drivers/xen-front.c +++ b/sound/drivers/xen-front.c @@ -19,13 +19,14 @@ */ #include +#include #include #include -#include #include #include +#include #include #include @@ -66,6 +67,33 @@ struct sh_buf_info { size_t vbuffer_sz; }; +struct sdev_pcm_stream_info { + int unique_id; + struct snd_pcm_hardware pcm_hw; + struct xdrv_evtchnl_info *evt_chnl; + bool is_open; + uint8_t req_next_id; + struct sh_buf_info sh_buf; +}; + +struct sdev_pcm_instance_info { + struct sdev_card_info *card_info; + struct snd_pcm *pcm; + struct snd_pcm_hardware pcm_hw; + int num_pcm_streams_pb; + struct sdev_pcm_stream_info *streams_pb; + int num_pcm_streams_cap; + struct sdev_pcm_stream_info *streams_cap; +}; + +struct sdev_card_info { + struct xdrv_info *xdrv_info; + struct snd_card *card; + struct snd_pcm_hardware pcm_hw; + int num_pcm_instances; + struct sdev_pcm_instance_info *pcm_instances; +}; + struct cfg_stream { int unique_id; char *xenstore_path; @@ -99,6 +127,8 @@ struct xdrv_info { struct xenbus_device *xb_dev; spinlock_t io_lock; struct mutex mutex; + bool sdrv_registered; + struct platform_device *sdrv_pdev; int num_evt_channels; struct xdrv_evtchnl_info *evt_chnls; struct sdev_card_plat_data cfg_plat_data; @@ -138,6 +168,132 @@ static struct snd_pcm_hardware sdrv_pcm_hw_default = { .fifo_size = 0, }; +static int sdrv_new_pcm(struct sdev_card_info *card_info, + struct cfg_pcm_instance *instance_config, + struct sdev_pcm_instance_info *pcm_instance_info) +{ + return 0; +} + +static int sdrv_probe(struct platform_device *pdev) +{ + struct sdev_card_info *card_info; + struct sdev_card_plat_data *platdata; + struct snd_card *card; + int ret, i; + + platdata = dev_get_platdata(&pdev->dev); + + dev_dbg(&pdev->dev, "Creating virtual sound card\n"); + + ret = snd_card_new(&pdev->dev, 0, XENSND_DRIVER_NAME, THIS_MODULE, + sizeof(struct sdev_card_info), &card); + if (ret < 0) + return ret; + + card_info = card->private_data; + card_info->xdrv_info = platdata->xdrv_info; + card_info->card = card; + card_info->pcm_instances = devm_kcalloc(&pdev->dev, + platdata->cfg_card.num_pcm_instances, + sizeof(struct sdev_pcm_instance_info), GFP_KERNEL); + if (!card_info->pcm_instances) { + ret = -ENOMEM; + goto fail; + } + + card_info->num_pcm_instances = platdata->cfg_card.num_pcm_instances; + card_info->pcm_hw = platdata->cfg_card.pcm_hw; + + for (i = 0; i < platdata->cfg_card.num_pcm_instances; i++) { + ret = sdrv_new_pcm(card_info, + &platdata->cfg_card.pcm_instances[i], + &card_info->pcm_instances[i]); + if (ret < 0) + goto fail; + } + + strncpy(card->driver, XENSND_DRIVER_NAME, sizeof(card->driver)); + strncpy(card->shortname, platdata->cfg_card.name_short, + sizeof(card->shortname)); + strncpy(card->longname, platdata->cfg_card.name_long, + sizeof(card->longname)); + + ret = snd_card_register(card); + if (ret < 0) + goto fail; + + platform_set_drvdata(pdev, card); + return 0; + +fail: + snd_card_free(card); + return ret; +} + +static int sdrv_remove(struct platform_device *pdev) +{ + struct sdev_card_info *info; + struct snd_card *card = platform_get_drvdata(pdev); + + info = card->private_data; + dev_dbg(&pdev->dev, "Removing virtual sound card %d\n", + info->card->number); + snd_card_free(card); + return 0; +} + +static struct platform_driver sdrv_info = { + .probe = sdrv_probe, + .remove = sdrv_remove, + .driver = { + .name = XENSND_DRIVER_NAME, + }, +}; + +static void sdrv_cleanup(struct xdrv_info *drv_info) +{ + if (!drv_info->sdrv_registered) + return; + + if (drv_info->sdrv_pdev) { + struct platform_device *sdrv_pdev; + + sdrv_pdev = drv_info->sdrv_pdev; + if (sdrv_pdev) + platform_device_unregister(sdrv_pdev); + } + platform_driver_unregister(&sdrv_info); + drv_info->sdrv_registered = false; +} + +static int sdrv_init(struct xdrv_info *drv_info) +{ + struct platform_device *sdrv_pdev; + int ret; + + ret = platform_driver_register(&sdrv_info); + if (ret < 0) + return ret; + + drv_info->sdrv_registered = true; + /* pass card configuration via platform data */ + sdrv_pdev = platform_device_register_data(NULL, + XENSND_DRIVER_NAME, 0, &drv_info->cfg_plat_data, + sizeof(drv_info->cfg_plat_data)); + if (IS_ERR(sdrv_pdev)) + goto fail; + + drv_info->sdrv_pdev = sdrv_pdev; + return 0; + +fail: + dev_err(&drv_info->xb_dev->dev, + "failed to register virtual sound driver\n"); + sdrv_cleanup(drv_info); + return -ENODEV; +} + static irqreturn_t xdrv_evtchnl_interrupt(int irq, void *dev_id) { struct xdrv_evtchnl_info *channel = dev_id; @@ -830,6 +986,7 @@ static int cfg_card(struct xdrv_info *drv_info, static void xdrv_remove_internal(struct xdrv_info *drv_info) { + sdrv_cleanup(drv_info); xdrv_evtchnl_free_all(drv_info); } @@ -1018,7 +1175,7 @@ static int xdrv_be_on_initwait(struct xdrv_info *drv_info) static inline int xdrv_be_on_connected(struct xdrv_info *drv_info) { - return 0; + return sdrv_init(drv_info); } static inline void xdrv_be_on_disconnected(struct xdrv_info *drv_info)