From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Feb 2021 23:05:10 +0000 (-0800)
Subject: Merge tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=143983e585073f18fbe3b7d30ed0f92cfc218cef;p=linux.git

Merge tag 'dmaengine-5.12-rc1' of git://git./linux/kernel/git/vkoul/dmaengine

Pull dmaengine updates from Vinod Koul:
 "We have couple of drivers removed a new driver and bunch of new device
  support and few updates to drivers for this round.

  New drivers/devices:
   - Intel LGM SoC DMA driver
   - Actions Semi S500 DMA controller
   - Renesas r8a779a0 dma controller
   - Ingenic JZ4760(B) dma controller
   - Intel KeemBay AxiDMA controller

  Removed:
   - Coh901318 dma driver
   - Zte zx dma driver
   - Sirfsoc dma driver

  Updates:
   - mmp_pdma, mmp_tdma gained module support
   - imx-sdma become modern and dropped platform data support
   - dw-axi driver gained slave and cyclic dma support"

* tag 'dmaengine-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (58 commits)
  dmaengine: dw-axi-dmac: remove redundant null check on desc
  dmaengine: xilinx_dma: Alloc tx descriptors GFP_NOWAIT
  dmaengine: dw-axi-dmac: Virtually split the linked-list
  dmaengine: dw-axi-dmac: Set constraint to the Max segment size
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA BYTE and HALFWORD registers
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA handshake
  dmaengine: dw-axi-dmac: Add Intel KeemBay AxiDMA support
  dmaengine: drivers: Kconfig: add HAS_IOMEM dependency to DW_AXI_DMAC
  dmaengine: dw-axi-dmac: Add Intel KeemBay DMA register fields
  dt-binding: dma: dw-axi-dmac: Add support for Intel KeemBay AxiDMA
  dmaengine: dw-axi-dmac: Support burst residue granularity
  dmaengine: dw-axi-dmac: Support of_dma_controller_register()
  dmaegine: dw-axi-dmac: Support device_prep_dma_cyclic()
  dmaengine: dw-axi-dmac: Support device_prep_slave_sg
  dmaengine: dw-axi-dmac: Add device_config operation
  dmaengine: dw-axi-dmac: Add device_synchronize() callback
  dmaengine: dw-axi-dmac: move dma_pool_create() to alloc_chan_resources()
  dmaengine: dw-axi-dmac: simplify descriptor management
  dt-bindings: dma: Add YAML schemas for dw-axi-dmac
  dmaengine: ti: k3-psil: optimize struct psil_endpoint_config for size
  ...
---

143983e585073f18fbe3b7d30ed0f92cfc218cef
diff --cc drivers/dma/idxd/init.c
index fa04acd5582a0,9687a24ff9826..085a0c3b62c68
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@@ -335,13 -339,10 +339,13 @@@ static int idxd_probe(struct idxd_devic
  	int rc;
  
  	dev_dbg(dev, "%s entered and resetting device\n", __func__);
 -	idxd_device_init_reset(idxd);
 +	rc = idxd_device_init_reset(idxd);
 +	if (rc < 0)
 +		return rc;
 +
  	dev_dbg(dev, "IDXD reset complete\n");
  
- 	if (IS_ENABLED(CONFIG_INTEL_IDXD_SVM)) {
+ 	if (IS_ENABLED(CONFIG_INTEL_IDXD_SVM) && sva) {
  		rc = idxd_enable_system_pasid(idxd);
  		if (rc < 0)
  			dev_warn(dev, "Failed to enable PASID. No SVA support: %d\n", rc);