Skip to contentSkip to conversation

ARM: socfpga: stratix10: Enable DMA330 DMA controller

PATCH New chee.hong.ang at intel.com 3 participants 8 messages May 3, 2019 – May 7, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

From: "Ang, Chee Hong" <[email protected]>

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 +
 arch/arm/mach-socfpga/spl_s10.c                        | 4 ++++
 2 files changed, 5 insertions(+)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
index e186296..3ac46c3 100644
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
 #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
 #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
 #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
 #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
 #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
 #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach-socfpga/spl_s10.c +4 -0
index a141ffe..e063229 100644
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
 	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS, &sysmgr_regs->dma);
 	writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs->dma_periph);
 
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+
 	spl_disable_firewall_l4_per();
 
 	spl_disable_firewall_l4_sys();
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 1 line · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330 ?

Don't you have a reset driver, like A10 and Gen5 ?

Quoted 34 lines
---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 +
 arch/arm/mach-socfpga/spl_s10.c                        | 4 ++++
 2 files changed, 5 insertions(+)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
index e186296..3ac46c3 100644
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
 #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
 #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
 #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
 #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
 #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
 #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach-socfpga/spl_s10.c +4 -0
index a141ffe..e063229 100644
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
 	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS, &sysmgr_regs->dma);
 	writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs->dma_periph);
 
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+
 	spl_disable_firewall_l4_per();
 
 	spl_disable_firewall_l4_sys();
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 6 lines · Marek Vasut
Quoted 2 lines · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330 ?

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Quoted 40 lines
Quoted 39 lines

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 + arch/arm/mach-socfpga/spl_s10.c                        | 4 ++++

 2 files changed, 5 insertions(+)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
index e186296..3ac46c3 100644
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
  #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
  #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
  #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
  #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
  #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
  #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach- renamed from arch/arm/mach-socfpga/spl_s10.c +0 -0

socfpga/spl_s10.c
index a141ffe..e063229 100644

arch/arm/mach-socfpga/spl_s10.c +0 -0
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
  	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS,
 &sysmgr_regs->dma);
  	writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs->dma_periph);

arch/arm/mach-socfpga/spl_s10.c +4 -0
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+

  spl_disable_firewall_l4_per();

  spl_disable_firewall_l4_sys();

#3 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 10 lines · Chee Hong
Quoted 6 lines · Marek Vasut
Quoted 2 lines · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330 ?

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Can you also answer my question regarding the reset driver ?

Quoted 37 lines
Quoted 37 lines
Quoted 37 lines

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 + arch/arm/mach-socfpga/spl_s10.c                        | 4 ++++

 2 files changed, 5 insertions(+)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
index e186296..3ac46c3 100644
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
  #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
  #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
  #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
  #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
  #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
  #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach- renamed from arch/arm/mach-socfpga/spl_s10.c +0 -0

socfpga/spl_s10.c
index a141ffe..e063229 100644

arch/arm/mach-socfpga/spl_s10.c +0 -0
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
  	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS,
 &sysmgr_regs->dma);
  	writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs->dma_periph);

arch/arm/mach-socfpga/spl_s10.c +4 -0
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+

  spl_disable_firewall_l4_per();

  spl_disable_firewall_l4_sys();

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 11 lines · Marek Vasut
Quoted 10 lines · Chee Hong
Quoted 8 lines · Marek Vasut
Quoted 3 lines · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330 ?

Quoted 6 lines
Quoted 5 lines
Quoted 1 line

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this
for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Can you also answer my question regarding the reset driver ?

Yes. S10 has a reset driver in drivers/reset/reset-socfpga.c.

Quoted 45 lines
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 + arch/arm/mach-socfpga/spl_s10.c                        | 4
++++

 2 files changed, 5 insertions(+)
(quoted diff) +0 -0

socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h index e186296..3ac46c3 100644

arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
  #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
  #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
  #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
  #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
  #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
  #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach- renamed from arch/arm/mach-socfpga/spl_s10.c +0 -0

socfpga/spl_s10.c
index a141ffe..e063229 100644

arch/arm/mach-socfpga/spl_s10.c +0 -0
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
  	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS,
 &sysmgr_regs->dma);

  writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs-

Quoted 1 line

dma_periph);

arch/arm/mach-socfpga/spl_s10.c +4 -0
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+

  spl_disable_firewall_l4_per();

  spl_disable_firewall_l4_sys();

#5 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 12 lines · Chee Hong
Quoted 11 lines · Marek Vasut
Quoted 10 lines · Chee Hong
Quoted 8 lines · Marek Vasut
Quoted 3 lines · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330 ?

Quoted 7 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this
for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Can you also answer my question regarding the reset driver ?

Yes. S10 has a reset driver in drivers/reset/reset-socfpga.c.

