From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0C92C5DF63 for ; Wed, 6 Nov 2019 16:51:21 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 34AAA2067B for ; Wed, 6 Nov 2019 16:51:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="jfwcEmNl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34AAA2067B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E0E9116B3; Wed, 6 Nov 2019 17:50:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E0E9116B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1573059079; bh=6w4SkKNKH04HXME3xJ92KAbBDGTmW3Ymlo6OTFjm7JE=; h=To:References:From:Date:In-Reply-To:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jfwcEmNlggqHKWjgmPusmZxe/NBYJ0CUMBOPxzE9EJctdOq8HS6CdBu4eaVD3n5rg Iwj8+2N4nGg4UPfqhGB38+swR2CoS9Y7IV5qh7qxvniv3ZLwnYdVXFk3QDCnArfeG5 4VpzYxMGr3gAzu+6b3EI3pwyu35HFeg9tNffUtH4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9C17CF8048D; Wed, 6 Nov 2019 17:49:55 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5FD08F804CF; Wed, 6 Nov 2019 17:49:54 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D728AF803F4 for ; Wed, 6 Nov 2019 17:49:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D728AF803F4 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Nov 2019 08:49:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,275,1569308400"; d="scan'208";a="285713476" Received: from pdblomfi-mobl.gar.corp.intel.com (HELO [10.254.107.145]) ([10.254.107.145]) by orsmga001.jf.intel.com with ESMTP; 06 Nov 2019 08:49:46 -0800 To: Ravulapati Vishnu vardhan rao References: <1573137364-5592-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> <1573137364-5592-2-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> From: Pierre-Louis Bossart Message-ID: <64ac2908-1091-16ec-b25a-5ac2abc9c9a9@linux.intel.com> Date: Wed, 6 Nov 2019 10:24:52 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 In-Reply-To: <1573137364-5592-2-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> Content-Language: en-US Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , Maruthi Srinivas Bayyavarapu , open list , Takashi Iwai , Liam Girdwood , Akshu.Agrawal@amd.com, Sanju R Mehta , Mark Brown , djkurtz@google.com, Vijendar Mukunda , Alex Deucher , Colin Ian King , Dan Carpenter Subject: Re: [alsa-devel] [RESEND PATCH v2 1/7] ASoC: amd: Create multiple I2S platform device endpoints X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 11/7/19 8:35 AM, Ravulapati Vishnu vardhan rao wrote: > Creates Platform Device endpoints for multiple > I2S instances: SP and BT endpoints device. > Pass PCI resources like MMIO, irq to the platform devices. > > Signed-off-by: Ravulapati Vishnu vardhan rao > --- > sound/soc/amd/raven/acp3x.h | 5 +++ > sound/soc/amd/raven/pci-acp3x.c | 82 +++++++++++++++++++++++++++-------------- > 2 files changed, 60 insertions(+), 27 deletions(-) > > diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h > index 4f2cadd..2f15fe1 100644 > --- a/sound/soc/amd/raven/acp3x.h > +++ b/sound/soc/amd/raven/acp3x.h > @@ -7,10 +7,15 @@ > > #include "chip_offset_byte.h" > > +#define ACP3x_DEVS 3 > #define ACP3x_PHY_BASE_ADDRESS 0x1240000 > #define ACP3x_I2S_MODE 0 > #define ACP3x_REG_START 0x1240000 > #define ACP3x_REG_END 0x1250200 > +#define ACP3x_I2STDM_REG_START 0x1242400 > +#define ACP3x_I2STDM_REG_END 0x1242410 > +#define ACP3x_BT_TDM_REG_START 0x1242800 > +#define ACP3x_BT_TDM_REG_END 0x1242810 > #define I2S_MODE 0x04 > #define BT_TX_THRESHOLD 26 > #define BT_RX_THRESHOLD 25 > diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c > index facec24..ec3ef625 100644 > --- a/sound/soc/amd/raven/pci-acp3x.c > +++ b/sound/soc/amd/raven/pci-acp3x.c > @@ -16,16 +16,16 @@ struct acp3x_dev_data { > void __iomem *acp3x_base; > bool acp3x_audio_mode; > struct resource *res; > - struct platform_device *pdev; > + struct platform_device *pdev[ACP3x_DEVS]; > }; > > static int snd_acp3x_probe(struct pci_dev *pci, > const struct pci_device_id *pci_id) > { > int ret; > - u32 addr, val; > + u32 addr, val, i; > struct acp3x_dev_data *adata; > - struct platform_device_info pdevinfo; > + struct platform_device_info pdevinfo[ACP3x_DEVS]; > unsigned int irqflags; > > if (pci_enable_device(pci)) { > @@ -68,7 +68,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, > switch (val) { > case I2S_MODE: > adata->res = devm_kzalloc(&pci->dev, > - sizeof(struct resource) * 2, > + sizeof(struct resource) * 4, > GFP_KERNEL); > if (!adata->res) { > ret = -ENOMEM; > @@ -80,39 +80,62 @@ static int snd_acp3x_probe(struct pci_dev *pci, > adata->res[0].start = addr; > adata->res[0].end = addr + (ACP3x_REG_END - ACP3x_REG_START); > > - adata->res[1].name = "acp3x_i2s_irq"; > - adata->res[1].flags = IORESOURCE_IRQ; > - adata->res[1].start = pci->irq; > - adata->res[1].end = pci->irq; > + adata->res[1].name = "acp3x_i2s_sp"; > + adata->res[1].flags = IORESOURCE_MEM; > + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; > + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; > + > + adata->res[2].name = "acp3x_i2s_bt"; > + adata->res[2].flags = IORESOURCE_MEM; > + adata->res[2].start = addr + ACP3x_BT_TDM_REG_START; > + adata->res[2].end = addr + ACP3x_BT_TDM_REG_END; > + > + adata->res[3].name = "acp3x_i2s_irq"; > + adata->res[3].flags = IORESOURCE_IRQ; > + adata->res[3].start = pci->irq; > + adata->res[3].end = adata->res[3].start; > > adata->acp3x_audio_mode = ACP3x_I2S_MODE; > > memset(&pdevinfo, 0, sizeof(pdevinfo)); > - pdevinfo.name = "acp3x_rv_i2s"; > - pdevinfo.id = 0; > - pdevinfo.parent = &pci->dev; > - pdevinfo.num_res = 2; > - pdevinfo.res = adata->res; > - pdevinfo.data = &irqflags; > - pdevinfo.size_data = sizeof(irqflags); > - > - adata->pdev = platform_device_register_full(&pdevinfo); > - if (IS_ERR(adata->pdev)) { > - dev_err(&pci->dev, "cannot register %s device\n", > - pdevinfo.name); > - ret = PTR_ERR(adata->pdev); > - goto unmap_mmio; > + pdevinfo[0].name = "acp3x_rv_i2s_dma"; > + pdevinfo[0].id = 0; > + pdevinfo[0].parent = &pci->dev; > + pdevinfo[0].num_res = 4; > + pdevinfo[0].res = &adata->res[0]; > + pdevinfo[0].data = &irqflags; > + pdevinfo[0].size_data = sizeof(irqflags); > + > + pdevinfo[1].name = "acp3x_i2s_playcap"; > + pdevinfo[1].id = 0; > + pdevinfo[1].parent = &pci->dev; > + pdevinfo[1].num_res = 1; > + pdevinfo[1].res = &adata->res[1]; > + > + pdevinfo[2].name = "acp3x_i2s_playcap"; > + pdevinfo[2].id = 1; > + pdevinfo[2].parent = &pci->dev; > + pdevinfo[2].num_res = 1; > + pdevinfo[2].res = &adata->res[2]; > + for (i = 0; i < ACP3x_DEVS ; i++) { > + adata->pdev[i] = > + platform_device_register_full(&pdevinfo[i]); > + if (adata->pdev[i] == NULL) { should be IS_ERR(adata->pdev[i]) > + dev_err(&pci->dev, "cannot register %s device\n", > + pdevinfo[i].name); > + ret = -ENODEV; > + goto unmap_mmio; > + } > } > break; > - default: > - dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); > - ret = -ENODEV; > - goto unmap_mmio; > } > return 0; > > unmap_mmio: > pci_disable_msi(pci); > + for (i = 0 ; i < ACP3x_DEVS ; i++) > + platform_device_unregister(adata->pdev[i]); > + kfree(adata->res); You should revisit the labels, in the default case you haven't allocated any memory > iounmap(adata->acp3x_base); > release_regions: > pci_release_regions(pci); > @@ -124,9 +147,13 @@ static int snd_acp3x_probe(struct pci_dev *pci, > > static void snd_acp3x_remove(struct pci_dev *pci) > { > + int i; > struct acp3x_dev_data *adata = pci_get_drvdata(pci); > > - platform_device_unregister(adata->pdev); > + if (adata->acp3x_audio_mode == ACP3x_I2S_MODE) { > + for (i = 0 ; i < ACP3x_DEVS ; i++) > + platform_device_unregister(adata->pdev[i]); > + } > iounmap(adata->acp3x_base); > > pci_disable_msi(pci); > @@ -151,6 +178,7 @@ static struct pci_driver acp3x_driver = { > > module_pci_driver(acp3x_driver); > > +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com"); > MODULE_AUTHOR("Maruthi.Bayyavarapu@amd.com"); > MODULE_DESCRIPTION("AMD ACP3x PCI driver"); > MODULE_LICENSE("GPL v2"); > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel