From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAED4C73C41 for ; Tue, 9 Jul 2019 13:34:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 962882080C for ; Tue, 9 Jul 2019 13:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726126AbfGINew (ORCPT ); Tue, 9 Jul 2019 09:34:52 -0400 Received: from mga11.intel.com ([192.55.52.93]:63297 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725947AbfGINew (ORCPT ); Tue, 9 Jul 2019 09:34:52 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 06:34:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,470,1557212400"; d="scan'208";a="173563332" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.145]) by FMSMGA003.fm.intel.com with ESMTP; 09 Jul 2019 06:34:49 -0700 Received: from andy by smile with local (Exim 4.92) (envelope-from ) id 1hkqGe-0003qt-PC; Tue, 09 Jul 2019 16:34:48 +0300 Date: Tue, 9 Jul 2019 16:34:48 +0300 From: Andy Shevchenko To: Curtis Malainey Cc: Ross Zwisler , Fletcher Woodruff , dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, Pierre-louis Bossart , Liam Girdwood Subject: Re: DW-DMA: Probe failures on broadwell Message-ID: <20190709133448.GC9224@smile.fi.intel.com> References: <20190709131401.GA9224@smile.fi.intel.com> <20190709132943.GB9224@smile.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190709132943.GB9224@smile.fi.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo User-Agent: Mutt/1.10.1 (2018-07-13) Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org On Tue, Jul 09, 2019 at 04:29:43PM +0300, Andy Shevchenko wrote: > 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 Also, it might require to set proper request lines (currently it uses 0 AFAICS). Something like it's done in drivers/spi/spi-pxa2xx-pci.c for Intel Merrifield. > > --- 8< --- 8< --- 8< --- > > From 2bd36a75460613f0a14f0763b766cae8ce20c57d Mon Sep 17 00:00:00 2001 > From: Andy Shevchenko > 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 > --- > 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 > > -- With Best Regards, Andy Shevchenko