diff mbox

[U-Boot] ls102xa: etsec: Use proper settings for BE BDs

Message ID 1439375354-14404-1-git-send-email-claudiu.manoil@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Claudiu Manoil Aug. 12, 2015, 10:29 a.m. UTC 
Replace the DMACTRL[LE] hack with recommended settings
for ETSECDMAMCR to get the same end effect - obtaining
big-endian buffer descriptors and frame data for eTSEC.
The reset / default value for ETSECDMAMCR is preserved,
excepting the BD and FR bits which are cleared to enable
the BE mode in accordance with the H/W specifications.

Fixes: 52d00a8 "ls102xa: etsec: Add etsec support for LS102xA"
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
---
 arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 +-
 board/freescale/ls1021aqds/ls1021aqds.c           | 3 ++-
 board/freescale/ls1021atwr/ls1021atwr.c           | 3 ++-
 drivers/net/tsec.c                                | 6 ------
 4 files changed, 5 insertions(+), 9 deletions(-)

Comments

alison wang Aug. 14, 2015, 8:39 a.m. UTC | #1 
Acked-by: Alison Wang <alison.wang@freescale.com>
Tested-by: Alison Wang <alison.wang@freescale.com>

Best Regards,
Alison Wang


> -----Original Message-----
> From: Claudiu Manoil [mailto:claudiu.manoil@freescale.com]
> Sent: Wednesday, August 12, 2015 6:29 PM
> To: Sun York-R58495
> Cc: Wang Huan-B18965; u-boot@lists.denx.de
> Subject: [PATCH] ls102xa: etsec: Use proper settings for BE BDs
> 
> Replace the DMACTRL[LE] hack with recommended settings for ETSECDMAMCR
> to get the same end effect - obtaining big-endian buffer descriptors
> and frame data for eTSEC.
> The reset / default value for ETSECDMAMCR is preserved, excepting the
> BD and FR bits which are cleared to enable the BE mode in accordance
> with the H/W specifications.
> 
> Fixes: 52d00a8 "ls102xa: etsec: Add etsec support for LS102xA"
> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
> ---
>  arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 2 +-
>  board/freescale/ls1021aqds/ls1021aqds.c           | 3 ++-
>  board/freescale/ls1021atwr/ls1021atwr.c           | 3 ++-
>  drivers/net/tsec.c                                | 6 ------
>  4 files changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
> b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
> index d34044a..60aa0d3 100644
> --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
> +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
> @@ -143,7 +143,7 @@ struct ccsr_gur {
>  	u32	sdhcpcr;
>  };
> 
> -#define SCFG_ETSECDMAMCR_LE_BD_FR	0xf8001a0f
> +#define SCFG_ETSECDMAMCR_LE_BD_FR	0x00000c00
>  #define SCFG_ETSECCMCR_GE2_CLK125	0x04000000
>  #define SCFG_ETSECCMCR_GE0_CLK125	0x00000000
>  #define SCFG_ETSECCMCR_GE1_CLK125	0x08000000
> diff --git a/board/freescale/ls1021aqds/ls1021aqds.c
> b/board/freescale/ls1021aqds/ls1021aqds.c
> index d6ef6ba..e585380 100644
> --- a/board/freescale/ls1021aqds/ls1021aqds.c
> +++ b/board/freescale/ls1021aqds/ls1021aqds.c
> @@ -280,7 +280,8 @@ int board_early_init_f(void)
>  	unsigned int major;
> 
>  #ifdef CONFIG_TSEC_ENET
> -	out_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
> +	/* clear BD & FR bits for BE BD's and frame data */
> +	clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
>  #endif
> 
>  #ifdef CONFIG_FSL_IFC
> diff --git a/board/freescale/ls1021atwr/ls1021atwr.c
> b/board/freescale/ls1021atwr/ls1021atwr.c
> index b7458a9..006700f 100644
> --- a/board/freescale/ls1021atwr/ls1021atwr.c
> +++ b/board/freescale/ls1021atwr/ls1021atwr.c
> @@ -481,7 +481,8 @@ int board_early_init_f(void)
>  	unsigned int major;
> 
>  #ifdef CONFIG_TSEC_ENET
> -	out_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
> +	/* clear BD & FR bits for BE BD's and frame data */
> +	clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
>  	out_be32(&scfg->etsecmcr, SCFG_ETSECCMCR_GE2_CLK125);  #endif
> 
> diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index
> 42d0374..4bdc188 100644
> --- a/drivers/net/tsec.c
> +++ b/drivers/net/tsec.c
> @@ -271,9 +271,6 @@ void redundant_init(struct eth_device *dev)
>  	out_be32(&regs->tstat, TSTAT_CLEAR_THALT);
>  	out_be32(&regs->rstat, RSTAT_CLEAR_RHALT);
>  	clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); -#ifdef
> CONFIG_LS102XA
> -	setbits_be32(&regs->dmactrl, DMACTRL_LE);
> -#endif
> 
>  	do {
>  		uint16_t status;
> @@ -370,9 +367,6 @@ static void startup_tsec(struct eth_device *dev)
>  	out_be32(&regs->tstat, TSTAT_CLEAR_THALT);
>  	out_be32(&regs->rstat, RSTAT_CLEAR_RHALT);
>  	clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); -#ifdef
> CONFIG_LS102XA
> -	setbits_be32(&regs->dmactrl, DMACTRL_LE);
> -#endif
>  }
> 
>  /* This returns the status bits of the device.	The return value
> --
> 1.7.11.7
York Sun Sept. 2, 2015, 2:48 a.m. UTC | #2 
On 08/12/2015 05:29 AM, Claudiu Manoil wrote:
> Replace the DMACTRL[LE] hack with recommended settings
> for ETSECDMAMCR to get the same end effect - obtaining
> big-endian buffer descriptors and frame data for eTSEC.
> The reset / default value for ETSECDMAMCR is preserved,
> excepting the BD and FR bits which are cleared to enable
> the BE mode in accordance with the H/W specifications.
> 
> Fixes: 52d00a8 "ls102xa: etsec: Add etsec support for LS102xA"
> Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
> ---

Applied to fsl-qoriq master branch. Awaiting upstream.

York
diff mbox

Patch

diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
index d34044a..60aa0d3 100644
--- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
+++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h
@@ -143,7 +143,7 @@  struct ccsr_gur {
 	u32	sdhcpcr;
 };
 
-#define SCFG_ETSECDMAMCR_LE_BD_FR	0xf8001a0f
+#define SCFG_ETSECDMAMCR_LE_BD_FR	0x00000c00
 #define SCFG_ETSECCMCR_GE2_CLK125	0x04000000
 #define SCFG_ETSECCMCR_GE0_CLK125	0x00000000
 #define SCFG_ETSECCMCR_GE1_CLK125	0x08000000
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c
index d6ef6ba..e585380 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/freescale/ls1021aqds/ls1021aqds.c
@@ -280,7 +280,8 @@  int board_early_init_f(void)
 	unsigned int major;
 
 #ifdef CONFIG_TSEC_ENET
-	out_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
+	/* clear BD & FR bits for BE BD's and frame data */
+	clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
 #endif
 
 #ifdef CONFIG_FSL_IFC
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index b7458a9..006700f 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -481,7 +481,8 @@  int board_early_init_f(void)
 	unsigned int major;
 
 #ifdef CONFIG_TSEC_ENET
-	out_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
+	/* clear BD & FR bits for BE BD's and frame data */
+	clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR);
 	out_be32(&scfg->etsecmcr, SCFG_ETSECCMCR_GE2_CLK125);
 #endif
 
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 42d0374..4bdc188 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -271,9 +271,6 @@  void redundant_init(struct eth_device *dev)
 	out_be32(&regs->tstat, TSTAT_CLEAR_THALT);
 	out_be32(&regs->rstat, RSTAT_CLEAR_RHALT);
 	clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS);
-#ifdef CONFIG_LS102XA
-	setbits_be32(&regs->dmactrl, DMACTRL_LE);
-#endif
 
 	do {
 		uint16_t status;
@@ -370,9 +367,6 @@  static void startup_tsec(struct eth_device *dev)
 	out_be32(&regs->tstat, TSTAT_CLEAR_THALT);
 	out_be32(&regs->rstat, RSTAT_CLEAR_RHALT);
 	clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS);
-#ifdef CONFIG_LS102XA
-	setbits_be32(&regs->dmactrl, DMACTRL_LE);
-#endif
 }
 
 /* This returns the status bits of the device.	The return value