On Aug 2, 2011, at 2:33 AM, Kumar Gala wrote:
The Frame Manager (FMan) on QorIQ SoCs with DPAA (datapath acceleration architecture) is the ethernet contoller block. Normally it is utilized via Queue Manager (Qman) and Buffer Manager (Bman). However for boot usage the FMan supports a mode similar to QE or CPM ethernet collers called Independent mode.
Additionally the FMan block supports multiple 1g and 10g interfaces as a single entity in the system rather than each controller being managed uniquely. This means we have to initialize all of Fman regardless of the number of interfaces we utilize.
Different SoCs support different combinations of the number of FMan as well as the number of 1g & 10g interfaces support per Fman.
We add support for the following SoCs:
- P1023 - 1 Fman, 2x1g
- P4080 - 2 Fman, each Fman has 4x1g and 1x10g
- P204x/P3041/P5020 - 1 Fman, 5x1g, 1x10g
Signed-off-by: Dave Liu daveliu@freescale.com Signed-off-by: Andy Fleming afleming@freescale.com Signed-off-by: Timur Tabi timur@freescale.com Signed-off-by: Roy Zang tie-fei.zang@freescale.com Signed-off-by: Dai Haruki dai.haruki@freescale.com Signed-off-by: Kim Phillips kim.phillips@freescale.com Signed-off-by: Ioana Radulescu ruxandra.radulescu@freescale.com Signed-off-by: Lei Xu B33228@freescale.com Signed-off-by: Mingkai Hu Mingkai.hu@freescale.com Signed-off-by: Scott Wood scottwood@freescale.com Signed-off-by: Shaohui Xie b21989@freescale.com Signed-off-by: Kumar Gala galak@kernel.crashing.org
- Removed static variable being init to 0
- Removed volatile from places it can be removed from
Makefile | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 5 + arch/powerpc/cpu/mpc8xxx/cpu.c | 4 + arch/powerpc/include/asm/config.h | 5 + arch/powerpc/include/asm/fsl_dtsec.h | 244 ++++++++++++ arch/powerpc/include/asm/fsl_fman.h | 257 ++++++++++++- arch/powerpc/include/asm/fsl_tgec.h | 215 +++++++++++ arch/powerpc/include/asm/immap_85xx.h | 23 +- drivers/net/Makefile | 1 + drivers/net/fm/Makefile | 61 +++ drivers/net/fm/dtsec.c | 181 +++++++++ drivers/net/fm/eth.c | 670 +++++++++++++++++++++++++++++++++ drivers/net/fm/fm.c | 432 +++++++++++++++++++++ drivers/net/fm/fm.h | 154 ++++++++ drivers/net/fm/init.c | 208 ++++++++++ drivers/net/fm/p1023.c | 68 ++++ drivers/net/fm/p4080.c | 94 +++++ drivers/net/fm/p5020.c | 85 +++++ drivers/net/fm/tgec.c | 119 ++++++ drivers/net/fm/tgec_phy.c | 139 +++++++ include/fm_eth.h | 114 ++++++ 21 files changed, 3068 insertions(+), 12 deletions(-) create mode 100644 arch/powerpc/include/asm/fsl_dtsec.h create mode 100644 arch/powerpc/include/asm/fsl_tgec.h create mode 100644 drivers/net/fm/Makefile create mode 100644 drivers/net/fm/dtsec.c create mode 100644 drivers/net/fm/eth.c create mode 100644 drivers/net/fm/fm.c create mode 100644 drivers/net/fm/fm.h create mode 100644 drivers/net/fm/init.c create mode 100644 drivers/net/fm/p1023.c create mode 100644 drivers/net/fm/p4080.c create mode 100644 drivers/net/fm/p5020.c create mode 100644 drivers/net/fm/tgec.c create mode 100644 drivers/net/fm/tgec_phy.c create mode 100644 include/fm_eth.h
Wolfgang,
Any issue merging this into 85xx next tree?
[ and the other patches in the series ]
- k