* [PATCH AUTOSEL 5.13 02/19] dmaengine: sprd: Add missing MODULE_DEVICE_TABLE
2021-09-13 22:33 [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Sasha Levin
@ 2021-09-13 22:33 ` Sasha Levin
2021-09-13 22:34 ` [PATCH AUTOSEL 5.13 04/19] dmaengine: ioat: depends on !UML Sasha Levin
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-09-13 22:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Zou Wei, Hulk Robot, Baolin Wang, Vinod Koul, Sasha Levin,
dmaengine
From: Zou Wei <zou_wei@huawei.com>
[ Upstream commit 4faee8b65ec32346f8096e64c5fa1d5a73121742 ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates
correct modalias for automatic loading of this driver when it is built
as an external module.
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zou Wei <zou_wei@huawei.com>
Reviewed-by: Baolin Wang <baolin.wang7@gmail.com>
Link: https://lore.kernel.org/r/1620094977-70146-1-git-send-email-zou_wei@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/dma/sprd-dma.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
index 0ef5ca81ba4d..4357d2395e6b 100644
--- a/drivers/dma/sprd-dma.c
+++ b/drivers/dma/sprd-dma.c
@@ -1265,6 +1265,7 @@ static const struct of_device_id sprd_dma_match[] = {
{ .compatible = "sprd,sc9860-dma", },
{},
};
+MODULE_DEVICE_TABLE(of, sprd_dma_match);
static int __maybe_unused sprd_dma_runtime_suspend(struct device *dev)
{
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH AUTOSEL 5.13 04/19] dmaengine: ioat: depends on !UML
2021-09-13 22:33 [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.13 02/19] dmaengine: sprd: Add missing MODULE_DEVICE_TABLE Sasha Levin
@ 2021-09-13 22:34 ` Sasha Levin
2021-09-13 22:34 ` [PATCH AUTOSEL 5.13 05/19] dmaengine: xilinx_dma: Set DMA mask for coherent APIs Sasha Levin
2021-09-14 6:56 ` [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-09-13 22:34 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Johannes Berg, Geert Uytterhoeven, Dave Jiang, Vinod Koul,
Sasha Levin, dmaengine
From: Johannes Berg <johannes.berg@intel.com>
[ Upstream commit bbac7a92a46f0876e588722ebe552ddfe6fd790f ]
Now that UML has PCI support, this driver must depend also on
!UML since it pokes at X86_64 architecture internals that don't
exist on ARCH=um.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20210809112409.a3a0974874d2.I2ffe3d11ed37f735da2f39884a74c953b258b995@changeid
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/dma/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index f450e4231db7..4f70cf57471a 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -315,7 +315,7 @@ config INTEL_IDXD_PERFMON
config INTEL_IOATDMA
tristate "Intel I/OAT DMA support"
- depends on PCI && X86_64
+ depends on PCI && X86_64 && !UML
select DMA_ENGINE
select DMA_ENGINE_RAID
select DCA
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH AUTOSEL 5.13 05/19] dmaengine: xilinx_dma: Set DMA mask for coherent APIs
2021-09-13 22:33 [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Sasha Levin
2021-09-13 22:33 ` [PATCH AUTOSEL 5.13 02/19] dmaengine: sprd: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-09-13 22:34 ` [PATCH AUTOSEL 5.13 04/19] dmaengine: ioat: depends on !UML Sasha Levin
@ 2021-09-13 22:34 ` Sasha Levin
2021-09-14 6:56 ` [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2021-09-13 22:34 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Radhey Shyam Pandey, Harini Katakam, Vinod Koul, Sasha Levin,
dmaengine, linux-arm-kernel
From: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
[ Upstream commit aac6c0f90799d66b8989be1e056408f33fd99fe6 ]
The xilinx dma driver uses the consistent allocations, so for correct
operation also set the DMA mask for coherent APIs. It fixes the below
kernel crash with dmatest client when DMA IP is configured with 64-bit
address width and linux is booted from high (>4GB) memory.
Call trace:
[ 489.531257] dma_alloc_from_pool+0x8c/0x1c0
[ 489.535431] dma_direct_alloc+0x284/0x330
[ 489.539432] dma_alloc_attrs+0x80/0xf0
[ 489.543174] dma_pool_alloc+0x160/0x2c0
[ 489.547003] xilinx_cdma_prep_memcpy+0xa4/0x180
[ 489.551524] dmatest_func+0x3cc/0x114c
[ 489.555266] kthread+0x124/0x130
[ 489.558486] ret_from_fork+0x10/0x3c
[ 489.562051] ---[ end trace 248625b2d596a90a ]---
Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Reviewed-by: Harini Katakam <harini.katakam@xilinx.com>
Link: https://lore.kernel.org/r/1629363528-30347-1-git-send-email-radhey.shyam.pandey@xilinx.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/dma/xilinx/xilinx_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
index 4b9530a7bf65..434b1ff22e31 100644
--- a/drivers/dma/xilinx/xilinx_dma.c
+++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -3077,7 +3077,7 @@ static int xilinx_dma_probe(struct platform_device *pdev)
xdev->ext_addr = false;
/* Set the dma mask bits */
- dma_set_mask(xdev->dev, DMA_BIT_MASK(addr_width));
+ dma_set_mask_and_coherent(xdev->dev, DMA_BIT_MASK(addr_width));
/* Initialize the DMA engine */
xdev->common.dev = &pdev->dev;
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML
2021-09-13 22:33 [PATCH AUTOSEL 5.13 01/19] dmaengine: idxd: depends on !UML Sasha Levin
` (2 preceding siblings ...)
2021-09-13 22:34 ` [PATCH AUTOSEL 5.13 05/19] dmaengine: xilinx_dma: Set DMA mask for coherent APIs Sasha Levin
@ 2021-09-14 6:56 ` Johannes Berg
3 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2021-09-14 6:56 UTC (permalink / raw)
To: Sasha Levin, linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: lkp, Jiang, Dave, Anton Ivanov, Vinod Koul,
dmaengine@vger.kernel.org
On Mon, 2021-09-13 at 22:33 +0000, Sasha Levin wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> [ Upstream commit b2296eeac91555bd13f774efa7ab7d4b12fb71ef ]
While this commit (and also "dmaengine: ioat: depends on !UML") isn't
*wrong* per se on old kernels, the subject matter is really only
relevant since commit 68f5d3f3b654 ("um: add PCI over virtio emulation
driver"), since previously "UML && PCI" could not be true.
Hence, there's no point applying this (and the ioat one) to anything
older than 5.14.
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread