From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Curtis Malainey <cujomalainey@google.com>
Cc: Ross Zwisler <zwisler@google.com>,
Fletcher Woodruff <fletcherw@google.com>,
dmaengine@vger.kernel.org, alsa-devel@alsa-project.org,
Pierre-louis Bossart <pierre-louis.bossart@intel.com>,
Liam Girdwood <liam.r.girdwood@intel.com>
Subject: Re: DW-DMA: Probe failures on broadwell
Date: Tue, 9 Jul 2019 16:29:43 +0300 [thread overview]
Message-ID: <20190709132943.GB9224@smile.fi.intel.com> (raw)
In-Reply-To: <20190709131401.GA9224@smile.fi.intel.com>
On Tue, Jul 09, 2019 at 04:14:01PM +0300, Andy Shevchenko wrote:
> On Mon, Jul 08, 2019 at 01:50:07PM -0700, Curtis Malainey wrote:
> So, the correct fix is to provide a platform data, like it's done in
> drivers/dma/dw/pci.c::idma32_pdata, in the sst-firmware.c::dw_probe(), and call
> idma32_dma_probe() with idma32_dma_remove() respectively on removal stage.
>
> (It will require latest patches to be applied, which are material for v5.x)
Below completely untested patch to try
--- 8< --- 8< --- 8< ---
From 2bd36a75460613f0a14f0763b766cae8ce20c57d Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Tue, 9 Jul 2019 16:24:35 +0300
Subject: [PATCH 1/1] ASoC: Intel: common: Use proper DMA controller type
It has been reported that Intel Broadwell machines can't use SST
since DMA driver probe failure. The root cause *maybe* in a wrong type
of DMA controller in use.
Use Intel iDMA 32-bit instead of Synopsys DesignWare controller for Intel SST.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
sound/soc/intel/common/sst-firmware.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c
index d27947aeb079..5da7fb74c845 100644
--- a/sound/soc/intel/common/sst-firmware.c
+++ b/sound/soc/intel/common/sst-firmware.c
@@ -174,6 +174,16 @@ static int block_list_prepare(struct sst_dsp *dsp,
return ret;
}
+static const struct dw_dma_platform_data idma32_pdata = {
+ .nr_channels = 8,
+ .chan_allocation_order = CHAN_ALLOCATION_ASCENDING,
+ .chan_priority = CHAN_PRIORITY_ASCENDING,
+ .block_size = 131071,
+ .nr_masters = 1,
+ .data_width = {4},
+ .multi_block = {1, 1, 1, 1, 1, 1, 1, 1},
+};
+
static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
int irq)
{
@@ -184,6 +194,7 @@ static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
if (!chip)
return ERR_PTR(-ENOMEM);
+ chip->pdata = &idma32_pdata;
chip->irq = irq;
chip->regs = devm_ioremap_resource(dev, mem);
if (IS_ERR(chip->regs))
@@ -195,7 +206,7 @@ static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
chip->dev = dev;
- err = dw_dma_probe(chip);
+ err = idma32_dma_probe(chip);
if (err)
return ERR_PTR(err);
@@ -204,7 +215,7 @@ static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem,
static void dw_remove(struct dw_dma_chip *chip)
{
- dw_dma_remove(chip);
+ idma32_dma_remove(chip);
}
static bool dma_chan_filter(struct dma_chan *chan, void *param)
--
2.20.1
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2019-07-09 13:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAOReqxhxHiJ-4UYC-j4Quuuy5YP9ywohe_JwiLpCxqCvP-7ypg@mail.gmail.com>
2019-07-09 13:14 ` DW-DMA: Probe failures on broadwell Andy Shevchenko
2019-07-09 13:29 ` Andy Shevchenko [this message]
2019-07-09 13:34 ` Andy Shevchenko
2019-07-09 13:38 ` Andy Shevchenko
2019-07-09 19:27 ` Curtis Malainey
2019-07-10 16:43 ` Andy Shevchenko
2019-07-10 21:24 ` Curtis Malainey
2019-07-11 13:12 ` Andy Shevchenko
2019-07-11 18:15 ` Curtis Malainey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709132943.GB9224@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=cujomalainey@google.com \
--cc=dmaengine@vger.kernel.org \
--cc=fletcherw@google.com \
--cc=liam.r.girdwood@intel.com \
--cc=pierre-louis.bossart@intel.com \
--cc=zwisler@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).