arm: socfpga: add reset manager defines for Arria10

PATCH New dinguyen at opensource.altera.com 4 participants 13 messages Jan 12, 2016 – Feb 6, 2016

Subsystems (5)

Device tree bindings Arm (32-bit) Arm sub-architectures Reset controller framework +1 more subsystems

lore

Share & tools

lore

dinguyen at opensource.altera.com

author

2016-01-12 20:56 UTC #0 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

From: Dinh Nguyen <[email protected]>

Add the Arria10 reset manager defines that is used in Linux. Change the license to SPDX.

[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: Add commit hash-id for original commit from Linux kernel

---
 include/dt-bindings/reset/altr,rst-mgr-a10.h | 103 +++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10.h

include/dt-bindings/reset/altr,rst-mgr-a10.h new file +103 -0

new file mode 100644
index 0000000..7619ca2
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2014, Steffen Trumtrar <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#ifndef _DT_BINDINGS_RESET_ALTR_RST_MGR_A10_H
+#define _DT_BINDINGS_RESET_ALTR_RST_MGR_A10_H
+
+/* MPUMODRST */
+#define CPU0_RESET		0
+#define CPU1_RESET		1
+#define WDS_RESET		2
+#define SCUPER_RESET		3
+
+/* PER0MODRST */
+#define EMAC0_RESET		32
+#define EMAC1_RESET		33
+#define EMAC2_RESET		34
+#define USB0_RESET		35
+#define USB1_RESET		36
+#define NAND_RESET		37
+#define QSPI_RESET		38
+#define SDMMC_RESET		39
+#define EMAC0_OCP_RESET		40
+#define EMAC1_OCP_RESET		41
+#define EMAC2_OCP_RESET		42
+#define USB0_OCP_RESET		43
+#define USB1_OCP_RESET		44
+#define NAND_OCP_RESET		45
+#define QSPI_OCP_RESET		46
+#define SDMMC_OCP_RESET		47
+#define DMA_RESET		48
+#define SPIM0_RESET		49
+#define SPIM1_RESET		50
+#define SPIS0_RESET		51
+#define SPIS1_RESET		52
+#define DMA_OCP_RESET		53
+#define EMAC_PTP_RESET		54
+/* 55 is empty*/
+#define DMAIF0_RESET		56
+#define DMAIF1_RESET		57
+#define DMAIF2_RESET		58
+#define DMAIF3_RESET		59
+#define DMAIF4_RESET		60
+#define DMAIF5_RESET		61
+#define DMAIF6_RESET		62
+#define DMAIF7_RESET		63
+
+/* PER1MODRST */
+#define L4WD0_RESET		64
+#define L4WD1_RESET		65
+#define L4SYSTIMER0_RESET	66
+#define L4SYSTIMER1_RESET	67
+#define SPTIMER0_RESET		68
+#define SPTIMER1_RESET		69
+/* 70-71 is reserved */
+#define I2C0_RESET		72
+#define I2C1_RESET		73
+#define I2C2_RESET		74
+#define I2C3_RESET		75
+#define I2C4_RESET		76
+/* 77-79 is reserved */
+#define UART0_RESET		80
+#define UART1_RESET		81
+/* 82-87 is reserved */
+#define GPIO0_RESET		88
+#define GPIO1_RESET		89
+#define GPIO2_RESET		90
+
+/* BRGMODRST */
+#define HPS2FPGA_RESET		96
+#define LWHPS2FPGA_RESET	97
+#define FPGA2HPS_RESET		98
+#define F2SSDRAM0_RESET		99
+#define F2SSDRAM1_RESET		100
+#define F2SSDRAM2_RESET		101
+#define DDRSCH_RESET		102
+
+/* SYSMODRST*/
+#define ROM_RESET		128
+#define OCRAM_RESET		129
+/* 130 is reserved */
+#define FPGAMGR_RESET		131
+#define S2F_RESET		132
+#define SYSDBG_RESET		133
+#define OCRAM_OCP_RESET		134
+
+/* COLDMODRST */
+#define CLKMGRCOLD_RESET	160
+/* 161-162 is reserved */
+#define S2FCOLD_RESET		163
+#define TIMESTAMPCOLD_RESET	164
+#define TAPCOLD_RESET		165
+#define HMCCOLD_RESET		166
+#define IOMGRCOLD_RESET		167
+
+/* NRSTMODRST */
+#define NRSTPINOE_RESET		192
+
+/* DBGMODRST */
+#define DBG_RESET		224
+#endif

Signature · 1 line

2.6.2

dinguyen at opensource.altera.com

author

2016-01-12 20:56 UTC #1 lore raw

PATCH 2/3 arm: socfpga: combine clrbits/setbits into a single clrsetbits

From: Dinh Nguyen <[email protected]>

There is no dependency on doing a separate clrbits first in the dwmac_deassert_reset function. Combine them into a single clrsetbits call.

Signed-off-by Dinh Nguyen <[email protected]>

---
 arch/arm/mach-socfpga/misc.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

arch/arm/mach-socfpga/misc.c +3 -6

index 517f629..e8bd3cf 100644
@@ -100,13 +100,10 @@ static void dwmac_deassert_reset(const unsigned int of_reset_id)
 		return;
 	}
 
-	/* Clearing emac0 PHY interface select to 0 */
-	clrbits_le32(&sysmgr_regs->emacgrp_ctrl,
-		     SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << physhift);
-
 	/* configure to PHY interface select choosed */
-	setbits_le32(&sysmgr_regs->emacgrp_ctrl,
-		     SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII << physhift);
+	clrsetbits_le32(&sysmgr_regs->emacgrp_ctrl,
+			SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << physhift,
+			SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII << physhift);
 
 	/* Release the EMAC controller from reset */
 	socfpga_per_reset(reset, 0);

Signature · 1 line

2.6.2

dinguyen at opensource.altera.com

author

2016-01-12 20:56 UTC #2 lore raw

PATCH v2 3/3 arm: socfpga: arria10: update dwmac reset function to support Arria10

In reply to dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>

On the Arria10, the EMAC phy mode configuration for each EMACs is located in separate registers versus being in 1 register for the GEN5 devices. The Arria10 also has 3 EMACs compared to 2 for the GEN5 devices.

Update the dwmac_deassert_reset function to support both GEN5 and Arria10 devices.

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: simplify the implementation a bit

---
 arch/arm/mach-socfpga/include/mach/system_manager.h |  4 +---
 arch/arm/mach-socfpga/misc.c                        | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

arch/arm/mach-socfpga/include/mach/system_manager.h +1 -3

index 9ca889a..831ba4a 100644
@@ -133,9 +133,7 @@ struct socfpga_system_manager {
 	u32  usb0_l3master;
 	u32  usb1_l3master;
 	u32  emac_global;
-	u32  emac0;
-	u32  emac1;
-	u32  emac2;
+	u32  emac[3];
 	u32  _pad_0x50_0x5f[4];
 	u32  fpgaintf_en_global;
 	u32  fpgaintf_en_0;

arch/arm/mach-socfpga/misc.c +14 -0

index e8bd3cf..5ae1d7d 100644
@@ -22,7 +22,11 @@
 #include <asm/arch/scu.h>
 #include <asm/pl310.h>
 
+#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
 #include <dt-bindings/reset/altr,rst-mgr.h>
+#else
+#include <dt-bindings/reset/altr,rst-mgr-a10.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -95,15 +99,25 @@ static void dwmac_deassert_reset(const unsigned int of_reset_id)
 	} else if (of_reset_id == EMAC1_RESET) {
 		physhift = SYSMGR_EMACGRP_CTRL_PHYSEL1_LSB;
 		reset = SOCFPGA_RESET(EMAC1);
+#ifndef CONFIG_TARGET_SOCFPGA_GEN5
+	} else if (of_reset_id == EMAC2_RESET) {
+		reset = SOCFPGA_RESET(EMAC2);
+#endif
 	} else {
 		printf("GMAC: Invalid reset ID (%i)!\n", of_reset_id);
 		return;
 	}
 
+#if defined(CONFIG_TARGET_SOCFPGA_GEN5)
 	/* configure to PHY interface select choosed */
 	clrsetbits_le32(&sysmgr_regs->emacgrp_ctrl,
 			SYSMGR_EMACGRP_CTRL_PHYSEL_MASK << physhift,
 			SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII << physhift);
+#else
+	clrsetbits_le32(&sysmgr_regs->emac[of_reset_id - EMAC0_RESET],
+			SYSMGR_EMACGRP_CTRL_PHYSEL_MASK,
+			SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII);
+#endif
 
 	/* Release the EMAC controller from reset */
 	socfpga_per_reset(reset, 0);

Signature · 1 line

2.6.2

Marek Vasut

2016-01-12 22:02 UTC #3 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

In reply to dinguyen at opensource.altera.com

Quoted 8 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>

Applied all three to u-boot-socfpga/02-arria10 , thanks!

btw what's the status of A10 ? What will I be able to compile it (and thus merge the stuff into mainline and ev. use it on actual A10) ? A board would be nice too ;-)

Best regards,
Marek Vasut

Dinh Nguyen

maintainer

2016-01-12 22:11 UTC #4 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 9 lines · Marek Vasut

Quoted 7 lines · dinguyen at opensource.altera.com
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]

Quoted 7 lines

Quoted 1 line
Signed-off-by Dinh Nguyen <[email protected]>
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and thus merge the stuff into mainline and ev. use it on actual A10) ? A board would be nice too ;-)

Here is my list of to-do that is left for A10:

- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10

I think the most work will be the SDRAM controller as it needs quite a bit of cleanup. I'm about ~25% through with that.

As for HW, I'll see what I can do.

Dinh

Marek Vasut

2016-01-12 22:16 UTC #5 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 20 lines · Dinh Nguyen

Quoted 11 lines · Marek Vasut
On Tuesday, January 12, 2016 at 09:56:42 PM,
dinguyen at opensource.altera.com
Quoted 7 lines · wrote:
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Quoted 7 lines
Quoted 1 line
Signed-off-by Dinh Nguyen <[email protected]>
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and thus merge the stuff into mainline and ev. use it on actual A10) ? A board would be nice too ;-)

Quoted 8 lines

Here is my list of to-do that is left for A10:
- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10
I think the most work will be the SDRAM controller as it needs quite a bit of cleanup. I'm about ~25% through with that.

Didn't you mention that you use nios2 that magically does that init for you? Shall I expect thousands of LoC SDRAM controller driver again or is there something "lighter" coming up ? ;-)

Quoted 1 line

As for HW, I'll see what I can do.

Don't worry about it too much. I also poked Chin about it some time ago, but I dunno where he got with this.

Thanks!

Best regards,
Marek Vasut

Chin Liang See

2016-01-13 01:58 UTC #6 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 35 lines · Marek Vasut

Quoted 26 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut
On Tuesday, January 12, 2016 at 09:56:42 PM,
dinguyen at opensource.altera.com
Quoted 10 lines · wrote:
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the
license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>
Quoted 7 lines
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and
thus merge the stuff into mainline and ev. use it on actual A10) ? A
board would be nice too ;-)
Here is my list of to-do that is left for A10:
Quoted 7 lines
- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10
I think the most work will be the SDRAM controller as it needs quite a
bit of cleanup. I'm about ~25% through with that.

Quoted 5 lines

Didn't you mention that you use nios2 that magically does that init for you?
Shall I expect thousands of LoC SDRAM controller driver again or is there
something "lighter" coming up ? ;-)

Yah it should be lighter as all SDRAM configuration now part of bitstream. Driver just need to derive the value from bitstream register and setup the DDR controller. No more DDR handoff.

Quoted 6 lines

Quoted 2 lines
As for HW, I'll see what I can do.
Don't worry about it too much. I also poked Chin about it some time ago, but
I dunno where he got with this.

I am still working on this. We have limited boards as we will be getting production board in a month time. Dinh, you have any boards to spare? Most of boards here already went into test farms.

Thanks
Chin Liang

Quoted 5 lines

Thanks!
Best regards,
Marek Vasut

Marek Vasut

2016-01-13 02:04 UTC #7 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 42 lines · Chin Liang See

Quoted 35 lines · Marek Vasut
Quoted 26 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut
On Tuesday, January 12, 2016 at 09:56:42 PM,
dinguyen at opensource.altera.com
Quoted 10 lines · wrote:
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the
license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>
Quoted 7 lines
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and
thus merge the stuff into mainline and ev. use it on actual A10) ? A
board would be nice too ;-)
Here is my list of to-do that is left for A10:
Quoted 7 lines
- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10
I think the most work will be the SDRAM controller as it needs quite a
bit of cleanup. I'm about ~25% through with that.
Quoted 5 lines
Didn't you mention that you use nios2 that magically does that init for you?
Shall I expect thousands of LoC SDRAM controller driver again or is there
something "lighter" coming up ? ;-)

Quoted 3 lines

Yah it should be lighter as all SDRAM configuration now part of bitstream. Driver just need to derive the value from bitstream register and setup the DDR controller. No more DDR handoff.

Whew :)

Quoted 9 lines

Quoted 5 lines
Quoted 1 line
As for HW, I'll see what I can do.
Don't worry about it too much. I also poked Chin about it some time ago, but
I dunno where he got with this.
I am still working on this. We have limited boards as we will be getting production board in a month time. Dinh, you have any boards to spare? Most of boards here already went into test farms.

I'll wait for the production ones , no need to hurry :)

Best regards,
Marek Vasut

Dinh Nguyen

maintainer

2016-01-13 17:28 UTC #8 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 43 lines · Marek Vasut

Quoted 42 lines · Chin Liang See
Quoted 40 lines · Marek Vasut
Quoted 26 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut
On Tuesday, January 12, 2016 at 09:56:42 PM,
dinguyen at opensource.altera.com
Quoted 10 lines · wrote:
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the
license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>
Quoted 7 lines
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and
thus merge the stuff into mainline and ev. use it on actual A10) ? A
board would be nice too ;-)
Here is my list of to-do that is left for A10:
Quoted 7 lines
- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10
I think the most work will be the SDRAM controller as it needs quite a
bit of cleanup. I'm about ~25% through with that.
Didn't you mention that you use nios2 that magically does that init for you?
Shall I expect thousands of LoC SDRAM controller driver again or is there
something "lighter" coming up ? ;-)

Quoted 6 lines

Quoted 3 lines
Yah it should be lighter as all SDRAM configuration now part of bitstream. Driver just need to derive the value from bitstream register and setup the DDR controller. No more DDR handoff.
Whew :)

While all of the above is true, the *crap* that is in the current implementation needs to get cleaned up. It's amazing to me how we(Altera) continue to go down this path of having to do things twice, instead of trying to upstream first!

Quoted 6 lines

Quoted 6 lines
Quoted 5 lines
Quoted 1 line
As for HW, I'll see what I can do.
Don't worry about it too much. I also poked Chin about it some time ago, but
I dunno where he got with this.

Quoted 6 lines

Quoted 3 lines
I am still working on this. We have limited boards as we will be getting production board in a month time. Dinh, you have any boards to spare? Most of boards here already went into test farms.
I'll wait for the production ones , no need to hurry :)

That's probably best. I do have an extra Rev A hardware, but trust me, you don't want to have anything do with that hardware.

Dinh

Marek Vasut

2016-01-13 20:37 UTC #9 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 48 lines · Dinh Nguyen

Quoted 47 lines · Marek Vasut
Quoted 45 lines · Chin Liang See
Quoted 35 lines · Marek Vasut
Quoted 26 lines · Dinh Nguyen
Quoted 15 lines · Marek Vasut
On Tuesday, January 12, 2016 at 09:56:42 PM,
dinguyen at opensource.altera.com
Quoted 10 lines · wrote:
From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the
license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>
Quoted 7 lines
Applied all three to u-boot-socfpga/02-arria10 , thanks!
btw what's the status of A10 ? What will I be able to compile it (and
thus merge the stuff into mainline and ev. use it on actual A10) ? A
board would be nice too ;-)
Here is my list of to-do that is left for A10:
Quoted 7 lines
- submit SDRAM controller
- rework FPGA manager for A10
- port an SPL for A10
I think the most work will be the SDRAM controller as it needs quite a
bit of cleanup. I'm about ~25% through with that.
Quoted 5 lines
Didn't you mention that you use nios2 that magically does that init for you?
Shall I expect thousands of LoC SDRAM controller driver again or is there
something "lighter" coming up ? ;-)
Yah it should be lighter as all SDRAM configuration now part of bitstream. Driver just need to derive the value from bitstream register and setup the DDR controller. No more DDR handoff.

Quoted 6 lines

Quoted 1 line
Whew :)
While all of the above is true, the *crap* that is in the current implementation needs to get cleaned up. It's amazing to me how we(Altera) continue to go down this path of having to do things twice, instead of trying to upstream first!

You'll soon be doing them thrice *smirk* , or maybe you already do ;-)

Quoted 6 lines

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
As for HW, I'll see what I can do.
Don't worry about it too much. I also poked Chin about it some time ago, but
I dunno where he got with this.

Quoted 8 lines

Quoted 5 lines
Quoted 3 lines
I am still working on this. We have limited boards as we will be getting production board in a month time. Dinh, you have any boards to spare? Most of boards here already went into test farms.
I'll wait for the production ones , no need to hurry :)
That's probably best. I do have an extra Rev A hardware, but trust me, you don't want to have anything do with that hardware.

You can save one collector's edition for me, it'd look nice right next to the Excalibur XA10 ;-D

Marek Vasut

2016-02-04 11:46 UTC #10 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

In reply to dinguyen at opensource.altera.com

Quoted 8 lines · dinguyen at opensource.altera.com

From: Dinh Nguyen <[email protected]>
Add the Arria10 reset manager defines that is used in Linux. Change the license to SPDX.
[commit 007bb689b3dbad83cdab0ad192bc6ed0162451e0 from the Linux kernel]
Signed-off-by Dinh Nguyen <[email protected]>

Hi!

A10 branch is now u-boot-socfpga/01-arria10 .

What is the current status of Arria10 please ?

Best regards,
Marek Vasut

Dinh Nguyen

author

2016-02-04 20:59 UTC #11 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 3 lines · Marek Vasut

A10 branch is now u-boot-socfpga/01-arria10 .

Thanks for carrying this.

Quoted 2 lines

What is the current status of Arria10 please ?

I haven't had time to work on Arria10 in the last 2 weeks. I hope to get back to it next week. I think I may have to slim the patches down to just fixing building for it.

Dinh

Marek Vasut

2016-02-06 07:43 UTC #12 lore raw

PATCH v2 1/3 arm: socfpga: add reset manager defines for Arria10

Quoted 10 lines · Dinh Nguyen

Quoted 1 line · Marek Vasut
A10 branch is now u-boot-socfpga/01-arria10 .
Thanks for carrying this.
Quoted 1 line
What is the current status of Arria10 please ?
I haven't had time to work on Arria10 in the last 2 weeks. I hope to get back to it next week. I think I may have to slim the patches down to just fixing building for it.

Got it, thanks

Best regards,
Marek Vasut