* [PATCH] dmaengine: xgene-dma: Fix the resource map to handle overlapping
@ 2015-07-07 10:04 Rameshwar Prasad Sahu
[not found] ` <1436263465-7677-1-git-send-email-rsahu-qTEPVZfXA3Y@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Rameshwar Prasad Sahu @ 2015-07-07 10:04 UTC (permalink / raw)
To: vinod.koul-ral2JQCrhuEAvxtiuMwx3w,
dan.j.williams-ral2JQCrhuEAvxtiuMwx3w
Cc: dmaengine-u79uwXL29TY76Z2rM5mHXA, arnd-r2nGTMty4D4,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
jcm-H+wXaHxf7aLQT0dZR+AlfA, patches-qTEPVZfXA3Y,
Rameshwar Prasad Sahu
There is an overlap in dma ring cmd csr region due to sharing of ethernet
ring cmd csr region. This patch fix the resource overlapping by mapping
the entire dma ring cmd csr region.
Signed-off-by: Rameshwar Prasad Sahu <rsahu-qTEPVZfXA3Y@public.gmane.org>
---
Documentation/devicetree/bindings/dma/apm-xgene-dma.txt | 2 +-
arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +-
drivers/dma/xgene-dma.c | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt
index d305876..c53e0b0 100644
--- a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt
+++ b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt
@@ -35,7 +35,7 @@ Example:
device_type = "dma";
reg = <0x0 0x1f270000 0x0 0x10000>,
<0x0 0x1f200000 0x0 0x10000>,
- <0x0 0x1b008000 0x0 0x2000>,
+ <0x0 0x1b000000 0x0 0x400000>,
<0x0 0x1054a000 0x0 0x100>;
interrupts = <0x0 0x82 0x4>,
<0x0 0xb8 0x4>,
diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 0689c3f..58093ed 100644
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -823,7 +823,7 @@
device_type = "dma";
reg = <0x0 0x1f270000 0x0 0x10000>,
<0x0 0x1f200000 0x0 0x10000>,
- <0x0 0x1b008000 0x0 0x2000>,
+ <0x0 0x1b000000 0x0 0x400000>,
<0x0 0x1054a000 0x0 0x100>;
interrupts = <0x0 0x82 0x4>,
<0x0 0xb8 0x4>,
diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c
index 620fd55ec..dff22ab 100644
--- a/drivers/dma/xgene-dma.c
+++ b/drivers/dma/xgene-dma.c
@@ -111,6 +111,7 @@
#define XGENE_DMA_MEM_RAM_SHUTDOWN 0xD070
#define XGENE_DMA_BLK_MEM_RDY 0xD074
#define XGENE_DMA_BLK_MEM_RDY_VAL 0xFFFFFFFF
+#define XGENE_DMA_RING_CMD_SM_OFFSET 0x8000
/* X-Gene SoC EFUSE csr register and bit defination */
#define XGENE_SOC_JTAG1_SHADOW 0x18
@@ -1887,6 +1888,8 @@ static int xgene_dma_get_resources(struct platform_device *pdev,
return -ENOMEM;
}
+ pdma->csr_ring_cmd += XGENE_DMA_RING_CMD_SM_OFFSET;
+
/* Get efuse csr region */
res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
if (!res) {
--
1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <1436263465-7677-1-git-send-email-rsahu-qTEPVZfXA3Y@public.gmane.org>]
* Re: [PATCH] dmaengine: xgene-dma: Fix the resource map to handle overlapping [not found] ` <1436263465-7677-1-git-send-email-rsahu-qTEPVZfXA3Y@public.gmane.org> @ 2015-07-10 8:36 ` Rameshwar Sahu 2015-07-16 13:02 ` Vinod Koul 1 sibling, 0 replies; 3+ messages in thread From: Rameshwar Sahu @ 2015-07-10 8:36 UTC (permalink / raw) To: Vinod Koul, dan.j.williams-ral2JQCrhuEAvxtiuMwx3w Cc: dmaengine-u79uwXL29TY76Z2rM5mHXA, Arnd Bergmann, linux-kernel-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, jcm-H+wXaHxf7aLQT0dZR+AlfA, patches-qTEPVZfXA3Y, Rameshwar Prasad Sahu Hi Vinod, On Tue, Jul 7, 2015 at 3:34 PM, Rameshwar Prasad Sahu <rsahu-qTEPVZfXA3Y@public.gmane.org> wrote: > There is an overlap in dma ring cmd csr region due to sharing of ethernet > ring cmd csr region. This patch fix the resource overlapping by mapping > the entire dma ring cmd csr region. > > Signed-off-by: Rameshwar Prasad Sahu <rsahu-qTEPVZfXA3Y@public.gmane.org> > --- > Documentation/devicetree/bindings/dma/apm-xgene-dma.txt | 2 +- > arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- > drivers/dma/xgene-dma.c | 3 +++ > 3 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt > index d305876..c53e0b0 100644 > --- a/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt > +++ b/Documentation/devicetree/bindings/dma/apm-xgene-dma.txt > @@ -35,7 +35,7 @@ Example: > device_type = "dma"; > reg = <0x0 0x1f270000 0x0 0x10000>, > <0x0 0x1f200000 0x0 0x10000>, > - <0x0 0x1b008000 0x0 0x2000>, > + <0x0 0x1b000000 0x0 0x400000>, > <0x0 0x1054a000 0x0 0x100>; > interrupts = <0x0 0x82 0x4>, > <0x0 0xb8 0x4>, > diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi > index 0689c3f..58093ed 100644 > --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi > +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi > @@ -823,7 +823,7 @@ > device_type = "dma"; > reg = <0x0 0x1f270000 0x0 0x10000>, > <0x0 0x1f200000 0x0 0x10000>, > - <0x0 0x1b008000 0x0 0x2000>, > + <0x0 0x1b000000 0x0 0x400000>, > <0x0 0x1054a000 0x0 0x100>; > interrupts = <0x0 0x82 0x4>, > <0x0 0xb8 0x4>, > diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c > index 620fd55ec..dff22ab 100644 > --- a/drivers/dma/xgene-dma.c > +++ b/drivers/dma/xgene-dma.c > @@ -111,6 +111,7 @@ > #define XGENE_DMA_MEM_RAM_SHUTDOWN 0xD070 > #define XGENE_DMA_BLK_MEM_RDY 0xD074 > #define XGENE_DMA_BLK_MEM_RDY_VAL 0xFFFFFFFF > +#define XGENE_DMA_RING_CMD_SM_OFFSET 0x8000 > > /* X-Gene SoC EFUSE csr register and bit defination */ > #define XGENE_SOC_JTAG1_SHADOW 0x18 > @@ -1887,6 +1888,8 @@ static int xgene_dma_get_resources(struct platform_device *pdev, > return -ENOMEM; > } > > + pdma->csr_ring_cmd += XGENE_DMA_RING_CMD_SM_OFFSET; > + > /* Get efuse csr region */ > res = platform_get_resource(pdev, IORESOURCE_MEM, 3); > if (!res) { > -- > 1.8.2.1 > Any comments on above patch ? -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dmaengine: xgene-dma: Fix the resource map to handle overlapping [not found] ` <1436263465-7677-1-git-send-email-rsahu-qTEPVZfXA3Y@public.gmane.org> 2015-07-10 8:36 ` Rameshwar Sahu @ 2015-07-16 13:02 ` Vinod Koul 1 sibling, 0 replies; 3+ messages in thread From: Vinod Koul @ 2015-07-16 13:02 UTC (permalink / raw) To: Rameshwar Prasad Sahu Cc: dan.j.williams-ral2JQCrhuEAvxtiuMwx3w, dmaengine-u79uwXL29TY76Z2rM5mHXA, arnd-r2nGTMty4D4, linux-kernel-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, jcm-H+wXaHxf7aLQT0dZR+AlfA, patches-qTEPVZfXA3Y On Tue, Jul 07, 2015 at 03:34:25PM +0530, Rameshwar Prasad Sahu wrote: > There is an overlap in dma ring cmd csr region due to sharing of ethernet > ring cmd csr region. This patch fix the resource overlapping by mapping > the entire dma ring cmd csr region. Applied thanks -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-16 13:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-07 10:04 [PATCH] dmaengine: xgene-dma: Fix the resource map to handle overlapping Rameshwar Prasad Sahu
[not found] ` <1436263465-7677-1-git-send-email-rsahu-qTEPVZfXA3Y@public.gmane.org>
2015-07-10 8:36 ` Rameshwar Sahu
2015-07-16 13:02 ` Vinod Koul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).