So why don't you use it ? :-)

Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 + arch/arm/mach-socfpga/spl_s10.c                        | 4
++++

 2 files changed, 5 insertions(+)
(quoted diff) +0 -0

socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h index e186296..3ac46c3 100644

arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
  #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
  #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
  #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
  #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
  #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
  #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach- renamed from arch/arm/mach-socfpga/spl_s10.c +0 -0

socfpga/spl_s10.c
index a141ffe..e063229 100644

arch/arm/mach-socfpga/spl_s10.c +0 -0
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
  	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS,
 &sysmgr_regs->dma);

  writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs-

Quoted 1 line

dma_periph);

arch/arm/mach-socfpga/spl_s10.c +4 -0
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+

  spl_disable_firewall_l4_per();

  spl_disable_firewall_l4_sys();

Signature · 2 lines
Best regards,
Marek Vasut
#6 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 19 lines · Marek Vasut
Quoted 18 lines · Chee Hong
Quoted 16 lines · Marek Vasut
Quoted 14 lines · Chee Hong
Quoted 11 lines · Marek Vasut
Quoted 4 lines · chee.hong.ang at intel.com

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330
?

Quoted 8 lines
Quoted 7 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this
for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Can you also answer my question regarding the reset driver ?

Yes. S10 has a reset driver in drivers/reset/reset-socfpga.c.

So why don't you use it ? :-)

Since our u-boot don't have DMA330 driver, I am going to drop this patch and let Linux DMA driver take care of the reset. Thanks.

Quoted 52 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines
Quoted 51 lines

---
 arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 +
 arch/arm/mach-socfpga/spl_s10.c                        | 4
++++

 2 files changed, 5 insertions(+)
(quoted diff) +0 -0

socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h index e186296..3ac46c3 100644
--- a/arch/arm/mach- socfpga/include/mach/reset_manager_s10.h
+++ b/arch/arm/mach- socfpga/include/mach/reset_manager_s10.h

arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +1 -0
@@ -95,6 +95,7 @@ struct socfpga_reset_manager {
  #define RSTMGR_DMA		RSTMGR_DEFINE(1, 16)
  #define RSTMGR_SPIM0		RSTMGR_DEFINE(1, 17)
  #define RSTMGR_SPIM1		RSTMGR_DEFINE(1, 18)
+#define RSTMGR_DMA_OCP		RSTMGR_DEFINE(1, 21)
  #define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
  #define RSTMGR_L4WD1		RSTMGR_DEFINE(2, 1)
  #define RSTMGR_L4WD2		RSTMGR_DEFINE(2, 2)
arch/arm/mach- renamed from arch/arm/mach-socfpga/spl_s10.c +0 -0

socfpga/spl_s10.c
index a141ffe..e063229 100644

arch/arm/mach-socfpga/spl_s10.c +0 -0
@@ -158,6 +158,10 @@ void board_init_f(ulong dummy)
  	writel(SYSMGR_DMA_IRQ_NS | SYSMGR_DMA_MGR_NS,
 &sysmgr_regs->dma);

  writel(SYSMGR_DMAPERIPH_ALL_NS, &sysmgr_regs-

Quoted 2 lines

dma_periph);

arch/arm/mach-socfpga/spl_s10.c +4 -0
+	/* enable DMA330 DMA */
+	socfpga_per_reset(SOCFPGA_RESET(DMA), 0);
+	socfpga_per_reset(SOCFPGA_RESET(DMA_OCP), 0);
+

  spl_disable_firewall_l4_per();

  spl_disable_firewall_l4_sys();

#7 lore raw

PATCH 1/1 ARM: socfpga: stratix10: Enable DMA330 DMA controller

Quoted 25 lines · Chee Hong
Quoted 24 lines · Marek Vasut
Quoted 23 lines · Chee Hong
Quoted 21 lines · Marek Vasut
Quoted 19 lines · Chee Hong
Quoted 6 lines · Marek Vasut
Quoted 3 lines · chee.hong.ang at intel.com
Quoted 6 lines
Quoted 1 line

From: "Ang, Chee Hong" <[email protected]>

Commit message is missing -- why do you need to enable the DMA330
?

Don't you have a reset driver, like A10 and Gen5 ?

DMA driver for S10 is still missing in u-boot. I need to enable this
for booting Linux which is required by Linux's DMA driver. I will add the reason to enable DMA330 in the commit message.

Quoted 5 lines
Quoted 3 lines
Quoted 2 lines
Quoted 1 line

Can you also answer my question regarding the reset driver ?

Yes. S10 has a reset driver in drivers/reset/reset-socfpga.c.

So why don't you use it ? :-)

Since our u-boot don't have DMA330 driver, I am going to drop this patch and let Linux DMA driver take care of the reset. Thanks.

That sounds like a good idea -- only enable peripherals when they are really needed.

Signature · 2 lines
Best regards,
Marek Vasut