| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <51C42A71.1090403@ti.com>
Date: Fri, 21 Jun 2013 15:56:57 +0530
From: Sourav Poddar <sourav.poddar@...com>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
CC: Joel A Fernandes <joelagnel@...com>,
Tony Lindgren <tony@...mide.com>, Sekhar Nori <nsekhar@...com>,
Matt Porter <matt@...orter.com>,
Grant Likely <grant.likely@...retlab.ca>,
Rob Herring <rob.herring@...xeda.com>,
Vinod Koul <vinod.koul@...el.com>,
Benoit Cousson <b-cousson@...com>,
Russell King <linux@....linux.org.uk>,
Rob Landley <rob@...dley.net>,
Andrew Morton <akpm@...ux-foundation.org>,
Jason Kridner <jkridner@...gleboard.org>,
Koen Kooi <koen@...gleboard.org>,
Devicetree Discuss <devicetree-discuss@...ts.ozlabs.org>,
Linux OMAP List <linux-omap@...r.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@...ts.infradead.org>,
Linux DaVinci Kernel List
<davinci-linux-open-source@...ux.davincidsp.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Documentation List <linux-doc@...r.kernel.org>,
Linux MMC List <linux-mmc@...r.kernel.org>,
Linux SPI Devel List
<spi-devel-general@...ts.sourceforge.net>,
Arnd Bergmann <arnd@...db.de>
Subject: Re: [PATCH v12 09/11] spi: omap2-mcspi: convert to dma_request_slave_channel_compat()
Hi Mark,
On Friday 21 June 2013 02:36 AM, Joel A Fernandes wrote:
> From: Matt Porter<mporter@...com>
>
> Convert dmaengine channel requests to use
> dma_request_slave_channel_compat(). This supports the DT case of
> platforms requiring channel selection from either the OMAP DMA or
> the EDMA engine. AM33xx only boots from DT and is the only user
> implementing EDMA so in the !DT case we can default to the OMAP DMA
> filter.
>
> Signed-off-by: Matt Porter<mporter@...com>
> Acked-by: Mark Brown<broonie@...nsource.wolfsonmicro.com>
> Signed-off-by: Joel A Fernandes<joelagnel@...com>
> ---
> drivers/spi/spi-omap2-mcspi.c | 64 ++++++++++++++++++++++++++++-------------
> 1 file changed, 44 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
> index 86d2158..ca4ab78 100644
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -102,6 +102,9 @@ struct omap2_mcspi_dma {
>
> struct completion dma_tx_completion;
> struct completion dma_rx_completion;
> +
> + char dma_rx_ch_name[14];
> + char dma_tx_ch_name[14];
> };
>
> /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
> @@ -830,12 +833,20 @@ static int omap2_mcspi_request_dma(struct spi_device *spi)
> dma_cap_zero(mask);
> dma_cap_set(DMA_SLAVE, mask);
> sig = mcspi_dma->dma_rx_sync_dev;
> - mcspi_dma->dma_rx = dma_request_channel(mask, omap_dma_filter_fn,&sig);
> +
> + mcspi_dma->dma_rx =
> + dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
> + &sig,&master->dev,
> + mcspi_dma->dma_rx_ch_name);
> if (!mcspi_dma->dma_rx)
> goto no_dma;
>
> sig = mcspi_dma->dma_tx_sync_dev;
> - mcspi_dma->dma_tx = dma_request_channel(mask, omap_dma_filter_fn,&sig);
> + mcspi_dma->dma_tx =
> + dma_request_slave_channel_compat(mask, omap_dma_filter_fn,
> + &sig,&master->dev,
> + mcspi_dma->dma_tx_ch_name);
> +
> if (!mcspi_dma->dma_tx) {
> dma_release_channel(mcspi_dma->dma_rx);
> mcspi_dma->dma_rx = NULL;
> @@ -1256,29 +1267,42 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
> goto free_master;
>
> for (i = 0; i< master->num_chipselect; i++) {
> - char dma_ch_name[14];
> + char *dma_rx_ch_name = mcspi->dma_channels[i].dma_rx_ch_name;
> + char *dma_tx_ch_name = mcspi->dma_channels[i].dma_tx_ch_name;
> struct resource *dma_res;
>
> - sprintf(dma_ch_name, "rx%d", i);
> - dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
> - dma_ch_name);
> - if (!dma_res) {
> - dev_dbg(&pdev->dev, "cannot get DMA RX channel\n");
> - status = -ENODEV;
> - break;
> - }
> + sprintf(dma_rx_ch_name, "rx%d", i);
> + if (!pdev->dev.of_node) {
> + dma_res =
> + platform_get_resource_byname(pdev,
> + IORESOURCE_DMA,
> + dma_rx_ch_name);
> + if (!dma_res) {
> + dev_dbg(&pdev->dev,
> + "cannot get DMA RX channel\n");
> + status = -ENODEV;
> + break;
> + }
>
> - mcspi->dma_channels[i].dma_rx_sync_dev = dma_res->start;
> - sprintf(dma_ch_name, "tx%d", i);
> - dma_res = platform_get_resource_byname(pdev, IORESOURCE_DMA,
> - dma_ch_name);
> - if (!dma_res) {
> - dev_dbg(&pdev->dev, "cannot get DMA TX channel\n");
> - status = -ENODEV;
> - break;
> + mcspi->dma_channels[i].dma_rx_sync_dev =
> + dma_res->start;
> }
> + sprintf(dma_tx_ch_name, "tx%d", i);
> + if (!pdev->dev.of_node) {
> + dma_res =
> + platform_get_resource_byname(pdev,
> + IORESOURCE_DMA,
> + dma_tx_ch_name);
> + if (!dma_res) {
> + dev_dbg(&pdev->dev,
> + "cannot get DMA TX channel\n");
> + status = -ENODEV;
> + break;
> + }
>
> - mcspi->dma_channels[i].dma_tx_sync_dev = dma_res->start;
> + mcspi->dma_channels[i].dma_tx_sync_dev =
> + dma_res->start;
> + }
> }
>
> if (status< 0)
Acked-by: Sourav Poddar <sourav.poddar@...com>
Tested-by: Sourav Poddar <sourav.poddar@...com>
This patch can go independently and does not depend on the rest of the
series.
Can these patch be pulled?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists