linux-kernel - linux-next: manual merge of the mmc tree with the slave-dma tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 23 Feb 2012 11:40:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Chris Ball <cjb@...top.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Viresh Kumar <viresh.kumar@...com>,
	Vinod Koul <vinod.koul@...el.com>,
	Ludovic Desroches <ludovic.desroches@...el.com>
Subject: linux-next: manual merge of the mmc tree with the slave-dma tree

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/atmel-mci.c between commit e2b35f3dbfc0
("dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config
changes") from the slave-dma tree and commit 43df92914ea0 ("mmc:
atmel-mci: don't use dma features when dma is present but there is no
chan available") from the mmc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/mmc/host/atmel-mci.c
index 44062d3,390863e..0000000
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@@ -1970,19 -1971,13 +1970,21 @@@ static bool atmci_configure_dma(struct 
  			dma_request_channel(mask, atmci_filter, pdata->dma_slave);
  	}
  	if (!host->dma.chan) {
- 		dev_notice(&host->pdev->dev, "DMA not available, using PIO\n");
+ 		dev_warn(&host->pdev->dev, "no DMA channel available\n");
+ 		return false;
  	} else {
  		dev_info(&host->pdev->dev,
- 					"Using %s for DMA transfers\n",
+ 					"using %s for DMA transfers\n",
  					dma_chan_name(host->dma.chan));
 +
 +		host->dma_conf.src_addr = host->mapbase + ATMCI_RDR;
 +		host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +		host->dma_conf.src_maxburst = 1;
 +		host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR;
 +		host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +		host->dma_conf.dst_maxburst = 1;
 +		host->dma_conf.device_fc = false;
+ 		return true;
  	}
  }
  

Content of type "application/pgp-signature" skipped