Skip to contentSkip to conversation

Patch "ARM: pxa: add the number of DMA requestor lines" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 3, 2017

Subsystems (5)
Stable branch Device tree bindings Arm (32-bit) Arm sub-architectures +1 more subsystems
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: pxa: add the number of DMA requestor lines

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-pxa-add-the-number-of-dma-requestor-lines.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 72b195cb716284217e8b270af420bc7e5cf04b3c Mon Sep 17 00:00:00 2001

From: Robert Jarzmik <[email protected]>
Date: Mon, 15 Feb 2016 21:57:47 +0100
Subject: ARM: pxa: add the number of DMA requestor lines

From: Robert Jarzmik <[email protected]>

commit 72b195cb716284217e8b270af420bc7e5cf04b3c upstream.

Declare the number of DMA requestor lines per platform :
- for pxa25x: 40 requestor lines
- for pxa27x: 75 requestor lines
- for pxa3xx: 100 requestor lines

This information will be used to activate the DMA flow control or not.

Signed-off-by Robert Jarzmik <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/arm/boot/dts/pxa27x.dtsi        |    1 +
 arch/arm/boot/dts/pxa3xx.dtsi        |    1 +
 arch/arm/mach-pxa/devices.c          |    3 ++-
 arch/arm/mach-pxa/pxa25x.c           |    2 +-
 arch/arm/mach-pxa/pxa27x.c           |    2 +-
 arch/arm/mach-pxa/pxa3xx.c           |    2 +-
 arch/arm/plat-pxa/include/plat/dma.h |    2 +-
 7 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/boot/dts/pxa27x.dtsi +1 -0
@@ -13,6 +13,7 @@
 			interrupts = <25>;
 			#dma-channels = <32>;
 			#dma-cells = <2>;
+			#dma-requests = <75>;
 			status = "okay";
 		};
arch/arm/boot/dts/pxa3xx.dtsi +1 -0
@@ -12,6 +12,7 @@
 			interrupts = <25>;
 			#dma-channels = <32>;
 			#dma-cells = <2>;
+			#dma-requests = <100>;
 			status = "okay";
 		};
arch/arm/mach-pxa/devices.c +2 -1
@@ -1203,6 +1203,7 @@ void __init pxa2xx_set_spi_info(unsigned
 
 static struct mmp_dma_platdata pxa_dma_pdata = {
 	.dma_channels	= 0,
+	.nb_requestors	= 0,
 };
 
 static struct resource pxa_dma_resource[] = {

@@ -1231,7 +1232,7 @@ static struct platform_device pxa2xx_pxa
 	.resource	= pxa_dma_resource,
 };
 
-void __init pxa2xx_set_dmac_info(int nb_channels)
+void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)
 {
 	pxa_dma_pdata.dma_channels = nb_channels;
 	pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);
arch/arm/mach-pxa/pxa25x.c +1 -1
@@ -206,7 +206,7 @@ static int __init pxa25x_init(void)
 		register_syscore_ops(&pxa_irq_syscore_ops);
 		register_syscore_ops(&pxa2xx_mfp_syscore_ops);
 
-		pxa2xx_set_dmac_info(16);
+		pxa2xx_set_dmac_info(16, 40);
 		pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);
 		ret = platform_add_devices(pxa25x_devices,
 					   ARRAY_SIZE(pxa25x_devices));
arch/arm/mach-pxa/pxa27x.c +1 -1
@@ -309,7 +309,7 @@ static int __init pxa27x_init(void)
 		if (!of_have_populated_dt()) {
 			pxa_register_device(&pxa27x_device_gpio,
 					    &pxa27x_gpio_info);
-			pxa2xx_set_dmac_info(32);
+			pxa2xx_set_dmac_info(32, 75);
 			ret = platform_add_devices(devices,
 						   ARRAY_SIZE(devices));
 		}
arch/arm/mach-pxa/pxa3xx.c +1 -1
@@ -450,7 +450,7 @@ static int __init pxa3xx_init(void)
 		if (of_have_populated_dt())
 			return 0;
 
-		pxa2xx_set_dmac_info(32);
+		pxa2xx_set_dmac_info(32, 100);
 		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 		if (ret)
 			return ret;
arch/arm/plat-pxa/include/plat/dma.h +1 -1
@@ -95,6 +95,6 @@ static inline int pxad_toggle_reserved_c
 }
 #endif
 
-extern void __init pxa2xx_set_dmac_info(int nb_channels);
+extern void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors);
 
 #endif /* __PLAT_DMA_H */

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/arm-pxa-fix-the-number-of-dma-requestor-lines.patch queue-4.4/arm-pxa-add-the-number-of-dma-requestor-lines.patch queue-4.4/dmaengine-mmp-pdma-add-number-of-requestors.patch