[U-Boot] [PATCH v2 1/3] qe: kconfig: U QE kconfig

[U-Boot] [PATCH v2 1/3] qe: kconfig: U QE kconfig

[Ran Wang]

add Kconfig option for U QUICC Engine.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
---
Change in v2:
	Add more conditional define to support more platforms.

 drivers/Kconfig    |  2 ++
 drivers/qe/Kconfig | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 drivers/qe/Kconfig

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 56536c4b19..884a945a19 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -74,6 +74,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/pwm/Kconfig"
 
+source "drivers/qe/Kconfig"
+
 source "drivers/ram/Kconfig"
 
 source "drivers/remoteproc/Kconfig"
diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig
new file mode 100644
index 0000000000..c47b54ab12
--- /dev/null
+++ b/drivers/qe/Kconfig
@@ -0,0 +1,12 @@
+#
+# QUICC Engine Drivers
+#
+config  U_QE
+	bool "Enable support for U QUICC Engine"
+	default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \
+		|| (TARGET_T1024QDS) \
+		|| (TARGET_T1024RDB) \
+		|| (TARGET_T1040QDS && !NOBQFMAN) \
+		|| (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT)
+	help
+	  Choose this option to add support for U QUICC Engine.
-- 
2.17.1

[U-Boot] [PATCH v2 2/3] arm: layerscape: Remove CONFIG_U_QE define in head files

[Ran Wang]

Because it has been moved to drivers/qe/Kconfig instead.
Following platforms are involved:
T102xQDS, T102xRDB, T1040QDS, ls1021aqds, ls1021atwr, ls1043ardb

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
---
Change in v2:
	Remove CONFIG_U_QE from more platforms besides ls1021a

 include/configs/T102xQDS.h   | 1 -
 include/configs/T102xRDB.h   | 1 -
 include/configs/T1040QDS.h   | 1 -
 include/configs/ls1021aqds.h | 1 -
 include/configs/ls1021atwr.h | 1 -
 include/configs/ls1043ardb.h | 7 -------
 6 files changed, 12 deletions(-)

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 8a38c5e19c..191616b8b0 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DPAA_FMAN
 
 #define CONFIG_QE
-#define CONFIG_U_QE
 /* Default address of microcode for the Linux FMan driver */
 #if defined(CONFIG_SPIFLASH)
 /*
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f7a54f7a97..ac5de8d164 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -669,7 +669,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_TARGET_T1024RDB
 #define CONFIG_QE
-#define CONFIG_U_QE
 #endif
 /* Default address of microcode for the Linux FMan driver */
 #if defined(CONFIG_SPIFLASH)
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index e890860b7e..25615be40e 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -549,7 +549,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DPAA_PME
 
 #define CONFIG_QE
-#define CONFIG_U_QE
 /* Default address of microcode for the Linux Fman driver */
 #if defined(CONFIG_SPIFLASH)
 /*
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 994e6ca362..7f7ffdede1 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -107,7 +107,6 @@ unsigned long get_board_ddr_clk(void);
 
 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
 	!defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 #endif
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 75b2e2fbbd..ddd024e8c0 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -106,7 +106,6 @@
 
 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
 	!defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 #endif
 
diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index bc639e586f..ffd92dbb43 100644
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -268,13 +268,6 @@
 #endif
 #endif
 
-/* QE */
-#ifndef SPL_NO_QE
-#if !defined(CONFIG_NAND_BOOT) && !defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
-#endif
-#endif
-
 /* SATA */
 #ifndef SPL_NO_SATA
 #ifndef CONFIG_CMD_EXT2
-- 
2.17.1

[U-Boot] [PATCH v2 3/3] armv7: ls102xa: Disable QE before enter deep sleep

[Ran Wang]

Otherwise system will hang after executing wfi.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
---
Change in v2:
	None	

 arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c         | 4 ++++
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
index af413f8622..bb169aaaf4 100644
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
@@ -73,6 +73,7 @@ static void __secure ls1_deepsleep_irq_cfg(void)
 	 * read, that is why we don't read it from register ippdexpcr1 itself.
 	 */
 	ippdexpcr1 = in_le32(&scfg->sparecr[7]);
+	out_be32(&rcpm->ippdexpcr1, ippdexpcr1);
 
 	if (ippdexpcr0 & RCPM_IPPDEXPCR0_ETSEC)
 		pmcintecr |= SCFG_PMCINTECR_ETSECRXG0 |
@@ -192,6 +193,9 @@ static void __secure ls1_deep_sleep(u32 entry_point)
 	setbits_be32(&scfg->dpslpcr, SCFG_DPSLPCR_WDRR_EN);
 	setbits_be32(&gur->crstsr, DCFG_CRSTSR_WDRFR);
 
+	/* Disable QE */
+	setbits_be32(&gur->devdisr, CCSR_DEVDISR1_QE);
+
 	ls1_deepsleep_irq_cfg();
 
 	psci_v7_flush_dcache_all();
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index 13a282ffe1..a3d1171aa9 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -86,6 +86,8 @@ struct sys_info {
 	unsigned long freq_localbus;
 };
 
+#define CCSR_DEVDISR1_QE	0x00000001
+
 /* Device Configuration and Pin Control */
 struct ccsr_gur {
 	u32     porsr1;         /* POR status 1 */
-- 
2.17.1

[U-Boot] [PATCH v2 1/3] qe: kconfig: U QE kconfig

[York Sun]

On 09/24/2018 11:45 PM, Ran Wang wrote:
> add Kconfig option for U QUICC Engine.
> 
> Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> ---
> Change in v2:
> 	Add more conditional define to support more platforms.
> 
>  drivers/Kconfig    |  2 ++
>  drivers/qe/Kconfig | 12 ++++++++++++
>  2 files changed, 14 insertions(+)
>  create mode 100644 drivers/qe/Kconfig
> 
> diff --git a/drivers/Kconfig b/drivers/Kconfig
> index 56536c4b19..884a945a19 100644
> --- a/drivers/Kconfig
> +++ b/drivers/Kconfig
> @@ -74,6 +74,8 @@ source "drivers/power/Kconfig"
>  
>  source "drivers/pwm/Kconfig"
>  
> +source "drivers/qe/Kconfig"
> +
>  source "drivers/ram/Kconfig"
>  
>  source "drivers/remoteproc/Kconfig"
> diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig
> new file mode 100644
> index 0000000000..c47b54ab12
> --- /dev/null
> +++ b/drivers/qe/Kconfig
> @@ -0,0 +1,12 @@
> +#
> +# QUICC Engine Drivers
> +#
> +config  U_QE

Did you notice you have extra space here?

York

[U-Boot] [PATCH v2 2/3] arm: layerscape: Remove CONFIG_U_QE define in head files

[York Sun]

On 09/24/2018 11:45 PM, Ran Wang wrote:
> Because it has been moved to drivers/qe/Kconfig instead.
> Following platforms are involved:
> T102xQDS, T102xRDB, T1040QDS, ls1021aqds, ls1021atwr, ls1043ardb
> 
> Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> ---
> Change in v2:
> 	Remove CONFIG_U_QE from more platforms besides ls1021a
> 
>  include/configs/T102xQDS.h   | 1 -
>  include/configs/T102xRDB.h   | 1 -
>  include/configs/T1040QDS.h   | 1 -
>  include/configs/ls1021aqds.h | 1 -
>  include/configs/ls1021atwr.h | 1 -
>  include/configs/ls1043ardb.h | 7 -------
>  6 files changed, 12 deletions(-)

After removing all defines, please remove it from config_whitelist.txt.

York

[U-Boot] [PATCH v2 1/3] qe: kconfig: U QE kconfig

[Ran Wang]

Hi York,

> -----Original Message-----
> From: York Sun
> Sent: Wednesday, September 26, 2018 01:02
> To: Ran Wang <ran.wang_1@nxp.com>; Alison Wang <alison.wang@nxp.com>
> Cc: Qiang Zhao <qiang.zhao@nxp.com>; u-boot at lists.denx.de
> Subject: Re: [PATCH v2 1/3] qe: kconfig: U QE kconfig
> 
> On 09/24/2018 11:45 PM, Ran Wang wrote:
> > add Kconfig option for U QUICC Engine.
> >
> > Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> > ---
> > Change in v2:
> > 	Add more conditional define to support more platforms.
> >
> >  drivers/Kconfig    |  2 ++
> >  drivers/qe/Kconfig | 12 ++++++++++++
> >  2 files changed, 14 insertions(+)
> >  create mode 100644 drivers/qe/Kconfig
> >
> > diff --git a/drivers/Kconfig b/drivers/Kconfig index
> > 56536c4b19..884a945a19 100644
> > --- a/drivers/Kconfig
> > +++ b/drivers/Kconfig
> > @@ -74,6 +74,8 @@ source "drivers/power/Kconfig"
> >
> >  source "drivers/pwm/Kconfig"
> >
> > +source "drivers/qe/Kconfig"
> > +
> >  source "drivers/ram/Kconfig"
> >
> >  source "drivers/remoteproc/Kconfig"
> > diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig new file mode
> > 100644 index 0000000000..c47b54ab12
> > --- /dev/null
> > +++ b/drivers/qe/Kconfig
> > @@ -0,0 +1,12 @@
> > +#
> > +# QUICC Engine Drivers
> > +#
> > +config  U_QE
> 
> Did you notice you have extra space here?

My bad, will correct it, thanks for point out.

Ran

[U-Boot] [PATCH v2 2/3] arm: layerscape: Remove CONFIG_U_QE define in head files

[Ran Wang]

Hi York,

> -----Original Message-----
> From: York Sun
> Sent: Wednesday, September 26, 2018 01:02
> To: Ran Wang <ran.wang_1@nxp.com>; Alison Wang <alison.wang@nxp.com>
> Cc: Qiang Zhao <qiang.zhao@nxp.com>; u-boot at lists.denx.de
> Subject: Re: [PATCH v2 2/3] arm: layerscape: Remove CONFIG_U_QE define in
> head files
> 
> On 09/24/2018 11:45 PM, Ran Wang wrote:
> > Because it has been moved to drivers/qe/Kconfig instead.
> > Following platforms are involved:
> > T102xQDS, T102xRDB, T1040QDS, ls1021aqds, ls1021atwr, ls1043ardb
> >
> > Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
> > ---
> > Change in v2:
> > 	Remove CONFIG_U_QE from more platforms besides ls1021a
> >
> >  include/configs/T102xQDS.h   | 1 -
> >  include/configs/T102xRDB.h   | 1 -
> >  include/configs/T1040QDS.h   | 1 -
> >  include/configs/ls1021aqds.h | 1 -
> >  include/configs/ls1021atwr.h | 1 -
> >  include/configs/ls1043ardb.h | 7 -------
> >  6 files changed, 12 deletions(-)
> 
> After removing all defines, please remove it from config_whitelist.txt.

Got it, will add it in next version.

Ran