ls102xa: etsec: Use proper settings for BE BDs
Subsystems (2)
PATCH 1/1 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.
--- 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(-)
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +1 -1
@@ -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
board/freescale/ls1021aqds/ls1021aqds.c +2 -1
@@ -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
board/freescale/ls1021atwr/ls1021atwr.c +2 -1
@@ -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
drivers/net/tsec.c +0 -6
@@ -271,9 +271,6 @@ void redundant_init(struct eth_device *dev)out_be32 (®s->tstat,TSTAT_CLEAR_THALT );out_be32 (®s->rstat,RSTAT_CLEAR_RHALT );clrbits_be32 (®s->dmactrl,DMACTRL_GRS |DMACTRL_GTS ); -#ifdef CONFIG_LS102XA -setbits_be32 (®s->dmactrl,DMACTRL_LE ); -#endif do { uint16_t status;
@@ -370,9 +367,6 @@ static void startup_tsec(struct eth_device *dev)out_be32 (®s->tstat,TSTAT_CLEAR_THALT );out_be32 (®s->rstat,RSTAT_CLEAR_RHALT );clrbits_be32 (®s->dmactrl,DMACTRL_GRS |DMACTRL_GTS ); -#ifdef CONFIG_LS102XA -setbits_be32 (®s->dmactrl,DMACTRL_LE ); -#endif }/* This returns the status bits of the device. The return value
Signature · 1 line
1.7.11.7
PATCH 1/1 ls102xa: etsec: Use proper settings for BE BDs
Best Regards,
Alison Wang
Quoted 92 lines
-----Original Message-----
From: Claudiu Manoil [mailto:claudiu.manoil at freescale.com]
Sent: Wednesday, August 12, 2015 6:29 PM
To: Sun York-R58495
Cc: Wang Huan-B18965; u-boot at lists.denx.de
Subject: [PATCH] ls102xa: etsec: Use proper settings for BE BDsReplace 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 <[email protected]>--- 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(-)arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +1
-1@@ -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 0x08000000board/freescale/ls1021aqds/ls1021aqds.c +2
-1@@ -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 board/freescale/ls1021atwr/ls1021atwr.c +2
-1@@ -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 drivers/net/tsec.c index renamed from drivers/net/tsec.c +0
-042d0374..4bdc188 100644
drivers/net/tsec.c +0
-0@@ -271,9 +271,6 @@ void redundant_init(struct eth_device *dev)out_be32 (®s->tstat,TSTAT_CLEAR_THALT );out_be32 (®s->rstat,RSTAT_CLEAR_RHALT ); clrbits_be32(®s->dmactrl, DMACTRL_GRS | DMACTRL_GTS); -#ifdef
CONFIG_LS102XAdrivers/net/tsec.c +0
-2-setbits_be32 (®s->dmactrl,DMACTRL_LE ); -#endif do { uint16_t status;@@ -370,9 +367,6 @@ static void startup_tsec(struct eth_device *dev)out_be32 (®s->tstat,TSTAT_CLEAR_THALT );out_be32 (®s->rstat,RSTAT_CLEAR_RHALT ); clrbits_be32(®s->dmactrl, DMACTRL_GRS | DMACTRL_GTS); -#ifdef
CONFIG_LS102XAdrivers/net/tsec.c +0
-3-setbits_be32 (®s->dmactrl,DMACTRL_LE ); -#endif }/* This returns the status bits of the device. The return value -- 1.7.11.7
York Sun
AppliedPATCH 1/1 ls102xa: etsec: Use proper settings for BE BDs
In reply to Claudiu ManoilQuoted 10 lines · Claudiu Manoil
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 <[email protected]>---
Applied to fsl-qoriq master branch. Awaiting upstream.
York