[alsa-devel] [PATCH 1/7] ASoC: amd: No need PCI-MSI interrupts
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/pci-acp3x.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index facec24..8f6bf00 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -46,14 +46,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, goto release_regions; }
- /* check for msi interrupt support */ - ret = pci_enable_msi(pci); - if (ret) - /* msi is not enabled */ - irqflags = IRQF_SHARED; - else - /* msi is enabled */ - irqflags = 0; + irqflags = 0;
addr = pci_resource_start(pci, 0); adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); @@ -112,7 +105,6 @@ static int snd_acp3x_probe(struct pci_dev *pci, return 0;
unmap_mmio: - pci_disable_msi(pci); iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); @@ -129,7 +121,6 @@ static void snd_acp3x_remove(struct pci_dev *pci) platform_device_unregister(adata->pdev); iounmap(adata->acp3x_base);
- pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); }
Removed platform based endpoint registering in ACP-PCI driver. Now Registering PCM DMA and multiple I2S instances: SP and BT endpoint devices automatically by using MFD framework.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/acp3x.h | 8 +++ sound/soc/amd/raven/pci-acp3x.c | 123 ++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 41 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..c122dc6 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,13 +7,21 @@
#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 I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 8f6bf00..d9f5bc0 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,13 +9,21 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/mfd/core.h>
#include "acp3x.h"
+struct i2s_platform_data { + unsigned int cap; + int channel; + u32 snd_rates; +}; struct acp3x_dev_data { + struct device *parent; + struct mfd_cell *cell; + struct resource *res; void __iomem *acp3x_base; bool acp3x_audio_mode; - struct resource *res; struct platform_device *pdev; };
@@ -23,9 +31,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { int ret; - u32 addr, val; + resource_size_t addr; + int val, i, r; struct acp3x_dev_data *adata; - struct platform_device_info pdevinfo; + struct device *dev; + struct i2s_platform_data *i2s_pdata; unsigned int irqflags;
if (pci_enable_device(pci)) { @@ -56,55 +66,87 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata); - + adata->parent = &pci->dev; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev, - sizeof(struct resource) * 2, - GFP_KERNEL); - if (!adata->res) { + sizeof(struct resource) * 4, + GFP_KERNEL); + adata->cell = devm_kzalloc(&pci->dev, + sizeof(struct mfd_cell) * ACP3x_DEVS, + GFP_KERNEL); + if (!adata->cell) { ret = -ENOMEM; goto unmap_mmio; }
- adata->res[0].name = "acp3x_i2s_iomem"; - adata->res[0].flags = IORESOURCE_MEM; - 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->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; + i2s_pdata = devm_kzalloc(&pci->dev, + sizeof(struct i2s_platform_data) * ACP3x_DEVS, + GFP_KERNEL); + if (i2s_pdata == NULL) { + kfree(adata->res); + kfree(adata->cell); + return -ENOMEM; } + adata->res[0].name = "acp3x_i2s_iomem"; + adata->res[0].flags = IORESOURCE_MEM; + adata->res[0].start = addr; + adata->res[0].end = addr + + (ACP3x_REG_END - ACP3x_REG_START); + i2s_pdata[0].cap = 0; + i2s_pdata[0].snd_rates = SNDRV_PCM_RATE_8000_96000; + + adata->res[1].name = "acp3x_i2s_sp_play_cap"; + adata->res[1].flags = IORESOURCE_MEM; + adata->res[1].start = addr + ACP3x_I2STDM_REG_START; + adata->res[1].end = addr + ACP3x_I2STDM_REG_END; + i2s_pdata[1].cap = 0; + i2s_pdata[1].snd_rates = SNDRV_PCM_RATE_8000_96000; + + adata->res[2].name = "acp3x_i2s_bt_play_cap"; + 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; + i2s_pdata[2].cap = 0; + i2s_pdata[2].snd_rates = SNDRV_PCM_RATE_8000_96000; + + 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; + + adata->cell[0].name = "acp3x_rv_i2s_dma"; + adata->cell[0].num_resources = 4; + adata->cell[0].resources = &adata->res[0]; + adata->cell[0].platform_data = &irqflags; + adata->cell[0].pdata_size = sizeof(irqflags); + + adata->cell[1].name = "acp3x_i2s_playcap"; + adata->cell[1].num_resources = 1; + adata->cell[1].resources = &adata->res[1]; + adata->cell[1].platform_data = &i2s_pdata[0]; + adata->cell[1].pdata_size = + sizeof(struct i2s_platform_data); + + adata->cell[2].name = "acp3x_i2s_playcap"; + adata->cell[2].num_resources = 1; + adata->cell[2].resources = &adata->res[2]; + adata->cell[2].platform_data = &i2s_pdata[1]; + adata->cell[2].pdata_size = + sizeof(struct i2s_platform_data); + r = mfd_add_hotplug_devices(adata->parent, + adata->cell, ACP3x_DEVS); break; - default: - dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val); - ret = -ENODEV; - goto unmap_mmio; } return 0;
unmap_mmio: + mfd_remove_devices(adata->parent); + kfree(adata->res); + kfree(adata->cell); iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); @@ -117,10 +159,8 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci); - - platform_device_unregister(adata->pdev); + mfd_remove_devices(adata->parent); iounmap(adata->acp3x_base); - pci_release_regions(pci); pci_disable_device(pci); } @@ -142,6 +182,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");
On Tue, 01 Oct 2019, Ravulapati Vishnu vardhan rao wrote:
Removed platform based endpoint registering in ACP-PCI driver. Now Registering PCM DMA and multiple I2S instances: SP and BT endpoint devices automatically by using MFD framework.
This is a hack.
Why are you using the MFD framework outside of drivers/mfd?
If this driver is an MFD, then please create an MFD driver.
If it's not, please do not use the MFD API.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com
sound/soc/amd/raven/acp3x.h | 8 +++ sound/soc/amd/raven/pci-acp3x.c | 123 ++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 41 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..c122dc6 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,13 +7,21 @@
#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 I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 8f6bf00..d9f5bc0 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,13 +9,21 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/mfd/core.h>
#include "acp3x.h"
+struct i2s_platform_data {
- unsigned int cap;
- int channel;
- u32 snd_rates;
+}; struct acp3x_dev_data {
- struct device *parent;
- struct mfd_cell *cell;
- struct resource *res; void __iomem *acp3x_base; bool acp3x_audio_mode;
- struct resource *res; struct platform_device *pdev;
};
@@ -23,9 +31,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { int ret;
- u32 addr, val;
- resource_size_t addr;
- int val, i, r; struct acp3x_dev_data *adata;
- struct platform_device_info pdevinfo;
struct device *dev;
struct i2s_platform_data *i2s_pdata; unsigned int irqflags;
if (pci_enable_device(pci)) {
@@ -56,55 +66,87 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata);
- adata->parent = &pci->dev; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev,
sizeof(struct resource) * 2,GFP_KERNEL);if (!adata->res) {
sizeof(struct resource) * 4,GFP_KERNEL);adata->cell = devm_kzalloc(&pci->dev,sizeof(struct mfd_cell) * ACP3x_DEVS,GFP_KERNEL);if (!adata->cell) { ret = -ENOMEM; goto unmap_mmio;
adata->res[0].name = "acp3x_i2s_iomem";adata->res[0].flags = IORESOURCE_MEM;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->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;
i2s_pdata = devm_kzalloc(&pci->dev,sizeof(struct i2s_platform_data) * ACP3x_DEVS,GFP_KERNEL);if (i2s_pdata == NULL) {kfree(adata->res);kfree(adata->cell);return -ENOMEM;adata->res[0].name = "acp3x_i2s_iomem";adata->res[0].flags = IORESOURCE_MEM;adata->res[0].start = addr;adata->res[0].end = addr +(ACP3x_REG_END - ACP3x_REG_START);i2s_pdata[0].cap = 0;i2s_pdata[0].snd_rates = SNDRV_PCM_RATE_8000_96000;adata->res[1].name = "acp3x_i2s_sp_play_cap";adata->res[1].flags = IORESOURCE_MEM;adata->res[1].start = addr + ACP3x_I2STDM_REG_START;adata->res[1].end = addr + ACP3x_I2STDM_REG_END;i2s_pdata[1].cap = 0;i2s_pdata[1].snd_rates = SNDRV_PCM_RATE_8000_96000;adata->res[2].name = "acp3x_i2s_bt_play_cap";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;i2s_pdata[2].cap = 0;i2s_pdata[2].snd_rates = SNDRV_PCM_RATE_8000_96000;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;adata->cell[0].name = "acp3x_rv_i2s_dma";adata->cell[0].num_resources = 4;adata->cell[0].resources = &adata->res[0];adata->cell[0].platform_data = &irqflags;adata->cell[0].pdata_size = sizeof(irqflags);adata->cell[1].name = "acp3x_i2s_playcap";adata->cell[1].num_resources = 1;adata->cell[1].resources = &adata->res[1];adata->cell[1].platform_data = &i2s_pdata[0];adata->cell[1].pdata_size =sizeof(struct i2s_platform_data);adata->cell[2].name = "acp3x_i2s_playcap";adata->cell[2].num_resources = 1;adata->cell[2].resources = &adata->res[2];adata->cell[2].platform_data = &i2s_pdata[1];adata->cell[2].pdata_size =sizeof(struct i2s_platform_data);r = mfd_add_hotplug_devices(adata->parent,adata->cell, ACP3x_DEVS);
- default:
dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val);ret = -ENODEV;goto unmap_mmio;unmap_mmio:
- mfd_remove_devices(adata->parent);
- kfree(adata->res);
- kfree(adata->cell); iounmap(adata->acp3x_base);
release_regions: pci_release_regions(pci); @@ -117,10 +159,8 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci);
- platform_device_unregister(adata->pdev);
- mfd_remove_devices(adata->parent); iounmap(adata->acp3x_base);
- pci_release_regions(pci); pci_disable_device(pci);
} @@ -142,6 +182,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");
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding the devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Thank you once again for your inputs.
Regards, Vishnu
On 01/10/19 12:15 PM, Lee Jones wrote:
On Tue, 01 Oct 2019, Ravulapati Vishnu vardhan rao wrote:
Removed platform based endpoint registering in ACP-PCI driver. Now Registering PCM DMA and multiple I2S instances: SP and BT endpoint devices automatically by using MFD framework.
This is a hack.
Why are you using the MFD framework outside of drivers/mfd?
If this driver is an MFD, then please create an MFD driver.
If it's not, please do not use the MFD API.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com
sound/soc/amd/raven/acp3x.h | 8 +++ sound/soc/amd/raven/pci-acp3x.c | 123 ++++++++++++++++++++++++++-------------- 2 files changed, 90 insertions(+), 41 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 4f2cadd..c122dc6 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,13 +7,21 @@
#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 I2S_RX_THRESHOLD 27 +#define I2S_TX_THRESHOLD 28 #define BT_TX_THRESHOLD 26 #define BT_RX_THRESHOLD 25 +#define ACP_ERR_INTR_MASK 29 #define ACP3x_POWER_ON 0x00 #define ACP3x_POWER_ON_IN_PROGRESS 0x01 #define ACP3x_POWER_OFF 0x02 diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index 8f6bf00..d9f5bc0 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -9,13 +9,21 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/interrupt.h> +#include <linux/mfd/core.h>
#include "acp3x.h"
+struct i2s_platform_data {
- unsigned int cap;
- int channel;
- u32 snd_rates;
+}; struct acp3x_dev_data {
- struct device *parent;
- struct mfd_cell *cell;
- struct resource *res; void __iomem *acp3x_base; bool acp3x_audio_mode;
- struct resource *res; struct platform_device *pdev; };
@@ -23,9 +31,11 @@ static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { int ret;
- u32 addr, val;
- resource_size_t addr;
- int val, i, r; struct acp3x_dev_data *adata;
- struct platform_device_info pdevinfo;
struct device *dev;
struct i2s_platform_data *i2s_pdata; unsigned int irqflags;
if (pci_enable_device(pci)) {
@@ -56,55 +66,87 @@ static int snd_acp3x_probe(struct pci_dev *pci, } pci_set_master(pci); pci_set_drvdata(pci, adata);
- adata->parent = &pci->dev; val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { case I2S_MODE: adata->res = devm_kzalloc(&pci->dev,
sizeof(struct resource) * 2,GFP_KERNEL);if (!adata->res) {
sizeof(struct resource) * 4,GFP_KERNEL);adata->cell = devm_kzalloc(&pci->dev,sizeof(struct mfd_cell) * ACP3x_DEVS,GFP_KERNEL);if (!adata->cell) { ret = -ENOMEM; goto unmap_mmio;
adata->res[0].name = "acp3x_i2s_iomem";adata->res[0].flags = IORESOURCE_MEM;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->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;
i2s_pdata = devm_kzalloc(&pci->dev,sizeof(struct i2s_platform_data) * ACP3x_DEVS,GFP_KERNEL);if (i2s_pdata == NULL) {kfree(adata->res);kfree(adata->cell);return -ENOMEM;adata->res[0].name = "acp3x_i2s_iomem";adata->res[0].flags = IORESOURCE_MEM;adata->res[0].start = addr;adata->res[0].end = addr +(ACP3x_REG_END - ACP3x_REG_START);i2s_pdata[0].cap = 0;i2s_pdata[0].snd_rates = SNDRV_PCM_RATE_8000_96000;adata->res[1].name = "acp3x_i2s_sp_play_cap";adata->res[1].flags = IORESOURCE_MEM;adata->res[1].start = addr + ACP3x_I2STDM_REG_START;adata->res[1].end = addr + ACP3x_I2STDM_REG_END;i2s_pdata[1].cap = 0;i2s_pdata[1].snd_rates = SNDRV_PCM_RATE_8000_96000;adata->res[2].name = "acp3x_i2s_bt_play_cap";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;i2s_pdata[2].cap = 0;i2s_pdata[2].snd_rates = SNDRV_PCM_RATE_8000_96000;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;adata->cell[0].name = "acp3x_rv_i2s_dma";adata->cell[0].num_resources = 4;adata->cell[0].resources = &adata->res[0];adata->cell[0].platform_data = &irqflags;adata->cell[0].pdata_size = sizeof(irqflags);adata->cell[1].name = "acp3x_i2s_playcap";adata->cell[1].num_resources = 1;adata->cell[1].resources = &adata->res[1];adata->cell[1].platform_data = &i2s_pdata[0];adata->cell[1].pdata_size =sizeof(struct i2s_platform_data);adata->cell[2].name = "acp3x_i2s_playcap";adata->cell[2].num_resources = 1;adata->cell[2].resources = &adata->res[2];adata->cell[2].platform_data = &i2s_pdata[1];adata->cell[2].pdata_size =sizeof(struct i2s_platform_data);r = mfd_add_hotplug_devices(adata->parent,adata->cell, ACP3x_DEVS);
default:
dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val);ret = -ENODEV;goto unmap_mmio;} return 0;
unmap_mmio:
- mfd_remove_devices(adata->parent);
- kfree(adata->res);
- kfree(adata->cell); iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci);
@@ -117,10 +159,8 @@ static int snd_acp3x_probe(struct pci_dev *pci, static void snd_acp3x_remove(struct pci_dev *pci) { struct acp3x_dev_data *adata = pci_get_drvdata(pci);
- platform_device_unregister(adata->pdev);
- mfd_remove_devices(adata->parent); iounmap(adata->acp3x_base);
- pci_release_regions(pci); pci_disable_device(pci); }
@@ -142,6 +182,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");
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding the devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Tuesday, October 1, 2019 8:00 AM To: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding the devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
There are more drivers outside of drivers/mfd using this API than drivers in drivers/mfd. In a lot of cases it doesn't make sense to move the driver to drivers/mfd.
Alex
-- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
On Tue, 01 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Tuesday, October 1, 2019 8:00 AM To: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding the devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
There are more drivers outside of drivers/mfd using this API than drivers in drivers/mfd.
People do wrong things all the time. It doesn't make them right.
In a lot of cases it doesn't make sense to move the driver to drivers/mfd.
In those cases, the platform_device_*() API should be used.
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Wednesday, October 2, 2019 8:38 AM To: Deucher, Alexander Alexander.Deucher@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Tuesday, October 1, 2019 8:00 AM To: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Liam Girdwood
Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju
Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org;
open
list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding
the
devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
There are more drivers outside of drivers/mfd using this API than drivers in drivers/mfd.
People do wrong things all the time. It doesn't make them right.
In a lot of cases it doesn't make sense to move the driver to drivers/mfd.
In those cases, the platform_device_*() API should be used.
Why do we have both? It's not clear to me on when we should use one vs the other. These are not platforms per se, they are PCI devices that happen to have other devices on them. On previous projects, I was told to use mfd and no objections were raised at that time.
Alex
On Wed, 02 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Wednesday, October 2, 2019 8:38 AM To: Deucher, Alexander Alexander.Deucher@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Tuesday, October 1, 2019 8:00 AM To: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Liam Girdwood
Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju
Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org;
open
list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding
the
devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
There are more drivers outside of drivers/mfd using this API than drivers in drivers/mfd.
People do wrong things all the time. It doesn't make them right.
In a lot of cases it doesn't make sense to move the driver to drivers/mfd.
In those cases, the platform_device_*() API should be used.
Why do we have both? It's not clear to me on when we should use one
The platform_device_*() API is the de facto API to use for registering devices. mfd_*() is a framework built on-top of that for devices which register sub-devices that do not reasonably reside elsewhere.
The mfd_*() helper functions should only be used by MFD devices.
vs the other. These are not platforms per se, they are PCI devices that happen to have other devices on them. On previous projects, I was told to use mfd and no objections were raised at that time.
Who told you to use MFD API outside of drivers/mfd? That's a hack.
Hi Lee,
We have two instances BT and I2S. We need to create devices with same name added with number of device like example: acp3x_i2s_playcap.1.autohttp://1.auto acp3x_i2s_playcap.2.autohttp://2.auto
by using MFD we can make it happen automatically by giving "acp3x_i2s_playcap" and other extension will be added by MFD add device API. This helps us by rectifying the renaming issue which we get by using Platform_dev_create API`s.If we have to use platform related APIs then we need to give different naming conventions while creating the devices and cant use it in loop as we have 3 devices we need to call three explicitly.This make our code lengthy. If we use MFD it would help us a lot.
Please suggest us how can we proceed.
Thanks, Vishnu
Get Outlook for Androidhttps://aka.ms/ghei36
________________________________ From: Lee Jones lee.jones@linaro.org Sent: Wednesday, October 2, 2019 7:05:53 PM To: Deucher, Alexander Alexander.Deucher@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Wed, 02 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Wednesday, October 2, 2019 8:38 AM To: Deucher, Alexander Alexander.Deucher@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju Sanju.Mehta@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, Deucher, Alexander wrote:
-----Original Message----- From: Lee Jones lee.jones@linaro.org Sent: Tuesday, October 1, 2019 8:00 AM To: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Liam Girdwood
Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Mehta, Sanju
Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org;
open
list linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/7] ASoC: amd: Registering device endpoints using MFD framework
On Tue, 01 Oct 2019, vishnu wrote:
Hi Jones,
I am very Thankful to your review comments.
Actually The driver is not totally based on MFD. It just uses mfd_add_hotplug_devices() and mfd_remove_devices() for adding
the
devices automatically.
Remaining code has nothing to do with MFD framework.
So I thought It would not break the coding style and moved ahead by using the MFD API by adding its header file.
If it is any violation of coding standard then I can move it to drivers/mfd.
This patch could be a show stopper for us.Please suggest us how can we move ahead ASAP.
Either move the MFD parts to drivers/mfd, or stop using the MFD API.
There are more drivers outside of drivers/mfd using this API than drivers in drivers/mfd.
People do wrong things all the time. It doesn't make them right.
In a lot of cases it doesn't make sense to move the driver to drivers/mfd.
In those cases, the platform_device_*() API should be used.
Why do we have both? It's not clear to me on when we should use one
The platform_device_*() API is the de facto API to use for registering devices. mfd_*() is a framework built on-top of that for devices which register sub-devices that do not reasonably reside elsewhere.
The mfd_*() helper functions should only be used by MFD devices.
vs the other. These are not platforms per se, they are PCI devices that happen to have other devices on them. On previous projects, I was told to use mfd and no objections were raised at that time.
Who told you to use MFD API outside of drivers/mfd? That's a hack.
-- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
On Thu, 10 Oct 2019, RAVULAPATI, VISHNU VARDHAN RAO wrote:
Hi Lee,
We have two instances BT and I2S. We need to create devices with same name added with number of device like example: acp3x_i2s_playcap.1.autohttp://1.auto acp3x_i2s_playcap.2.autohttp://2.auto
by using MFD we can make it happen automatically by giving "acp3x_i2s_playcap" and other extension will be added by MFD add device API.
The auto extension is handed by the platform_deivce_alloc() API.
platform_device_alloc("acp3x_i2s_playcap", PLATFORM_DEVID_AUTO);
This helps us by rectifying the renaming issue which we get by using Platform_dev_create API`s.If we have to use platform related APIs then we need to give different naming conventions while creating the devices and cant use it in loop as we have 3 devices we need to call three explicitly.This make our code lengthy. If we use MFD it would help us a lot.
Please suggest us how can we proceed.
You have 2 choices available to you based on whether your device is an MFD or not:
If yes, move it (or a part of it) to drivers/mfd. If no, then use the platform_device_*() API.
Hi Lee,
Okay.We will proceed with existing platform device model.
Mark,
I will resend the patches with the review comments addressed.
Thanks, Vishnu
On 14/10/19 12:33 PM, Lee Jones wrote:
On Thu, 10 Oct 2019, RAVULAPATI, VISHNU VARDHAN RAO wrote:
Hi Lee,
We have two instances BT and I2S. We need to create devices with same name added with number of device like example: acp3x_i2s_playcap.1.autohttp://1.auto acp3x_i2s_playcap.2.autohttp://2.auto
by using MFD we can make it happen automatically by giving "acp3x_i2s_playcap" and other extension will be added by MFD add device API.
The auto extension is handed by the platform_deivce_alloc() API.
platform_device_alloc("acp3x_i2s_playcap", PLATFORM_DEVID_AUTO);
This helps us by rectifying the renaming issue which we get by using Platform_dev_create API`s.If we have to use platform related APIs then we need to give different naming conventions while creating the devices and cant use it in loop as we have 3 devices we need to call three explicitly.This make our code lengthy. If we use MFD it would help us a lot.
Please suggest us how can we proceed.
You have 2 choices available to you based on whether your device is an MFD or not:
If yes, move it (or a part of it) to drivers/mfd. If no, then use the platform_device_*() API.
Asoc: PCM DMA driver should only have dma ops. So Removed all DAI related functionality. Refactoring the PCM DMA diver code. Added new file containing only DAI ops.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/acp3x-i2s.c | 289 ++++++++++++++++++++++++++++++++++++ sound/soc/amd/raven/acp3x-pcm-dma.c | 211 +------------------------- sound/soc/amd/raven/acp3x.h | 23 +++ 3 files changed, 320 insertions(+), 203 deletions(-) create mode 100644 sound/soc/amd/raven/acp3x-i2s.c
diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c new file mode 100644 index 0000000..7420928 --- /dev/null +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -0,0 +1,289 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// AMD ALSA SoC PCM Driver +// +//Copyright 2016 Advanced Micro Devices, Inc. + +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/err.h> +#include <linux/io.h> +#include <linux/pm_runtime.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-dai.h> +#include <linux/dma-mapping.h> + +#include "acp3x.h" + +#define DRV_NAME "acp3x-i2s" + +static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) +{ + u64 byte_count; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + } else { + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + } + return byte_count; +} + +static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + + struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + + case SND_SOC_DAIFMT_I2S: + adata->tdm_mode = false; + break; + case SND_SOC_DAIFMT_DSP_A: + adata->tdm_mode = true; + break; + default: + return -EINVAL; + } + + return 0; +} + +static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, + u32 rx_mask, int slots, int slot_width) +{ + u32 val = 0; + u16 slot_len; + + struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); + + switch (slot_width) { + case SLOT_WIDTH_8: + slot_len = 8; + break; + case SLOT_WIDTH_16: + slot_len = 16; + break; + case SLOT_WIDTH_24: + slot_len = 24; + break; + case SLOT_WIDTH_32: + slot_len = 0; + break; + default: + return -EINVAL; + } + + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); + + val = (FRM_LEN | (slots << 15) | (slot_len << 18)); + rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); + rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); + + adata->tdm_fmt = val; + return 0; +} + +static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + u32 val = 0; + struct i2s_stream_instance *rtd = substream->runtime->private_data; + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_U8: + case SNDRV_PCM_FORMAT_S8: + rtd->xfer_resolution = 0x0; + break; + case SNDRV_PCM_FORMAT_S16_LE: + rtd->xfer_resolution = 0x02; + break; + case SNDRV_PCM_FORMAT_S24_LE: + rtd->xfer_resolution = 0x04; + break; + case SNDRV_PCM_FORMAT_S32_LE: + rtd->xfer_resolution = 0x05; + break; + default: + return -EINVAL; + } + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); + val = val | (rtd->xfer_resolution << 3); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + else + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + + return 0; +} + +static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + int ret = 0; + struct i2s_stream_instance *rtd = substream->runtime->private_data; + u32 val, period_bytes; + + period_bytes = frames_to_bytes(substream->runtime, + substream->runtime->period_size); + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + rtd->bytescount = acp_get_byte_count(rtd, + substream->stream); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_TX_INTR_WATERMARK_SIZE); + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + } else { + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_BT_RX_INTR_WATERMARK_SIZE); + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + } + rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + } else { + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + } + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { + .hw_params = acp3x_i2s_hwparams, + .trigger = acp3x_i2s_trigger, + .set_fmt = acp3x_i2s_set_fmt, + .set_tdm_slot = acp3x_i2s_set_tdm_slot, +}; + +static const struct snd_soc_component_driver acp3x_dai_component = { + .name = "acp3x-i2s", +}; + +static struct snd_soc_dai_driver acp3x_i2s_dai = { + .playback = { + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 8, + + .rate_min = 8000, + .rate_max = 96000, + }, + .capture = { + .rates = SNDRV_PCM_RATE_8000_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | + SNDRV_PCM_FMTBIT_U8 | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE, + .channels_min = 2, + .channels_max = 2, + .rate_min = 8000, + .rate_max = 48000, + }, + .ops = &acp3x_i2s_dai_ops, +}; + + +static int acp3x_dai_probe(struct platform_device *pdev) +{ + int status; + struct resource *res; + struct i2s_dev_data *adata; + + if (!pdev->dev.platform_data) { + dev_err(&pdev->dev, "platform_data not retrieved\n"); + return -ENODEV; + } + + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), + GFP_KERNEL); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); + return -ENODEV; + } + + adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); + if (IS_ERR(adata->acp3x_base)) + return PTR_ERR(adata->acp3x_base); + + + + adata->i2s_irq = res->start; + adata->play_stream = NULL; + adata->capture_stream = NULL; + + dev_set_drvdata(&pdev->dev, adata); + status = devm_snd_soc_register_component(&pdev->dev, + &acp3x_dai_component, + &acp3x_i2s_dai, 1); + if (status) { + dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + goto dev_err; + } + + pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); + pm_runtime_use_autosuspend(&pdev->dev); + pm_runtime_enable(&pdev->dev); + return 0; +dev_err: + /*ignore device status and return driver probe error*/ + return -ENODEV; +} + +static int acp3x_dai_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + return 0; +} +static struct platform_driver acp3x_dai_driver = { + .probe = acp3x_dai_probe, + .remove = acp3x_dai_remove, + .driver = { + .name = "acp3x_i2s_playcap", + }, +}; + +module_platform_driver(acp3x_dai_driver); + +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com"); +MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index bc4dfaf..e14ec55 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -18,24 +18,6 @@
#define DRV_NAME "acp3x-i2s-audio"
-struct i2s_dev_data { - bool tdm_mode; - unsigned int i2s_irq; - u32 tdm_fmt; - void __iomem *acp3x_base; - struct snd_pcm_substream *play_stream; - struct snd_pcm_substream *capture_stream; -}; - -struct i2s_stream_instance { - u16 num_pages; - u16 channels; - u32 xfer_resolution; - u64 bytescount; - dma_addr_t dma_addr; - void __iomem *acp3x_base; -}; - static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | @@ -432,183 +414,6 @@ static struct snd_pcm_ops acp3x_dma_ops = { .mmap = acp3x_dma_mmap, };
- -static int acp3x_dai_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) -{ - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { - case SND_SOC_DAIFMT_I2S: - adata->tdm_mode = false; - break; - case SND_SOC_DAIFMT_DSP_A: - adata->tdm_mode = true; - break; - default: - return -EINVAL; - } - - return 0; -} - -static int acp3x_dai_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, - u32 rx_mask, int slots, int slot_width) -{ - u32 val = 0; - u16 slot_len; - - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); - - switch (slot_width) { - case SLOT_WIDTH_8: - slot_len = 8; - break; - case SLOT_WIDTH_16: - slot_len = 16; - break; - case SLOT_WIDTH_24: - slot_len = 24; - break; - case SLOT_WIDTH_32: - slot_len = 0; - break; - default: - return -EINVAL; - } - - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); - - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); - - adata->tdm_fmt = val; - return 0; -} - -static int acp3x_dai_i2s_hwparams(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, - struct snd_soc_dai *dai) -{ - u32 val = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_U8: - case SNDRV_PCM_FORMAT_S8: - rtd->xfer_resolution = 0x0; - break; - case SNDRV_PCM_FORMAT_S16_LE: - rtd->xfer_resolution = 0x02; - break; - case SNDRV_PCM_FORMAT_S24_LE: - rtd->xfer_resolution = 0x04; - break; - case SNDRV_PCM_FORMAT_S32_LE: - rtd->xfer_resolution = 0x05; - break; - default: - return -EINVAL; - } - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | (rtd->xfer_resolution << 3); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - else - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - - return 0; -} - -static int acp3x_dai_i2s_trigger(struct snd_pcm_substream *substream, - int cmd, struct snd_soc_dai *dai) -{ - int ret = 0; - struct i2s_stream_instance *rtd = substream->runtime->private_data; - u32 val, period_bytes; - - period_bytes = frames_to_bytes(substream->runtime, - substream->runtime->period_size); - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - rtd->bytescount = acp_get_byte_count(rtd, substream->stream); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_TX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - rv_writel(period_bytes, rtd->acp3x_base + - mmACP_BT_RX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - } else { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); - } - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); - break; - default: - ret = -EINVAL; - break; - } - - return ret; -} - -static struct snd_soc_dai_ops acp3x_dai_i2s_ops = { - .hw_params = acp3x_dai_i2s_hwparams, - .trigger = acp3x_dai_i2s_trigger, - .set_fmt = acp3x_dai_i2s_set_fmt, - .set_tdm_slot = acp3x_dai_set_tdm_slot, -}; - -static struct snd_soc_dai_driver acp3x_i2s_dai_driver = { - .playback = { - .rates = SNDRV_PCM_RATE_8000_96000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 8, - - .rate_min = 8000, - .rate_max = 96000, - }, - .capture = { - .rates = SNDRV_PCM_RATE_8000_48000, - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S24_LE | - SNDRV_PCM_FMTBIT_S32_LE, - .channels_min = 2, - .channels_max = 2, - .rate_min = 8000, - .rate_max = 48000, - }, - .ops = &acp3x_dai_i2s_ops, -}; - static const struct snd_soc_component_driver acp3x_i2s_component = { .name = DRV_NAME, .ops = &acp3x_dma_ops, @@ -627,17 +432,16 @@ static int acp3x_audio_probe(struct platform_device *pdev) return -ENODEV; } irqflags = *((unsigned int *)(pdev->dev.platform_data)); + adata = devm_kzalloc(&pdev->dev, sizeof(*adata), GFP_KERNEL); + if (!adata) + return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { - dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); return -ENODEV; }
- adata = devm_kzalloc(&pdev->dev, sizeof(*adata), GFP_KERNEL); - if (!adata) - return -ENOMEM; - adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
@@ -658,9 +462,9 @@ static int acp3x_audio_probe(struct platform_device *pdev) return -ENODEV; status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, - &acp3x_i2s_dai_driver, 1); + NULL, 0); if (status) { - dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); + dev_err(&pdev->dev, "Fail to register acp i2s component\n"); goto dev_err; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, @@ -782,13 +586,14 @@ static struct platform_driver acp3x_dma_driver = { .probe = acp3x_audio_probe, .remove = acp3x_audio_remove, .driver = { - .name = "acp3x_rv_i2s", + .name = "acp3x_rv_i2s_dma", .pm = &acp3x_pm_ops, }, };
module_platform_driver(acp3x_dma_driver);
+MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com"); MODULE_AUTHOR("Maruthi.Bayyavarapu@amd.com"); MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index c122dc6..baa76cd 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -54,6 +54,29 @@ #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20
+struct acp3x_platform_info { + u16 play_i2s_instance; + u16 cap_i2s_instance; + u16 capture_channel; +}; + +struct i2s_dev_data { + bool tdm_mode; + unsigned int i2s_irq; + u32 tdm_fmt; + void __iomem *acp3x_base; + struct snd_pcm_substream *play_stream; + struct snd_pcm_substream *capture_stream; +}; + +struct i2s_stream_instance { + u16 num_pages; + u16 channels; + u32 xfer_resolution; + u64 bytescount; + dma_addr_t dma_addr; + void __iomem *acp3x_base; +};
static inline u32 rv_readl(void __iomem *base_addr) {
This patch adds I2S SP support in ACP PCM DMA and DAI. Added I2S support in DMA and DAI probe,its hw_params handling its open and close functionalities. This enable to open and close on the SP instance for playback and capture.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/Makefile | 2 + sound/soc/amd/raven/acp3x-i2s.c | 181 +++++++++++++++++++++++------- sound/soc/amd/raven/acp3x-pcm-dma.c | 218 +++++++++++++++++++++++++----------- sound/soc/amd/raven/acp3x.h | 75 +++++++++++-- 4 files changed, 358 insertions(+), 118 deletions(-)
diff --git a/sound/soc/amd/raven/Makefile b/sound/soc/amd/raven/Makefile index 108d1ac..8eef292 100644 --- a/sound/soc/amd/raven/Makefile +++ b/sound/soc/amd/raven/Makefile @@ -1,6 +1,8 @@ # SPDX-License-Identifier: GPL-2.0+ # Raven Ridge platform Support snd-pci-acp3x-objs := pci-acp3x.o +snd-acp3x-i2s-objs := acp3x-i2s.o snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o +obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 7420928..4511b9b 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -19,24 +19,6 @@
#define DRV_NAME "acp3x-i2s"
-static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) -{ - u64 byte_count; - - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); - } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); - } - return byte_count; -} - static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) {
@@ -100,8 +82,18 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { u32 val = 0; + struct snd_soc_pcm_runtime *prtd = substream->private_data; + struct snd_soc_card *card = prtd->card; + struct acp3x_platform_info *pinfo = snd_soc_card_get_drvdata(card); struct i2s_stream_instance *rtd = substream->runtime->private_data;
+ if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } + switch (params_format(params)) { case SNDRV_PCM_FORMAT_U8: case SNDRV_PCM_FORMAT_S8: @@ -119,12 +111,33 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, default: return -EINVAL; } - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | (rtd->xfer_resolution << 3); - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); - else - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_I2STDM_ITER); + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(rtd->acp3x_base + mmACP_I2STDM_IRER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_I2STDM_IRER); + } + }
return 0; } @@ -135,7 +148,16 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, int ret = 0; struct i2s_stream_instance *rtd = substream->runtime->private_data; u32 val, period_bytes; - + struct snd_soc_pcm_runtime *prtd = substream->private_data; + struct snd_soc_card *card = prtd->card; + struct acp3x_platform_info *pinfo = snd_soc_card_get_drvdata(card); + + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } period_bytes = frames_to_bytes(substream->runtime, substream->runtime->period_size); switch (cmd) { @@ -145,34 +167,105 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, rtd->bytescount = acp_get_byte_count(rtd, substream->stream); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - rv_writel(period_bytes, rtd->acp3x_base + + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + rv_writel(period_bytes, rtd->acp3x_base + mmACP_BT_TX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + val = rv_readl(rtd->acp3x_base + + mmACP_BTTDM_ITER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_BTTDM_ITER); + rv_writel(1, rtd->acp3x_base + + mmACP_BTTDM_IER); + break; + case I2S_SP_INSTANCE: + default: + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_I2S_TX_INTR_WATERMARK_SIZE); + val = rv_readl(rtd->acp3x_base + + mmACP_I2STDM_ITER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_I2STDM_ITER); + rv_writel(1, rtd->acp3x_base + + mmACP_I2STDM_IER); + } } else { - rv_writel(period_bytes, rtd->acp3x_base + + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + rv_writel(period_bytes, rtd->acp3x_base + mmACP_BT_RX_INTR_WATERMARK_SIZE); - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val | BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + val = rv_readl(rtd->acp3x_base + + mmACP_BTTDM_IRER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_BTTDM_IRER); + rv_writel(1, rtd->acp3x_base + + mmACP_BTTDM_IER); + break; + case I2S_SP_INSTANCE: + default: + rv_writel(period_bytes, rtd->acp3x_base + + mmACP_I2S_RX_INTR_WATERMARK_SIZE); + val = rv_readl(rtd->acp3x_base + + mmACP_I2STDM_IRER); + val = val | BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_I2STDM_IRER); + rv_writel(1, rtd->acp3x_base + + mmACP_I2STDM_IER); + } } - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); - break; + break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(rtd->acp3x_base + + mmACP_BTTDM_ITER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_BTTDM_ITER); + rv_writel(0, rtd->acp3x_base + + mmACP_BTTDM_IER); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(rtd->acp3x_base + + mmACP_I2STDM_ITER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_I2STDM_ITER); + rv_writel(0, rtd->acp3x_base + + mmACP_I2STDM_IER); + } + } else { - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); - val = val & ~BIT(0); - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = rv_readl(rtd->acp3x_base + + mmACP_BTTDM_IRER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_BTTDM_IRER); + rv_writel(0, rtd->acp3x_base + + mmACP_BTTDM_IER); + break; + case I2S_SP_INSTANCE: + default: + val = rv_readl(rtd->acp3x_base + + mmACP_I2STDM_IRER); + val = val & ~BIT(0); + rv_writel(val, rtd->acp3x_base + + mmACP_I2STDM_IRER); + rv_writel(0, rtd->acp3x_base + + mmACP_I2STDM_IER); + } } - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); - break; + break; default: ret = -EINVAL; break; @@ -249,6 +342,8 @@ static int acp3x_dai_probe(struct platform_device *pdev) adata->i2s_irq = res->start; adata->play_stream = NULL; adata->capture_stream = NULL; + adata->i2ssp_play_stream = NULL; + adata->i2ssp_capture_stream = NULL;
dev_set_drvdata(&pdev->dev, adata); status = devm_snd_soc_register_component(&pdev->dev, diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index e14ec55..6fa892a 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -193,20 +193,35 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) { u16 page_idx; - u32 low, high, val, acp_fifo_addr; - dma_addr_t addr = rtd->dma_addr; + uint64_t low, high, val, acp_fifo_addr; + dma_addr_t addr;
- /* 8 scratch registers used to map one 64 bit address */ - if (direction == SNDRV_PCM_STREAM_PLAYBACK) - val = 0; - else - val = rtd->num_pages * 8; + addr = rtd->dma_addr;
+ if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_PB_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_PB_PTE_OFFSET; + } + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + val = ACP_SRAM_BT_CP_PTE_OFFSET; + break; + case I2S_SP_INSTANCE: + default: + val = ACP_SRAM_SP_CP_PTE_OFFSET; + } + } /* Group Enable */ rv_writel(ACP_SRAM_PTE_OFFSET | BIT(31), rtd->acp3x_base + - mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); + mmACPAXI2AXI_ATU_BASE_ADDR_GRP_1); rv_writel(PAGE_SIZE_4K_ENABLE, rtd->acp3x_base + - mmACPAXI2AXI_ATU_PAGE_SIZE_GRP_1); + mmACPAXI2AXI_ATU_PAGE_SIZE_GRP_1);
for (page_idx = 0; page_idx < rtd->num_pages; page_idx++) { /* Load the low address of page int ACP SRAM through SRBM */ @@ -223,38 +238,95 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) }
if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_TX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + (rtd->num_pages * 8) - + PLAYBACK_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_TX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + /* Config ringbuffer */ + rv_writel(I2S_BT_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_TX_RINGBUFADDR); + rv_writel(MAX_BUFFER, rtd->acp3x_base + + mmACP_BT_TX_RINGBUFSIZE); + rv_writel(DMA_SIZE, + rtd->acp3x_base + mmACP_BT_TX_DMA_SIZE); + + /* Config audio fifo */ + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_PB_FIFO_ADDR_OFFSET; + rv_writel(acp_fifo_addr, + rtd->acp3x_base + mmACP_BT_TX_FIFOADDR); + rv_writel(FIFO_SIZE, + rtd->acp3x_base + mmACP_BT_TX_FIFOSIZE); + /* Enable watermark/period interrupt to host */ + rv_writel(BIT(BT_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + break; + + case I2S_SP_INSTANCE: + default: + /* Config ringbuffer */ + rv_writel(I2S_SP_TX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFADDR); + rv_writel(MAX_BUFFER, + rtd->acp3x_base + mmACP_I2S_TX_RINGBUFSIZE); + rv_writel(DMA_SIZE, + rtd->acp3x_base + mmACP_I2S_TX_DMA_SIZE); + + /* Config audio fifo */ + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_PB_FIFO_ADDR_OFFSET; + rv_writel(acp_fifo_addr, + rtd->acp3x_base + mmACP_I2S_TX_FIFOADDR); + rv_writel(FIFO_SIZE, + rtd->acp3x_base + mmACP_I2S_TX_FIFOSIZE); + /* Enable watermark/period interrupt to host */ + rv_writel(BIT(I2S_TX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + } } else { - /* Config ringbuffer */ - rv_writel(MEM_WINDOW_START + MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFADDR); - rv_writel(MAX_BUFFER, rtd->acp3x_base + - mmACP_BT_RX_RINGBUFSIZE); - rv_writel(DMA_SIZE, rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); - - /* Config audio fifo */ - acp_fifo_addr = ACP_SRAM_PTE_OFFSET + - (rtd->num_pages * 8) + CAPTURE_FIFO_ADDR_OFFSET; - rv_writel(acp_fifo_addr, rtd->acp3x_base + - mmACP_BT_RX_FIFOADDR); - rv_writel(FIFO_SIZE, rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + /* Config ringbuffer */ + rv_writel(I2S_BT_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFADDR); + rv_writel(MAX_BUFFER, + rtd->acp3x_base + mmACP_BT_RX_RINGBUFSIZE); + rv_writel(DMA_SIZE, + rtd->acp3x_base + mmACP_BT_RX_DMA_SIZE); + + /* Config audio fifo */ + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + BT_CAPT_FIFO_ADDR_OFFSET; + rv_writel(acp_fifo_addr, + rtd->acp3x_base + mmACP_BT_RX_FIFOADDR); + rv_writel(FIFO_SIZE, + rtd->acp3x_base + mmACP_BT_RX_FIFOSIZE); + /* Enable watermark/period interrupt to host */ + rv_writel(BIT(BT_RX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + break; + + case I2S_SP_INSTANCE: + default: + /* Config ringbuffer */ + rv_writel(I2S_SP_RX_MEM_WINDOW_START, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFADDR); + rv_writel(MAX_BUFFER, + rtd->acp3x_base + mmACP_I2S_RX_RINGBUFSIZE); + rv_writel(DMA_SIZE, + rtd->acp3x_base + mmACP_I2S_RX_DMA_SIZE); + + /* Config audio fifo */ + acp_fifo_addr = ACP_SRAM_PTE_OFFSET + + SP_CAPT_FIFO_ADDR_OFFSET; + rv_writel(acp_fifo_addr, + rtd->acp3x_base + mmACP_I2S_RX_FIFOADDR); + rv_writel(FIFO_SIZE, + rtd->acp3x_base + mmACP_I2S_RX_FIFOSIZE); + /* Enable watermark/period interrupt to host */ + rv_writel(BIT(I2S_RX_THRESHOLD), + rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); + } }
- /* Enable watermark/period interrupt to host */ - rv_writel(BIT(BT_TX_THRESHOLD) | BIT(BT_RX_THRESHOLD), - rtd->acp3x_base + mmACP_EXTERNAL_INTR_CNTL); }
static int acp3x_dma_open(struct snd_pcm_substream *substream) @@ -285,48 +357,45 @@ static int acp3x_dma_open(struct snd_pcm_substream *substream) return ret; }
- if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = substream; - else + adata->i2ssp_play_stream = substream; + } else { adata->capture_stream = substream; + adata->i2ssp_capture_stream = substream; + }
i2s_data->acp3x_base = adata->acp3x_base; runtime->private_data = i2s_data; return 0; }
-static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) -{ - u64 byte_count; - - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); - } else { - byte_count = rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); - byte_count |= rv_readl(rtd->acp3x_base + - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); - } - return byte_count; -} - static int acp3x_dma_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { int status; - u64 size; - struct snd_pcm_runtime *runtime = substream->runtime; - struct i2s_stream_instance *rtd = runtime->private_data; + uint64_t size; + struct snd_soc_pcm_runtime *prtd = substream->private_data; + struct snd_soc_card *card = prtd->card; + struct acp3x_platform_info *pinfo = snd_soc_card_get_drvdata(card);
+ struct i2s_stream_instance *rtd = substream->runtime->private_data; if (!rtd) return -EINVAL;
+ + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + } else + pr_err("pinfo failed\n"); + size = params_buffer_bytes(params); status = snd_pcm_lib_malloc_pages(substream, size); if (status < 0) @@ -349,8 +418,17 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_pcm_substream *substream) u32 pos = 0; u32 buffersize = 0; u64 bytescount = 0; - struct i2s_stream_instance *rtd = - substream->runtime->private_data; + struct snd_soc_pcm_runtime *prtd = substream->private_data; + struct snd_soc_card *card = prtd->card; + struct acp3x_platform_info *pinfo = snd_soc_card_get_drvdata(card); + struct i2s_stream_instance *rtd = substream->runtime->private_data; + + if (pinfo) { + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + rtd->i2s_instance = pinfo->play_i2s_instance; + else + rtd->i2s_instance = pinfo->cap_i2s_instance; + }
buffersize = frames_to_bytes(substream->runtime, substream->runtime->buffer_size); @@ -390,15 +468,19 @@ static int acp3x_dma_close(struct snd_pcm_substream *substream) DRV_NAME); struct i2s_dev_data *adata = dev_get_drvdata(component->dev);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { adata->play_stream = NULL; - else + adata->i2ssp_play_stream = NULL; + } else { adata->capture_stream = NULL; + adata->i2ssp_capture_stream = NULL; + }
/* Disable ACP irq, when the current stream is being closed and * another stream is also not active. */ - if (!adata->play_stream && !adata->capture_stream) + if (!adata->play_stream && !adata->capture_stream && + !adata->i2ssp_play_stream && !adata->i2ssp_capture_stream) rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); kfree(rtd); return 0; @@ -454,6 +536,8 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2s_irq = res->start; adata->play_stream = NULL; adata->capture_stream = NULL; + adata->i2ssp_play_stream = NULL; + adata->i2ssp_capture_stream = NULL;
dev_set_drvdata(&pdev->dev, adata); /* Initialize ACP */ diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index baa76cd..d97d7d5 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -7,6 +7,9 @@
#include "chip_offset_byte.h"
+#define I2S_SP_INSTANCE 0x01 +#define I2S_BT_INSTANCE 0x02 + #define ACP3x_DEVS 3 #define ACP3x_PHY_BASE_ADDRESS 0x1240000 #define ACP3x_I2S_MODE 0 @@ -29,19 +32,28 @@ #define ACP3x_SOFT_RESET__SoftResetAudDone_MASK 0x00010001
#define ACP_SRAM_PTE_OFFSET 0x02050000 +#define ACP_SRAM_SP_PB_PTE_OFFSET 0x0 +#define ACP_SRAM_SP_CP_PTE_OFFSET 0x100 +#define ACP_SRAM_BT_PB_PTE_OFFSET 0x200 +#define ACP_SRAM_BT_CP_PTE_OFFSET 0x300 #define PAGE_SIZE_4K_ENABLE 0x2 -#define MEM_WINDOW_START 0x4000000 -#define PLAYBACK_FIFO_ADDR_OFFSET 0x400 -#define CAPTURE_FIFO_ADDR_OFFSET 0x500 +#define I2S_SP_TX_MEM_WINDOW_START 0x4000000 +#define I2S_SP_RX_MEM_WINDOW_START 0x4020000 +#define I2S_BT_TX_MEM_WINDOW_START 0x4040000 +#define I2S_BT_RX_MEM_WINDOW_START 0x4060000
+#define SP_PB_FIFO_ADDR_OFFSET 0x500 +#define SP_CAPT_FIFO_ADDR_OFFSET 0x700 +#define BT_PB_FIFO_ADDR_OFFSET 0x900 +#define BT_CAPT_FIFO_ADDR_OFFSET 0xB00 #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 -#define PLAYBACK_MAX_PERIOD_SIZE 16384 -#define PLAYBACK_MIN_PERIOD_SIZE 4096 +#define PLAYBACK_MAX_PERIOD_SIZE 8192 +#define PLAYBACK_MIN_PERIOD_SIZE 1024 #define CAPTURE_MIN_NUM_PERIODS 2 #define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 16384 -#define CAPTURE_MIN_PERIOD_SIZE 4096 +#define CAPTURE_MAX_PERIOD_SIZE 8192 +#define CAPTURE_MIN_PERIOD_SIZE 1024
#define MAX_BUFFER (PLAYBACK_MAX_PERIOD_SIZE * PLAYBACK_MAX_NUM_PERIODS) #define MIN_BUFFER MAX_BUFFER @@ -67,14 +79,20 @@ struct i2s_dev_data { void __iomem *acp3x_base; struct snd_pcm_substream *play_stream; struct snd_pcm_substream *capture_stream; + struct snd_pcm_substream *i2ssp_play_stream; + struct snd_pcm_substream *i2ssp_capture_stream; };
struct i2s_stream_instance { u16 num_pages; + u16 i2s_instance; + u16 capture_channel; + u16 direction; u16 channels; u32 xfer_resolution; - u64 bytescount; + u32 val; dma_addr_t dma_addr; + u64 bytescount; void __iomem *acp3x_base; };
@@ -87,3 +105,44 @@ static inline void rv_writel(u32 val, void __iomem *base_addr) { writel(val, base_addr - ACP3x_PHY_BASE_ADDRESS); } + +static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, + int direction) +{ + u64 byte_count; + + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_TX_LINEARPOSITIONCNTR_LOW); + } + + } else { + switch (rtd->i2s_instance) { + case I2S_BT_INSTANCE: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); + break; + case I2S_SP_INSTANCE: + default: + byte_count = rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_HIGH); + byte_count |= rv_readl(rtd->acp3x_base + + mmACP_I2S_RX_LINEARPOSITIONCNTR_LOW); + } + } + return byte_count; +} +
ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support for TDM mode. Desired mode can be selected from ASoC machine driver.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/acp3x-i2s.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 4511b9b..312207b 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -43,7 +43,8 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, u32 rx_mask, int slots, int slot_width) { u32 val = 0; - u16 slot_len; + u32 mode = 0; + u16 slot_len, flen;
struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai);
@@ -64,16 +65,31 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, return -EINVAL; }
- val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); - - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); + /* Enable I2S / BT channels TDM and respective + * I2S/BT`s TX/RX Formats frame lengths. + */ + flen = (FRM_LEN | (slots << 15) | (slot_len << 18)); + + mode = rv_readl(adata->acp3x_base + mmACP_BTTDM_IER); + if (mode) { + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); + rv_writel(flen, adata->acp3x_base + mmACP_BTTDM_TXFRMT); + val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); + rv_writel(flen, adata->acp3x_base + mmACP_BTTDM_RXFRMT); + }
- adata->tdm_fmt = val; + mode = rv_readl(adata->acp3x_base + mmACP_I2STDM_IER); + if (mode) { + val = rv_readl(adata->acp3x_base + mmACP_I2STDM_ITER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_I2STDM_ITER); + rv_writel(flen, adata->acp3x_base + mmACP_I2STDM_TXFRMT); + val = rv_readl(adata->acp3x_base + mmACP_I2STDM_IRER); + rv_writel((val | 0x2), adata->acp3x_base + mmACP_I2STDM_IRER); + rv_writel(flen, adata->acp3x_base + mmACP_I2STDM_RXFRMT); + } + adata->tdm_fmt = flen; return 0; }
Whenever audio data equal to I2S-SP fifo watermark level is produced/consumed, interrupt is generated.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/acp3x-pcm-dma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 6fa892a..49f640f 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -176,6 +176,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->play_stream); play_flag = 1; } + if ((val & BIT(I2S_TX_THRESHOLD)) && + rv_i2s_data->i2ssp_play_stream) { + rv_writel(BIT(I2S_TX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_play_stream); + play_flag = 1; + }
if ((val & BIT(BT_RX_THRESHOLD)) && rv_i2s_data->capture_stream) { rv_writel(BIT(BT_RX_THRESHOLD), rv_i2s_data->acp3x_base + @@ -183,6 +190,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) snd_pcm_period_elapsed(rv_i2s_data->capture_stream); cap_flag = 1; } + if ((val & BIT(I2S_RX_THRESHOLD)) && + rv_i2s_data->i2ssp_capture_stream) { + rv_writel(BIT(I2S_RX_THRESHOLD), + rv_i2s_data->acp3x_base + mmACP_EXTERNAL_INTR_STAT); + snd_pcm_period_elapsed(rv_i2s_data->i2ssp_capture_stream); + cap_flag = 1; + }
if (play_flag | cap_flag) return IRQ_HANDLED;
When audio usecase in progress and system wide suspend happens, ACP will be powered off and when system resumes, for audio usecase to continue, all the runtime configuration data needs to be programmed again. Added 'resume'pm call back to ACP pm ops and also Added runtime PM operations for ACP3x PCM platform device. Device will be powered on/off based on device is in use or not.
Signed-off-by: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com --- sound/soc/amd/raven/acp3x-pcm-dma.c | 160 +++------------------------- sound/soc/amd/raven/acp3x.h | 7 ++ sound/soc/amd/raven/pci-acp3x.c | 204 +++++++++++++++++++++++++++++++++++- 3 files changed, 223 insertions(+), 148 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index 49f640f..4011c78 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -58,106 +58,6 @@ static const struct snd_pcm_hardware acp3x_pcm_hardware_capture = { .periods_max = CAPTURE_MAX_NUM_PERIODS, };
-static int acp3x_power_on(void __iomem *acp3x_base, bool on) -{ - u16 val, mask; - u32 timeout; - - if (on == true) { - val = 1; - mask = ACP3x_POWER_ON; - } else { - val = 0; - mask = ACP3x_POWER_OFF; - } - - rv_writel(val, acp3x_base + mmACP_PGFSM_CONTROL); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); - if ((val & ACP3x_POWER_OFF_IN_PROGRESS) == mask) - break; - if (timeout > 100) { - pr_err("ACP3x power state change failure\n"); - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_reset(void __iomem *acp3x_base) -{ - u32 val, timeout; - - rv_writel(1, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || - timeout > 100) { - if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - - rv_writel(0, acp3x_base + mmACP_SOFT_RESET); - timeout = 0; - while (true) { - val = rv_readl(acp3x_base + mmACP_SOFT_RESET); - if (!val || timeout > 100) { - if (!val) - break; - return -ENODEV; - } - timeout++; - cpu_relax(); - } - return 0; -} - -static int acp3x_init(void __iomem *acp3x_base) -{ - int ret; - - /* power on */ - ret = acp3x_power_on(acp3x_base, true); - if (ret) { - pr_err("ACP3x power on failed\n"); - return ret; - } - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - return 0; -} - -static int acp3x_deinit(void __iomem *acp3x_base) -{ - int ret; - - /* Reset */ - ret = acp3x_reset(acp3x_base); - if (ret) { - pr_err("ACP3x reset failed\n"); - return ret; - } - /* power off */ - ret = acp3x_power_on(acp3x_base, false); - if (ret) { - pr_err("ACP3x power off failed\n"); - return ret; - } - return 0; -} - static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { u16 play_flag, cap_flag; @@ -554,75 +454,52 @@ static int acp3x_audio_probe(struct platform_device *pdev) adata->i2ssp_capture_stream = NULL;
dev_set_drvdata(&pdev->dev, adata); - /* Initialize ACP */ - status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; status = devm_snd_soc_register_component(&pdev->dev, &acp3x_i2s_component, NULL, 0); if (status) { dev_err(&pdev->dev, "Fail to register acp i2s component\n"); - goto dev_err; + return -ENODEV; } status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, irqflags, "ACP3x_I2S_IRQ", adata); if (status) { dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); - goto dev_err; + return -ENODEV; }
pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; -dev_err: - status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_info(&pdev->dev, "ACP de-initialized\n"); - /*ignore device status and return driver probe error*/ - return -ENODEV; }
static int acp3x_audio_remove(struct platform_device *pdev) { - int ret; - struct i2s_dev_data *adata = dev_get_drvdata(&pdev->dev); - - ret = acp3x_deinit(adata->acp3x_base); - if (ret) - dev_err(&pdev->dev, "ACP de-init failed\n"); - else - dev_info(&pdev->dev, "ACP de-initialized\n"); - pm_runtime_disable(&pdev->dev); return 0; }
static int acp3x_resume(struct device *dev) { - int status; u32 val; struct i2s_dev_data *adata = dev_get_drvdata(dev);
- status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; - if (adata->play_stream && adata->play_stream->runtime) { struct i2s_stream_instance *rtd = adata->play_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_PLAYBACK); rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_ITER); + rtd->acp3x_base + mmACP_BTTDM_ITER); + val = rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_I2STDM_ITER); if (adata->tdm_mode == true) { rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_TXFRMT); + mmACP_BTTDM_TXFRMT); val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_ITER); + mmACP_BTTDM_ITER); } }
@@ -631,13 +508,17 @@ static int acp3x_resume(struct device *dev) adata->capture_stream->runtime->private_data; config_acp3x_dma(rtd, SNDRV_PCM_STREAM_CAPTURE); rv_writel((rtd->xfer_resolution << 3), - rtd->acp3x_base + mmACP_BTTDM_IRER); + rtd->acp3x_base + mmACP_BTTDM_IRER); + val = rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER); + val = val | (rtd->xfer_resolution << 3); + rv_writel(val, rtd->acp3x_base + mmACP_I2STDM_ITER); + if (adata->tdm_mode == true) { rv_writel(adata->tdm_fmt, adata->acp3x_base + - mmACP_BTTDM_RXFRMT); + mmACP_BTTDM_RXFRMT); val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); rv_writel((val | 0x2), adata->acp3x_base + - mmACP_BTTDM_IRER); + mmACP_BTTDM_IRER); } }
@@ -648,15 +529,8 @@ static int acp3x_resume(struct device *dev)
static int acp3x_pcm_runtime_suspend(struct device *dev) { - int status; struct i2s_dev_data *adata = dev_get_drvdata(dev);
- status = acp3x_deinit(adata->acp3x_base); - if (status) - dev_err(dev, "ACP de-init failed\n"); - else - dev_info(dev, "ACP de-initialized\n"); - rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);
return 0; @@ -664,12 +538,8 @@ static int acp3x_pcm_runtime_suspend(struct device *dev)
static int acp3x_pcm_runtime_resume(struct device *dev) { - int status; struct i2s_dev_data *adata = dev_get_drvdata(dev);
- status = acp3x_init(adata->acp3x_base); - if (status) - return -ENODEV; rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); return 0; } diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index d97d7d5..21c3109 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -65,6 +65,13 @@ #define SLOT_WIDTH_16 0x10 #define SLOT_WIDTH_24 0x18 #define SLOT_WIDTH_32 0x20 +#define ACP_PGFSM_CNTL_POWER_ON_MASK 0x01 +#define ACP_PGFSM_CNTL_POWER_OFF_MASK 0x00 +#define ACP_PGFSM_STATUS_MASK 0x03 +#define ACP_POWERED_ON 0x00 +#define ACP_POWER_ON_IN_PROGRESS 0x01 +#define ACP_POWERED_OFF 0x02 +#define ACP_POWER_OFF_IN_PROGRESS 0x03
struct acp3x_platform_info { u16 play_i2s_instance; diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c index d9f5bc0..8386c4a 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -10,6 +10,9 @@ #include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/mfd/core.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> +#include <sound/pcm.h>
#include "acp3x.h"
@@ -27,12 +30,141 @@ struct acp3x_dev_data { struct platform_device *pdev; };
+static int acp3x_power_on(void __iomem *acp3x_base) +{ + u32 val; + u32 timeout = 0; + int ret = 0; + + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (val) { + if (!((val & ACP_PGFSM_STATUS_MASK) == + ACP_POWER_ON_IN_PROGRESS)) + rv_writel(ACP_PGFSM_CNTL_POWER_ON_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + while (true) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if (!val) + break; + udelay(1); + if (timeout > 500) { + pr_err("ACP is Not Powered ON\n"); + ret = -ETIMEDOUT; + break; + } + timeout++; + } + if (ret) { + pr_err("ACP is not powered on status:%d\n", ret); + return ret; + } + } + return ret; +} + +static int acp3x_power_off(void __iomem *acp3x_base) +{ + u32 val; + u32 timeout = 0; + int ret = 0; + + val = rv_readl(acp3x_base + mmACP_PGFSM_CONTROL); + rv_writel(ACP_PGFSM_CNTL_POWER_OFF_MASK, + acp3x_base + mmACP_PGFSM_CONTROL); + while (true) { + val = rv_readl(acp3x_base + mmACP_PGFSM_STATUS); + if ((val & ACP_PGFSM_STATUS_MASK) == ACP_POWERED_OFF) + break; + udelay(1); + if (timeout > 500) { + pr_err("ACP is Not Powered OFF\n"); + ret = -ETIMEDOUT; + break; + } + timeout++; + } + if (ret) + pr_err("ACP is not powered off status:%d\n", ret); + return ret; +} + + +static int acp3x_reset(void __iomem *acp3x_base) +{ + u32 val, timeout; + + rv_writel(1, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (true) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if ((val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) || + timeout > 100) { + if (val & ACP3x_SOFT_RESET__SoftResetAudDone_MASK) + break; + return -ENODEV; + } + timeout++; + cpu_relax(); + } + rv_writel(0, acp3x_base + mmACP_SOFT_RESET); + timeout = 0; + while (true) { + val = rv_readl(acp3x_base + mmACP_SOFT_RESET); + if (!val || timeout > 100) { + if (!val) + break; + return -ENODEV; + } + timeout++; + cpu_relax(); + } + return 0; +} + +static int acp3x_init(void __iomem *acp3x_base) +{ + int ret; + + /* power on */ + ret = acp3x_power_on(acp3x_base); + if (ret) { + pr_err("ACP3x power on failed\n"); + return ret; + } + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + return 0; +} + +static int acp3x_deinit(void __iomem *acp3x_base) +{ + int ret; + + /* Reset */ + ret = acp3x_reset(acp3x_base); + if (ret) { + pr_err("ACP3x reset failed\n"); + return ret; + } + /* power off */ + ret = acp3x_power_off(acp3x_base); + if (ret) { + pr_err("ACP3x power off failed\n"); + return ret; + } + return 0; +} + static int snd_acp3x_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { int ret; resource_size_t addr; - int val, i, r; + int val, i, r, status; struct acp3x_dev_data *adata; struct device *dev; struct i2s_platform_data *i2s_pdata; @@ -46,7 +178,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, ret = pci_request_regions(pci, "AMD ACP3x audio"); if (ret < 0) { dev_err(&pci->dev, "pci_request_regions failed\n"); - goto disable_pci; + goto release_regions; }
adata = devm_kzalloc(&pci->dev, sizeof(struct acp3x_dev_data), @@ -67,6 +199,10 @@ static int snd_acp3x_probe(struct pci_dev *pci, pci_set_master(pci); pci_set_drvdata(pci, adata); adata->parent = &pci->dev; + status = acp3x_init(adata->acp3x_base); + if (status) + return -ENODEV; + val = rv_readl(adata->acp3x_base + mmACP_I2S_PIN_CONFIG); switch (val) { case I2S_MODE: @@ -141,26 +277,85 @@ static int snd_acp3x_probe(struct pci_dev *pci, adata->cell, ACP3x_DEVS); break; } + pm_runtime_set_autosuspend_delay(&pci->dev, 10000); + pm_runtime_use_autosuspend(&pci->dev); + pm_runtime_set_active(&pci->dev); + pm_runtime_put_noidle(&pci->dev); + pm_runtime_enable(&pci->dev); return 0;
unmap_mmio: + status = acp3x_deinit(adata->acp3x_base); + if (status) + dev_err(&pci->dev, "ACP de-init failed\n"); + else + dev_info(&pci->dev, "ACP de-initialized\n"); mfd_remove_devices(adata->parent); kfree(adata->res); kfree(adata->cell); iounmap(adata->acp3x_base); release_regions: pci_release_regions(pci); -disable_pci: pci_disable_device(pci); + status = acp3x_deinit(adata->acp3x_base); + if (status) + dev_err(&pci->dev, "ACP de-init failed\n"); + else + dev_info(&pci->dev, "ACP de-initialized\n");
return ret; }
+ + +static int snd_acp3x_suspend(struct device *dev) +{ + + int status; + struct acp3x_dev_data *adata = dev_get_drvdata(dev); + + status = acp3x_deinit(adata->acp3x_base); + if (status) + dev_err(dev, "ACP de-init failed\n"); + else + dev_info(dev, "ACP de-initialized\n"); + + return 0; +} +static int snd_acp3x_resume(struct device *dev) +{ + + int status; + struct acp3x_dev_data *adata = dev_get_drvdata(dev); + + status = acp3x_init(adata->acp3x_base); + if (status) + return -ENODEV; + + return 0; +} + +static const struct dev_pm_ops acp3x_pm = { + .runtime_suspend = snd_acp3x_suspend, + .runtime_resume = snd_acp3x_resume, + .resume = snd_acp3x_resume, + +}; + static void snd_acp3x_remove(struct pci_dev *pci) { + int i; struct acp3x_dev_data *adata = pci_get_drvdata(pci); mfd_remove_devices(adata->parent); + i = acp3x_deinit(adata->acp3x_base); + if (i) + dev_err(&pci->dev, "ACP de-init failed\n"); + else + dev_info(&pci->dev, "ACP de-initialized\n"); iounmap(adata->acp3x_base); + pm_runtime_disable(&pci->dev); + pm_runtime_get_noresume(&pci->dev); + pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci); } @@ -178,6 +373,9 @@ static struct pci_driver acp3x_driver = { .id_table = snd_acp3x_ids, .probe = snd_acp3x_probe, .remove = snd_acp3x_remove, + .driver = { + .pm = &acp3x_pm, + } };
module_pci_driver(acp3x_driver);
-----Original Message----- From: Ravulapati Vishnu vardhan rao Vishnuvardhanrao.Ravulapati@amd.com Sent: Monday, September 30, 2019 8:58 PM Cc: Deucher, Alexander Alexander.Deucher@amd.com; RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Mark Brown broonie@kernel.org; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Deucher, Alexander Alexander.Deucher@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: [PATCH 1/7] ASoC: amd: No need PCI-MSI interrupts
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts? Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Alex
Signed-off-by: Ravulapati Vishnu vardhan rao
Vishnuvardhanrao.Ravulapati@amd.com
sound/soc/amd/raven/pci-acp3x.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci- acp3x.c index facec24..8f6bf00 100644 --- a/sound/soc/amd/raven/pci-acp3x.c +++ b/sound/soc/amd/raven/pci-acp3x.c @@ -46,14 +46,7 @@ static int snd_acp3x_probe(struct pci_dev *pci, goto release_regions; }
- /* check for msi interrupt support */
- ret = pci_enable_msi(pci);
- if (ret)
/* msi is not enabled */irqflags = IRQF_SHARED;- else
/* msi is enabled */irqflags = 0;
irqflags = 0;
addr = pci_resource_start(pci, 0); adata->acp3x_base = ioremap(addr, pci_resource_len(pci, 0)); @@ -
112,7 +105,6 @@ static int snd_acp3x_probe(struct pci_dev *pci, return 0;
unmap_mmio:
- pci_disable_msi(pci); iounmap(adata->acp3x_base);
release_regions: pci_release_regions(pci); @@ -129,7 +121,6 @@ static void snd_acp3x_remove(struct pci_dev *pci) platform_device_unregister(adata->pdev); iounmap(adata->acp3x_base);
- pci_disable_msi(pci); pci_release_regions(pci); pci_disable_device(pci);
}
2.7.4
On Tue, Oct 01, 2019 at 05:23:43PM +0000, Deucher, Alexander wrote:
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts?
As I understand it. Or at the very least I'm not aware of any situation where they're harmful. It'd be good to have a clear explanation of why we're removing the support.
Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Yes.
Hi, Please find my inline comments.
Thanks, Vishnu
On 01/10/19 10:59 PM, Mark Brown wrote:
On Tue, Oct 01, 2019 at 05:23:43PM +0000, Deucher, Alexander wrote:
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts?
As I understand it. Or at the very least I'm not aware of any situation where they're harmful. It'd be good to have a clear explanation of why we're removing the support.
Actually our device is audio device and it does not depends on MSI`s. So we thought to remove it as it has no purpose or meaning to have this code in our audio based ACP-PCI driver.
Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Yes.
On 11/10/19 3:03 AM, vishnu wrote:
Hi, Please find my inline comments.
Thanks, Vishnu
On 01/10/19 10:59 PM, Mark Brown wrote:
On Tue, Oct 01, 2019 at 05:23:43PM +0000, Deucher, Alexander wrote:
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts?
As I understand it. Or at the very least I'm not aware of any situation where they're harmful. It'd be good to have a clear explanation of why we're removing the support.
Actually our device is audio device and it does not depends on MSI`s. So we thought to remove it as it has no purpose or meaning to have this code in our audio based ACP-PCI driver.
Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Yes.
Hi Mark,
Any updates on this patch.
Regards, Vishnu
-----Original Message----- From: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com Sent: Thursday, October 17, 2019 5:33 AM To: Mark Brown broonie@kernel.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: RAVULAPATI, VISHNU VARDHAN RAO Vishnuvardhanrao.Ravulapati@amd.com; Liam Girdwood lgirdwood@gmail.com; Jaroslav Kysela perex@perex.cz; Takashi Iwai tiwai@suse.com; Mukunda, Vijendar Vijendar.Mukunda@amd.com; Maruthi Srinivas Bayyavarapu Maruthi.Bayyavarapu@amd.com; Colin Ian King colin.king@canonical.com; Dan Carpenter dan.carpenter@oracle.com; moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM... alsa-devel@alsa-project.org; open list linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/7] ASoC: amd: No need PCI-MSI interrupts
On 11/10/19 3:03 AM, vishnu wrote:
Hi, Please find my inline comments.
Thanks, Vishnu
On 01/10/19 10:59 PM, Mark Brown wrote:
On Tue, Oct 01, 2019 at 05:23:43PM +0000, Deucher, Alexander wrote:
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts?
As I understand it. Or at the very least I'm not aware of any situation where they're harmful. It'd be good to have a clear explanation of why we're removing the support.
Actually our device is audio device and it does not depends on MSI`s. So we thought to remove it as it has no purpose or meaning to have this code in our audio based ACP-PCI driver.
Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Yes.
Hi Mark,
Any updates on this patch.
You are removing functionality from the driver with no rational as to why it's necessary. What's the point of this patch? Does it fix a particular issue? If not, I suggest just dropping it. The hw supports MSIs, why not use them?
Alex
On 01/10/19 10:59 PM, Mark Brown wrote:
On Tue, Oct 01, 2019 at 05:23:43PM +0000, Deucher, Alexander wrote:
ACP-PCI controller driver does not depends msi interrupts. So removed msi related pci functions which have no use and does not impact on existing functionality.
In general, however, aren't MSIs preferred to legacy interrupts?
As I understand it. Or at the very least I'm not aware of any situation where they're harmful. It'd be good to have a clear explanation of why we're removing the support.
Doesn't the driver have to opt into MSI support? As such, won't removing this code effectively disable MSI support?
Yes.
Hi Mark,
Any further updates on this patch.
Regards, Vishnu
participants (6)
-
Deucher, Alexander -
Lee Jones -
Mark Brown -
Ravulapati Vishnu vardhan rao -
RAVULAPATI, VISHNU VARDHAN RAO
-
vishnu