All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series
@ 2017-10-09  9:11 Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
                   ` (9 more replies)
  0 siblings, 10 replies; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Hi,

This patch series introduces U-Boot support for NXP's LS1012A Packet Forwarding
Engine (pfe_eth). LS1012A uses hardware packet forwarding engine to provide
high performance Ethernet interfaces. The device includes two Ethernet ports.

Depends on https://patchwork.ozlabs.org/patch/704305

Regards
Calvin

Calvin Johnson (9):
  drivers: net: pfe_eth: LS1012A PFE driver introduction
  drivers: net: pfe_eth: provide pfe commands
  drivers: net: pfe_eth: LS1012A PFE headers
  board: freescale: ls1012a: enable network support on ls1012a platforms
  armv8: fsl-lsch2: initialize pfe gemac
  armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure
  armv8: fsl-lsch2: configure pfe's scfg & dcfg registers
  fsl: csu: enable ns access for PFE
  configs: ls1012a: add pfe configuration for LS1012A

 arch/arm/cpu/armv8/fsl-layerscape/cpu.c            |    8 +
 arch/arm/cpu/armv8/fsl-layerscape/soc.c            |   18 +
 .../include/asm/arch-fsl-layerscape/immap_lsch2.h  |   38 +-
 .../include/asm/arch-fsl-layerscape/ns_access.h    |    2 +
 arch/arm/include/asm/arch-fsl-layerscape/soc.h     |    3 +
 board/freescale/ls1012afrdm/Makefile               |    1 +
 board/freescale/ls1012afrdm/eth.c                  |   86 ++
 board/freescale/ls1012afrdm/ls1012afrdm.c          |    5 -
 board/freescale/ls1012aqds/Makefile                |    1 +
 board/freescale/ls1012aqds/eth.c                   |  263 +++++
 board/freescale/ls1012aqds/ls1012aqds.c            |   97 +-
 board/freescale/ls1012aqds/ls1012aqds_pfe.h        |   48 +
 board/freescale/ls1012aqds/ls1012aqds_qixis.h      |    2 +-
 board/freescale/ls1012ardb/Makefile                |    1 +
 board/freescale/ls1012ardb/eth.c                   |   70 ++
 board/freescale/ls1012ardb/ls1012ardb.c            |    4 -
 configs/ls1012afrdm_qspi_defconfig                 |    1 +
 configs/ls1012aqds_qspi_defconfig                  |    1 +
 configs/ls1012ardb_qspi_defconfig                  |    1 +
 drivers/net/Kconfig                                |    1 +
 drivers/net/Makefile                               |    1 +
 drivers/net/pfe_eth/Kconfig                        |   29 +
 drivers/net/pfe_eth/Makefile                       |   11 +
 drivers/net/pfe_eth/pfe.c                          | 1161 ++++++++++++++++++++
 drivers/net/pfe_eth/pfe_cmd.c                      |  537 +++++++++
 drivers/net/pfe_eth/pfe_driver.c                   |  626 +++++++++++
 drivers/net/pfe_eth/pfe_eth.c                      |  545 +++++++++
 drivers/net/pfe_eth/pfe_firmware.c                 |  230 ++++
 include/configs/ls1012a_common.h                   |    6 +-
 include/configs/ls1012afrdm.h                      |    7 +
 include/configs/ls1012aqds.h                       |   14 +
 include/configs/ls1012ardb.h                       |   13 +
 include/pfe_eth/pfe/cbus.h                         |   75 ++
 include/pfe_eth/pfe/cbus/bmu.h                     |   40 +
 include/pfe_eth/pfe/cbus/class_csr.h               |  181 +++
 include/pfe_eth/pfe/cbus/emac.h                    |  150 +++
 include/pfe_eth/pfe/cbus/gpi.h                     |   62 ++
 include/pfe_eth/pfe/cbus/hif.h                     |   68 ++
 include/pfe_eth/pfe/cbus/hif_nocpy.h               |   40 +
 include/pfe_eth/pfe/cbus/tmu_csr.h                 |  148 +++
 include/pfe_eth/pfe/cbus/util_csr.h                |   47 +
 include/pfe_eth/pfe/pfe.h                          |  178 +++
 include/pfe_eth/pfe_driver.h                       |   55 +
 include/pfe_eth/pfe_eth.h                          |  111 ++
 include/pfe_eth/pfe_firmware.h                     |   17 +
 45 files changed, 4983 insertions(+), 20 deletions(-)
 create mode 100644 board/freescale/ls1012afrdm/eth.c
 create mode 100644 board/freescale/ls1012aqds/eth.c
 create mode 100644 board/freescale/ls1012aqds/ls1012aqds_pfe.h
 create mode 100644 board/freescale/ls1012ardb/eth.c
 create mode 100644 drivers/net/pfe_eth/Kconfig
 create mode 100644 drivers/net/pfe_eth/Makefile
 create mode 100644 drivers/net/pfe_eth/pfe.c
 create mode 100644 drivers/net/pfe_eth/pfe_cmd.c
 create mode 100644 drivers/net/pfe_eth/pfe_driver.c
 create mode 100644 drivers/net/pfe_eth/pfe_eth.c
 create mode 100644 drivers/net/pfe_eth/pfe_firmware.c
 create mode 100644 include/pfe_eth/pfe/cbus.h
 create mode 100644 include/pfe_eth/pfe/cbus/bmu.h
 create mode 100644 include/pfe_eth/pfe/cbus/class_csr.h
 create mode 100644 include/pfe_eth/pfe/cbus/emac.h
 create mode 100644 include/pfe_eth/pfe/cbus/gpi.h
 create mode 100644 include/pfe_eth/pfe/cbus/hif.h
 create mode 100644 include/pfe_eth/pfe/cbus/hif_nocpy.h
 create mode 100644 include/pfe_eth/pfe/cbus/tmu_csr.h
 create mode 100644 include/pfe_eth/pfe/cbus/util_csr.h
 create mode 100644 include/pfe_eth/pfe/pfe.h
 create mode 100644 include/pfe_eth/pfe_driver.h
 create mode 100644 include/pfe_eth/pfe_eth.h
 create mode 100644 include/pfe_eth/pfe_firmware.h

-- 
2.7.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-10-30 18:40   ` York Sun
  2017-12-05 20:13   ` Joe Hershberger
  2017-10-09  9:11 ` [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands Calvin Johnson
                   ` (8 subsequent siblings)
  9 siblings, 2 replies; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

This patch adds PFE driver into U-Boot.

Following are the main driver files:-
pfe.c: provides low level helper functions to initialize PFE internal
processor engines and other hardware blocks.
pfe_driver.c: provides probe functions, initialization functions
and packet send and receive functions.
pfe_eth.c: provides high level gemac, phy and mdio initialization
functions.
pfe_firmware.c: provides functions to load firmware into PFE
internal processor engines.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 drivers/net/pfe_eth/Kconfig        |    8 +
 drivers/net/pfe_eth/Makefile       |   10 +
 drivers/net/pfe_eth/pfe.c          | 1161 ++++++++++++++++++++++++++++++++++++
 drivers/net/pfe_eth/pfe_driver.c   |  626 +++++++++++++++++++
 drivers/net/pfe_eth/pfe_eth.c      |  545 +++++++++++++++++
 drivers/net/pfe_eth/pfe_firmware.c |  230 +++++++
 6 files changed, 2580 insertions(+)
 create mode 100644 drivers/net/pfe_eth/Kconfig
 create mode 100644 drivers/net/pfe_eth/Makefile
 create mode 100644 drivers/net/pfe_eth/pfe.c
 create mode 100644 drivers/net/pfe_eth/pfe_driver.c
 create mode 100644 drivers/net/pfe_eth/pfe_eth.c
 create mode 100644 drivers/net/pfe_eth/pfe_firmware.c

diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
new file mode 100644
index 0000000..b9996df
--- /dev/null
+++ b/drivers/net/pfe_eth/Kconfig
@@ -0,0 +1,8 @@
+config UTIL_PE_DISABLED
+	bool
+	help
+	  Disable UTIL processor engine of PFE
+
+config SYS_FSL_PPFE_ADDR
+	hex "PFE base address"
+	default 0x04000000
diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile
new file mode 100644
index 0000000..e78f1bf
--- /dev/null
+++ b/drivers/net/pfe_eth/Makefile
@@ -0,0 +1,10 @@
+# Copyright 2015-2016 Freescale Semiconductor, Inc.
+# Copyright 2017 NXP
+#
+# SPDX-License-Identifier:GPL-2.0+
+
+# Layerscape PFE driver
+obj-y += pfe.o		\
+	 pfe_driver.o	\
+	 pfe_eth.o	\
+	 pfe_firmware.o
diff --git a/drivers/net/pfe_eth/pfe.c b/drivers/net/pfe_eth/pfe.c
new file mode 100644
index 0000000..fc6631e
--- /dev/null
+++ b/drivers/net/pfe_eth/pfe.c
@@ -0,0 +1,1161 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+#include <pfe_eth/pfe_eth.h>
+#include <pfe_eth/pfe/pfe.h>
+
+void *ddr_base_addr;
+unsigned long ddr_phys_base_addr;
+static struct pe_info pe[MAX_PE];
+
+/*
+ * Initializes the PFE library.
+ * Must be called before using any of the library functions.
+ *
+ * @param[in] cbus_base		CBUS virtual base address (as mapped in
+ *				the host CPU address space)
+ * @param[in] ddr_base		DDR virtual base address (as mapped in
+ *				the host CPU address space)
+ * @param[in] ddr_phys_base	DDR physical base address (as mapped in
+ *				platform)
+ */
+void pfe_lib_init(void *ddr_base, unsigned long ddr_phys_base)
+{
+	ddr_base_addr = ddr_base;
+	ddr_phys_base_addr = ddr_phys_base;
+
+	pe[CLASS0_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(0);
+	pe[CLASS0_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(0);
+	pe[CLASS0_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS0_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS0_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS0_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[CLASS1_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(1);
+	pe[CLASS1_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(1);
+	pe[CLASS1_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS1_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS1_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS1_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[CLASS2_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(2);
+	pe[CLASS2_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(2);
+	pe[CLASS2_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS2_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS2_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS2_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[CLASS3_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(3);
+	pe[CLASS3_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(3);
+	pe[CLASS3_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS3_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS3_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS3_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[CLASS4_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(4);
+	pe[CLASS4_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(4);
+	pe[CLASS4_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS4_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS4_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS4_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[CLASS5_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(5);
+	pe[CLASS5_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(5);
+	pe[CLASS5_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
+	pe[CLASS5_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
+	pe[CLASS5_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
+	pe[CLASS5_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
+
+	pe[TMU0_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(0);
+	pe[TMU0_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(0);
+	pe[TMU0_ID].pmem_size = (u32)TMU_IMEM_SIZE;
+	pe[TMU0_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
+	pe[TMU0_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
+	pe[TMU0_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
+
+	pe[TMU1_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(1);
+	pe[TMU1_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(1);
+	pe[TMU1_ID].pmem_size = (u32)TMU_IMEM_SIZE;
+	pe[TMU1_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
+	pe[TMU1_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
+	pe[TMU1_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
+
+	pe[TMU3_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(3);
+	pe[TMU3_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(3);
+	pe[TMU3_ID].pmem_size = (u32)TMU_IMEM_SIZE;
+	pe[TMU3_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
+	pe[TMU3_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
+	pe[TMU3_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+	pe[UTIL_ID].dmem_base_addr = (u32)UTIL_DMEM_BASE_ADDR;
+	pe[UTIL_ID].mem_access_wdata = (void *)UTIL_MEM_ACCESS_WDATA;
+	pe[UTIL_ID].mem_access_addr = (void *)UTIL_MEM_ACCESS_ADDR;
+	pe[UTIL_ID].mem_access_rdata = (void *)UTIL_MEM_ACCESS_RDATA;
+#endif
+}
+
+/*
+ * Writes a buffer to PE internal memory from the host
+ * through indirect access registers.
+ *
+ * @param[in] id	       PE identification (CLASS0_ID, ..., TMU0_ID,
+ *				..., UTIL_ID)
+ * @param[in] src		Buffer source address
+ * @param[in] mem_access_addr	DMEM destination address (must be 32bit
+ *				aligned)
+ * @param[in] len		Number of bytes to copy
+ */
+void pe_mem_memcpy_to32(int id, u32 mem_access_addr, const void *src, unsigned
+				int len)
+{
+	u32 offset = 0, val, addr;
+	unsigned int len32 = len >> 2;
+	int i;
+
+	addr = mem_access_addr | PE_MEM_ACCESS_WRITE |
+		PE_MEM_ACCESS_BYTE_ENABLE(0, 4);
+
+	for (i = 0; i < len32; i++, offset += 4, src += 4) {
+		val = *(u32 *)src;
+		writel(cpu_to_be32(val), pe[id].mem_access_wdata);
+		writel(addr + offset, pe[id].mem_access_addr);
+	}
+
+	len = (len & 0x3);
+	if (len) {
+		val = 0;
+
+		addr = (mem_access_addr | PE_MEM_ACCESS_WRITE |
+			PE_MEM_ACCESS_BYTE_ENABLE(0, len)) + offset;
+
+		for (i = 0; i < len; i++, src++)
+			val |= (*(u8 *)src) << (8 * i);
+
+		writel(cpu_to_be32(val), pe[id].mem_access_wdata);
+		writel(addr, pe[id].mem_access_addr);
+	}
+}
+
+/*
+ * Writes a buffer to PE internal data memory (DMEM) from the host
+ * through indirect access registers.
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID,
+ *			..., UTIL_ID)
+ * @param[in] src	Buffer source address
+ * @param[in] dst	DMEM destination address (must be 32bit
+ *			aligned)
+ * @param[in] len	Number of bytes to copy
+ */
+void pe_dmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len)
+{
+	pe_mem_memcpy_to32(id, pe[id].dmem_base_addr | dst | PE_MEM_ACCESS_DMEM,
+			   src, len);
+}
+
+/*
+ * Writes a buffer to PE internal program memory (PMEM) from the host
+ * through indirect access registers.
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID,
+ *			..., TMU3_ID)
+ * @param[in] src	Buffer source address
+ * @param[in] dst	PMEM destination address (must be 32bit
+ *			aligned)
+ * @param[in] len	Number of bytes to copy
+ */
+void pe_pmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len)
+{
+	pe_mem_memcpy_to32(id, pe[id].pmem_base_addr | (dst & (pe[id].pmem_size
+				- 1)) | PE_MEM_ACCESS_IMEM, src, len);
+}
+
+/*
+ * Reads PE internal program memory (IMEM) from the host
+ * through indirect access registers.
+ * @param[in] id		PE identification (CLASS0_ID, ..., TMU0_ID,
+ *				..., TMU3_ID)
+ * @param[in] addr		PMEM read address (must be aligned on size)
+ * @param[in] size		Number of bytes to read (maximum 4, must not
+ *				cross 32bit boundaries)
+ * @return			the data read (in PE endianness, i.e BE).
+ */
+u32 pe_pmem_read(int id, u32 addr, u8 size)
+{
+	u32 offset = addr & 0x3;
+	u32 mask = 0xffffffff >> ((4 - size) << 3);
+	u32 val;
+
+	addr = pe[id].pmem_base_addr | ((addr & ~0x3) & (pe[id].pmem_size - 1))
+		| PE_MEM_ACCESS_READ | PE_MEM_ACCESS_IMEM |
+		PE_MEM_ACCESS_BYTE_ENABLE(offset, size);
+
+	writel(addr, pe[id].mem_access_addr);
+	val = be32_to_cpu(readl(pe[id].mem_access_rdata));
+
+	return (val >> (offset << 3)) & mask;
+}
+
+/*
+ * Writes PE internal data memory (DMEM) from the host
+ * through indirect access registers.
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID,
+ *			..., UTIL_ID)
+ * @param[in] addr	DMEM write address (must be aligned on size)
+ * @param[in] val	Value to write (in PE endianness, i.e BE)
+ * @param[in] size	Number of bytes to write (maximum 4, must not
+ *			cross 32bit boundaries)
+ */
+void pe_dmem_write(int id, u32 val, u32 addr, u8 size)
+{
+	u32 offset = addr & 0x3;
+
+	addr = pe[id].dmem_base_addr | (addr & ~0x3) | PE_MEM_ACCESS_WRITE |
+		PE_MEM_ACCESS_DMEM | PE_MEM_ACCESS_BYTE_ENABLE(offset, size);
+
+	/* Indirect access interface is byte swapping data being written */
+	writel(cpu_to_be32(val << (offset << 3)), pe[id].mem_access_wdata);
+	writel(addr, pe[id].mem_access_addr);
+}
+
+/*
+ * Reads PE internal data memory (DMEM) from the host
+ * through indirect access registers.
+ * @param[in] id		PE identification (CLASS0_ID, ..., TMU0_ID,
+ *				..., UTIL_ID)
+ * @param[in] addr		DMEM read address (must be aligned on size)
+ * @param[in] size		Number of bytes to read (maximum 4, must not
+ *				cross 32bit boundaries)
+ * @return			the data read (in PE endianness, i.e BE).
+ */
+u32 pe_dmem_read(int id, u32 addr, u8 size)
+{
+	u32 offset = addr & 0x3;
+	u32 mask = 0xffffffff >> ((4 - size) << 3);
+	u32 val;
+
+	addr = pe[id].dmem_base_addr | (addr & ~0x3) | PE_MEM_ACCESS_READ |
+		PE_MEM_ACCESS_DMEM | PE_MEM_ACCESS_BYTE_ENABLE(offset, size);
+
+	writel(addr, pe[id].mem_access_addr);
+
+	/* Indirect access interface is byte swapping data being read */
+	val = be32_to_cpu(readl(pe[id].mem_access_rdata));
+
+	return (val >> (offset << 3)) & mask;
+}
+
+/*
+ * This function is used to write to CLASS internal bus peripherals (ccu,
+ * pe-lem) from the host
+ * through indirect access registers.
+ * @param[in]	val	value to write
+ * @param[in]	addr	Address to write to (must be aligned on size)
+ * @param[in]	size	Number of bytes to write (1, 2 or 4)
+ *
+ */
+void class_bus_write(u32 val, u32 addr, u8 size)
+{
+	u32 offset = addr & 0x3;
+
+	writel((addr & CLASS_BUS_ACCESS_BASE_MASK), CLASS_BUS_ACCESS_BASE);
+
+	addr = (addr & ~CLASS_BUS_ACCESS_BASE_MASK) | PE_MEM_ACCESS_WRITE |
+		(size << 24);
+
+	writel(cpu_to_be32(val << (offset << 3)), CLASS_BUS_ACCESS_WDATA);
+	writel(addr, CLASS_BUS_ACCESS_ADDR);
+}
+
+/*
+ * Reads from CLASS internal bus peripherals (ccu, pe-lem) from the host
+ * through indirect access registers.
+ * @param[in] addr	Address to read from (must be aligned on size)
+ * @param[in] size	Number of bytes to read (1, 2 or 4)
+ * @return		the read data
+ */
+u32 class_bus_read(u32 addr, u8 size)
+{
+	u32 offset = addr & 0x3;
+	u32 mask = 0xffffffff >> ((4 - size) << 3);
+	u32 val;
+
+	writel((addr & CLASS_BUS_ACCESS_BASE_MASK), CLASS_BUS_ACCESS_BASE);
+
+	addr = (addr & ~CLASS_BUS_ACCESS_BASE_MASK) | (size << 24);
+
+	writel(addr, CLASS_BUS_ACCESS_ADDR);
+	val = be32_to_cpu(readl(CLASS_BUS_ACCESS_RDATA));
+
+	return (val >> (offset << 3)) & mask;
+}
+
+/*
+ * Writes data to the cluster memory (PE_LMEM)
+ * @param[in] dst	PE LMEM destination address (must be 32bit aligned)
+ * @param[in] src	Buffer source address
+ * @param[in] len	Number of bytes to copy
+ */
+void class_pe_lmem_memcpy_to32(u32 dst, const void *src, unsigned int len)
+{
+	u32 len32 = len >> 2;
+	int i;
+
+	for (i = 0; i < len32; i++, src += 4, dst += 4)
+		class_bus_write(*(u32 *)src, dst, 4);
+
+	if (len & 0x2) {
+		class_bus_write(*(u16 *)src, dst, 2);
+		src += 2;
+		dst += 2;
+	}
+
+	if (len & 0x1) {
+		class_bus_write(*(u8 *)src, dst, 1);
+		src++;
+		dst++;
+	}
+}
+
+/*
+ * Writes value to the cluster memory (PE_LMEM)
+ * @param[in] dst	PE LMEM destination address (must be 32bit aligned)
+ * @param[in] val	Value to write
+ * @param[in] len	Number of bytes to write
+ */
+void class_pe_lmem_memset(u32 dst, int val, unsigned int len)
+{
+	u32 len32 = len >> 2;
+	int i;
+
+	val = val | (val << 8) | (val << 16) | (val << 24);
+
+	for (i = 0; i < len32; i++, dst += 4)
+		class_bus_write(val, dst, 4);
+
+	if (len & 0x2) {
+		class_bus_write(val, dst, 2);
+		dst += 2;
+	}
+
+	if (len & 0x1) {
+		class_bus_write(val, dst, 1);
+		dst++;
+	}
+}
+
+/*
+ * Reads data from the cluster memory (PE_LMEM)
+ * @param[out] dst	pointer to the source buffer data are copied to
+ * @param[in] len	length in bytes of the amount of data to read
+ *			from cluster memory
+ * @param[in] offset	offset in bytes in the cluster memory where data are
+ *			read from
+ */
+void pe_lmem_read(u32 *dst, u32 len, u32 offset)
+{
+	u32 len32 = len >> 2;
+	int i = 0;
+
+	for (i = 0; i < len32; dst++, i++, offset += 4)
+		*dst = class_bus_read(PE_LMEM_BASE_ADDR + offset, 4);
+
+	if (len & 0x03)
+		*dst = class_bus_read(PE_LMEM_BASE_ADDR + offset, (len & 0x03));
+}
+
+/*
+ * Writes data to the cluster memory (PE_LMEM)
+ * @param[in] src	pointer to the source buffer data are copied from
+ * @param[in] len	length in bytes of the amount of data to write to the
+ *				cluster memory
+ * @param[in] offset	offset in bytes in the cluster memory where data are
+ *				written to
+ */
+void pe_lmem_write(u32 *src, u32 len, u32 offset)
+{
+	u32 len32 = len >> 2;
+	int i = 0;
+
+	for (i = 0; i < len32; src++, i++, offset += 4)
+		class_bus_write(*src, PE_LMEM_BASE_ADDR + offset, 4);
+
+	if (len & 0x03)
+		class_bus_write(*src, PE_LMEM_BASE_ADDR + offset, (len &
+					0x03));
+}
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+/*
+ * Writes UTIL program memory (DDR) from the host.
+ *
+ * @param[in] addr	Address to write (virtual, must be aligned on size)
+ * @param[in] val	Value to write (in PE endianness, i.e BE)
+ * @param[in] size	Number of bytes to write (2 or 4)
+ */
+static void util_pmem_write(u32 val, void *addr, u8 size)
+{
+	void *addr64 = (void *)((unsigned long)addr & ~0x7);
+	unsigned long off = 8 - ((unsigned long)addr & 0x7) - size;
+
+	/* IMEM should  be loaded as a 64bit swapped value in a 64bit aligned
+	 * location
+	 */
+	if (size == 4)
+		writel(be32_to_cpu(val), addr64 + off);
+	else
+		writew(be16_to_cpu((u16)val), addr64 + off);
+}
+
+/*
+ * Writes a buffer to UTIL program memory (DDR) from the host.
+ *
+ * @param[in] dst	Address to write (virtual, must be at least 16bit
+ *					aligned)
+ * @param[in] src	Buffer to write (in PE endianness, i.e BE, must have
+ *				same alignment as dst)
+ * @param[in] len	Number of bytes to write (must be@least 16bit
+ *						aligned)
+ */
+static void util_pmem_memcpy(void *dst, const void *src, unsigned int len)
+{
+	unsigned int len32;
+	int i;
+
+	if ((unsigned long)src & 0x2) {
+		util_pmem_write(*(u16 *)src, dst, 2);
+		src += 2;
+		dst += 2;
+		len -= 2;
+	}
+
+	len32 = len >> 2;
+
+	for (i = 0; i < len32; i++, dst += 4, src += 4)
+		util_pmem_write(*(u32 *)src, dst, 4);
+
+	if (len & 0x2)
+		util_pmem_write(*(u16 *)src, dst, len & 0x2);
+}
+#endif
+
+/*
+ * Loads an elf section into pmem
+ * Code needs to be@least 16bit aligned and only PROGBITS sections are
+ * supported
+ *
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID, ...,
+ *					TMU3_ID)
+ * @param[in] data	pointer to the elf firmware
+ * @param[in] shdr	pointer to the elf section header
+ */
+static int pe_load_pmem_section(int id, const void *data, Elf32_Shdr *shdr)
+{
+	u32 offset = be32_to_cpu(shdr->sh_offset);
+	u32 addr = be32_to_cpu(shdr->sh_addr);
+	u32 size = be32_to_cpu(shdr->sh_size);
+	u32 type = be32_to_cpu(shdr->sh_type);
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+	if (id == UTIL_ID) {
+		printf("%s: unsupported pmem section for UTIL\n", __func__);
+		return -1;
+	}
+#endif
+
+	if (((unsigned long)(data + offset) & 0x3) != (addr & 0x3)) {
+		printf(
+			"%s: load address(%x) and elf file address(%lx) don't have the same alignment\n",
+			__func__, addr, (unsigned long) data + offset);
+
+		return -1;
+	}
+
+	if (addr & 0x1) {
+		printf("%s: load address(%x) is not 16bit aligned\n",
+		       __func__, addr);
+		return -1;
+	}
+
+	if (size & 0x1) {
+		printf("%s: load size(%x) is not 16bit aligned\n", __func__,
+		       size);
+		return -1;
+	}
+
+		debug("pmem pe%d @%x len %d\n", id, addr, size);
+	switch (type) {
+	case SHT_PROGBITS:
+		pe_pmem_memcpy_to32(id, addr, data + offset, size);
+		break;
+
+	default:
+		printf("%s: unsupported section type(%x)\n", __func__, type);
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Loads an elf section into dmem
+ * Data needs to be at least 32bit aligned, NOBITS sections are correctly
+ * initialized to 0
+ *
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID,
+ *			..., UTIL_ID)
+ * @param[in] data	pointer to the elf firmware
+ * @param[in] shdr	pointer to the elf section header
+ */
+static int pe_load_dmem_section(int id, const void *data, Elf32_Shdr *shdr)
+{
+	u32 offset = be32_to_cpu(shdr->sh_offset);
+	u32 addr = be32_to_cpu(shdr->sh_addr);
+	u32 size = be32_to_cpu(shdr->sh_size);
+	u32 type = be32_to_cpu(shdr->sh_type);
+	u32 size32 = size >> 2;
+	int i;
+
+	if (((unsigned long)(data + offset) & 0x3) != (addr & 0x3)) {
+		printf(
+			"%s: load address(%x) and elf file address(%lx) don't have the same alignment\n",
+			__func__, addr, (unsigned long)data + offset);
+
+		return -1;
+	}
+
+	if (addr & 0x3) {
+		printf("%s: load address(%x) is not 32bit aligned\n",
+		       __func__, addr);
+		return -1;
+	}
+
+	switch (type) {
+	case SHT_PROGBITS:
+		debug("dmem pe%d @%x len %d\n", id, addr, size);
+		pe_dmem_memcpy_to32(id, addr, data + offset, size);
+		break;
+
+	case SHT_NOBITS:
+		debug("dmem zero pe%d @%x len %d\n", id, addr, size);
+		for (i = 0; i < size32; i++, addr += 4)
+			pe_dmem_write(id, 0, addr, 4);
+
+		if (size & 0x3)
+			pe_dmem_write(id, 0, addr, size & 0x3);
+
+		break;
+
+	default:
+		printf("%s: unsupported section type(%x)\n", __func__, type);
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Loads an elf section into DDR
+ * Data needs to be@least 32bit aligned, NOBITS sections are correctly
+ *		initialized to 0
+ *
+ * @param[in] id	PE identification (CLASS0_ID, ..., TMU0_ID,
+ *			..., UTIL_ID)
+ * @param[in] data	pointer to the elf firmware
+ * @param[in] shdr	pointer to the elf section header
+ */
+static int pe_load_ddr_section(int id, const void *data, Elf32_Shdr *shdr)
+{
+	u32 offset = be32_to_cpu(shdr->sh_offset);
+	u32 addr = be32_to_cpu(shdr->sh_addr);
+	u32 size = be32_to_cpu(shdr->sh_size);
+	u32 type = be32_to_cpu(shdr->sh_type);
+	u32 flags = be32_to_cpu(shdr->sh_flags);
+
+	switch (type) {
+	case SHT_PROGBITS:
+		debug("ddr  pe%d @%x len %d\n", id, addr, size);
+		if (flags & SHF_EXECINSTR) {
+			if (id <= CLASS_MAX_ID) {
+				/* DO the loading only once in DDR */
+				if (id == CLASS0_ID) {
+					debug(
+						"%s: load address(%x) and elf file address(%lx) rcvd\n"
+						, __func__, addr,
+						(unsigned long)data + offset);
+					if (((unsigned long)(data + offset)
+						&0x3) != (addr & 0x3)) {
+						printf(
+							"%s: load address(%x) and elf file address(%lx) don't have the same alignment\n",
+							__func__, addr,
+							(unsigned long)data +
+							offset);
+
+						return -1;
+					}
+
+					if (addr & 0x1) {
+						printf(
+							"%s: load address(%x) is not 16bit aligned\n"
+							, __func__, addr);
+						return -1;
+					}
+
+					if (size & 0x1) {
+						printf(
+							"%s: load length(%x) is not 16bit aligned\n"
+							, __func__, size);
+						return -1;
+					}
+
+					memcpy((void *)DDR_PFE_TO_VIRT(addr),
+					       data + offset, size);
+				}
+			}
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+			else if (id == UTIL_ID) {
+				if (((unsigned long)(data + offset) & 0x3)
+					!= (addr & 0x3)) {
+					printf(
+						"%s: load address(%x) and elf file address(%lx) don't have the same alignment\n",
+							__func__, addr,
+						(unsigned long)data + offset);
+
+					return -1;
+				}
+
+				if (addr & 0x1) {
+					printf(
+						"%s: load address(%x) is not 16bit aligned\n"
+						, __func__, addr);
+					return -1;
+				}
+
+				if (size & 0x1) {
+					printf(
+						"%s: load length(%x) is not 16bit aligned\n"
+						, __func__, size);
+					return -1;
+				}
+
+				util_pmem_memcpy((void *)DDR_PFE_TO_VIRT(addr),
+						 data + offset, size);
+			}
+#endif
+			else {
+				printf(
+					"%s: unsupported ddr section type(%x) for PE(%d)\n"
+					, __func__, type, id);
+				return -1;
+			}
+
+		} else {
+			memcpy((void *)DDR_PFE_TO_VIRT(addr), data + offset,
+			       size);
+		}
+
+		break;
+
+	case SHT_NOBITS:
+		debug("ddr zero pe%d @%x len %d\n", id, addr, size);
+		memset((void *)DDR_PFE_TO_VIRT(addr), 0, size);
+
+		break;
+
+	default:
+		printf("%s: unsupported section type(%x)\n", __func__, type);
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Loads an elf section into pe lmem
+ * Data needs to be@least 32bit aligned, NOBITS sections are correctly
+ * initialized to 0
+ *
+ * @param[in] id	PE identification (CLASS0_ID,..., CLASS5_ID)
+ * @param[in] data	pointer to the elf firmware
+ * @param[in] shdr	pointer to the elf section header
+ */
+static int pe_load_pe_lmem_section(int id, const void *data, Elf32_Shdr *shdr)
+{
+	u32 offset = be32_to_cpu(shdr->sh_offset);
+	u32 addr = be32_to_cpu(shdr->sh_addr);
+	u32 size = be32_to_cpu(shdr->sh_size);
+	u32 type = be32_to_cpu(shdr->sh_type);
+
+	if (id > CLASS_MAX_ID) {
+		printf("%s: unsupported pe-lmem section type(%x) for PE(%d)\n",
+		       __func__, type, id);
+		return -1;
+	}
+
+	if (((unsigned long)(data + offset) & 0x3) != (addr & 0x3)) {
+		printf(
+			"%s: load address(%x) and elf file address(%lx) don't have the same alignment\n",
+			__func__, addr, (unsigned long)data + offset);
+
+		return -1;
+	}
+
+	if (addr & 0x3) {
+		printf("%s: load address(%x) is not 32bit aligned\n",
+		       __func__, addr);
+		return -1;
+	}
+
+	debug("lmem  pe%d @%x len %d\n", id, addr, size);
+
+	switch (type) {
+	case SHT_PROGBITS:
+		class_pe_lmem_memcpy_to32(addr, data + offset, size);
+		break;
+
+	case SHT_NOBITS:
+		class_pe_lmem_memset(addr, 0, size);
+		break;
+
+	default:
+		printf("%s: unsupported section type(%x)\n", __func__, type);
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * Loads an elf section into a PE
+ * For now only supports loading a section to dmem (all PE's), pmem (class and
+ * tmu PE's), DDDR (util PE code)
+ * @param[in] id PE identification (CLASS0_ID, ..., TMU0_ID,
+ * ..., UTIL_ID)
+ * @param[in] data	pointer to the elf firmware
+ * @param[in] shdr	pointer to the elf section header
+ */
+int pe_load_elf_section(int id, const void *data, Elf32_Shdr *shdr)
+{
+	u32 addr = be32_to_cpu(shdr->sh_addr);
+	u32 size = be32_to_cpu(shdr->sh_size);
+
+	if (IS_DMEM(addr, size))
+		return pe_load_dmem_section(id, data, shdr);
+	else if (IS_PMEM(addr, size))
+		return pe_load_pmem_section(id, data, shdr);
+	else if (IS_PFE_LMEM(addr, size))
+		return 0;
+	else if (IS_PHYS_DDR(addr, size))
+		return pe_load_ddr_section(id, data, shdr);
+	else if (IS_PE_LMEM(addr, size))
+		return pe_load_pe_lmem_section(id, data, shdr);
+	else
+		printf("%s: unsupported memory range(%x)\n", __func__, addr);
+
+	return 0;
+}
+
+/**************************** BMU ***************************/
+/*
+ * Resets a BMU block.
+ * @param[in] base	BMU block base address
+ */
+static inline void bmu_reset(void *base)
+{
+	writel(CORE_SW_RESET, base + BMU_CTRL);
+
+	/* Wait for self clear */
+	while (readl(base + BMU_CTRL) & CORE_SW_RESET)
+		;
+}
+
+/*
+ * Enabled a BMU block.
+ * @param[in] base	BMU block base address
+ */
+void bmu_enable(void *base)
+{
+	writel(CORE_ENABLE, base + BMU_CTRL);
+}
+
+/*
+ * Disables a BMU block.
+ * @param[in] base	BMU block base address
+ */
+static inline void bmu_disable(void *base)
+{
+	writel(CORE_DISABLE, base + BMU_CTRL);
+}
+
+/*
+ * Sets the configuration of a BMU block.
+ * @param[in] base	BMU block base address
+ * @param[in] cfg	BMU configuration
+ */
+static inline void bmu_set_config(void *base, struct bmu_cfg *cfg)
+{
+	writel(cfg->baseaddr, base + BMU_UCAST_BASE_ADDR);
+	writel(cfg->count & 0xffff, base + BMU_UCAST_CONFIG);
+	writel(cfg->size & 0xffff, base + BMU_BUF_SIZE);
+
+	/* Interrupts are never used */
+	writel(0x0, base + BMU_INT_ENABLE);
+}
+
+/*
+ * Initializes a BMU block.
+ * @param[in] base	BMU block base address
+ * @param[in] cfg	BMU configuration
+ */
+void bmu_init(void *base, struct bmu_cfg *cfg)
+{
+	bmu_disable(base);
+
+	bmu_set_config(base, cfg);
+
+	bmu_reset(base);
+}
+
+/**************************** GPI ***************************/
+/*
+ * Resets a GPI block.
+ * @param[in] base	GPI base address
+ */
+static inline void gpi_reset(void *base)
+{
+	writel(CORE_SW_RESET, base + GPI_CTRL);
+}
+
+/*
+ * Enables a GPI block.
+ * @param[in] base	GPI base address
+ */
+void gpi_enable(void *base)
+{
+	writel(CORE_ENABLE, base + GPI_CTRL);
+}
+
+/*
+ * Disables a GPI block.
+ * @param[in] base	GPI base address
+ */
+void gpi_disable(void *base)
+{
+	writel(CORE_DISABLE, base + GPI_CTRL);
+}
+
+/*
+ * Sets the configuration of a GPI block.
+ * @param[in] base	GPI base address
+ * @param[in] cfg	GPI configuration
+ */
+static inline void gpi_set_config(void *base, struct gpi_cfg *cfg)
+{
+	writel(CBUS_VIRT_TO_PFE(BMU1_BASE_ADDR + BMU_ALLOC_CTRL), base
+	       + GPI_LMEM_ALLOC_ADDR);
+	writel(CBUS_VIRT_TO_PFE(BMU1_BASE_ADDR + BMU_FREE_CTRL), base
+	       + GPI_LMEM_FREE_ADDR);
+	writel(CBUS_VIRT_TO_PFE(BMU2_BASE_ADDR + BMU_ALLOC_CTRL), base
+	       + GPI_DDR_ALLOC_ADDR);
+	writel(CBUS_VIRT_TO_PFE(BMU2_BASE_ADDR + BMU_FREE_CTRL), base
+	       + GPI_DDR_FREE_ADDR);
+	writel(CBUS_VIRT_TO_PFE(CLASS_INQ_PKTPTR), base + GPI_CLASS_ADDR);
+	writel(DDR_HDR_SIZE, base + GPI_DDR_DATA_OFFSET);
+	writel(LMEM_HDR_SIZE, base + GPI_LMEM_DATA_OFFSET);
+	writel(0, base + GPI_LMEM_SEC_BUF_DATA_OFFSET);
+	writel(0, base + GPI_DDR_SEC_BUF_DATA_OFFSET);
+	writel((DDR_HDR_SIZE << 16) | LMEM_HDR_SIZE, base + GPI_HDR_SIZE);
+	writel((DDR_BUF_SIZE << 16) | LMEM_BUF_SIZE, base + GPI_BUF_SIZE);
+
+	writel(((cfg->lmem_rtry_cnt << 16) | (GPI_DDR_BUF_EN << 1) |
+		GPI_LMEM_BUF_EN), base + GPI_RX_CONFIG);
+	writel(cfg->tmlf_txthres, base + GPI_TMLF_TX);
+	writel(cfg->aseq_len, base + GPI_DTX_ASEQ);
+
+	/*Make GPI AXI transactions non-bufferable */
+	writel(0x1, base + GPI_AXI_CTRL);
+}
+
+/*
+ * Initializes a GPI block.
+ * @param[in] base	GPI base address
+ * @param[in] cfg	GPI configuration
+ */
+void gpi_init(void *base, struct gpi_cfg *cfg)
+{
+	gpi_reset(base);
+
+	gpi_disable(base);
+
+	gpi_set_config(base, cfg);
+}
+
+/**************************** CLASSIFIER ***************************/
+/*
+ * Resets CLASSIFIER block.
+ */
+static inline void class_reset(void)
+{
+	writel(CORE_SW_RESET, CLASS_TX_CTRL);
+}
+
+/*
+ * Enables all CLASS-PE's cores.
+ */
+void class_enable(void)
+{
+	writel(CORE_ENABLE, CLASS_TX_CTRL);
+}
+
+/*
+ * Disables all CLASS-PE's cores.
+ */
+void class_disable(void)
+{
+	writel(CORE_DISABLE, CLASS_TX_CTRL);
+}
+
+/*
+ * Sets the configuration of the CLASSIFIER block.
+ * @param[in] cfg	CLASSIFIER configuration
+ */
+static inline void class_set_config(struct class_cfg *cfg)
+{
+	if (PLL_CLK_EN == 0) {
+		/* Clock ratio: for 1:1 the value is 0 */
+		writel(0x0, CLASS_PE_SYS_CLK_RATIO);
+	} else {
+		/* Clock ratio: for 1:2 the value is 1 */
+		writel(0x1, CLASS_PE_SYS_CLK_RATIO);
+	}
+	writel((DDR_HDR_SIZE << 16) | LMEM_HDR_SIZE, CLASS_HDR_SIZE);
+	writel(LMEM_BUF_SIZE, CLASS_LMEM_BUF_SIZE);
+	writel(CLASS_ROUTE_ENTRY_SIZE(CLASS_ROUTE_SIZE) |
+		CLASS_ROUTE_HASH_SIZE(cfg->route_table_hash_bits),
+		CLASS_ROUTE_HASH_ENTRY_SIZE);
+	writel(HASH_CRC_PORT_IP | QB2BUS_LE, CLASS_ROUTE_MULTI);
+
+	writel(cfg->route_table_baseaddr, CLASS_ROUTE_TABLE_BASE);
+	memset((void *)DDR_PFE_TO_VIRT(cfg->route_table_baseaddr), 0,
+	       ROUTE_TABLE_SIZE);
+
+	writel(CLASS_PE0_RO_DM_ADDR0_VAL, CLASS_PE0_RO_DM_ADDR0);
+	writel(CLASS_PE0_RO_DM_ADDR1_VAL, CLASS_PE0_RO_DM_ADDR1);
+	writel(CLASS_PE0_QB_DM_ADDR0_VAL, CLASS_PE0_QB_DM_ADDR0);
+	writel(CLASS_PE0_QB_DM_ADDR1_VAL, CLASS_PE0_QB_DM_ADDR1);
+	writel(CBUS_VIRT_TO_PFE(TMU_PHY_INQ_PKTPTR), CLASS_TM_INQ_ADDR);
+
+	writel(23, CLASS_AFULL_THRES);
+	writel(23, CLASS_TSQ_FIFO_THRES);
+
+	writel(24, CLASS_MAX_BUF_CNT);
+	writel(24, CLASS_TSQ_MAX_CNT);
+
+	/*Make Class AXI transactions non-bufferable */
+	writel(0x1, CLASS_AXI_CTRL);
+
+	/*Make Util AXI transactions non-bufferable */
+	/*Util is disabled in U-boot, do it from here */
+	writel(0x1, UTIL_AXI_CTRL);
+}
+
+/*
+ * Initializes CLASSIFIER block.
+ * @param[in] cfg	CLASSIFIER configuration
+ */
+void class_init(struct class_cfg *cfg)
+{
+	class_reset();
+
+	class_disable();
+
+	class_set_config(cfg);
+}
+
+/**************************** TMU ***************************/
+/*
+ * Enables TMU-PE cores.
+ * @param[in] pe_mask	TMU PE mask
+ */
+void tmu_enable(u32 pe_mask)
+{
+	writel(readl(TMU_TX_CTRL) | (pe_mask & 0xF), TMU_TX_CTRL);
+}
+
+/*
+ * Disables TMU cores.
+ * @param[in] pe_mask	TMU PE mask
+ */
+void tmu_disable(u32 pe_mask)
+{
+	writel(readl(TMU_TX_CTRL) & ~(pe_mask & 0xF), TMU_TX_CTRL);
+}
+
+/*
+ * Initializes TMU block.
+ * @param[in] cfg	TMU configuration
+ */
+void tmu_init(struct tmu_cfg *cfg)
+{
+	int q, phyno;
+
+	/* keep in soft reset */
+	writel(SW_RESET, TMU_CTRL);
+
+	/*Make Class AXI transactions non-bufferable */
+	writel(0x1, TMU_AXI_CTRL);
+
+	/* enable EMAC PHY ports */
+	writel(0x3, TMU_SYS_GENERIC_CONTROL);
+
+	writel(750, TMU_INQ_WATERMARK);
+
+	writel(CBUS_VIRT_TO_PFE(EGPI1_BASE_ADDR + GPI_INQ_PKTPTR),
+	       TMU_PHY0_INQ_ADDR);
+	writel(CBUS_VIRT_TO_PFE(EGPI2_BASE_ADDR + GPI_INQ_PKTPTR),
+	       TMU_PHY1_INQ_ADDR);
+
+	writel(CBUS_VIRT_TO_PFE(HGPI_BASE_ADDR + GPI_INQ_PKTPTR),
+	       TMU_PHY3_INQ_ADDR);
+	writel(CBUS_VIRT_TO_PFE(HIF_NOCPY_RX_INQ0_PKTPTR), TMU_PHY4_INQ_ADDR);
+	writel(CBUS_VIRT_TO_PFE(UTIL_INQ_PKTPTR), TMU_PHY5_INQ_ADDR);
+	writel(CBUS_VIRT_TO_PFE(BMU2_BASE_ADDR + BMU_FREE_CTRL),
+	       TMU_BMU_INQ_ADDR);
+
+	/* enabling all 10 schedulers [9:0] of each TDQ  */
+	writel(0x3FF, TMU_TDQ0_SCH_CTRL);
+	writel(0x3FF, TMU_TDQ1_SCH_CTRL);
+	writel(0x3FF, TMU_TDQ3_SCH_CTRL);
+
+	if (PLL_CLK_EN == 0) {
+		/* Clock ratio: for 1:1 the value is 0 */
+		writel(0x0, TMU_PE_SYS_CLK_RATIO);
+	} else {
+		/* Clock ratio: for 1:2 the value is 1 */
+		writel(0x1, TMU_PE_SYS_CLK_RATIO);
+	}
+
+	/* Extra packet pointers will be stored from this address onwards */
+	debug("TMU_LLM_BASE_ADDR %x\n", cfg->llm_base_addr);
+	writel(cfg->llm_base_addr, TMU_LLM_BASE_ADDR);
+
+	debug("TMU_LLM_QUE_LEN %x\n", cfg->llm_queue_len);
+	writel(cfg->llm_queue_len,	TMU_LLM_QUE_LEN);
+
+	writel(5, TMU_TDQ_IIFG_CFG);
+	writel(DDR_BUF_SIZE, TMU_BMU_BUF_SIZE);
+
+	writel(0x0, TMU_CTRL);
+
+	/* MEM init */
+	writel(MEM_INIT, TMU_CTRL);
+
+	while (!(readl(TMU_CTRL) & MEM_INIT_DONE))
+		;
+
+	/* LLM init */
+	writel(LLM_INIT, TMU_CTRL);
+
+	while (!(readl(TMU_CTRL) & LLM_INIT_DONE))
+		;
+
+	/* set up each queue for tail drop */
+	for (phyno = 0; phyno < 4; phyno++) {
+		if (phyno == 2)
+			continue;
+		for (q = 0; q < 16; q++) {
+			u32 qmax;
+
+			writel((phyno << 8) | q, TMU_TEQ_CTRL);
+			writel(1 << 22, TMU_TEQ_QCFG);
+
+			if (phyno == 3)
+				qmax = DEFAULT_TMU3_QDEPTH;
+			else
+				qmax = (q == 0) ? DEFAULT_Q0_QDEPTH :
+					DEFAULT_MAX_QDEPTH;
+
+			writel(qmax << 18, TMU_TEQ_HW_PROB_CFG2);
+			writel(qmax >> 14, TMU_TEQ_HW_PROB_CFG3);
+		}
+	}
+	writel(0x05, TMU_TEQ_DISABLE_DROPCHK);
+	writel(0, TMU_CTRL);
+}
+
+/**************************** UTIL ***************************/
+/*
+ * Initializes UTIL block.
+ */
+void util_init(void)
+{
+	/*Make Util AXI transactions non-bufferable */
+	writel(0x1, UTIL_AXI_CTRL);
+
+	if (PLL_CLK_EN == 0) {
+		/* Clock ratio: for 1:1 the value is 0 */
+		writel(0x0, UTIL_PE_SYS_CLK_RATIO);
+	} else {
+		writel(0x1, UTIL_PE_SYS_CLK_RATIO);
+		/* Clock ratio: for 1:2 the value is 1 */
+	}
+}
+
+/**************************** HIF ***************************/
+/*
+ * Enable hif tx DMA and interrupt
+ */
+void hif_tx_enable(void)
+{
+	writel(HIF_CTRL_DMA_EN, HIF_TX_CTRL);
+}
+
+/*
+ * Disable hif tx DMA and interrupt
+ */
+void hif_tx_disable(void)
+{
+	u32 hif_int;
+
+	writel(0, HIF_TX_CTRL);
+
+	hif_int = readl(HIF_INT_ENABLE);
+	hif_int &= HIF_TXPKT_INT_EN;
+	writel(hif_int, HIF_INT_ENABLE);
+}
+
+/*
+ * Enable hif rx DMA and interrupt
+ */
+void hif_rx_enable(void)
+{
+	writel((HIF_CTRL_DMA_EN | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL);
+}
+
+/*
+ * Disable hif rx DMA and interrupt
+ */
+void hif_rx_disable(void)
+{
+	u32 hif_int;
+
+	writel(0, HIF_RX_CTRL);
+
+	hif_int = readl(HIF_INT_ENABLE);
+	hif_int &= HIF_RXPKT_INT_EN;
+	writel(hif_int, HIF_INT_ENABLE);
+}
+/*
+ * Initializes HIF copy block.
+ */
+void hif_init(void)
+{
+	/* Initialize HIF registers */
+	writel(HIF_RX_POLL_CTRL_CYCLE<<16|HIF_TX_POLL_CTRL_CYCLE,
+	       HIF_POLL_CTRL);
+	/* Make HIF AXI transactions non-bufferable */
+	writel(0x1, HIF_AXI_CTRL);
+}
diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
new file mode 100644
index 0000000..5336ba7
--- /dev/null
+++ b/drivers/net/pfe_eth/pfe_driver.c
@@ -0,0 +1,626 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <pfe_eth/pfe_eth.h>
+#include <pfe_eth/pfe_firmware.h>
+
+static struct tx_desc_s *g_tx_desc;
+static struct rx_desc_s *g_rx_desc;
+
+/*
+ * HIF Rx interface function
+ * Reads the rx descriptor from the current location (rx_to_read).
+ * - If the descriptor has a valid data/pkt, then get the data pointer
+ * - check for the input rx phy number
+ * - increments the rx data pointer by pkt_head_room_size
+ * - decrements the data length by pkt_head_room_size
+ * - handover the packet to caller.
+ *
+ * @param[out]	pkt_ptr	Pointer to store rx packet pointer
+ * @param[out] phy_port Pointer to store recv phy port
+ *
+ * @return	-1 if no packet, else returns length of packet.
+ */
+int pfe_recv(unsigned int *pkt_ptr, int *phy_port)
+{
+	struct rx_desc_s *rx_desc = g_rx_desc;
+	struct buf_desc *bd;
+	int len = -1;
+
+	struct hif_header_s *hif_header;
+
+	bd = rx_desc->rx_base + rx_desc->rx_to_read;
+
+	if (bd->ctrl & BD_CTRL_DESC_EN)
+		return len; /* No pending Rx packet */
+
+	/* this len include hif_header(8bytes) */
+	len = bd->ctrl & 0xFFFF;
+
+	hif_header = (struct hif_header_s *)DDR_PFE_TO_VIRT(bd->data);
+
+	/* Get the recive port info from the packet */
+	debug(
+		"Pkt recv'd: Pkt ptr(%p), len(%d), gemac_port(%d) status(%08x)\n",
+		hif_header, len, hif_header->port_no, bd->status);
+
+#ifdef DEBUG
+	{
+		int i;
+		unsigned char *p = (unsigned char *)hif_header;
+
+		for (i = 0; i < len; i++) {
+			if (!(i % 16))
+				printf("\n");
+			printf(" %02x", p[i]);
+		}
+		printf("\n");
+	}
+#endif
+
+	*pkt_ptr = (unsigned long)(hif_header + 1);
+	*phy_port = hif_header->port_no;
+	len -= sizeof(struct hif_header_s);
+
+	rx_desc->rx_to_read = (rx_desc->rx_to_read + 1)
+			       & (rx_desc->rx_ring_size - 1);
+
+	/* reset bd control field */
+	bd->ctrl = (MAX_FRAME_SIZE | BD_CTRL_LIFM | BD_CTRL_DESC_EN
+		    | BD_CTRL_DIR);
+	bd->status = 0;
+
+	/* Give START_STROBE to BDP to fetch the descriptor __NOW__,
+	 * BDP need not to wait for rx_poll_cycle time to fetch the descriptor,
+	 * In idle state (ie., no rx pkt), BDP will not fetch
+	 * the descriptor even if strobe is given(I think)
+	 */
+	writel((readl(HIF_RX_CTRL) | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL);
+
+	return len;
+}
+
+/*
+ * HIF Tx interface function
+ * This function sends a single packet to PFE from HIF interface.
+ * - No interrupt indication on tx completion.
+ * - After tx descriptor is updated and TX DMA is enabled.
+ * - To support both chipit and read c2k environment, data is copied to
+ *   tx buffers. After verification this copied can be avoided.
+ *
+ * @param[in] phy_port	Phy port number to send out this packet
+ * @param[in] data	Pointer to the data
+ * @param[in] length	Length of the ethernet packet to be transferred.
+ *
+ * @return -1 if tx Q is full, else returns the tx location where the pkt is
+ * placed.
+ */
+int pfe_send(int phy_port, void *data, int length)
+{
+	struct tx_desc_s *tx_desc = g_tx_desc;
+	struct buf_desc *bd;
+	struct hif_header_s hif_header;
+	u8 *tx_buf_va;
+
+	debug("%s:pkt: %p, len: %d, tx_base: %p, tx_to_send: %d\n", __func__,
+	      data, length, tx_desc->tx_base, tx_desc->tx_to_send);
+
+	bd = tx_desc->tx_base + tx_desc->tx_to_send;
+
+	/* check queue-full condition */
+	if (bd->ctrl & BD_CTRL_DESC_EN) {
+		printf("Tx queue full\n");
+		return -1;
+	}
+
+	/* PFE checks for min pkt size */
+	if (length < MIN_PKT_SIZE)
+		length = MIN_PKT_SIZE;
+
+	tx_buf_va = (void *)DDR_PFE_TO_VIRT(bd->data);
+	debug("%s: tx_buf_va: %p, tx_buf_pa: %08x\n", __func__, tx_buf_va,
+	      bd->data);
+
+	/* Fill the gemac/phy port number to send this packet out */
+	memset(&hif_header, 0, sizeof(struct hif_header_s));
+	hif_header.port_no = phy_port;
+
+	memcpy(tx_buf_va, (u8 *)&hif_header, sizeof(struct hif_header_s));
+	memcpy(tx_buf_va + sizeof(struct hif_header_s), data, length);
+	length += sizeof(struct hif_header_s);
+
+#ifdef DEBUG
+	{
+		int i;
+		unsigned char *p = (unsigned char *)tx_buf_va;
+
+		for (i = 0; i < length; i++) {
+			if (!(i % 16))
+				printf("\n");
+			printf("%02x ", p[i]);
+		}
+	}
+#endif
+
+	debug("before0: Tx Done, status: %08x, ctrl: %08x\n", bd->status,
+	      bd->ctrl);
+
+	/* fill the tx desc */
+	bd->ctrl = (u32)(BD_CTRL_DESC_EN | BD_CTRL_LIFM | (length & 0xFFFF));
+	bd->status = 0;
+
+	/* NOTE: This code can be removed after verification */
+	bd->status = 0xF0;
+
+	writel((HIF_CTRL_DMA_EN | HIF_CTRL_BDP_CH_START_WSTB), HIF_TX_CTRL);
+
+	udelay(100);
+
+	return tx_desc->tx_to_send;
+}
+
+/*
+ * HIF to check the Tx done
+ *  This function will chceck the tx done indication of the current tx_to_send
+ * locations
+ *  if success, moves the tx_to_send to next location.
+ *
+ * @return -1 if TX ownership bit is not cleared by hw.
+ * else on success (tx done copletion) returns zero.
+ */
+int pfe_tx_done(void)
+{
+	struct tx_desc_s *tx_desc = g_tx_desc;
+	struct buf_desc *bd;
+
+	debug("%s:tx_base: %p, tx_to_send: %d\n", __func__, tx_desc->tx_base,
+	      tx_desc->tx_to_send);
+
+	bd = tx_desc->tx_base + tx_desc->tx_to_send;
+
+	/* check queue-full condition */
+	if (bd->ctrl & BD_CTRL_DESC_EN)
+		return -1;
+
+	/* reset the control field */
+	bd->ctrl = 0;
+	/* bd->data = (u32)NULL; */
+	bd->status = 0;
+
+	debug("Tx Done : status: %08x, ctrl: %08x\n", bd->status, bd->ctrl);
+
+	/* increment the txtosend index to next location */
+	tx_desc->tx_to_send = (tx_desc->tx_to_send + 1)
+			       & (tx_desc->tx_ring_size - 1);
+
+	debug("Tx next pkt location: %d\n", tx_desc->tx_to_send);
+
+	return 0;
+}
+
+/*
+ * Helper function to dump Rx descriptors.
+ */
+static inline void hif_rx_desc_dump(void)
+{
+	struct buf_desc *bd_va;
+	int i;
+	struct rx_desc_s *rx_desc;
+
+	if (g_rx_desc == NULL) {
+		printf("%s: HIF Rx desc no init\n", __func__);
+		return;
+	}
+
+	rx_desc = g_rx_desc;
+	bd_va = rx_desc->rx_base;
+
+	debug("HIF rx desc: base_va: %p, base_pa: %08x\n", rx_desc->rx_base,
+	      rx_desc->rx_base_pa);
+	for (i = 0; i < rx_desc->rx_ring_size; i++) {
+		debug("status: %08x, ctrl: %08x, data: %08x, next: 0x%08x\n",
+		      bd_va->status, bd_va->ctrl, bd_va->data, bd_va->next);
+		bd_va++;
+	}
+}
+
+/*
+ * This function mark all Rx descriptors as LAST_BD.
+ */
+void hif_rx_desc_disable(void)
+{
+	int i;
+	struct rx_desc_s *rx_desc;
+	struct buf_desc *bd_va;
+
+	if (g_rx_desc == NULL) {
+		printf("%s: HIF Rx desc not initialized\n", __func__);
+		return;
+	}
+
+	rx_desc = g_rx_desc;
+	bd_va = rx_desc->rx_base;
+
+	for (i = 0; i < rx_desc->rx_ring_size; i++) {
+		bd_va->ctrl |= BD_CTRL_LAST_BD;
+		bd_va++;
+	}
+}
+
+/*
+ * HIF Rx Desc initialization function.
+ */
+static int hif_rx_desc_init(struct pfe *pfe)
+{
+	u32 ctrl;
+	struct buf_desc *bd_va;
+	struct buf_desc *bd_pa;
+	struct rx_desc_s *rx_desc;
+	u32 rx_buf_pa;
+	int i;
+
+	/* sanity check */
+	if (g_rx_desc) {
+		printf("%s: HIF Rx desc re-init request\n", __func__);
+		return 0;
+	}
+
+	rx_desc = (struct rx_desc_s *)malloc(sizeof(struct rx_desc_s));
+	if (rx_desc == NULL) {
+		printf("%s: Memory allocation failure\n", __func__);
+		return -1;
+	}
+	memset(rx_desc, 0, sizeof(struct rx_desc_s));
+
+	/* init: Rx ring buffer */
+	rx_desc->rx_ring_size = HIF_RX_DESC_NT;
+
+	/* NOTE: must be 64bit aligned  */
+	bd_va = (struct buf_desc *)(pfe->ddr_baseaddr + RX_BD_BASEADDR);
+	bd_pa = (struct buf_desc *)(pfe->ddr_phys_baseaddr + RX_BD_BASEADDR);
+
+	rx_desc->rx_base = bd_va;
+	rx_desc->rx_base_pa = (unsigned long)bd_pa;
+
+	rx_buf_pa = pfe->ddr_phys_baseaddr + HIF_RX_PKT_DDR_BASEADDR;
+
+	debug("%s: Rx desc base: %p, base_pa: %08x, desc_count: %d\n",
+	      __func__, rx_desc->rx_base, rx_desc->rx_base_pa,
+	      rx_desc->rx_ring_size);
+
+	memset(bd_va, 0, sizeof(struct buf_desc) * rx_desc->rx_ring_size);
+
+	ctrl = (MAX_FRAME_SIZE | BD_CTRL_DESC_EN | BD_CTRL_DIR | BD_CTRL_LIFM);
+
+	for (i = 0; i < rx_desc->rx_ring_size; i++) {
+		bd_va->next = (unsigned long)(bd_pa + 1);
+		bd_va->ctrl = ctrl;
+		bd_va->data = rx_buf_pa + (i * MAX_FRAME_SIZE);
+		bd_va++;
+		bd_pa++;
+	}
+	--bd_va;
+	bd_va->next = (u32)rx_desc->rx_base_pa;
+
+	writel(rx_desc->rx_base_pa, HIF_RX_BDP_ADDR);
+	writel((readl(HIF_RX_CTRL) | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL);
+
+	g_rx_desc = rx_desc;
+
+	return 0;
+}
+
+/*
+ * Helper function to dump Tx Descriptors.
+ */
+static inline void hif_tx_desc_dump(void)
+{
+	struct tx_desc_s *tx_desc;
+	int i;
+	struct buf_desc *bd_va;
+
+	if (g_tx_desc == NULL) {
+		printf("%s: HIF Tx desc no init\n", __func__);
+		return;
+	}
+
+	tx_desc = g_tx_desc;
+	bd_va = tx_desc->tx_base;
+
+	debug("HIF tx desc: base_va: %p, base_pa: %08x\n", tx_desc->tx_base,
+	      tx_desc->tx_base_pa);
+
+	for (i = 0; i < tx_desc->tx_ring_size; i++)
+		bd_va++;
+}
+
+/*
+ * HIF Tx descriptor initialization function.
+ */
+static int hif_tx_desc_init(struct pfe *pfe)
+{
+	struct buf_desc *bd_va;
+	struct buf_desc *bd_pa;
+	int i;
+	struct tx_desc_s *tx_desc;
+	u32 tx_buf_pa;
+
+	/* sanity check */
+	if (g_tx_desc) {
+		printf("%s: HIF Tx desc re-init request\n", __func__);
+		return 0;
+	}
+
+	tx_desc = (struct tx_desc_s *)malloc(sizeof(struct tx_desc_s));
+	if (tx_desc == NULL) {
+		printf("%s:%d:Memory allocation failure\n", __func__,
+		       __LINE__);
+		return -1;
+	}
+	memset(tx_desc, 0, sizeof(struct tx_desc_s));
+
+	/* init: Tx ring buffer */
+	tx_desc->tx_ring_size = HIF_TX_DESC_NT;
+
+	/* NOTE: must be 64bit aligned  */
+	bd_va = (struct buf_desc *)(pfe->ddr_baseaddr + TX_BD_BASEADDR);
+	bd_pa = (struct buf_desc *)(pfe->ddr_phys_baseaddr + TX_BD_BASEADDR);
+
+	tx_desc->tx_base_pa = (unsigned long)bd_pa;
+	tx_desc->tx_base = bd_va;
+
+	debug("%s: Tx desc_base: %p, base_pa: %08x, desc_count: %d\n",
+	      __func__, tx_desc->tx_base, tx_desc->tx_base_pa,
+	      tx_desc->tx_ring_size);
+
+	memset(bd_va, 0, sizeof(struct buf_desc) * tx_desc->tx_ring_size);
+
+	tx_buf_pa = pfe->ddr_phys_baseaddr + HIF_TX_PKT_DDR_BASEADDR;
+
+	for (i = 0; i < tx_desc->tx_ring_size; i++) {
+		bd_va->next = (unsigned long)(bd_pa + 1);
+		bd_va->data = tx_buf_pa + (i * MAX_FRAME_SIZE);
+		bd_va++;
+		bd_pa++;
+	}
+	--bd_va;
+	bd_va->next = (u32)tx_desc->tx_base_pa;
+
+	writel(tx_desc->tx_base_pa, HIF_TX_BDP_ADDR);
+
+	g_tx_desc = tx_desc;
+
+	return 0;
+}
+
+/*
+ * PFE/Class initialization.
+ */
+static void pfe_class_init(struct pfe *pfe)
+{
+	struct class_cfg class_cfg = {
+		.route_table_baseaddr = pfe->ddr_phys_baseaddr +
+					ROUTE_TABLE_BASEADDR,
+		.route_table_hash_bits = ROUTE_TABLE_HASH_BITS,
+	};
+
+	class_init(&class_cfg);
+
+	debug("class init complete\n");
+}
+
+/*
+ * PFE/TMU initialization.
+ */
+static void pfe_tmu_init(struct pfe *pfe)
+{
+	struct tmu_cfg tmu_cfg = {
+		.llm_base_addr = pfe->ddr_phys_baseaddr + TMU_LLM_BASEADDR,
+		.llm_queue_len = TMU_LLM_QUEUE_LEN,
+	};
+
+	tmu_init(&tmu_cfg);
+
+	debug("tmu init complete\n");
+}
+
+/*
+ * PFE/BMU (both BMU1 & BMU2) initialization.
+ */
+static void pfe_bmu_init(struct pfe *pfe)
+{
+	struct bmu_cfg bmu1_cfg = {
+		.baseaddr = CBUS_VIRT_TO_PFE(LMEM_BASE_ADDR +
+						BMU1_LMEM_BASEADDR),
+		.count = BMU1_BUF_COUNT,
+		.size = BMU1_BUF_SIZE,
+	};
+
+	struct bmu_cfg bmu2_cfg = {
+		.baseaddr = pfe->ddr_phys_baseaddr + BMU2_DDR_BASEADDR,
+		.count = BMU2_BUF_COUNT,
+		.size = BMU2_BUF_SIZE,
+	};
+
+	bmu_init(BMU1_BASE_ADDR, &bmu1_cfg);
+	debug("bmu1 init: done\n");
+
+	bmu_init(BMU2_BASE_ADDR, &bmu2_cfg);
+	debug("bmu2 init: done\n");
+}
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+/*
+ * PFE/Util initialization function.
+ */
+static void pfe_util_init(struct pfe *pfe)
+{
+	util_init();
+	printf("util init complete\n");
+}
+#endif
+
+/*
+ * PFE/GPI initialization function.
+ *  - egpi1, egpi2, egpi3, hgpi
+ */
+static void pfe_gpi_init(struct pfe *pfe)
+{
+	struct gpi_cfg egpi1_cfg = {
+		.lmem_rtry_cnt = EGPI1_LMEM_RTRY_CNT,
+		.tmlf_txthres = EGPI1_TMLF_TXTHRES,
+		.aseq_len = EGPI1_ASEQ_LEN,
+	};
+
+	struct gpi_cfg egpi2_cfg = {
+		.lmem_rtry_cnt = EGPI2_LMEM_RTRY_CNT,
+		.tmlf_txthres = EGPI2_TMLF_TXTHRES,
+		.aseq_len = EGPI2_ASEQ_LEN,
+	};
+
+	struct gpi_cfg hgpi_cfg = {
+		.lmem_rtry_cnt = HGPI_LMEM_RTRY_CNT,
+		.tmlf_txthres = HGPI_TMLF_TXTHRES,
+		.aseq_len = HGPI_ASEQ_LEN,
+	};
+
+	gpi_init(EGPI1_BASE_ADDR, &egpi1_cfg);
+	debug("GPI1 init complete\n");
+
+	gpi_init(EGPI2_BASE_ADDR, &egpi2_cfg);
+	debug("GPI2 init complete\n");
+
+	gpi_init(HGPI_BASE_ADDR, &hgpi_cfg);
+	debug("HGPI init complete\n");
+}
+
+/*
+ * PFE/HIF initialization function.
+ */
+static void pfe_hif_init(struct pfe *pfe)
+{
+	hif_tx_disable();
+	hif_rx_disable();
+
+	hif_tx_desc_init(pfe);
+	hif_rx_desc_init(pfe);
+
+	hif_init();
+
+	hif_tx_enable();
+	hif_rx_enable();
+
+	hif_rx_desc_dump();
+	hif_tx_desc_dump();
+
+	debug("HIF init complete\n");
+}
+
+/*
+ * PFE initialization
+ * - Firmware loading (CLASS-PE and TMU-PE)
+ * - BMU1 and BMU2 init
+ * - GEMAC init
+ * - GPI init
+ * - CLASS-PE init
+ * - TMU-PE init
+ * - HIF tx and rx descriptors init
+ *
+ * @param[in]	edev	Pointer to eth device structure.
+ *
+ * @return 0, on success.
+ */
+static int pfe_hw_init(struct pfe *pfe)
+{
+	debug("%s: start\n", __func__);
+
+	writel(0x3, CLASS_PE_SYS_CLK_RATIO);
+	writel(0x3, TMU_PE_SYS_CLK_RATIO);
+	writel(0x3, UTIL_PE_SYS_CLK_RATIO);
+	udelay(10);
+
+	pfe_class_init(pfe);
+
+	pfe_tmu_init(pfe);
+
+	pfe_bmu_init(pfe);
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+	pfe_util_init(pfe);
+#endif
+
+	pfe_gpi_init(pfe);
+
+	pfe_hif_init(pfe);
+
+	bmu_enable(BMU1_BASE_ADDR);
+	debug("bmu1 enabled\n");
+
+	bmu_enable(BMU2_BASE_ADDR);
+	debug("bmu2 enabled\n");
+
+	debug("%s: done\n", __func__);
+
+	return 0;
+}
+
+/*
+ * PFE probe function.
+ * - Initializes pfe_lib
+ * - pfe hw init
+ * - fw loading and enables PEs
+ * - should be executed once.
+ *
+ * @param[in] pfe  Pointer the pfe control block
+ */
+int pfe_probe(struct pfe *pfe)
+{
+	static int init_done;
+
+	if (init_done)
+		return 0;
+
+	debug("ddr_baseaddr: %p, ddr_phys_baseaddr: %08x\n",
+	      pfe->ddr_baseaddr, (u32)pfe->ddr_phys_baseaddr);
+
+	pfe_lib_init(pfe->ddr_baseaddr, pfe->ddr_phys_baseaddr);
+
+	pfe_hw_init(pfe);
+
+	/* Load the class,TM, Util fw.
+	 * By now pfe is:
+	 * - out of reset + disabled + configured.
+	 * Fw loading should be done after pfe_hw_init()
+	 */
+	/* It loads default inbuilt sbl firmware */
+	pfe_firmware_init();
+
+	init_done = 1;
+
+	return 0;
+}
+
+/*
+ * PFE remove function
+ *  - stopes PEs
+ *  - frees tx/rx descriptor resources
+ *  - should be called once.
+ *
+ * @param[in] pfe Pointer to pfe control block.
+ */
+int pfe_remove(struct pfe *pfe)
+{
+	if (g_tx_desc)
+		free(g_tx_desc);
+
+	if (g_rx_desc)
+		free(g_rx_desc);
+
+	pfe_firmware_exit();
+
+	return 0;
+}
diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
new file mode 100644
index 0000000..8d8de40
--- /dev/null
+++ b/drivers/net/pfe_eth/pfe_eth.c
@@ -0,0 +1,545 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <pfe_eth/pfe_eth.h>
+
+struct gemac_s gem_info[] = {
+	/* PORT_0 configuration */ {
+		/* GEMAC config */
+		.gemac_mode = GMII,
+		.gemac_speed = SPEED_1000M,
+		.gemac_duplex = DUPLEX_FULL,
+
+		/* phy iface */
+		.phy_address = EMAC1_PHY_ADDR,
+		.phy_mode = PHY_INTERFACE_MODE_SGMII,
+	},
+	/* PORT_1 configuration */ {
+		/* GEMAC config */
+		.gemac_mode = GMII,
+		.gemac_speed = SPEED_1000M,
+		.gemac_duplex = DUPLEX_FULL,
+
+		/* phy iface */
+		.phy_address = EMAC2_PHY_ADDR,
+		.phy_mode = PHY_INTERFACE_MODE_RGMII,
+	},
+};
+
+#define MAX_GEMACS      2
+
+static struct ls1012a_eth_dev *gemac_list[MAX_GEMACS];
+
+#define MDIO_TIMEOUT    5000
+
+static inline void ls1012a_gemac_enable(void *gemac_base)
+{
+	writel(readl(gemac_base + EMAC_ECNTRL_REG) |
+		EMAC_ECNTRL_ETHER_EN, gemac_base + EMAC_ECNTRL_REG);
+}
+
+static inline void ls1012a_gemac_disable(void *gemac_base)
+{
+	writel(readl(gemac_base + EMAC_ECNTRL_REG) &
+		~EMAC_ECNTRL_ETHER_EN, gemac_base + EMAC_ECNTRL_REG);
+}
+
+static inline void ls1012a_gemac_set_speed(void *gemac_base, u32 speed)
+{
+	struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
+	u32 ecr = readl(gemac_base + EMAC_ECNTRL_REG) & ~EMAC_ECNTRL_SPEED;
+	u32 rcr = readl(gemac_base + EMAC_RCNTRL_REG) & ~EMAC_RCNTRL_RMII_10T;
+	u32 rgmii_pcr = in_be32(&scfg->rgmiipcr) &
+			~(SCFG_RGMIIPCR_SETSP_1000M|SCFG_RGMIIPCR_SETSP_10M);
+
+	if (speed == _1000BASET) {
+		ecr |= EMAC_ECNTRL_SPEED;
+		rgmii_pcr |= SCFG_RGMIIPCR_SETSP_1000M;
+	} else if (speed != _100BASET) {
+		rcr |= EMAC_RCNTRL_RMII_10T;
+		rgmii_pcr |= SCFG_RGMIIPCR_SETSP_10M;
+	}
+
+	writel(ecr, gemac_base + EMAC_ECNTRL_REG);
+	out_be32(&scfg->rgmiipcr, rgmii_pcr | SCFG_RGMIIPCR_SETFD);
+
+	/* remove loop back */
+	rcr &= ~EMAC_RCNTRL_LOOP;
+	/* enable flow control */
+	rcr |= EMAC_RCNTRL_FCE;
+
+	/* Enable MII mode */
+	rcr |= EMAC_RCNTRL_MII_MODE;
+
+	writel(rcr, gemac_base + EMAC_RCNTRL_REG);
+
+	/* Enable Tx full duplex */
+	writel(readl(gemac_base + EMAC_TCNTRL_REG) | EMAC_TCNTRL_FDEN,
+	       gemac_base + EMAC_TCNTRL_REG);
+}
+
+static inline void ls1012a_gemac_set_ethaddr(void *gemac_base, uchar *mac)
+{
+	writel((mac[0] << 24) + (mac[1] << 16) + (mac[2] << 8) + mac[3],
+	       gemac_base + EMAC_PHY_ADDR_LOW);
+	writel((mac[4] << 24) + (mac[5] << 16) + 0x8808, gemac_base +
+	       EMAC_PHY_ADDR_HIGH);
+}
+
+/** Stops or Disables GEMAC pointing to this eth iface.
+ *
+ * @param[in]   edev    Pointer to eth device structure.
+ *
+ * @return      none
+ */
+static inline void ls1012a_eth_halt(struct eth_device *edev)
+{
+	struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)edev->priv;
+
+	ls1012a_gemac_disable(priv->gem->gemac_base);
+
+	gpi_disable(priv->gem->egpi_base);
+}
+
+static int ls1012a_eth_init(struct eth_device *dev, bd_t *bd)
+{
+	struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
+	struct gemac_s *gem = priv->gem;
+	int speed;
+
+	/* set ethernet mac address */
+	ls1012a_gemac_set_ethaddr(gem->gemac_base, dev->enetaddr);
+
+	writel(0x00000004, gem->gemac_base + EMAC_TFWR_STR_FWD);
+	writel(0x00000005, gem->gemac_base + EMAC_RX_SECTIOM_FULL);
+	writel(0x00003fff, gem->gemac_base + EMAC_TRUNC_FL);
+	writel(0x00000030, gem->gemac_base + EMAC_TX_SECTION_EMPTY);
+	writel(0x00000000, gem->gemac_base + EMAC_MIB_CTRL_STS_REG);
+
+#ifdef CONFIG_PHYLIB
+	/* Start up the PHY */
+	if (phy_startup(priv->phydev)) {
+		printf("Could not initialize PHY %s\n",
+		       priv->phydev->dev->name);
+		return -1;
+	}
+	speed = priv->phydev->speed;
+	printf("Speed detected %x\n", speed);
+	if (priv->phydev->duplex == DUPLEX_HALF) {
+		printf("Half duplex not supported\n");
+		return -1;
+	}
+#endif
+
+	ls1012a_gemac_set_speed(gem->gemac_base, speed);
+
+	/* Enable GPI */
+	gpi_enable(gem->egpi_base);
+
+	/* Enable GEMAC */
+	ls1012a_gemac_enable(gem->gemac_base);
+
+	return 0;
+}
+
+static int ls1012a_eth_send(struct eth_device *dev, void *data, int length)
+{
+	struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
+
+	int rc;
+	int i = 0;
+
+	rc = pfe_send(priv->gemac_port, data, length);
+
+	if (rc < 0) {
+		printf("Tx Q full\n");
+		return 0;
+	}
+
+	while (1) {
+		rc = pfe_tx_done();
+		if (rc == 0)
+			break;
+
+			udelay(100);
+			i++;
+			if (i == 30000)
+				printf("Tx timeout, send failed\n");
+			break;
+	}
+
+	return 0;
+}
+
+static int ls1012a_eth_recv(struct eth_device *dev)
+{
+	struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
+	u32 pkt_buf;
+	int len;
+	int phy_port;
+
+	len = pfe_recv(&pkt_buf, &phy_port);
+
+	if (len < 0)
+		return 0; /* no packet in rx */
+
+	debug("Rx pkt: pkt_buf(%08x), phy_port(%d), len(%d)\n", pkt_buf,
+	      phy_port, len);
+	if (phy_port != priv->gemac_port)  {
+		printf("Rx pkt not on expected port\n");
+		return 0;
+	}
+
+	/* Pass the packet up to the protocol layers. */
+	net_process_received_packet((void *)(long int)pkt_buf, len);
+
+	return 0;
+}
+
+#if defined(CONFIG_PHYLIB)
+
+#define MDIO_TIMEOUT    5000
+static int ls1012a_write_addr(struct mii_dev *bus, int phy_addr, int dev_addr,
+			      int reg_addr)
+{
+	void *reg_base = bus->priv;
+	u32 devadr;
+	u32 phy;
+	u32 reg_data;
+	int timeout = MDIO_TIMEOUT;
+
+	devadr = ((dev_addr & EMAC_MII_DATA_RA_MASK) << EMAC_MII_DATA_RA_SHIFT);
+	phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
+
+	reg_data = (EMAC_MII_DATA_TA | phy | devadr | reg_addr);
+
+
+	writel(reg_data, reg_base + EMAC_MII_DATA_REG);
+
+	/*
+	 * wait for the MII interrupt
+	 */
+	while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
+		if (timeout-- <= 0) {
+			printf("Phy MDIO read/write timeout\n");
+			return -1;
+		}
+	}
+
+	/*
+	 * clear MII interrupt
+	 */
+	writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
+
+
+	return 0;
+}
+
+static int ls1012a_phy_read(struct mii_dev *bus, int phy_addr, int dev_addr, int
+				reg_addr)
+{
+	void *reg_base = bus->priv;
+	u32 reg;
+	u32 phy;
+	u32 reg_data;
+	u16 val;
+	int timeout = MDIO_TIMEOUT;
+
+	if (dev_addr == MDIO_DEVAD_NONE) {
+			reg = ((reg_addr & EMAC_MII_DATA_RA_MASK) <<
+		       EMAC_MII_DATA_RA_SHIFT);
+	} else {
+		ls1012a_write_addr(bus, phy_addr, dev_addr, reg_addr);
+		reg = ((dev_addr & EMAC_MII_DATA_RA_MASK) <<
+		       EMAC_MII_DATA_RA_SHIFT);
+	}
+
+	phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
+
+	if (dev_addr == MDIO_DEVAD_NONE)
+		reg_data = (EMAC_MII_DATA_ST | EMAC_MII_DATA_OP_RD |
+			    EMAC_MII_DATA_TA | phy | reg);
+	else
+		reg_data = (EMAC_MII_DATA_OP_CL45_RD | EMAC_MII_DATA_TA |
+			    phy | reg);
+
+	writel(reg_data, reg_base + EMAC_MII_DATA_REG);
+
+	/*
+	 * wait for the MII interrupt
+	 */
+	while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
+		if (timeout-- <= 0) {
+			printf("Phy MDIO read/write timeout\n");
+			return -1;
+		}
+	}
+
+	/*
+	 * clear MII interrupt
+	 */
+	writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
+
+	/*
+	 * it's now safe to read the PHY's register
+	 */
+	val = (u16)readl(reg_base + EMAC_MII_DATA_REG);
+	debug("%s: %p phy: 0x%x reg:0x%08x val:%#x\n", __func__, reg_base,
+	      phy_addr, reg_addr, val);
+
+	return val;
+}
+
+static int ls1012a_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr,
+				int reg_addr, u16 data)
+{
+	void *reg_base = bus->priv;
+	u32 reg;
+	u32 phy;
+	u32 reg_data;
+	int timeout = MDIO_TIMEOUT;
+	int val;
+
+	if (dev_addr == MDIO_DEVAD_NONE) {
+		reg = ((reg_addr & EMAC_MII_DATA_RA_MASK) <<
+		       EMAC_MII_DATA_RA_SHIFT);
+	} else {
+		ls1012a_write_addr(bus, phy_addr, dev_addr, reg_addr);
+		reg = ((dev_addr & EMAC_MII_DATA_RA_MASK) <<
+		       EMAC_MII_DATA_RA_SHIFT);
+	}
+
+	phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
+
+	if (dev_addr == MDIO_DEVAD_NONE)
+		reg_data = (EMAC_MII_DATA_ST | EMAC_MII_DATA_OP_WR |
+			    EMAC_MII_DATA_TA | phy | reg | data);
+	else
+		reg_data = (EMAC_MII_DATA_OP_CL45_WR | EMAC_MII_DATA_TA |
+			    phy | reg | data);
+
+	writel(reg_data, reg_base + EMAC_MII_DATA_REG);
+
+	/*
+	 * wait for the MII interrupt
+	 */
+	while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
+		if (timeout-- <= 0) {
+			printf("Phy MDIO read/write timeout\n");
+			return -1;
+		}
+	}
+
+	/*
+	 * clear MII interrupt
+	 */
+	writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
+
+	debug("%s: phy: %02x reg:%02x val:%#x\n", __func__, phy_addr,
+	      reg_addr, data);
+
+	return val;
+}
+
+struct mii_dev *ls1012a_mdio_init(struct mdio_info *mdio_info)
+{
+	struct mii_dev *bus;
+	int ret;
+	u32 mdio_speed;
+	u32 pclk = 250000000;
+
+	bus = mdio_alloc();
+	if (!bus) {
+		printf("mdio_alloc failed\n");
+		return NULL;
+	}
+	bus->read = ls1012a_phy_read;
+	bus->write = ls1012a_phy_write;
+	/* MAC1 MDIO used to communicate with external PHYS */
+	bus->priv = mdio_info->reg_base;
+	sprintf(bus->name, mdio_info->name);
+
+	/* configure mdio speed */
+	mdio_speed = (DIV_ROUND_UP(pclk, 4000000) << EMAC_MII_SPEED_SHIFT);
+	mdio_speed |= EMAC_HOLDTIME(0x5);
+	writel(mdio_speed, mdio_info->reg_base + EMAC_MII_CTRL_REG);
+
+	ret = mdio_register(bus);
+	if (ret) {
+		printf("mdio_register failed\n");
+		free(bus);
+		return NULL;
+	}
+	return bus;
+}
+
+static void ls1012a_configure_serdes(struct ls1012a_eth_dev *priv)
+{
+	struct mii_dev bus;
+	int value, sgmii_2500 = 0;
+	struct gemac_s *gem = priv->gem;
+
+	if (gem->phy_mode == PHY_INTERFACE_MODE_SGMII_2500)
+		sgmii_2500 = 1;
+
+	printf("%s %d\n", __func__, priv->gemac_port);
+
+	/* PCS configuration done with corresponding GEMAC */
+	bus.priv = gem_info[priv->gemac_port].gemac_base;
+
+	ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x0);
+	ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x1);
+	ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x2);
+	ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x3);
+
+	/* Reset serdes */
+	ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x0, 0x8000);
+
+	/* SGMII IF mode + AN enable only for 1G SGMII, not for 2.5G */
+	value = PHY_SGMII_IF_MODE_SGMII;
+	if (!sgmii_2500)
+		value |= PHY_SGMII_IF_MODE_AN;
+	else
+		value |= PHY_SGMII_IF_MODE_SGMII_GBT;
+
+	ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x14, value);
+
+	/* Dev ability according to SGMII specification */
+	value = PHY_SGMII_DEV_ABILITY_SGMII;
+	ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x4, value);
+
+	/* These values taken from validation team */
+	if (!sgmii_2500) {
+		ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x13, 0x0);
+		ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x12, 0x400);
+	} else {
+		ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x13, 0x7);
+		ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x12, 0xa120);
+	}
+
+	/* Restart AN */
+	value = PHY_SGMII_CR_DEF_VAL;
+	if (!sgmii_2500)
+		value |= PHY_SGMII_CR_RESET_AN;
+	ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0, value);
+}
+
+void ls1012a_set_mdio(int dev_id, struct mii_dev *bus)
+{
+	gem_info[dev_id].bus = bus;
+}
+
+void ls1012a_set_phy_address_mode(int dev_id, int phy_id, int phy_mode)
+{
+	gem_info[dev_id].phy_address = phy_id;
+	gem_info[dev_id].phy_mode  = phy_mode;
+}
+
+int ls1012a_phy_configure(struct ls1012a_eth_dev *priv, int dev_id, int phy_id)
+{
+	struct phy_device *phydev = NULL;
+	struct eth_device *dev = priv->dev;
+	struct gemac_s *gem = priv->gem;
+	struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
+
+	/* Configure SGMII  PCS */
+	if (gem->phy_mode == PHY_INTERFACE_MODE_SGMII ||
+	    gem->phy_mode == PHY_INTERFACE_MODE_SGMII_2500) {
+		out_be32(&scfg->mdioselcr, 0x00000000);
+		ls1012a_configure_serdes(priv);
+	}
+
+	/* By this time on-chip SGMII initialization is done
+	 * we can switch mdio interface to external PHYs
+	 */
+	out_be32(&scfg->mdioselcr, 0x80000000);
+
+	if (!gem->bus)
+		return -1;
+	phydev = phy_connect(gem->bus, phy_id, dev, gem->phy_mode);
+	if (!phydev) {
+		printf("phy_connect failed\n");
+		return -1;
+	}
+
+	phy_config(phydev);
+
+	priv->phydev = phydev;
+
+	return 0;
+}
+#endif
+
+int gemac_initialize(bd_t *bis, int dev_id, char *devname)
+{
+	struct eth_device *dev;
+	struct ls1012a_eth_dev *priv;
+	struct pfe *pfe;
+	int i;
+
+	if (dev_id > 1) {
+		printf("Invalid port\n");
+		return -1;
+	}
+
+	dev = (struct eth_device *)malloc(sizeof(struct eth_device));
+	if (!dev)
+		return -1;
+
+	memset(dev, 0, sizeof(struct eth_device));
+
+	priv = (struct ls1012a_eth_dev *)malloc(sizeof(struct ls1012a_eth_dev));
+	if (!priv)
+		return -1;
+
+	gemac_list[dev_id] = priv;
+	priv->gemac_port = dev_id;
+	priv->gem = &gem_info[priv->gemac_port];
+	priv->dev = dev;
+
+	pfe = &priv->pfe;
+
+	pfe->cbus_baseaddr = (void *)CONFIG_SYS_FSL_PFE_ADDR;
+	pfe->ddr_baseaddr = (void *)CONFIG_DDR_PFE_BASEADDR;
+	pfe->ddr_phys_baseaddr = (unsigned long)CONFIG_DDR_PFE_PHYS_BASEADDR;
+
+	sprintf(dev->name, devname);
+	dev->priv = priv;
+	dev->init = ls1012a_eth_init;
+	dev->halt = ls1012a_eth_halt;
+	dev->send = ls1012a_eth_send;
+	dev->recv = ls1012a_eth_recv;
+
+	/* Tell u-boot to get the addr from the env */
+	for (i = 0; i < 6; i++)
+		dev->enetaddr[i] = 0;
+
+	pfe_probe(pfe);
+
+	switch (priv->gemac_port)  {
+	case EMAC_PORT_0:
+	default:
+		priv->gem->gemac_base = EMAC1_BASE_ADDR;
+		priv->gem->egpi_base = EGPI1_BASE_ADDR;
+		break;
+	case EMAC_PORT_1:
+		priv->gem->gemac_base = EMAC2_BASE_ADDR;
+		priv->gem->egpi_base = EGPI2_BASE_ADDR;
+		break;
+	}
+
+#if defined(CONFIG_PHYLIB)
+	if (ls1012a_phy_configure(priv, dev_id,
+				  gem_info[priv->gemac_port].phy_address))
+		return -1;
+#endif
+
+	eth_register(dev);
+
+	return 0;
+}
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
new file mode 100644
index 0000000..4fc1522
--- /dev/null
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * @file
+ *  Contains all the functions to handle parsing and loading of PE firmware
+ * files.
+ */
+
+#include <pfe_eth/pfe_eth.h>
+#include <pfe_eth/pfe_firmware.h>
+
+#define PFE_FIRMEWARE_FIT_CNF_NAME	"config at 1"
+
+static const void *pfe_fit_addr = (void *)CONFIG_SYS_LS_PFE_FW_ADDR;
+
+/*
+ * PFE elf firmware loader.
+ * Loads an elf firmware image into a list of PE's (specified using a bitmask)
+ *
+ * @param pe_mask	Mask of PE id's to load firmware to
+ * @param pfe_firmware	Pointer to the firmware image
+ *
+ * @return		0 on success, a negative value on error
+ */
+static int pfe_load_elf(int pe_mask, uint8_t *pfe_firmware)
+{
+	Elf32_Ehdr *elf_hdr = (Elf32_Ehdr *)pfe_firmware;
+	Elf32_Half sections = be16_to_cpu(elf_hdr->e_shnum);
+	Elf32_Shdr *shdr = (Elf32_Shdr *)(pfe_firmware +
+						be32_to_cpu(elf_hdr->e_shoff));
+	int id, section;
+	int ret;
+
+	debug("%s: no of sections: %d\n", __func__, sections);
+
+	/* Some sanity checks */
+	if (strncmp((char *)&elf_hdr->e_ident[EI_MAG0], ELFMAG, SELFMAG)) {
+		printf("%s: incorrect elf magic number\n", __func__);
+		return -1;
+	}
+
+	if (elf_hdr->e_ident[EI_CLASS] != ELFCLASS32) {
+		printf("%s: incorrect elf class(%x)\n", __func__,
+		       elf_hdr->e_ident[EI_CLASS]);
+		return -1;
+	}
+
+	if (elf_hdr->e_ident[EI_DATA] != ELFDATA2MSB) {
+		printf("%s: incorrect elf data(%x)\n", __func__,
+		       elf_hdr->e_ident[EI_DATA]);
+		return -1;
+	}
+
+	if (be16_to_cpu(elf_hdr->e_type) != ET_EXEC) {
+		printf("%s: incorrect elf file type(%x)\n", __func__,
+		       be16_to_cpu(elf_hdr->e_type));
+		return -1;
+	}
+
+	for (section = 0; section < sections; section++, shdr++) {
+		if (!(be32_to_cpu(shdr->sh_flags) & (SHF_WRITE | SHF_ALLOC |
+			SHF_EXECINSTR)))
+			continue;
+		for (id = 0; id < MAX_PE; id++)
+			if (pe_mask & (1 << id)) {
+				ret = pe_load_elf_section(id,
+							  pfe_firmware, shdr);
+				if (ret < 0)
+					goto err;
+			}
+	}
+	return 0;
+
+err:
+	return ret;
+}
+
+/*
+ * Get PFE firmware from FIT image
+ *
+ * @param data pointer to PFE firmware
+ * @param size pointer to size of the firmware
+ * @param fw_name pfe firmware name, either class or tmu
+ *
+ * @return 0 on success, a negative value on error
+ */
+static int pfe_get_fw(const void **data,
+		      size_t *size, char *fw_name)
+{
+	int conf_node_off, fw_node_off;
+	char *conf_node_name = NULL;
+	char *desc;
+	int ret = 0;
+
+	conf_node_name = PFE_FIRMEWARE_FIT_CNF_NAME;
+
+	conf_node_off = fit_conf_get_node(pfe_fit_addr, conf_node_name);
+	if (conf_node_off < 0) {
+		printf("PFE Firmware: %s: no such config\n", conf_node_name);
+		return -ENOENT;
+	}
+
+	fw_node_off = fit_conf_get_prop_node(pfe_fit_addr, conf_node_off,
+					     fw_name);
+	if (fw_node_off < 0) {
+		printf("PFE Firmware: No '%s' in config\n",
+		       fw_name);
+		return -ENOLINK;
+	}
+
+	if (!(fit_image_verify(pfe_fit_addr, fw_node_off))) {
+		printf("PFE Firmware: Bad firmware image (bad CRC)\n");
+		return -EINVAL;
+	}
+
+	if (fit_image_get_data(pfe_fit_addr, fw_node_off, data, size)) {
+		printf("PFE Firmware: Can't get %s subimage data/size",
+		       fw_name);
+		return -ENOENT;
+	}
+
+	ret = fit_get_desc(pfe_fit_addr, fw_node_off, &desc);
+	if (ret)
+		printf("PFE Firmware: Can't get description\n");
+	else
+		printf("%s\n", desc);
+
+	return ret;
+}
+
+/*
+ * Check PFE FIT image
+ *
+ * @return 0 on success, a negative value on error
+ */
+static int pfe_fit_check(void)
+{
+	int ret = 0;
+
+	ret = fdt_check_header(pfe_fit_addr);
+	if (ret) {
+		printf("PFE Firmware: Bad firmware image (not a FIT image)\n");
+		return ret;
+	}
+
+	if (!fit_check_format(pfe_fit_addr)) {
+		printf("PFE Firmware: Bad firmware image (bad FIT header)\n");
+		ret = -1;
+		return ret;
+	}
+
+	return ret;
+}
+
+/*
+ * PFE firmware initialization.
+ * Loads different firmware files from FIT image.
+ * Initializes PE IMEM/DMEM and UTIL-PE DDR
+ * Initializes control path symbol addresses (by looking them up in the elf
+ * firmware files
+ * Takes PE's out of reset
+ *
+ * @return 0 on success, a negative value on error
+ */
+int pfe_firmware_init(void)
+{
+	char *pfe_firmware_name;
+	const void *raw_image_addr;
+	size_t raw_image_size = 0;
+	uint8_t *pfe_firmware;
+	int ret = 0;
+	int fw_count;
+
+	ret = pfe_fit_check();
+	if (ret)
+		goto err;
+
+	for (fw_count = 0; fw_count < 2; fw_count++) {
+		if (fw_count == 0)
+			pfe_firmware_name = "class";
+		else if (fw_count == 1)
+			pfe_firmware_name = "tmu";
+
+		pfe_get_fw(&raw_image_addr, &raw_image_size, pfe_firmware_name);
+		pfe_firmware = malloc(raw_image_size);
+		memcpy((void *)pfe_firmware, (void *)raw_image_addr,
+		       raw_image_size);
+
+		if (fw_count == 0)
+			ret = pfe_load_elf(CLASS_MASK, pfe_firmware);
+		else if (fw_count == 1)
+			ret = pfe_load_elf(TMU_MASK, pfe_firmware);
+
+		if (ret < 0) {
+			printf("%s: %s firmware load failed\n", __func__,
+			       pfe_firmware_name);
+			goto err;
+		}
+		debug("%s: %s firmware loaded\n", __func__, pfe_firmware_name);
+		free(pfe_firmware);
+	}
+
+	tmu_enable(0xb);
+	class_enable();
+	gpi_enable(HGPI_BASE_ADDR);
+
+err:
+	return ret;
+}
+
+/*
+ * PFE firmware cleanup
+ * Puts PE's in reset
+ */
+void pfe_firmware_exit(void)
+{ debug("%s\n", __func__);
+
+	class_disable();
+	tmu_disable(0xf);
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+	util_disable();
+#endif
+	hif_tx_disable();
+	hif_rx_disable();
+}
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-12-05 20:32   ` Joe Hershberger
  2017-10-09  9:11 ` [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers Calvin Johnson
                   ` (7 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

pfe_command provides command line support for several features that
support pfe like starting or stopping the pfe, checking the health
of the processor engines and checking status of different unit inside
pfe.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 drivers/net/pfe_eth/Makefile  |   1 +
 drivers/net/pfe_eth/pfe_cmd.c | 537 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 538 insertions(+)
 create mode 100644 drivers/net/pfe_eth/pfe_cmd.c

diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile
index e78f1bf..3e88e53 100644
--- a/drivers/net/pfe_eth/Makefile
+++ b/drivers/net/pfe_eth/Makefile
@@ -5,6 +5,7 @@
 
 # Layerscape PFE driver
 obj-y += pfe.o		\
+	 pfe_cmd.o	\
 	 pfe_driver.o	\
 	 pfe_eth.o	\
 	 pfe_firmware.o
diff --git a/drivers/net/pfe_eth/pfe_cmd.c b/drivers/net/pfe_eth/pfe_cmd.c
new file mode 100644
index 0000000..74f7c3d
--- /dev/null
+++ b/drivers/net/pfe_eth/pfe_cmd.c
@@ -0,0 +1,537 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/*
+ * @file
+ * @brief PFE utility commands
+ */
+
+#include <pfe_eth/pfe_eth.h>
+
+static inline void pfe_command_help(void)
+{
+	printf("Usage: pfe [pe | status | expt ] <options>\n");
+}
+
+static void pfe_command_pe(int argc, char * const argv[])
+{
+	if (argc >= 3 && strcmp(argv[2], "pmem") == 0) {
+		if (argc >= 4 && strcmp(argv[3], "read") == 0) {
+			int i;
+			int num;
+			int id;
+			u32 addr;
+			u32 size;
+			u32 val;
+
+			if (argc == 7) {
+				num = simple_strtoul(argv[6], NULL, 0);
+			} else if (argc == 6) {
+				num = 1;
+			} else {
+				printf("Usage: pfe pe pmem read <id> <addr> [<num>]\n");
+				return;
+			}
+
+			id = simple_strtoul(argv[4], NULL, 0);
+			addr = simple_strtoul(argv[5], NULL, 16);
+			size = 4;
+
+			for (i = 0; i < num; i++, addr += 4) {
+				val = pe_pmem_read(id, addr, size);
+				val = be32_to_cpu(val);
+				if (!(i&3))
+					printf("%08x: ", addr);
+				printf("%08x%s", val, i == num - 1 || (i & 3)
+				       == 3 ? "\n" : " ");
+			}
+
+		} else {
+			printf("Usage: pfe pe pmem read <parameters>\n");
+		}
+	} else if (argc >= 3 && strcmp(argv[2], "dmem") == 0) {
+		if (argc >= 4 && strcmp(argv[3], "read") == 0) {
+			int i;
+			int num;
+			int id;
+			u32 addr;
+			u32 size;
+			u32 val;
+
+			if (argc == 7) {
+				num = simple_strtoul(argv[6], NULL, 0);
+			} else if (argc == 6) {
+				num = 1;
+			} else {
+				printf("Usage: pfe pe dmem read <id> <addr> [<num>]\n");
+				return;
+			}
+
+			id = simple_strtoul(argv[4], NULL, 0);
+			addr = simple_strtoul(argv[5], NULL, 16);
+			size = 4;
+
+			for (i = 0; i < num; i++, addr += 4) {
+				val = pe_dmem_read(id, addr, size);
+				val = be32_to_cpu(val);
+				if (!(i&3))
+					printf("%08x: ", addr);
+				printf("%08x%s", val, i == num - 1 || (i & 3)
+				       == 3 ? "\n" : " ");
+			}
+
+		} else if (argc >= 4 && strcmp(argv[3], "write") == 0) {
+			int id;
+			u32 val;
+			u32 addr;
+			u32 size;
+
+			if (argc != 7) {
+				printf("Usage: pfe pe dmem write <id> <val> <addr>\n");
+				return;
+			}
+
+			id = simple_strtoul(argv[4], NULL, 0);
+			val = simple_strtoul(argv[5], NULL, 16);
+			val = cpu_to_be32(val);
+			addr = simple_strtoul(argv[6], NULL, 16);
+			size = 4;
+			pe_dmem_write(id, val, addr, size);
+		} else {
+			printf("Usage: pfe pe dmem [read | write] <parameters>\n");
+		}
+	} else if (argc >= 3 && strcmp(argv[2], "lmem") == 0) {
+		if (argc >= 4 && strcmp(argv[3], "read") == 0) {
+			int i;
+			int num;
+			u32 val;
+			u32 offset;
+
+			if (argc == 6) {
+				num = simple_strtoul(argv[5], NULL, 0);
+			} else if (argc == 5) {
+				num = 1;
+			} else {
+				printf("Usage: pfe pe lmem read <offset> [<num>]\n");
+				return;
+			}
+
+			offset = simple_strtoul(argv[4], NULL, 16);
+
+			for (i = 0; i < num; i++, offset += 4) {
+				pe_lmem_read(&val, 4, offset);
+				val = be32_to_cpu(val);
+				printf("%08x%s", val, i == num - 1 || (i & 7)
+				       == 7 ? "\n" : " ");
+			}
+
+		} else if (argc >= 4 && strcmp(argv[3], "write") == 0)	{
+			u32 val;
+			u32 offset;
+
+			if (argc != 6) {
+				printf("Usage: pfe pe lmem write <val> <offset>\n");
+				return;
+			}
+
+			val = simple_strtoul(argv[4], NULL, 16);
+			val = cpu_to_be32(val);
+			offset = simple_strtoul(argv[5], NULL, 16);
+			pe_lmem_write(&val, 4, offset);
+		} else {
+			printf("Usage: pfe pe lmem [read | write] <parameters>\n");
+		}
+	} else {
+		if (strcmp(argv[2], "help") != 0)
+			printf("Unknown option: %s\n", argv[2]);
+
+		printf("Usage: pfe pe <parameters>\n");
+	}
+}
+
+#define NUM_QUEUES		16
+
+/*
+ * qm_read_drop_stat
+ * This function is used to read the drop statistics from the TMU
+ * hw drop counter.  Since the hw counter is always cleared afer
+ * reading, this function maintains the previous drop count, and
+ * adds the new value to it.  That value can be retrieved by
+ * passing a pointer to it with the total_drops arg.
+ *
+ * @param tmu           TMU number (0 - 3)
+ * @param queue         queue number (0 - 15)
+ * @param total_drops   pointer to location to store total drops (or NULL)
+ * @param do_reset      if TRUE, clear total drops after updating
+ *
+ */
+u32 qm_read_drop_stat(u32 tmu, u32 queue, u32 *total_drops, int do_reset)
+{
+	static u32 qtotal[TMU_MAX_ID + 1][NUM_QUEUES];
+	u32 val;
+
+	writel((tmu << 8) | queue, TMU_TEQ_CTRL);
+	writel((tmu << 8) | queue, TMU_LLM_CTRL);
+	val = readl(TMU_TEQ_DROP_STAT);
+	qtotal[tmu][queue] += val;
+	if (total_drops)
+		*total_drops = qtotal[tmu][queue];
+	if (do_reset)
+		qtotal[tmu][queue] = 0;
+	return val;
+}
+
+static ssize_t tmu_queue_stats(char *buf, int tmu, int queue)
+{
+	ssize_t len = 0;
+	u32 drops;
+
+	printf("%d-%02d, ", tmu, queue);
+
+	drops = qm_read_drop_stat(tmu, queue, NULL, 0);
+
+	/* Select queue */
+	writel((tmu << 8) | queue, TMU_TEQ_CTRL);
+	writel((tmu << 8) | queue, TMU_LLM_CTRL);
+
+	printf("(teq) drop: %10u, tx: %10u (llm) head: %08x, tail: %08x, drop: %10u\n",
+	       drops, readl(TMU_TEQ_TRANS_STAT),
+	       readl(TMU_LLM_QUE_HEADPTR), readl(TMU_LLM_QUE_TAILPTR),
+	       readl(TMU_LLM_QUE_DROPCNT));
+
+	return len;
+}
+
+static ssize_t tmu_queues(char *buf, int tmu)
+{
+	ssize_t len = 0;
+	int queue;
+
+	for (queue = 0; queue < 16; queue++)
+		len += tmu_queue_stats(buf + len, tmu, queue);
+
+	return len;
+}
+
+static inline void hif_status(void)
+{
+	printf("hif:\n");
+
+	printf("  tx curr bd:    %x\n", readl(HIF_TX_CURR_BD_ADDR));
+	printf("  tx status:     %x\n", readl(HIF_TX_STATUS));
+	printf("  tx dma status: %x\n", readl(HIF_TX_DMA_STATUS));
+
+	printf("  rx curr bd:    %x\n", readl(HIF_RX_CURR_BD_ADDR));
+	printf("  rx status:     %x\n", readl(HIF_RX_STATUS));
+	printf("  rx dma status: %x\n", readl(HIF_RX_DMA_STATUS));
+
+	printf("hif nocopy:\n");
+
+	printf("  tx curr bd:    %x\n", readl(HIF_NOCPY_TX_CURR_BD_ADDR));
+	printf("  tx status:     %x\n", readl(HIF_NOCPY_TX_STATUS));
+	printf("  tx dma status: %x\n", readl(HIF_NOCPY_TX_DMA_STATUS));
+
+	printf("  rx curr bd:    %x\n", readl(HIF_NOCPY_RX_CURR_BD_ADDR));
+	printf("  rx status:     %x\n", readl(HIF_NOCPY_RX_STATUS));
+	printf("  rx dma status: %x\n", readl(HIF_NOCPY_RX_DMA_STATUS));
+}
+
+static void gpi(int id, void *base)
+{
+	u32 val;
+
+	printf("gpi%d:\n  ", id);
+
+	printf("  tx under stick: %x\n", readl(base + GPI_FIFO_STATUS));
+	val = readl(base + GPI_FIFO_DEBUG);
+	printf("  tx pkts:        %x\n", (val >> 23) & 0x3f);
+	printf("  rx pkts:        %x\n", (val >> 18) & 0x3f);
+	printf("  tx bytes:       %x\n", (val >> 9) & 0x1ff);
+	printf("  rx bytes:       %x\n", (val >> 0) & 0x1ff);
+	printf("  overrun:        %x\n", readl(base + GPI_OVERRUN_DROPCNT));
+}
+
+static void  bmu(int id, void *base)
+{
+	printf("bmu: %d\n", id);
+	printf("  buf size:  %x\n", (1 << readl(base + BMU_BUF_SIZE)));
+	printf("  buf count: %x\n", readl(base + BMU_BUF_CNT));
+	printf("  buf rem:   %x\n", readl(base + BMU_REM_BUF_CNT));
+	printf("  buf curr:  %x\n", readl(base + BMU_CURR_BUF_CNT));
+	printf("  free err:  %x\n", readl(base + BMU_FREE_ERR_ADDR));
+}
+
+#define	PESTATUS_ADDR_CLASS	0x800
+#define PEMBOX_ADDR_CLASS	0x890
+#define	PESTATUS_ADDR_TMU	0x80
+#define PEMBOX_ADDR_TMU		0x290
+#define	PESTATUS_ADDR_UTIL	0x0
+
+static void pfe_pe_status(int argc, char * const argv[])
+{
+	int do_clear = 0;
+	u32 id;
+	u32 dmem_addr;
+	u32 cpu_state;
+	u32 activity_counter;
+	u32 rx;
+	u32 tx;
+	u32 drop;
+	char statebuf[5];
+	u32 class_debug_reg = 0;
+#ifdef CONFIG_PFE_WARN_WA
+	u32 debug_indicator;
+	u32 debug[16];
+	int j;
+#endif
+	if (argc == 4 && strcmp(argv[3], "clear") == 0)
+		do_clear = 1;
+
+	for (id = CLASS0_ID; id < MAX_PE; id++) {
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+		if (id == UTIL_ID) {
+			printf("util:\n");
+			dmem_addr = PESTATUS_ADDR_UTIL;
+		} else if (id >= TMU0_ID) {
+#else
+		if (id >= TMU0_ID) {
+#endif
+			if (id == TMU2_ID)
+				continue;
+			if (id == TMU0_ID)
+				printf("tmu:\n");
+			dmem_addr = PESTATUS_ADDR_TMU;
+		} else {
+			if (id == CLASS0_ID)
+				printf("class:\n");
+			dmem_addr = PESTATUS_ADDR_CLASS;
+			class_debug_reg = readl(CLASS_PE0_DEBUG + id * 4);
+		}
+
+		cpu_state = pe_dmem_read(id, dmem_addr, 4);
+		dmem_addr += 4;
+		memcpy(statebuf, (char *)&cpu_state, 4);
+		statebuf[4] = '\0';
+		activity_counter = pe_dmem_read(id, dmem_addr, 4);
+		dmem_addr += 4;
+		rx = pe_dmem_read(id, dmem_addr, 4);
+		if (do_clear)
+			pe_dmem_write(id, 0, dmem_addr, 4);
+		dmem_addr += 4;
+		tx = pe_dmem_read(id, dmem_addr, 4);
+		if (do_clear)
+			pe_dmem_write(id, 0, dmem_addr, 4);
+		dmem_addr += 4;
+		drop = pe_dmem_read(id, dmem_addr, 4);
+		if (do_clear)
+			pe_dmem_write(id, 0, dmem_addr, 4);
+		dmem_addr += 4;
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+		if (id == UTIL_ID) {
+			printf("state=%4s ctr=%08x rx=%x tx=%x\n",
+			       statebuf, cpu_to_be32(activity_counter),
+			       cpu_to_be32(rx), cpu_to_be32(tx));
+		} else
+#endif
+		if (id >= TMU0_ID) {
+			printf("%d: state=%4s ctr=%08x rx=%x qstatus=%x\n",
+			       id - TMU0_ID, statebuf,
+			       cpu_to_be32(activity_counter),
+			       cpu_to_be32(rx), cpu_to_be32(tx));
+		} else {
+			printf("%d: pc=1%04x ldst=%04x state=%4s ctr=%08x rx=%x tx=%x drop=%x\n",
+			       id - CLASS0_ID, class_debug_reg & 0xFFFF,
+			       class_debug_reg >> 16,
+			       statebuf, cpu_to_be32(activity_counter),
+			       cpu_to_be32(rx), cpu_to_be32(tx),
+			       cpu_to_be32(drop));
+		}
+#ifdef CONFIG_PFE_WARN_WA
+		debug_indicator = pe_dmem_read(id, dmem_addr, 4);
+		dmem_addr += 4;
+		if (debug_indicator == cpu_to_be32('DBUG')) {
+			int last = 0;
+			for (j = 0; j < 16; j++) {
+				debug[j] = pe_dmem_read(id, dmem_addr, 4);
+				if (debug[j]) {
+					last = j + 1;
+					if (do_clear)
+						pe_dmem_write(id, 0,
+							      dmem_addr, 4);
+				}
+				dmem_addr += 4;
+			}
+			for (j = 0; j < last; j++)
+				printf("%08x%s", cpu_to_be32(debug[j]),
+				       (j & 0x7) == 0x7 || j
+				       == last - 1 ? "\n" : " ")
+		}
+#endif
+	}
+}
+
+static void pfe_command_status(int argc, char * const argv[])
+{
+	if (argc >= 3 && strcmp(argv[2], "pe") == 0) {
+		pfe_pe_status(argc, argv);
+	} else if (argc == 3 && strcmp(argv[2], "bmu") == 0) {
+		bmu(1, BMU1_BASE_ADDR);
+		bmu(2, BMU2_BASE_ADDR);
+	} else if (argc == 3 && strcmp(argv[2], "hif") == 0) {
+		hif_status();
+	} else if (argc == 3 && strcmp(argv[2], "gpi") == 0) {
+		gpi(0, EGPI1_BASE_ADDR);
+		gpi(1, EGPI2_BASE_ADDR);
+		gpi(3, HGPI_BASE_ADDR);
+	} else if (argc == 3 && strcmp(argv[2], "tmu0_queues") == 0) {
+		tmu_queues(NULL, 0);
+	} else if (argc == 3 && strcmp(argv[2], "tmu1_queues") == 0) {
+		tmu_queues(NULL, 1);
+	} else if (argc == 3 && strcmp(argv[2], "tmu3_queues") == 0) {
+		tmu_queues(NULL, 3);
+	} else {
+		printf("Usage: pfe status [pe <clear> | bmu | gpi | hif | tmuX_queues ]\n");
+	}
+
+	return;
+}
+
+#define EXPT_DUMP_ADDR 0x1fa8
+#define EXPT_REG_COUNT 20
+static const char *register_names[EXPT_REG_COUNT] = {
+		"  pc", "ECAS", " EID", "  ED",
+		"  sp", "  r1", "  r2", "  r3",
+		"  r4", "  r5", "  r6", "  r7",
+		"  r8", "  r9", " r10", " r11",
+		" r12", " r13", " r14", " r15"
+};
+
+static void pfe_command_expt(int argc, char * const argv[])
+{
+	unsigned int id, i, val, addr;
+
+	if (argc == 3) {
+		id = simple_strtoul(argv[2], NULL, 0);
+		addr = EXPT_DUMP_ADDR;
+		printf("Exception information for PE %d:\n", id);
+		for (i = 0; i < EXPT_REG_COUNT; i++) {
+			val = pe_dmem_read(id, addr, 4);
+			val = be32_to_cpu(val);
+			printf("%s:%08x%s", register_names[i], val,
+			       (i & 3) == 3 ? "\n" : " ");
+			addr += 4;
+		}
+	} else {
+		printf("Usage: pfe expt <id>\n");
+	}
+}
+
+#ifdef PFE_LS1012A_RESET_WA
+/*This function sends a dummy packet to HIF through TMU3 */
+static void send_dummy_pkt_to_hif(void)
+{
+	u32 buf;
+	static u32 dummy_pkt[] =  {
+		0x4200800a, 0x01000003, 0x00018100, 0x00000000,
+		0x33221100, 0x2b785544, 0xd73093cb, 0x01000608,
+		0x04060008, 0x2b780200, 0xd73093cb, 0x0a01a8c0,
+		0x33221100, 0xa8c05544, 0x00000301, 0x00000000,
+		0x00000000, 0x00000000, 0x00000000, 0xbe86c51f };
+
+	/*Allocate BMU2 buffer */
+	buf = readl(BMU2_BASE_ADDR + BMU_ALLOC_CTRL);
+
+	debug("Sending a dummy pkt to HIF %x\n", buf);
+	buf += 0x80;
+	memcpy((void *)DDR_PFE_TO_VIRT(buf), dummy_pkt, sizeof(dummy_pkt));
+
+	/*Write length and pkt to TMU*/
+	writel(0x03000042, TMU_PHY_INQ_PKTPTR);
+	writel(buf, TMU_PHY_INQ_PKTINFO);
+}
+
+static void pfe_command_stop(int argc, char * const argv[])
+{
+	int id, hif_stop_loop = 10;
+	u32 rx_status;
+
+	printf("Stopping PFE...\n");
+
+	/*Mark all descriptors as LAST_BD */
+	hif_rx_desc_disable();
+
+	/*If HIF Rx BDP is busy send a dummy packet */
+	do {
+		rx_status = readl(HIF_RX_STATUS);
+		if (rx_status & BDP_CSR_RX_DMA_ACTV)
+			send_dummy_pkt_to_hif();
+		udelay(10);
+	} while (hif_stop_loop--);
+
+	if (readl(HIF_RX_STATUS) & BDP_CSR_RX_DMA_ACTV)
+		printf("Unable to stop HIF\n");
+
+	/*Disable Class PEs */
+	for (id = CLASS0_ID; id <= CLASS_MAX_ID; id++) {
+		/*Inform PE to stop */
+		pe_dmem_write(id, cpu_to_be32(1), PEMBOX_ADDR_CLASS, 4);
+		udelay(10);
+
+		/*Read status */
+		if (!pe_dmem_read(id, PEMBOX_ADDR_CLASS+4, 4))
+			printf("Failed to stop PE%d\n", id);
+	}
+
+	/*Disable TMU PEs */
+	for (id = TMU0_ID; id <= TMU_MAX_ID; id++) {
+		if (id == TMU2_ID)
+			continue;
+
+		/*Inform PE to stop */
+		pe_dmem_write(id, 1, PEMBOX_ADDR_TMU, 4);
+		udelay(10);
+
+		/*Read status */
+		if (!pe_dmem_read(id, PEMBOX_ADDR_TMU+4, 4))
+			printf("Failed to stop PE%d\n", id);
+	}
+}
+#endif
+
+static int pfe_command(cmd_tbl_t *cmdtp, int flag, int argc,
+		       char * const argv[])
+{
+	if (argc == 1 || strcmp(argv[1], "help") == 0) {
+		pfe_command_help();
+		return CMD_RET_SUCCESS;
+	}
+
+	if (strcmp(argv[1], "pe") == 0) {
+		pfe_command_pe(argc, argv);
+	} else if (strcmp(argv[1], "status") == 0) {
+		pfe_command_status(argc, argv);
+	} else if (strcmp(argv[1], "expt") == 0) {
+		pfe_command_expt(argc, argv);
+#ifdef PFE_LS1012A_RESET_WA
+	} else if (strcmp(argv[1], "stop") == 0) {
+		pfe_command_stop(argc, argv);
+#endif
+	} else {
+		printf("Unknown option: %s\n", argv[1]);
+		pfe_command_help();
+		return CMD_RET_FAILURE;
+	}
+	return CMD_RET_SUCCESS;
+}
+
+
+U_BOOT_CMD(
+	pfe,	7,	1,	pfe_command,
+	"Performs PFE lib utility functions",
+	"Usage:\n"
+	"pfe <options>"
+);
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-12-05 21:16   ` Joe Hershberger
  2017-10-09  9:11 ` [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms Calvin Johnson
                   ` (6 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Contains all the pfe header files.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 include/pfe_eth/pfe/cbus.h           |  75 +++++++++++++++
 include/pfe_eth/pfe/cbus/bmu.h       |  40 ++++++++
 include/pfe_eth/pfe/cbus/class_csr.h | 181 +++++++++++++++++++++++++++++++++++
 include/pfe_eth/pfe/cbus/emac.h      | 150 +++++++++++++++++++++++++++++
 include/pfe_eth/pfe/cbus/gpi.h       |  62 ++++++++++++
 include/pfe_eth/pfe/cbus/hif.h       |  68 +++++++++++++
 include/pfe_eth/pfe/cbus/hif_nocpy.h |  40 ++++++++
 include/pfe_eth/pfe/cbus/tmu_csr.h   | 148 ++++++++++++++++++++++++++++
 include/pfe_eth/pfe/cbus/util_csr.h  |  47 +++++++++
 include/pfe_eth/pfe/pfe.h            | 178 ++++++++++++++++++++++++++++++++++
 include/pfe_eth/pfe_driver.h         |  55 +++++++++++
 include/pfe_eth/pfe_eth.h            | 111 +++++++++++++++++++++
 include/pfe_eth/pfe_firmware.h       |  17 ++++
 13 files changed, 1172 insertions(+)
 create mode 100644 include/pfe_eth/pfe/cbus.h
 create mode 100644 include/pfe_eth/pfe/cbus/bmu.h
 create mode 100644 include/pfe_eth/pfe/cbus/class_csr.h
 create mode 100644 include/pfe_eth/pfe/cbus/emac.h
 create mode 100644 include/pfe_eth/pfe/cbus/gpi.h
 create mode 100644 include/pfe_eth/pfe/cbus/hif.h
 create mode 100644 include/pfe_eth/pfe/cbus/hif_nocpy.h
 create mode 100644 include/pfe_eth/pfe/cbus/tmu_csr.h
 create mode 100644 include/pfe_eth/pfe/cbus/util_csr.h
 create mode 100644 include/pfe_eth/pfe/pfe.h
 create mode 100644 include/pfe_eth/pfe_driver.h
 create mode 100644 include/pfe_eth/pfe_eth.h
 create mode 100644 include/pfe_eth/pfe_firmware.h

diff --git a/include/pfe_eth/pfe/cbus.h b/include/pfe_eth/pfe/cbus.h
new file mode 100644
index 0000000..ec31481
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _CBUS_H_
+#define _CBUS_H_
+
+#include "cbus/emac.h"
+#include "cbus/gpi.h"
+#include "cbus/bmu.h"
+#include "cbus/hif.h"
+#include "cbus/tmu_csr.h"
+#include "cbus/class_csr.h"
+#include "cbus/hif_nocpy.h"
+#include "cbus/util_csr.h"
+
+#define CBUS_BASE_ADDR		((void *)CONFIG_SYS_FSL_PFE_ADDR)
+
+/* PFE Control and Status Register Desciption */
+#define EMAC1_BASE_ADDR		(CBUS_BASE_ADDR + 0x200000)
+#define EGPI1_BASE_ADDR		(CBUS_BASE_ADDR + 0x210000)
+#define EMAC2_BASE_ADDR		(CBUS_BASE_ADDR + 0x220000)
+#define EGPI2_BASE_ADDR		(CBUS_BASE_ADDR + 0x230000)
+#define BMU1_BASE_ADDR		(CBUS_BASE_ADDR + 0x240000)
+#define BMU2_BASE_ADDR		(CBUS_BASE_ADDR + 0x250000)
+#define ARB_BASE_ADDR		(CBUS_BASE_ADDR + 0x260000)
+#define DDR_CONFIG_BASE_ADDR	(CBUS_BASE_ADDR + 0x270000)
+#define HIF_BASE_ADDR		(CBUS_BASE_ADDR + 0x280000)
+#define HGPI_BASE_ADDR		(CBUS_BASE_ADDR + 0x290000)
+#define LMEM_BASE_ADDR		(CBUS_BASE_ADDR + 0x300000)
+#define LMEM_SIZE		0x10000
+#define LMEM_END		(LMEM_BASE_ADDR + LMEM_SIZE)
+#define TMU_CSR_BASE_ADDR	(CBUS_BASE_ADDR + 0x310000)
+#define CLASS_CSR_BASE_ADDR	(CBUS_BASE_ADDR + 0x320000)
+#define HIF_NOCPY_BASE_ADDR	(CBUS_BASE_ADDR + 0x350000)
+#define UTIL_CSR_BASE_ADDR	(CBUS_BASE_ADDR + 0x360000)
+#define CBUS_GPT_BASE_ADDR	(CBUS_BASE_ADDR + 0x370000)
+
+/*
+ * defgroup XXX_MEM_ACCESS_ADDR PE memory access through CSR
+ * XXX_MEM_ACCESS_ADDR register bit definitions.
+ */
+/* Internal Memory Write. */
+#define PE_MEM_ACCESS_WRITE		(1<<31)
+/* Internal Memory Read. */
+#define PE_MEM_ACCESS_READ		(0<<31)
+
+#define PE_MEM_ACCESS_IMEM		(1<<15)
+#define PE_MEM_ACCESS_DMEM		(1<<16)
+/* Byte Enables of the Internal memory access. These are interpred in BE */
+#define PE_MEM_ACCESS_BYTE_ENABLE(offset, size)	(((((1 << (size)) - 1) << (4 \
+							- (offset) - (size)))\
+							& 0xf) << 24)
+/* PFE cores states */
+#define CORE_DISABLE	0x00000000
+#define CORE_ENABLE	0x00000001
+#define CORE_SW_RESET	0x00000002
+
+/* LMEM defines */
+#define LMEM_HDR_SIZE		0x0010
+#define LMEM_BUF_SIZE_LN2	0x7
+#define LMEM_BUF_SIZE		(1 << LMEM_BUF_SIZE_LN2)
+
+/* DDR defines */
+#define DDR_HDR_SIZE		0x0100
+#define DDR_BUF_SIZE_LN2	0xb
+#define DDR_BUF_SIZE		(1 << DDR_BUF_SIZE_LN2)
+
+/* Clock generation through PLL */
+#define PLL_CLK_EN	1
+
+#endif /* _CBUS_H_ */
diff --git a/include/pfe_eth/pfe/cbus/bmu.h b/include/pfe_eth/pfe/cbus/bmu.h
new file mode 100644
index 0000000..f707cc3
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/bmu.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _BMU_H_
+#define _BMU_H_
+
+#define BMU_VERSION		0x000
+#define BMU_CTRL		0x004
+#define BMU_UCAST_CONFIG	0x008
+#define BMU_UCAST_BASE_ADDR	0x00c
+#define BMU_BUF_SIZE		0x010
+#define BMU_BUF_CNT		0x014
+#define BMU_THRES		0x018
+#define BMU_INT_SRC		0x020
+#define BMU_INT_ENABLE		0x024
+#define BMU_ALLOC_CTRL		0x030
+#define BMU_FREE_CTRL		0x034
+#define BMU_FREE_ERR_ADDR	0x038
+#define BMU_CURR_BUF_CNT	0x03c
+#define BMU_MCAST_CNT		0x040
+#define BMU_MCAST_ALLOC_CTRL	0x044
+#define BMU_REM_BUF_CNT		0x048
+#define BMU_LOW_WATERMARK	0x050
+#define BMU_HIGH_WATERMARK	0x054
+#define BMU_INT_MEM_ACCESS	0x100
+
+struct bmu_cfg {
+	u32 baseaddr;
+	u32 count;
+	u32 size;
+};
+
+#define BMU1_BUF_SIZE	LMEM_BUF_SIZE_LN2
+#define BMU2_BUF_SIZE	DDR_BUF_SIZE_LN2
+
+#endif /* _BMU_H_ */
diff --git a/include/pfe_eth/pfe/cbus/class_csr.h b/include/pfe_eth/pfe/cbus/class_csr.h
new file mode 100644
index 0000000..413707f
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/class_csr.h
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _CLASS_CSR_H_
+#define _CLASS_CSR_H_
+
+/*
+ * @file class_csr.h.
+ * class_csr - block containing all the classifier control and status register.
+ * Mapped on CBUS and accessible from all PE's and ARM.
+ */
+#define CLASS_VERSION			(CLASS_CSR_BASE_ADDR + 0x000)
+#define CLASS_TX_CTRL			(CLASS_CSR_BASE_ADDR + 0x004)
+#define CLASS_INQ_PKTPTR		(CLASS_CSR_BASE_ADDR + 0x010)
+/* (ddr_hdr_size[24:16], lmem_hdr_size[5:0]) */
+#define CLASS_HDR_SIZE			(CLASS_CSR_BASE_ADDR + 0x014)
+/* LMEM header size for the Classifier block.
+ * Data in the LMEM is written from this offset.
+ */
+#define CLASS_HDR_SIZE_LMEM(off)	((off) & 0x3f)
+/* DDR header size for the Classifier block.
+ * Data in the DDR is written from this offset.
+ */
+#define CLASS_HDR_SIZE_DDR(off)		(((off) & 0x1ff) << 16)
+
+/* DMEM address of first [15:0] and second [31:16] buffers on QB side. */
+#define CLASS_PE0_QB_DM_ADDR0		(CLASS_CSR_BASE_ADDR + 0x020)
+/* DMEM address of third [15:0] and fourth [31:16] buffers on QB side. */
+#define CLASS_PE0_QB_DM_ADDR1		(CLASS_CSR_BASE_ADDR + 0x024)
+
+/* DMEM address of first [15:0] and second [31:16] buffers on RO side. */
+#define CLASS_PE0_RO_DM_ADDR0		(CLASS_CSR_BASE_ADDR + 0x060)
+/* DMEM address of third [15:0] and fourth [31:16] buffers on RO side. */
+#define CLASS_PE0_RO_DM_ADDR1		(CLASS_CSR_BASE_ADDR + 0x064)
+
+/*
+ * @name Class PE memory access. Allows external PE's and HOST to
+ * read/write PMEM/DMEM memory ranges for each classifier PE.
+ */
+#define CLASS_MEM_ACCESS_ADDR		(CLASS_CSR_BASE_ADDR + 0x100)
+/* Internal Memory Access Write Data [31:0] */
+#define CLASS_MEM_ACCESS_WDATA		(CLASS_CSR_BASE_ADDR + 0x104)
+/* Internal Memory Access Read Data [31:0] */
+#define CLASS_MEM_ACCESS_RDATA		(CLASS_CSR_BASE_ADDR + 0x108)
+#define CLASS_TM_INQ_ADDR		(CLASS_CSR_BASE_ADDR + 0x114)
+#define CLASS_PE_STATUS			(CLASS_CSR_BASE_ADDR + 0x118)
+
+#define CLASS_PE_SYS_CLK_RATIO		(CLASS_CSR_BASE_ADDR + 0x200)
+#define CLASS_AFULL_THRES		(CLASS_CSR_BASE_ADDR + 0x204)
+#define CLASS_GAP_BETWEEN_READS		(CLASS_CSR_BASE_ADDR + 0x208)
+#define CLASS_MAX_BUF_CNT		(CLASS_CSR_BASE_ADDR + 0x20c)
+#define CLASS_TSQ_FIFO_THRES		(CLASS_CSR_BASE_ADDR + 0x210)
+#define CLASS_TSQ_MAX_CNT		(CLASS_CSR_BASE_ADDR + 0x214)
+#define CLASS_IRAM_DATA_0		(CLASS_CSR_BASE_ADDR + 0x218)
+#define CLASS_IRAM_DATA_1		(CLASS_CSR_BASE_ADDR + 0x21c)
+#define CLASS_IRAM_DATA_2		(CLASS_CSR_BASE_ADDR + 0x220)
+#define CLASS_IRAM_DATA_3		(CLASS_CSR_BASE_ADDR + 0x224)
+
+#define CLASS_BUS_ACCESS_ADDR		(CLASS_CSR_BASE_ADDR + 0x228)
+/* bit 23:0 of PE peripheral address are stored in CLASS_BUS_ACCESS_ADDR */
+#define CLASS_BUS_ACCESS_ADDR_MASK	(0x0001FFFF)
+
+#define CLASS_BUS_ACCESS_WDATA		(CLASS_CSR_BASE_ADDR + 0x22c)
+#define CLASS_BUS_ACCESS_RDATA		(CLASS_CSR_BASE_ADDR + 0x230)
+
+/*
+ * (route_entry_size[9:0], route_hash_size[23:16]
+ * (this is actually ln2(size)))
+ */
+#define CLASS_ROUTE_HASH_ENTRY_SIZE	(CLASS_CSR_BASE_ADDR + 0x234)
+#define CLASS_ROUTE_ENTRY_SIZE(size)	 ((size) & 0x1ff)
+#define CLASS_ROUTE_HASH_SIZE(hash_bits) (((hash_bits) & 0xff) << 16)
+
+#define CLASS_ROUTE_TABLE_BASE		(CLASS_CSR_BASE_ADDR + 0x238)
+#define CLASS_ROUTE_MULTI		(CLASS_CSR_BASE_ADDR + 0x23c)
+#define CLASS_SMEM_OFFSET		(CLASS_CSR_BASE_ADDR + 0x240)
+#define CLASS_LMEM_BUF_SIZE		(CLASS_CSR_BASE_ADDR + 0x244)
+#define CLASS_VLAN_ID			(CLASS_CSR_BASE_ADDR + 0x248)
+#define CLASS_BMU1_BUF_FREE		(CLASS_CSR_BASE_ADDR + 0x24c)
+#define CLASS_USE_TMU_INQ		(CLASS_CSR_BASE_ADDR + 0x250)
+#define CLASS_VLAN_ID1			(CLASS_CSR_BASE_ADDR + 0x254)
+
+#define CLASS_BUS_ACCESS_BASE		(CLASS_CSR_BASE_ADDR + 0x258)
+/* bit 31:24 of PE peripheral address are stored in CLASS_BUS_ACCESS_BASE */
+#define CLASS_BUS_ACCESS_BASE_MASK	(0xFF000000)
+
+#define CLASS_HIF_PARSE			(CLASS_CSR_BASE_ADDR + 0x25c)
+
+#define CLASS_HOST_PE0_GP		(CLASS_CSR_BASE_ADDR + 0x260)
+#define CLASS_PE0_GP			(CLASS_CSR_BASE_ADDR + 0x264)
+#define CLASS_HOST_PE1_GP		(CLASS_CSR_BASE_ADDR + 0x268)
+#define CLASS_PE1_GP			(CLASS_CSR_BASE_ADDR + 0x26c)
+#define CLASS_HOST_PE2_GP		(CLASS_CSR_BASE_ADDR + 0x270)
+#define CLASS_PE2_GP			(CLASS_CSR_BASE_ADDR + 0x274)
+#define CLASS_HOST_PE3_GP		(CLASS_CSR_BASE_ADDR + 0x278)
+#define CLASS_PE3_GP			(CLASS_CSR_BASE_ADDR + 0x27c)
+#define CLASS_HOST_PE4_GP		(CLASS_CSR_BASE_ADDR + 0x280)
+#define CLASS_PE4_GP			(CLASS_CSR_BASE_ADDR + 0x284)
+#define CLASS_HOST_PE5_GP		(CLASS_CSR_BASE_ADDR + 0x288)
+#define CLASS_PE5_GP			(CLASS_CSR_BASE_ADDR + 0x28c)
+
+#define CLASS_PE_INT_SRC		(CLASS_CSR_BASE_ADDR + 0x290)
+#define CLASS_PE_INT_ENABLE		(CLASS_CSR_BASE_ADDR + 0x294)
+
+#define CLASS_TPID0_TPID1		(CLASS_CSR_BASE_ADDR + 0x298)
+#define CLASS_TPID2			(CLASS_CSR_BASE_ADDR + 0x29c)
+
+#define CLASS_L4_CHKSUM_ADDR		(CLASS_CSR_BASE_ADDR + 0x2a0)
+
+#define CLASS_PE0_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2a4)
+#define CLASS_PE1_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2a8)
+#define CLASS_PE2_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2ac)
+#define CLASS_PE3_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2b0)
+#define CLASS_PE4_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2b4)
+#define CLASS_PE5_DEBUG			(CLASS_CSR_BASE_ADDR + 0x2b8)
+
+#define CLASS_STATE			(CLASS_CSR_BASE_ADDR + 0x2bc)
+#define CLASS_AXI_CTRL			(CLASS_CSR_BASE_ADDR + 0x2d0)
+
+/* CLASS defines */
+#define CLASS_PBUF_SIZE			0x100	/* Fixed by hardware */
+#define CLASS_PBUF_HEADER_OFFSET	0x80	/* Can be configured */
+
+#define CLASS_PBUF0_BASE_ADDR		0x000	/* Can be configured */
+/* Can be configured */
+#define CLASS_PBUF1_BASE_ADDR	(CLASS_PBUF0_BASE_ADDR + CLASS_PBUF_SIZE)
+/* Can be configured */
+#define CLASS_PBUF2_BASE_ADDR	(CLASS_PBUF1_BASE_ADDR + CLASS_PBUF_SIZE)
+/* Can be configured */
+#define CLASS_PBUF3_BASE_ADDR	(CLASS_PBUF2_BASE_ADDR + CLASS_PBUF_SIZE)
+
+#define CLASS_PBUF0_HEADER_BASE_ADDR	(CLASS_PBUF0_BASE_ADDR +\
+						CLASS_PBUF_HEADER_OFFSET)
+#define CLASS_PBUF1_HEADER_BASE_ADDR	(CLASS_PBUF1_BASE_ADDR +\
+						CLASS_PBUF_HEADER_OFFSET)
+#define CLASS_PBUF2_HEADER_BASE_ADDR	(CLASS_PBUF2_BASE_ADDR +\
+						CLASS_PBUF_HEADER_OFFSET)
+#define CLASS_PBUF3_HEADER_BASE_ADDR	(CLASS_PBUF3_BASE_ADDR +\
+						CLASS_PBUF_HEADER_OFFSET)
+
+#define CLASS_PE0_RO_DM_ADDR0_VAL	((CLASS_PBUF1_BASE_ADDR << 16) |\
+						CLASS_PBUF0_BASE_ADDR)
+#define CLASS_PE0_RO_DM_ADDR1_VAL	((CLASS_PBUF3_BASE_ADDR << 16) |\
+						CLASS_PBUF2_BASE_ADDR)
+
+#define CLASS_PE0_QB_DM_ADDR0_VAL	((CLASS_PBUF1_HEADER_BASE_ADDR << 16)\
+						| CLASS_PBUF0_HEADER_BASE_ADDR)
+#define CLASS_PE0_QB_DM_ADDR1_VAL	((CLASS_PBUF3_HEADER_BASE_ADDR << 16)\
+						| CLASS_PBUF2_HEADER_BASE_ADDR)
+
+#define CLASS_ROUTE_SIZE		128
+#define CLASS_ROUTE_HASH_BITS		20
+#define CLASS_ROUTE_HASH_MASK		((1 << CLASS_ROUTE_HASH_BITS) - 1)
+
+#define TWO_LEVEL_ROUTE		(1 << 0)
+#define PHYNO_IN_HASH		(1 << 1)
+#define HW_ROUTE_FETCH		(1 << 3)
+#define HW_BRIDGE_FETCH		(1 << 5)
+#define IP_ALIGNED		(1 << 6)
+#define ARC_HIT_CHECK_EN	(1 << 7)
+#define CLASS_TOE		(1 << 11)
+#define HASH_NORMAL		(0 << 12)
+#define HASH_CRC_PORT		(1 << 12)
+#define HASH_CRC_IP		(2 << 12)
+#define HASH_CRC_PORT_IP	(3 << 12)
+#define QB2BUS_LE		(1 << 15)
+
+#define	TCP_CHKSUM_DROP		(1 << 0)
+#define	UDP_CHKSUM_DROP		(1 << 1)
+#define	IPV4_CHKSUM_DROP	(1 << 9)
+
+struct class_cfg {
+	u32 route_table_baseaddr;
+	u32 route_table_hash_bits;
+};
+
+#endif /* _CLASS_CSR_H_ */
diff --git a/include/pfe_eth/pfe/cbus/emac.h b/include/pfe_eth/pfe/cbus/emac.h
new file mode 100644
index 0000000..3cfcd99
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/emac.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _EMAC_H_
+#define _EMAC_H_
+
+#define EMAC_IEVENT_REG		0x004
+#define EMAC_IMASK_REG		0x008
+#define EMAC_R_DES_ACTIVE_REG	0x010
+#define EMAC_X_DES_ACTIVE_REG	0x014
+#define EMAC_ECNTRL_REG		0x024
+#define EMAC_MII_DATA_REG	0x040
+#define EMAC_MII_CTRL_REG	0x044
+#define EMAC_MIB_CTRL_STS_REG	0x064
+#define EMAC_RCNTRL_REG		0x084
+#define EMAC_TCNTRL_REG		0x0C4
+#define EMAC_PHY_ADDR_LOW	0x0E4
+#define EMAC_PHY_ADDR_HIGH	0x0E8
+#define EMAC_TFWR_STR_FWD	0x144
+#define EMAC_RX_SECTIOM_FULL	0x190
+#define EMAC_TX_SECTION_EMPTY	0x1A0
+#define EMAC_TRUNC_FL		0x1B0
+
+/* GEMAC definitions and settings */
+#define EMAC_PORT_0			0
+#define EMAC_PORT_1			1
+
+/* GEMAC Bit definitions */
+#define EMAC_IEVENT_HBERR                0x80000000
+#define EMAC_IEVENT_BABR                 0x40000000
+#define EMAC_IEVENT_BABT                 0x20000000
+#define EMAC_IEVENT_GRA                  0x10000000
+#define EMAC_IEVENT_TXF                  0x08000000
+#define EMAC_IEVENT_TXB                  0x04000000
+#define EMAC_IEVENT_RXF                  0x02000000
+#define EMAC_IEVENT_RXB                  0x01000000
+#define EMAC_IEVENT_MII                  0x00800000
+#define EMAC_IEVENT_EBERR                0x00400000
+#define EMAC_IEVENT_LC                   0x00200000
+#define EMAC_IEVENT_RL                   0x00100000
+#define EMAC_IEVENT_UN                   0x00080000
+
+#define EMAC_IMASK_HBERR                 0x80000000
+#define EMAC_IMASK_BABR                  0x40000000
+#define EMAC_IMASKT_BABT                 0x20000000
+#define EMAC_IMASK_GRA                   0x10000000
+#define EMAC_IMASKT_TXF                  0x08000000
+#define EMAC_IMASK_TXB                   0x04000000
+#define EMAC_IMASKT_RXF                  0x02000000
+#define EMAC_IMASK_RXB                   0x01000000
+#define EMAC_IMASK_MII                   0x00800000
+#define EMAC_IMASK_EBERR                 0x00400000
+#define EMAC_IMASK_LC                    0x00200000
+#define EMAC_IMASKT_RL                   0x00100000
+#define EMAC_IMASK_UN                    0x00080000
+
+#define EMAC_RCNTRL_MAX_FL_SHIFT         16
+#define EMAC_RCNTRL_LOOP                 0x00000001
+#define EMAC_RCNTRL_DRT                  0x00000002
+#define EMAC_RCNTRL_MII_MODE             0x00000004
+#define EMAC_RCNTRL_PROM                 0x00000008
+#define EMAC_RCNTRL_BC_REJ               0x00000010
+#define EMAC_RCNTRL_FCE                  0x00000020
+#define EMAC_RCNTRL_RGMII                0x00000040
+#define EMAC_RCNTRL_SGMII                0x00000080
+#define EMAC_RCNTRL_RMII                 0x00000100
+#define EMAC_RCNTRL_RMII_10T             0x00000200
+#define EMAC_RCNTRL_CRC_FWD		 0x00004000
+
+#define EMAC_TCNTRL_GTS                  0x00000001
+#define EMAC_TCNTRL_HBC                  0x00000002
+#define EMAC_TCNTRL_FDEN                 0x00000004
+#define EMAC_TCNTRL_TFC_PAUSE            0x00000008
+#define EMAC_TCNTRL_RFC_PAUSE            0x00000010
+
+#define EMAC_ECNTRL_RESET                0x00000001      /* reset the EMAC */
+#define EMAC_ECNTRL_ETHER_EN             0x00000002      /* enable the EMAC */
+#define EMAC_ECNTRL_SPEED                0x00000020
+#define EMAC_ECNTRL_DBSWAP               0x00000100
+
+#define EMAC_X_WMRK_STRFWD               0x00000100
+
+#define EMAC_X_DES_ACTIVE_TDAR           0x01000000
+#define EMAC_R_DES_ACTIVE_RDAR           0x01000000
+
+/*
+ * The possible operating speeds of the MAC, currently supporting 10, 100 and
+ * 1000Mb modes.
+ */
+enum mac_speed {SPEED_10M, SPEED_100M, SPEED_1000M, SPEED_1000M_PCS};
+
+#define GMII	1
+#define MII	2
+#define RMII	3
+#define RGMII	4
+#define SGMII	5
+
+#define DUPLEX_HALF	0x00
+#define DUPLEX_FULL	0x01
+
+/* Default configuration */
+#define EMAC0_DEFAULT_DUPLEX_MODE	FULLDUPLEX
+#define EMAC0_DEFAULT_EMAC_MODE		RGMII
+#define EMAC0_DEFAULT_EMAC_SPEED	SPEED_1000M
+
+#define EMAC1_DEFAULT_DUPLEX_MODE	FULLDUPLEX
+#define EMAC1_DEFAULT_EMAC_MODE		SGMII
+#define EMAC1_DEFAULT_EMAC_SPEED	SPEED_1000M
+
+/* MII-related definitios */
+#define EMAC_MII_DATA_ST         0x40000000      /* Start of frame delimiter */
+#define EMAC_MII_DATA_OP_RD      0x20000000      /* Perform a read operation */
+#define EMAC_MII_DATA_OP_CL45_RD 0x30000000      /* Perform a read operation */
+#define EMAC_MII_DATA_OP_WR      0x10000000      /* Perform a write operation */
+#define EMAC_MII_DATA_OP_CL45_WR 0x10000000      /* Perform a write operation */
+#define EMAC_MII_DATA_PA_MSK     0x0f800000      /* PHY Address field mask */
+#define EMAC_MII_DATA_RA_MSK     0x007c0000      /* PHY Register field mask */
+#define EMAC_MII_DATA_TA         0x00020000      /* Turnaround */
+#define EMAC_MII_DATA_DATAMSK    0x0000ffff      /* PHY data field */
+
+#define EMAC_MII_DATA_RA_SHIFT   18      /* MII Register address bits */
+#define EMAC_MII_DATA_RA_MASK	 0x1F      /* MII Register address mask */
+#define EMAC_MII_DATA_PA_SHIFT   23      /* MII PHY address bits */
+#define EMAC_MII_DATA_PA_MASK    0x1F      /* MII PHY address mask */
+
+#define EMAC_MII_DATA_RA(v) ((v & EMAC_MII_DATA_RA_MASK) <<\
+				EMAC_MII_DATA_RA_SHIFT)
+#define EMAC_MII_DATA_PA(v) ((v & EMAC_MII_DATA_RA_MASK) <<\
+				EMAC_MII_DATA_PA_SHIFT)
+#define EMAC_MII_DATA(v)    (v & 0xffff)
+
+#define EMAC_MII_SPEED_SHIFT	1
+#define EMAC_HOLDTIME_SHIFT	8
+#define EMAC_HOLDTIME_MASK	0x7
+#define EMAC_HOLDTIME(v)    ((v & EMAC_HOLDTIME_MASK) << EMAC_HOLDTIME_SHIFT)
+
+/* Internal PHY Registers - SGMII */
+#define PHY_SGMII_CR_PHY_RESET      0x8000
+#define PHY_SGMII_CR_RESET_AN       0x0200
+#define PHY_SGMII_CR_DEF_VAL        0x1140
+#define PHY_SGMII_DEV_ABILITY_SGMII 0x4001
+#define PHY_SGMII_IF_MODE_AN        0x0002
+#define PHY_SGMII_IF_MODE_SGMII     0x0001
+#define PHY_SGMII_IF_MODE_SGMII_GBT 0x0008
+
+#endif /* _EMAC_H_ */
diff --git a/include/pfe_eth/pfe/cbus/gpi.h b/include/pfe_eth/pfe/cbus/gpi.h
new file mode 100644
index 0000000..f86f3f9
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/gpi.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _GPI_H_
+#define _GPI_H_
+
+#define GPI_VERSION			0x00
+#define GPI_CTRL			0x04
+#define GPI_RX_CONFIG			0x08
+#define GPI_HDR_SIZE			0x0c
+#define GPI_BUF_SIZE			0x10
+#define GPI_LMEM_ALLOC_ADDR		0x14
+#define GPI_LMEM_FREE_ADDR		0x18
+#define GPI_DDR_ALLOC_ADDR		0x1c
+#define GPI_DDR_FREE_ADDR		0x20
+#define GPI_CLASS_ADDR			0x24
+#define GPI_DRX_FIFO			0x28
+#define GPI_TRX_FIFO			0x2c
+#define GPI_INQ_PKTPTR			0x30
+#define GPI_DDR_DATA_OFFSET		0x34
+#define GPI_LMEM_DATA_OFFSET		0x38
+#define GPI_TMLF_TX			0x4c
+#define GPI_DTX_ASEQ			0x50
+#define GPI_FIFO_STATUS			0x54
+#define GPI_FIFO_DEBUG			0x58
+#define GPI_TX_PAUSE_TIME		0x5c
+#define GPI_LMEM_SEC_BUF_DATA_OFFSET	0x60
+#define GPI_DDR_SEC_BUF_DATA_OFFSET	0x64
+#define GPI_TOE_CHKSUM_EN		0x68
+#define GPI_OVERRUN_DROPCNT		0x6c
+#define GPI_AXI_CTRL			0x70
+
+struct gpi_cfg {
+	u32 lmem_rtry_cnt;
+	u32 tmlf_txthres;
+	u32 aseq_len;
+};
+
+/* GPI commons defines */
+#define GPI_LMEM_BUF_EN		0x1
+#define GPI_DDR_BUF_EN		0x1
+
+/* EGPI 1 defines */
+#define EGPI1_LMEM_RTRY_CNT	0x40
+#define EGPI1_TMLF_TXTHRES	0xBC
+#define EGPI1_ASEQ_LEN		0x50
+
+/* EGPI 2 defines */
+#define EGPI2_LMEM_RTRY_CNT	0x40
+#define EGPI2_TMLF_TXTHRES	0xBC
+#define EGPI2_ASEQ_LEN		0x40
+
+/* HGPI defines */
+#define HGPI_LMEM_RTRY_CNT	0x40
+#define HGPI_TMLF_TXTHRES	0xBC
+#define HGPI_ASEQ_LEN		0x40
+
+#endif /* _GPI_H_ */
diff --git a/include/pfe_eth/pfe/cbus/hif.h b/include/pfe_eth/pfe/cbus/hif.h
new file mode 100644
index 0000000..f602b58
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/hif.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _HIF_H_
+#define _HIF_H_
+
+/*
+ * @file hif.h.
+ * hif - PFE hif block control and status register.
+ * Mapped on CBUS and accessible from all PE's and ARM.
+ */
+#define HIF_VERSION		(HIF_BASE_ADDR + 0x00)
+#define HIF_TX_CTRL		(HIF_BASE_ADDR + 0x04)
+#define HIF_TX_CURR_BD_ADDR	(HIF_BASE_ADDR + 0x08)
+#define HIF_TX_ALLOC		(HIF_BASE_ADDR + 0x0c)
+#define HIF_TX_BDP_ADDR		(HIF_BASE_ADDR + 0x10)
+#define HIF_TX_STATUS		(HIF_BASE_ADDR + 0x14)
+#define HIF_RX_CTRL		(HIF_BASE_ADDR + 0x20)
+#define HIF_RX_BDP_ADDR		(HIF_BASE_ADDR + 0x24)
+#define HIF_RX_STATUS		(HIF_BASE_ADDR + 0x30)
+#define HIF_INT_SRC		(HIF_BASE_ADDR + 0x34)
+#define HIF_INT_ENABLE		(HIF_BASE_ADDR + 0x38)
+#define HIF_POLL_CTRL		(HIF_BASE_ADDR + 0x3c)
+#define HIF_RX_CURR_BD_ADDR	(HIF_BASE_ADDR + 0x40)
+#define HIF_RX_ALLOC		(HIF_BASE_ADDR + 0x44)
+#define HIF_TX_DMA_STATUS	(HIF_BASE_ADDR + 0x48)
+#define HIF_RX_DMA_STATUS	(HIF_BASE_ADDR + 0x4c)
+#define HIF_INT_COAL		(HIF_BASE_ADDR + 0x50)
+#define HIF_AXI_CTRL		(HIF_BASE_ADDR + 0x54)
+
+/* HIF_TX_CTRL bits */
+#define HIF_CTRL_DMA_EN			(1<<0)
+#define HIF_CTRL_BDP_POLL_CTRL_EN	(1<<1)
+#define HIF_CTRL_BDP_CH_START_WSTB	(1<<2)
+
+/* HIF_RX_STATUS bits */
+#define BDP_CSR_RX_DMA_ACTV	(1<<16)
+
+/* HIF_INT_ENABLE bits */
+#define HIF_INT_EN		(1 << 0)
+#define HIF_RXBD_INT_EN		(1 << 1)
+#define HIF_RXPKT_INT_EN	(1 << 2)
+#define HIF_TXBD_INT_EN		(1 << 3)
+#define HIF_TXPKT_INT_EN	(1 << 4)
+
+/* HIF_POLL_CTRL bits*/
+#define HIF_RX_POLL_CTRL_CYCLE	0x0400
+#define HIF_TX_POLL_CTRL_CYCLE	0x0400
+
+/* Buffer descriptor control bits */
+#define BD_CTRL_BUFLEN_MASK	(0xffff)
+#define BD_BUF_LEN(x)	(x & BD_CTRL_BUFLEN_MASK)
+#define BD_CTRL_CBD_INT_EN	(1 << 16)
+#define BD_CTRL_PKT_INT_EN	(1 << 17)
+#define BD_CTRL_LIFM		(1 << 18)
+#define BD_CTRL_LAST_BD		(1 << 19)
+#define BD_CTRL_DIR		(1 << 20)
+#define BD_CTRL_PKT_XFER	(1 << 24)
+#define BD_CTRL_DESC_EN		(1 << 31)
+#define BD_CTRL_PARSE_DISABLE	(1 << 25)
+#define BD_CTRL_BRFETCH_DISABLE	(1 << 26)
+#define BD_CTRL_RTFETCH_DISABLE	(1 << 27)
+
+#endif /* _HIF_H_ */
diff --git a/include/pfe_eth/pfe/cbus/hif_nocpy.h b/include/pfe_eth/pfe/cbus/hif_nocpy.h
new file mode 100644
index 0000000..c2d6f6d
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/hif_nocpy.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _HIF_NOCPY_H_
+#define _HIF_NOCPY_H_
+
+#define HIF_NOCPY_VERSION		(HIF_NOCPY_BASE_ADDR + 0x00)
+#define HIF_NOCPY_TX_CTRL		(HIF_NOCPY_BASE_ADDR + 0x04)
+#define HIF_NOCPY_TX_CURR_BD_ADDR	(HIF_NOCPY_BASE_ADDR + 0x08)
+#define HIF_NOCPY_TX_ALLOC		(HIF_NOCPY_BASE_ADDR + 0x0c)
+#define HIF_NOCPY_TX_BDP_ADDR		(HIF_NOCPY_BASE_ADDR + 0x10)
+#define HIF_NOCPY_TX_STATUS		(HIF_NOCPY_BASE_ADDR + 0x14)
+#define HIF_NOCPY_RX_CTRL		(HIF_NOCPY_BASE_ADDR + 0x20)
+#define HIF_NOCPY_RX_BDP_ADDR		(HIF_NOCPY_BASE_ADDR + 0x24)
+#define HIF_NOCPY_RX_STATUS		(HIF_NOCPY_BASE_ADDR + 0x30)
+#define HIF_NOCPY_INT_SRC		(HIF_NOCPY_BASE_ADDR + 0x34)
+#define HIF_NOCPY_INT_ENABLE		(HIF_NOCPY_BASE_ADDR + 0x38)
+#define HIF_NOCPY_POLL_CTRL		(HIF_NOCPY_BASE_ADDR + 0x3c)
+#define HIF_NOCPY_RX_CURR_BD_ADDR	(HIF_NOCPY_BASE_ADDR + 0x40)
+#define HIF_NOCPY_RX_ALLOC		(HIF_NOCPY_BASE_ADDR + 0x44)
+#define HIF_NOCPY_TX_DMA_STATUS		(HIF_NOCPY_BASE_ADDR + 0x48)
+#define HIF_NOCPY_RX_DMA_STATUS		(HIF_NOCPY_BASE_ADDR + 0x4c)
+#define HIF_NOCPY_RX_INQ0_PKTPTR	(HIF_NOCPY_BASE_ADDR + 0x50)
+#define HIF_NOCPY_RX_INQ1_PKTPTR	(HIF_NOCPY_BASE_ADDR + 0x54)
+#define HIF_NOCPY_TX_PORT_NO		(HIF_NOCPY_BASE_ADDR + 0x60)
+#define HIF_NOCPY_LMEM_ALLOC_ADDR	(HIF_NOCPY_BASE_ADDR + 0x64)
+#define HIF_NOCPY_CLASS_ADDR		(HIF_NOCPY_BASE_ADDR + 0x68)
+#define HIF_NOCPY_TMU_PORT0_ADDR	(HIF_NOCPY_BASE_ADDR + 0x70)
+#define HIF_NOCPY_TMU_PORT1_ADDR	(HIF_NOCPY_BASE_ADDR + 0x74)
+#define HIF_NOCPY_TMU_PORT2_ADDR	(HIF_NOCPY_BASE_ADDR + 0x7c)
+#define HIF_NOCPY_TMU_PORT3_ADDR	(HIF_NOCPY_BASE_ADDR + 0x80)
+#define HIF_NOCPY_TMU_PORT4_ADDR	(HIF_NOCPY_BASE_ADDR + 0x84)
+#define HIF_NOCPY_INT_COAL		(HIF_NOCPY_BASE_ADDR + 0x90)
+#define HIF_NOCPY_AXI_CTRL		(HIF_NOCPY_BASE_ADDR + 0x94)
+
+#endif /* _HIF_NOCPY_H_ */
diff --git a/include/pfe_eth/pfe/cbus/tmu_csr.h b/include/pfe_eth/pfe/cbus/tmu_csr.h
new file mode 100644
index 0000000..2fc8dbe
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/tmu_csr.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _TMU_CSR_H_
+#define _TMU_CSR_H_
+
+#define TMU_VERSION			(TMU_CSR_BASE_ADDR + 0x000)
+#define TMU_INQ_WATERMARK		(TMU_CSR_BASE_ADDR + 0x004)
+#define TMU_PHY_INQ_PKTPTR		(TMU_CSR_BASE_ADDR + 0x008)
+#define TMU_PHY_INQ_PKTINFO		(TMU_CSR_BASE_ADDR + 0x00c)
+#define TMU_PHY_INQ_FIFO_CNT		(TMU_CSR_BASE_ADDR + 0x010)
+#define TMU_SYS_GENERIC_CONTROL		(TMU_CSR_BASE_ADDR + 0x014)
+#define TMU_SYS_GENERIC_STATUS		(TMU_CSR_BASE_ADDR + 0x018)
+#define TMU_SYS_GEN_CON0		(TMU_CSR_BASE_ADDR + 0x01c)
+#define TMU_SYS_GEN_CON1		(TMU_CSR_BASE_ADDR + 0x020)
+#define TMU_SYS_GEN_CON2		(TMU_CSR_BASE_ADDR + 0x024)
+#define TMU_SYS_GEN_CON3		(TMU_CSR_BASE_ADDR + 0x028)
+#define TMU_SYS_GEN_CON4		(TMU_CSR_BASE_ADDR + 0x02c)
+#define TMU_TEQ_DISABLE_DROPCHK		(TMU_CSR_BASE_ADDR + 0x030)
+#define TMU_TEQ_CTRL			(TMU_CSR_BASE_ADDR + 0x034)
+#define TMU_TEQ_QCFG			(TMU_CSR_BASE_ADDR + 0x038)
+#define TMU_TEQ_DROP_STAT		(TMU_CSR_BASE_ADDR + 0x03c)
+#define TMU_TEQ_QAVG			(TMU_CSR_BASE_ADDR + 0x040)
+#define TMU_TEQ_WREG_PROB		(TMU_CSR_BASE_ADDR + 0x044)
+#define TMU_TEQ_TRANS_STAT		(TMU_CSR_BASE_ADDR + 0x048)
+#define TMU_TEQ_HW_PROB_CFG0		(TMU_CSR_BASE_ADDR + 0x04c)
+#define TMU_TEQ_HW_PROB_CFG1		(TMU_CSR_BASE_ADDR + 0x050)
+#define TMU_TEQ_HW_PROB_CFG2		(TMU_CSR_BASE_ADDR + 0x054)
+#define TMU_TEQ_HW_PROB_CFG3		(TMU_CSR_BASE_ADDR + 0x058)
+#define TMU_TEQ_HW_PROB_CFG4		(TMU_CSR_BASE_ADDR + 0x05c)
+#define TMU_TEQ_HW_PROB_CFG5		(TMU_CSR_BASE_ADDR + 0x060)
+#define TMU_TEQ_HW_PROB_CFG6		(TMU_CSR_BASE_ADDR + 0x064)
+#define TMU_TEQ_HW_PROB_CFG7		(TMU_CSR_BASE_ADDR + 0x068)
+#define TMU_TEQ_HW_PROB_CFG8		(TMU_CSR_BASE_ADDR + 0x06c)
+#define TMU_TEQ_HW_PROB_CFG9		(TMU_CSR_BASE_ADDR + 0x070)
+#define TMU_TEQ_HW_PROB_CFG10		(TMU_CSR_BASE_ADDR + 0x074)
+#define TMU_TEQ_HW_PROB_CFG11		(TMU_CSR_BASE_ADDR + 0x078)
+#define TMU_TEQ_HW_PROB_CFG12		(TMU_CSR_BASE_ADDR + 0x07c)
+#define TMU_TEQ_HW_PROB_CFG13		(TMU_CSR_BASE_ADDR + 0x080)
+#define TMU_TEQ_HW_PROB_CFG14		(TMU_CSR_BASE_ADDR + 0x084)
+#define TMU_TEQ_HW_PROB_CFG15		(TMU_CSR_BASE_ADDR + 0x088)
+#define TMU_TEQ_HW_PROB_CFG16		(TMU_CSR_BASE_ADDR + 0x08c)
+#define TMU_TEQ_HW_PROB_CFG17		(TMU_CSR_BASE_ADDR + 0x090)
+#define TMU_TEQ_HW_PROB_CFG18		(TMU_CSR_BASE_ADDR + 0x094)
+#define TMU_TEQ_HW_PROB_CFG19		(TMU_CSR_BASE_ADDR + 0x098)
+#define TMU_TEQ_HW_PROB_CFG20		(TMU_CSR_BASE_ADDR + 0x09c)
+#define TMU_TEQ_HW_PROB_CFG21		(TMU_CSR_BASE_ADDR + 0x0a0)
+#define TMU_TEQ_HW_PROB_CFG22		(TMU_CSR_BASE_ADDR + 0x0a4)
+#define TMU_TEQ_HW_PROB_CFG23		(TMU_CSR_BASE_ADDR + 0x0a8)
+#define TMU_TEQ_HW_PROB_CFG24		(TMU_CSR_BASE_ADDR + 0x0ac)
+#define TMU_TEQ_HW_PROB_CFG25		(TMU_CSR_BASE_ADDR + 0x0b0)
+#define TMU_TDQ_IIFG_CFG		(TMU_CSR_BASE_ADDR + 0x0b4)
+/* [9:0] Scheduler Enable for each of the scheduler in the TDQ.
+ * This is a global Enable for all schedulers in PHY0
+ */
+#define TMU_TDQ0_SCH_CTRL		(TMU_CSR_BASE_ADDR + 0x0b8)
+#define TMU_LLM_CTRL			(TMU_CSR_BASE_ADDR + 0x0bc)
+#define TMU_LLM_BASE_ADDR		(TMU_CSR_BASE_ADDR + 0x0c0)
+#define TMU_LLM_QUE_LEN			(TMU_CSR_BASE_ADDR + 0x0c4)
+#define TMU_LLM_QUE_HEADPTR		(TMU_CSR_BASE_ADDR + 0x0c8)
+#define TMU_LLM_QUE_TAILPTR		(TMU_CSR_BASE_ADDR + 0x0cc)
+#define TMU_LLM_QUE_DROPCNT		(TMU_CSR_BASE_ADDR + 0x0d0)
+#define TMU_INT_EN			(TMU_CSR_BASE_ADDR + 0x0d4)
+#define TMU_INT_SRC			(TMU_CSR_BASE_ADDR + 0x0d8)
+#define TMU_INQ_STAT			(TMU_CSR_BASE_ADDR + 0x0dc)
+#define TMU_CTRL			(TMU_CSR_BASE_ADDR + 0x0e0)
+
+/* [31] Mem Access Command. 0 = Internal Memory Read, 1 = Internal
+ * memory Write [27:24] Byte Enables of the Internal memory access [23:0]
+ * Address of the internal memory. This address is used to access both the
+ * PM and DM of all the PE's
+ */
+#define TMU_MEM_ACCESS_ADDR		(TMU_CSR_BASE_ADDR + 0x0e4)
+
+/* Internal Memory Access Write Data */
+#define TMU_MEM_ACCESS_WDATA		(TMU_CSR_BASE_ADDR + 0x0e8)
+/* Internal Memory Access Read Data. The commands are blocked@the
+ * mem_access only
+ */
+#define TMU_MEM_ACCESS_RDATA		(TMU_CSR_BASE_ADDR + 0x0ec)
+
+/* [31:0] PHY0 in queue address (must be initialized with one of the
+ * xxx_INQ_PKTPTR cbus addresses)
+ */
+#define TMU_PHY0_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x0f0)
+/* [31:0] PHY1 in queue address (must be initialized with one of the
+ * xxx_INQ_PKTPTR cbus addresses)
+ */
+#define TMU_PHY1_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x0f4)
+/* [31:0] PHY3 in queue address (must be initialized with one of the
+ * xxx_INQ_PKTPTR cbus addresses)
+ */
+#define TMU_PHY3_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x0fc)
+#define TMU_BMU_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x100)
+#define TMU_TX_CTRL			(TMU_CSR_BASE_ADDR + 0x104)
+
+#define TMU_PE_SYS_CLK_RATIO		(TMU_CSR_BASE_ADDR + 0x114)
+#define TMU_PE_STATUS			(TMU_CSR_BASE_ADDR + 0x118)
+#define TMU_TEQ_MAX_THRESHOLD		(TMU_CSR_BASE_ADDR + 0x11c)
+
+/* [31:0] PHY4 in queue address (must be initialized with one of the
+ * xxx_INQ_PKTPTR cbus addresses)
+ */
+#define TMU_PHY4_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x134)
+
+/* [9:0] Scheduler Enable for each of the scheduler in the TDQ. This
+ * is a global Enable for all schedulers in PHY1
+ */
+#define TMU_TDQ1_SCH_CTRL		(TMU_CSR_BASE_ADDR + 0x138)
+/* [9:0] Scheduler Enable for each of the scheduler in the TDQ. This
+ * is a global Enable for all schedulers in PHY3
+ */
+#define TMU_TDQ3_SCH_CTRL		(TMU_CSR_BASE_ADDR + 0x140)
+
+#define TMU_BMU_BUF_SIZE		(TMU_CSR_BASE_ADDR + 0x144)
+/* [31:0] PHY5 in queue address (must be initialized with one of the
+ * xxx_INQ_PKTPTR cbus addresses)
+ */
+#define TMU_PHY5_INQ_ADDR		(TMU_CSR_BASE_ADDR + 0x148)
+
+#define TMU_AXI_CTRL			(TMU_CSR_BASE_ADDR + 0x17c)
+
+#define SW_RESET		(1 << 0) /* Global software reset */
+#define INQ_RESET		(1 << 2)
+#define TEQ_RESET		(1 << 3)
+#define TDQ_RESET		(1 << 4)
+#define PE_RESET		(1 << 5)
+#define MEM_INIT		(1 << 6)
+#define MEM_INIT_DONE		(1 << 7)
+#define LLM_INIT		(1 << 8)
+#define LLM_INIT_DONE		(1 << 9)
+#define ECC_MEM_INIT_DONE	(1<<10)
+
+struct tmu_cfg {
+	u32 llm_base_addr;
+	u32 llm_queue_len;
+};
+
+/* Not HW related for pfe_ctrl/pfe common defines */
+#define DEFAULT_MAX_QDEPTH	80
+#define DEFAULT_Q0_QDEPTH	511 /* We keep 1 large queue for host tx qos */
+#define DEFAULT_TMU3_QDEPTH	127
+
+#endif /* _TMU_CSR_H_ */
diff --git a/include/pfe_eth/pfe/cbus/util_csr.h b/include/pfe_eth/pfe/cbus/util_csr.h
new file mode 100644
index 0000000..bac4114
--- /dev/null
+++ b/include/pfe_eth/pfe/cbus/util_csr.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _UTIL_CSR_H_
+#define _UTIL_CSR_H_
+
+#define UTIL_VERSION			(UTIL_CSR_BASE_ADDR + 0x000)
+#define UTIL_TX_CTRL			(UTIL_CSR_BASE_ADDR + 0x004)
+#define UTIL_INQ_PKTPTR			(UTIL_CSR_BASE_ADDR + 0x010)
+
+#define UTIL_HDR_SIZE			(UTIL_CSR_BASE_ADDR + 0x014)
+
+#define UTIL_PE0_QB_DM_ADDR0		(UTIL_CSR_BASE_ADDR + 0x020)
+#define UTIL_PE0_QB_DM_ADDR1		(UTIL_CSR_BASE_ADDR + 0x024)
+#define UTIL_PE0_RO_DM_ADDR0		(UTIL_CSR_BASE_ADDR + 0x060)
+#define UTIL_PE0_RO_DM_ADDR1		(UTIL_CSR_BASE_ADDR + 0x064)
+
+#define UTIL_MEM_ACCESS_ADDR		(UTIL_CSR_BASE_ADDR + 0x100)
+#define UTIL_MEM_ACCESS_WDATA		(UTIL_CSR_BASE_ADDR + 0x104)
+#define UTIL_MEM_ACCESS_RDATA		(UTIL_CSR_BASE_ADDR + 0x108)
+
+#define UTIL_TM_INQ_ADDR		(UTIL_CSR_BASE_ADDR + 0x114)
+#define UTIL_PE_STATUS			(UTIL_CSR_BASE_ADDR + 0x118)
+
+#define UTIL_PE_SYS_CLK_RATIO		(UTIL_CSR_BASE_ADDR + 0x200)
+#define UTIL_AFULL_THRES		(UTIL_CSR_BASE_ADDR + 0x204)
+#define UTIL_GAP_BETWEEN_READS		(UTIL_CSR_BASE_ADDR + 0x208)
+#define UTIL_MAX_BUF_CNT		(UTIL_CSR_BASE_ADDR + 0x20c)
+#define UTIL_TSQ_FIFO_THRES		(UTIL_CSR_BASE_ADDR + 0x210)
+#define UTIL_TSQ_MAX_CNT		(UTIL_CSR_BASE_ADDR + 0x214)
+#define UTIL_IRAM_DATA_0		(UTIL_CSR_BASE_ADDR + 0x218)
+#define UTIL_IRAM_DATA_1		(UTIL_CSR_BASE_ADDR + 0x21c)
+#define UTIL_IRAM_DATA_2		(UTIL_CSR_BASE_ADDR + 0x220)
+#define UTIL_IRAM_DATA_3		(UTIL_CSR_BASE_ADDR + 0x224)
+
+#define UTIL_BUS_ACCESS_ADDR		(UTIL_CSR_BASE_ADDR + 0x228)
+#define UTIL_BUS_ACCESS_WDATA		(UTIL_CSR_BASE_ADDR + 0x22c)
+#define UTIL_BUS_ACCESS_RDATA		(UTIL_CSR_BASE_ADDR + 0x230)
+
+#define UTIL_INQ_AFULL_THRES		(UTIL_CSR_BASE_ADDR + 0x234)
+#define UTIL_AXI_CTRL			(UTIL_CSR_BASE_ADDR + 0x240)
+
+#endif /* _UTIL_CSR_H_ */
diff --git a/include/pfe_eth/pfe/pfe.h b/include/pfe_eth/pfe/pfe.h
new file mode 100644
index 0000000..1c73a95
--- /dev/null
+++ b/include/pfe_eth/pfe/pfe.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _PFE_H_
+#define _PFE_H_
+
+#include <elf.h>
+#include "cbus.h"
+
+#define PFE_LS1012A_RESET_WA
+#define CONFIG_UTIL_PE_DISABLED
+
+#define CLASS_DMEM_BASE_ADDR(i)	(0x00000000 | ((i) << 20))
+/* Only valid for mem access register interface */
+#define CLASS_IMEM_BASE_ADDR(i)	(0x00000000 | ((i) << 20))
+#define CLASS_DMEM_SIZE		0x00002000
+#define CLASS_IMEM_SIZE		0x00008000
+
+#define TMU_DMEM_BASE_ADDR(i)	(0x00000000 + ((i) << 20))
+/* Only valid for mem access register interface */
+#define TMU_IMEM_BASE_ADDR(i)	(0x00000000 + ((i) << 20))
+#define TMU_DMEM_SIZE		0x00000800
+#define TMU_IMEM_SIZE		0x00002000
+
+#define UTIL_DMEM_BASE_ADDR	0x00000000
+#define UTIL_DMEM_SIZE		0x00002000
+
+#define PE_LMEM_BASE_ADDR	0xc3010000
+#define PE_LMEM_SIZE		0x8000
+#define PE_LMEM_END		(PE_LMEM_BASE_ADDR + PE_LMEM_SIZE)
+
+#define DMEM_BASE_ADDR		0x00000000
+#define DMEM_SIZE		0x2000		/* TMU has less... */
+#define DMEM_END		(DMEM_BASE_ADDR + DMEM_SIZE)
+
+#define PMEM_BASE_ADDR		0x00010000
+#define PMEM_SIZE		0x8000		/* TMU has less... */
+#define PMEM_END		(PMEM_BASE_ADDR + PMEM_SIZE)
+
+/* Memory ranges check from PE point of view/memory map */
+#define IS_DMEM(addr, len)	(((unsigned long)(addr) >= DMEM_BASE_ADDR) &&\
+					(((unsigned long)(addr) +\
+					(len)) <= DMEM_END))
+#define IS_PMEM(addr, len)	(((unsigned long)(addr) >= PMEM_BASE_ADDR) &&\
+					(((unsigned long)(addr) +\
+					(len)) <= PMEM_END))
+#define IS_PE_LMEM(addr, len)	(((unsigned long)(addr) >= PE_LMEM_BASE_ADDR\
+					) && (((unsigned long)(addr)\
+					+ (len)) <= PE_LMEM_END))
+
+#define IS_PFE_LMEM(addr, len)	(((unsigned long)(addr) >=\
+					CBUS_VIRT_TO_PFE(LMEM_BASE_ADDR)) &&\
+					(((unsigned long)(addr) + (len)) <=\
+					CBUS_VIRT_TO_PFE(LMEM_END)))
+#define IS_PHYS_DDR(addr, len)	(((unsigned long)(addr) >=\
+					PFE_DDR_PHYS_BASE_ADDR) &&\
+					(((unsigned long)(addr) + (len)) <=\
+					PFE_DDR_PHYS_END))
+
+/* Host View Address */
+extern void *ddr_base_addr;
+
+#define DDR_BASE_ADDR		ddr_base_addr
+
+/* PFE View Address */
+/* DDR physical base address as seen by PE's. */
+#define PFE_DDR_PHYS_BASE_ADDR	0x03800000
+#define PFE_DDR_PHYS_SIZE	0xC000000
+#define PFE_DDR_PHYS_END	(PFE_DDR_PHYS_BASE_ADDR + PFE_DDR_PHYS_SIZE)
+/* CBUS physical base address as seen by PE's. */
+#define PFE_CBUS_PHYS_BASE_ADDR	0xc0000000
+
+/* Host<->PFE Mapping */
+#define DDR_PFE_TO_VIRT(p)	((unsigned long int)((p) + 0x80000000))
+#define CBUS_VIRT_TO_PFE(v)	(((v) - CBUS_BASE_ADDR) +\
+					PFE_CBUS_PHYS_BASE_ADDR)
+#define CBUS_PFE_TO_VIRT(p)	(((p) - PFE_CBUS_PHYS_BASE_ADDR) +\
+					CBUS_BASE_ADDR)
+
+enum {
+	CLASS0_ID = 0,
+	CLASS1_ID,
+	CLASS2_ID,
+	CLASS3_ID,
+	CLASS4_ID,
+	CLASS5_ID,
+
+	TMU0_ID,
+	TMU1_ID,
+	TMU2_ID,
+	TMU3_ID,
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+	UTIL_ID,
+#endif
+	MAX_PE
+};
+
+#define CLASS_MASK	((1 << CLASS0_ID) | (1 << CLASS1_ID) | (1 << CLASS2_ID)\
+				| (1 << CLASS3_ID) | (1 << CLASS4_ID) |\
+				(1 << CLASS5_ID))
+#define CLASS_MAX_ID	CLASS5_ID
+
+#define TMU_MASK	((1 << TMU0_ID) | (1 << TMU1_ID) | (1 << TMU3_ID))
+#define TMU_MAX_ID	TMU3_ID
+
+#if !defined(CONFIG_UTIL_PE_DISABLED)
+#define UTIL_MASK	(1 << UTIL_ID)
+#endif
+
+/*
+ * PE information.
+ * Structure containing PE's specific information. It is used to create
+ * generic C functions common to all PE's.
+ * Before using the library functions this structure needs to be
+ * initialized with the different registers virtual addresses
+ * (according to the ARM MMU mmaping). The default initialization supports a
+ * virtual == physical mapping.
+ *
+ */
+struct pe_info {
+	u32 dmem_base_addr;		/* PE's dmem base address */
+	u32 pmem_base_addr;		/* PE's pmem base address */
+	u32 pmem_size;			/* PE's pmem size */
+
+	void *mem_access_wdata;	       /* PE's _MEM_ACCESS_WDATA
+					* register address
+					*/
+	void *mem_access_addr;	       /* PE's _MEM_ACCESS_ADDR
+					* register address
+					*/
+	void *mem_access_rdata;	       /* PE's _MEM_ACCESS_RDATA
+					* register address
+					*/
+};
+
+void pe_lmem_read(u32 *dst, u32 len, u32 offset);
+void pe_lmem_write(u32 *src, u32 len, u32 offset);
+
+void pe_dmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len);
+void pe_pmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len);
+
+u32 pe_pmem_read(int id, u32 addr, u8 size);
+void pe_dmem_write(int id, u32 val, u32 addr, u8 size);
+u32 pe_dmem_read(int id, u32 addr, u8 size);
+void class_bus_write(u32 val, u32 addr, u8 size);
+u32 class_bus_read(u32 addr, u8 size);
+
+int pe_load_elf_section(int id, const void *data, Elf32_Shdr *shdr);
+
+void pfe_lib_init(void *ddr_base, unsigned long ddr_phys_base);
+
+void bmu_init(void *base, struct bmu_cfg *cfg);
+void bmu_enable(void *base);
+
+void gpi_init(void *base, struct gpi_cfg *cfg);
+void gpi_enable(void *base);
+void gpi_disable(void *base);
+
+void class_init(struct class_cfg *cfg);
+void class_enable(void);
+void class_disable(void);
+
+void tmu_init(struct tmu_cfg *cfg);
+void tmu_enable(u32 pe_mask);
+void tmu_disable(u32 pe_mask);
+
+void hif_init(void);
+void hif_tx_enable(void);
+void hif_tx_disable(void);
+void hif_rx_enable(void);
+void hif_rx_disable(void);
+void hif_rx_desc_disable(void);
+
+#endif /* _PFE_H_ */
diff --git a/include/pfe_eth/pfe_driver.h b/include/pfe_eth/pfe_driver.h
new file mode 100644
index 0000000..28997b4
--- /dev/null
+++ b/include/pfe_eth/pfe_driver.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __PFE_DRIVER_H__
+#define __PFE_DRIVER_H__
+
+#include "pfe/pfe.h"
+
+#define HIF_RX_DESC_NT		64
+#define	HIF_TX_DESC_NT		64
+
+#define RX_BD_BASEADDR		(HIF_DESC_BASEADDR)
+#define TX_BD_BASEADDR		(HIF_DESC_BASEADDR + HIF_TX_DESC_SIZE)
+
+#define MIN_PKT_SIZE		56
+#define MAX_FRAME_SIZE		2048
+
+struct __packed hif_header_s {
+	u8	port_no; /* Carries input port no for host rx packets and
+			  * output port no for tx pkts
+			  */
+	u8 reserved0;
+	u32 reserved2;
+};
+
+struct __packed buf_desc {
+	u32 ctrl;
+	u32 status;
+	u32 data;
+	u32 next;
+};
+
+struct rx_desc_s {
+	struct buf_desc *rx_base;
+	unsigned int rx_base_pa;
+	int rx_to_read;
+	int rx_ring_size;
+};
+
+struct tx_desc_s {
+	struct buf_desc *tx_base;
+	unsigned int tx_base_pa;
+	int tx_to_send;
+	int tx_ring_size;
+};
+
+int pfe_send(int phy_port, void *data, int length);
+int pfe_recv(unsigned int *pkt_ptr, int *phy_port);
+int pfe_tx_done(void);
+
+#endif
diff --git a/include/pfe_eth/pfe_eth.h b/include/pfe_eth/pfe_eth.h
new file mode 100644
index 0000000..8b4bc67
--- /dev/null
+++ b/include/pfe_eth/pfe_eth.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _LS1012a_ETH_H_
+#define _LS1012a_ETH_H_
+
+#include <linux/sizes.h>
+#include <asm/io.h>
+#include <miiphy.h>
+#include <malloc.h>
+#include "pfe_driver.h"
+
+#define BMU2_DDR_BASEADDR	0
+#define BMU2_BUF_COUNT		(3 * SZ_1K)
+#define BMU2_DDR_SIZE		(DDR_BUF_SIZE * BMU2_BUF_COUNT)
+
+#define HIF_RX_PKT_DDR_BASEADDR (BMU2_DDR_BASEADDR + BMU2_DDR_SIZE)
+#define HIF_RX_PKT_DDR_SIZE     (HIF_RX_DESC_NT * DDR_BUF_SIZE)
+#define HIF_TX_PKT_DDR_BASEADDR (HIF_RX_PKT_DDR_BASEADDR + HIF_RX_PKT_DDR_SIZE)
+#define HIF_TX_PKT_DDR_SIZE     (HIF_TX_DESC_NT * DDR_BUF_SIZE)
+
+#define HIF_DESC_BASEADDR       (HIF_TX_PKT_DDR_BASEADDR + HIF_TX_PKT_DDR_SIZE)
+#define HIF_RX_DESC_SIZE        (16 * HIF_RX_DESC_NT)
+#define HIF_TX_DESC_SIZE        (16 * HIF_TX_DESC_NT)
+
+#define UTIL_CODE_BASEADDR	0x780000
+#define UTIL_CODE_SIZE		(128 * SZ_1K)
+
+#define UTIL_DDR_DATA_BASEADDR	(UTIL_CODE_BASEADDR + UTIL_CODE_SIZE)
+#define UTIL_DDR_DATA_SIZE	(64 * SZ_1K)
+
+#define CLASS_DDR_DATA_BASEADDR	(UTIL_DDR_DATA_BASEADDR + UTIL_DDR_DATA_SIZE)
+#define CLASS_DDR_DATA_SIZE	(32 * SZ_1K)
+
+#define TMU_DDR_DATA_BASEADDR	(CLASS_DDR_DATA_BASEADDR + CLASS_DDR_DATA_SIZE)
+#define TMU_DDR_DATA_SIZE	(32 * SZ_1K)
+
+#define TMU_LLM_BASEADDR	(TMU_DDR_DATA_BASEADDR + TMU_DDR_DATA_SIZE)
+#define TMU_LLM_QUEUE_LEN	(16 * 256)
+	/* Must be power of two and at least 16 * 8 = 128 bytes */
+#define TMU_LLM_SIZE		(4 * 16 * TMU_LLM_QUEUE_LEN)
+	/* (4 TMU's x 16 queues x queue_len) */
+
+#define ROUTE_TABLE_BASEADDR	0x800000
+#define ROUTE_TABLE_HASH_BITS_MAX	15 /* 32K entries */
+#define ROUTE_TABLE_HASH_BITS		8  /* 256 entries */
+#define ROUTE_TABLE_SIZE	((1 << ROUTE_TABLE_HASH_BITS_MAX) \
+				* CLASS_ROUTE_SIZE)
+
+#define	PFE_TOTAL_DATA_SIZE	(ROUTE_TABLE_BASEADDR + ROUTE_TABLE_SIZE)
+
+#if PFE_TOTAL_DATA_SIZE > (12 * SZ_1M)
+#error DDR mapping above 12MiB
+#endif
+
+/* LMEM Mapping */
+#define BMU1_LMEM_BASEADDR	0
+#define BMU1_BUF_COUNT		256
+#define BMU1_LMEM_SIZE		(LMEM_BUF_SIZE * BMU1_BUF_COUNT)
+
+struct gemac_s {
+	void *gemac_base;
+	void *egpi_base;
+
+	/* GEMAC config */
+	int gemac_mode;
+	int gemac_speed;
+	int gemac_duplex;
+	int flags;
+	/* phy iface */
+	int phy_address;
+	int phy_mode;
+	struct mii_dev *bus;
+
+};
+
+struct mdio_info {
+	void *reg_base;
+	char *name;
+};
+
+struct pfe {
+	unsigned long ddr_phys_baseaddr;
+	void *ddr_baseaddr;
+	void *cbus_baseaddr;
+};
+
+struct ls1012a_eth_dev {
+	int gemac_port;
+
+	struct gemac_s *gem;
+	struct pfe      pfe;
+
+	struct eth_device *dev;
+#ifdef CONFIG_PHYLIB
+	struct phy_device *phydev;
+#endif
+};
+
+int pfe_probe(struct pfe *pfe);
+int pfe_remove(struct pfe *pfe);
+struct mii_dev *ls1012a_mdio_init(struct mdio_info *mdio_info);
+void ls1012a_set_mdio(int dev_id, struct mii_dev *bus);
+void ls1012a_set_phy_address_mode(int dev_id, int phy_id, int phy_mode);
+int gemac_initialize(bd_t *bis, int dev_id, char *devname);
+
+#endif /*_LS1012a_ETH_H_ */
diff --git a/include/pfe_eth/pfe_firmware.h b/include/pfe_eth/pfe_firmware.h
new file mode 100644
index 0000000..588b2ae
--- /dev/null
+++ b/include/pfe_eth/pfe_firmware.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/** @file
+ *  Contains all the defines to handle parsing and loading of PE firmware files.
+ */
+#ifndef __PFE_FIRMWARE_H__
+#define __PFE_FIRMWARE_H__
+
+int pfe_firmware_init(void);
+void pfe_firmware_exit(void);
+
+#endif
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (2 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-12-05 21:20   ` Joe Hershberger
  2017-10-09  9:11 ` [U-Boot] [PATCH 5/9] armv8: fsl-lsch2: initialize pfe gemac Calvin Johnson
                   ` (5 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Ethernet support on all three LS1012A platforms(FRDM, QDS and RDB) is
enabled with this patch.

eth.c files for all 3 platforms contain board ethernet initialization
function and also function to reset phy.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 board/freescale/ls1012afrdm/Makefile          |   1 +
 board/freescale/ls1012afrdm/eth.c             |  86 +++++++++
 board/freescale/ls1012afrdm/ls1012afrdm.c     |   5 -
 board/freescale/ls1012aqds/Makefile           |   1 +
 board/freescale/ls1012aqds/eth.c              | 263 ++++++++++++++++++++++++++
 board/freescale/ls1012aqds/ls1012aqds.c       |  97 +++++++++-
 board/freescale/ls1012aqds/ls1012aqds_pfe.h   |  48 +++++
 board/freescale/ls1012aqds/ls1012aqds_qixis.h |   2 +-
 board/freescale/ls1012ardb/Makefile           |   1 +
 board/freescale/ls1012ardb/eth.c              |  70 +++++++
 board/freescale/ls1012ardb/ls1012ardb.c       |   4 -
 include/configs/ls1012ardb.h                  |   5 +
 12 files changed, 568 insertions(+), 15 deletions(-)
 create mode 100644 board/freescale/ls1012afrdm/eth.c
 create mode 100644 board/freescale/ls1012aqds/eth.c
 create mode 100644 board/freescale/ls1012aqds/ls1012aqds_pfe.h
 create mode 100644 board/freescale/ls1012ardb/eth.c

diff --git a/board/freescale/ls1012afrdm/Makefile b/board/freescale/ls1012afrdm/Makefile
index dbfa2ce..1364f22 100644
--- a/board/freescale/ls1012afrdm/Makefile
+++ b/board/freescale/ls1012afrdm/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-y += ls1012afrdm.o
+obj-y += eth.o
diff --git a/board/freescale/ls1012afrdm/eth.c b/board/freescale/ls1012afrdm/eth.c
new file mode 100644
index 0000000..d9583ce
--- /dev/null
+++ b/board/freescale/ls1012afrdm/eth.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <netdev.h>
+#include <fm_eth.h>
+#include <fsl_mdio.h>
+#include <malloc.h>
+#include <fsl_dtsec.h>
+#include <asm/arch/soc.h>
+#include <asm/arch-fsl-layerscape/config.h>
+#include <asm/arch/fsl_serdes.h>
+
+#include <pfe_eth/pfe_eth.h>
+#include <asm/arch-fsl-layerscape/immap_lsch2.h>
+
+#define DEFAULT_PFE_MDIO_NAME "PFE_MDIO"
+#define DEFAULT_PFE_MDIO1_NAME "PFE_MDIO1"
+
+#define MASK_ETH_PHY_RST	0x00000100
+
+void reset_phy(void)
+{
+	unsigned int val;
+	struct ccsr_gpio *pgpio = (void *)(GPIO1_BASE_ADDR);
+
+	setbits_be32(&pgpio->gpdir, MASK_ETH_PHY_RST);
+
+	val = in_be32(&pgpio->gpdat);
+	setbits_be32(&pgpio->gpdat, val & ~MASK_ETH_PHY_RST);
+	mdelay(10);
+
+	val = in_be32(&pgpio->gpdat);
+	setbits_be32(&pgpio->gpdat, val | MASK_ETH_PHY_RST);
+	mdelay(50);
+}
+
+int board_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_FSL_PFE
+	struct mii_dev *bus;
+	struct mdio_info mac1_mdio_info;
+
+	reset_phy();
+
+	init_pfe_scfg_dcfg_regs();
+
+	mac1_mdio_info.reg_base = (void *)EMAC1_BASE_ADDR;
+	mac1_mdio_info.name = DEFAULT_PFE_MDIO_NAME;
+
+	bus = ls1012a_mdio_init(&mac1_mdio_info);
+	if (!bus) {
+		printf("Failed to register mdio\n");
+		return -1;
+	}
+
+	/* We don't really need this MDIO bus,
+	 * this is called just to initialize EMAC2 MDIO interface */
+	mac1_mdio_info.reg_base = (void *)0x04220000; /*EMAC2_BASE_ADDR*/
+	mac1_mdio_info.name = DEFAULT_PFE_MDIO1_NAME;
+
+	bus = ls1012a_mdio_init(&mac1_mdio_info);
+	if (!bus) {
+		printf("Failed to register mdio\n");
+		return -1;
+	}
+
+	/* MAC1 */
+	ls1012a_set_mdio(0, miiphy_get_dev_by_name(DEFAULT_PFE_MDIO_NAME));
+	ls1012a_set_phy_address_mode(0, EMAC1_PHY_ADDR,
+				     PHY_INTERFACE_MODE_SGMII);
+
+	/* MAC2 */
+	ls1012a_set_mdio(1, miiphy_get_dev_by_name(DEFAULT_PFE_MDIO_NAME));
+	ls1012a_set_phy_address_mode(1, EMAC2_PHY_ADDR,
+				     PHY_INTERFACE_MODE_SGMII);
+
+
+	return cpu_eth_init(bis);
+#endif
+}
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 9afd1c4..0145886 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -57,11 +57,6 @@ int dram_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
-{
-	return pci_eth_init(bis);
-}
-
 int board_early_init_f(void)
 {
 	fsl_lsch2_early_init_f();
diff --git a/board/freescale/ls1012aqds/Makefile b/board/freescale/ls1012aqds/Makefile
index 0b813f9..b18494a 100644
--- a/board/freescale/ls1012aqds/Makefile
+++ b/board/freescale/ls1012aqds/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-y += ls1012aqds.o
+obj-y += eth.o
diff --git a/board/freescale/ls1012aqds/eth.c b/board/freescale/ls1012aqds/eth.c
new file mode 100644
index 0000000..bf916f3
--- /dev/null
+++ b/board/freescale/ls1012aqds/eth.c
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <netdev.h>
+#include <fm_eth.h>
+#include <fsl_mdio.h>
+#include <malloc.h>
+#include <fsl_dtsec.h>
+#include <asm/arch/soc.h>
+#include <asm/arch-fsl-layerscape/config.h>
+#include <asm/arch/fsl_serdes.h>
+
+#include "../common/qixis.h"
+#include <pfe_eth/pfe_eth.h>
+#include "ls1012aqds_qixis.h"
+#include <asm/arch-fsl-layerscape/immap_lsch2.h>
+
+#define EMI_NONE	0xFF
+#define EMI1_RGMII	1
+#define EMI1_SLOT1	2
+#define EMI1_SLOT2	3
+
+#define DEFAULT_PFE_MDIO_NAME "PFE_MDIO"
+#define DEFAULT_PFE_MDIO1_NAME "PFE_MDIO1"
+
+static const char * const mdio_names[] = {
+	"NULL",
+	"LS1012AQDS_MDIO_RGMII",
+	"LS1012AQDS_MDIO_SLOT1",
+	"LS1012AQDS_MDIO_SLOT2",
+	"NULL",
+};
+
+static const char *ls1012aqds_mdio_name_for_muxval(u8 muxval)
+{
+	return mdio_names[muxval];
+}
+
+struct ls1012aqds_mdio {
+	u8 muxval;
+	struct mii_dev *realbus;
+};
+
+static void ls1012aqds_mux_mdio(u8 muxval)
+{
+	u8 brdcfg4;
+
+	if (muxval < 7) {
+		brdcfg4 = QIXIS_READ(brdcfg[4]);
+		brdcfg4 &= ~BRDCFG4_EMISEL_MASK;
+		brdcfg4 |= (muxval << BRDCFG4_EMISEL_SHIFT);
+		QIXIS_WRITE(brdcfg[4], brdcfg4);
+	}
+}
+
+static int ls1012aqds_mdio_read(struct mii_dev *bus, int addr, int devad,
+			      int regnum)
+{
+	struct ls1012aqds_mdio *priv = bus->priv;
+
+	ls1012aqds_mux_mdio(priv->muxval);
+
+	return priv->realbus->read(priv->realbus, addr, devad, regnum);
+}
+
+static int ls1012aqds_mdio_write(struct mii_dev *bus, int addr, int devad,
+			       int regnum, u16 value)
+{
+	struct ls1012aqds_mdio *priv = bus->priv;
+
+	ls1012aqds_mux_mdio(priv->muxval);
+
+	return priv->realbus->write(priv->realbus, addr, devad, regnum, value);
+}
+
+static int ls1012aqds_mdio_reset(struct mii_dev *bus)
+{
+	struct ls1012aqds_mdio *priv = bus->priv;
+
+	if (priv->realbus->reset)
+		return priv->realbus->reset(priv->realbus);
+	else
+		return -1;
+}
+
+static int ls1012aqds_mdio_init(char *realbusname, u8 muxval)
+{
+	struct ls1012aqds_mdio *pmdio;
+	struct mii_dev *bus = mdio_alloc();
+
+	if (!bus) {
+		printf("Failed to allocate ls1012aqds MDIO bus\n");
+		return -1;
+	}
+
+	pmdio = malloc(sizeof(*pmdio));
+	if (!pmdio) {
+		printf("Failed to allocate ls1012aqds private data\n");
+		free(bus);
+		return -1;
+	}
+
+	bus->read = ls1012aqds_mdio_read;
+	bus->write = ls1012aqds_mdio_write;
+	bus->reset = ls1012aqds_mdio_reset;
+	sprintf(bus->name, ls1012aqds_mdio_name_for_muxval(muxval));
+
+	pmdio->realbus = miiphy_get_dev_by_name(realbusname);
+
+	if (!pmdio->realbus) {
+		printf("No bus with name %s\n", realbusname);
+		free(bus);
+		free(pmdio);
+		return -1;
+	}
+
+	pmdio->muxval = muxval;
+	bus->priv = pmdio;
+	return mdio_register(bus);
+}
+
+int board_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_FSL_PFE
+	struct mii_dev *bus;
+	static const char *mdio_name;
+	struct mdio_info mac1_mdio_info;
+	struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+	u8 data8;
+
+	int srds_s1 = in_be32(&gur->rcwsr[4]) &
+			FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_MASK;
+	srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
+
+	init_pfe_scfg_dcfg_regs();
+
+	ls1012aqds_mux_mdio(2);
+
+	mac1_mdio_info.reg_base = (void *)EMAC1_BASE_ADDR;
+	mac1_mdio_info.name = DEFAULT_PFE_MDIO_NAME;
+
+	bus = ls1012a_mdio_init(&mac1_mdio_info);
+	if (!bus) {
+		printf("Failed to register mdio\n");
+		return -1;
+	}
+
+	mac1_mdio_info.reg_base = (void *)0x04220000; /*EMAC2_BASE_ADDR*/
+	mac1_mdio_info.name = DEFAULT_PFE_MDIO1_NAME;
+
+	bus = ls1012a_mdio_init(&mac1_mdio_info);
+	if (!bus) {
+		printf("Failed to register mdio\n");
+		return -1;
+	}
+
+	switch (srds_s1) {
+	case 0x3508:
+		printf("ls1012aqds:supported SerDes PRCTL= %d\n", srds_s1);
+#ifdef RGMII_RESET_WA
+		/* Work around for FPGA registers initialization
+		 * This is needed for RGMII to work */
+		printf("Reset RGMII WA....\n");
+		data8 = QIXIS_READ(rst_frc[0]);
+		data8 |= 0x2;
+		QIXIS_WRITE(rst_frc[0], data8);
+		data8 = QIXIS_READ(rst_frc[0]);
+
+		data8 = QIXIS_READ(res8[6]);
+		data8 |= 0xff;
+		QIXIS_WRITE(res8[6], data8);
+		data8 = QIXIS_READ(res8[6]);
+#endif
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_RGMII);
+		if (ls1012aqds_mdio_init(DEFAULT_PFE_MDIO_NAME, EMI1_RGMII) <
+		    0) {
+			printf("Failed to register mdio for %s\n", mdio_name);
+			return -1;
+		}
+
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT1);
+		if (ls1012aqds_mdio_init(DEFAULT_PFE_MDIO_NAME, EMI1_SLOT1) <
+		    0) {
+				printf("Failed to register mdio for %s\n",
+				       mdio_name);
+				return -1;
+		}
+
+		/* MAC2*/
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_RGMII);
+		bus = miiphy_get_dev_by_name(mdio_name);
+		ls1012a_set_mdio(1, bus);
+		ls1012a_set_phy_address_mode(1,  EMAC2_PHY_ADDR,
+					     PHY_INTERFACE_MODE_RGMII);
+
+		/* MAC1*/
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT1);
+		bus = miiphy_get_dev_by_name(mdio_name);
+		ls1012a_set_mdio(0, bus);
+		ls1012a_set_phy_address_mode(0, EMAC1_PHY_ADDR,
+					     PHY_INTERFACE_MODE_SGMII);
+		break;
+
+	case 0x2205:
+		printf("ls1012aqds:supported SerDes PRCTL= %d\n", srds_s1);
+		/* Work around for FPGA registers initialization
+		 * This is needed for RGMII to work */
+		printf("Reset SLOT1 SLOT2....\n");
+		data8 = QIXIS_READ(rst_frc[2]);
+		data8 |= 0xc0;
+		QIXIS_WRITE(rst_frc[2], data8);
+		mdelay(100);
+		data8 = QIXIS_READ(rst_frc[2]);
+		data8 &= 0x3f;
+		QIXIS_WRITE(rst_frc[2], data8);
+
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT1);
+		if (ls1012aqds_mdio_init(DEFAULT_PFE_MDIO_NAME, EMI1_SLOT1) <
+		    0) {
+				printf("Failed to register mdio for %s\n",
+				       mdio_name);
+				return -1;
+		}
+
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT2);
+		if (ls1012aqds_mdio_init(DEFAULT_PFE_MDIO_NAME, EMI1_SLOT2) <
+		    0) {
+			printf("Failed to register mdio for %s\n", mdio_name);
+			return -1;
+		}
+		/* MAC2*/
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT2);
+		bus = miiphy_get_dev_by_name(mdio_name);
+		ls1012a_set_mdio(1, bus);
+		ls1012a_set_phy_address_mode(1,  SGMII_2500_PHY2_ADDR,
+					     PHY_INTERFACE_MODE_SGMII_2500);
+
+		data8 = QIXIS_READ(brdcfg[12]);
+		data8 |= 0x20;
+		QIXIS_WRITE(brdcfg[12], data8);
+
+		/* MAC1*/
+		mdio_name = ls1012aqds_mdio_name_for_muxval(EMI1_SLOT1);
+		bus = miiphy_get_dev_by_name(mdio_name);
+		ls1012a_set_mdio(0, bus);
+		ls1012a_set_phy_address_mode(0, SGMII_2500_PHY1_ADDR,
+					     PHY_INTERFACE_MODE_SGMII_2500);
+		break;
+
+	default:
+		printf("ls1012aqds:unsupported SerDes PRCTL= %d\n", srds_s1);
+		break;
+	}
+	cpu_eth_init(bis);
+#endif
+	return pci_eth_init(bis);
+}
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c
index 406194d..5669d1f 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -29,6 +29,8 @@
 #include "../common/qixis.h"
 #include "ls1012aqds_qixis.h"
 
+#include "ls1012aqds_pfe.h"
+
 DECLARE_GLOBAL_DATA_PTR;
 
 int checkboard(void)
@@ -128,11 +130,6 @@ int board_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
-{
-	return pci_eth_init(bis);
-}
-
 int esdhc_status_fixup(void *blob, const char *compat)
 {
 	char esdhc0_path[] = "/soc/esdhc@1560000";
@@ -161,12 +158,102 @@ int esdhc_status_fixup(void *blob, const char *compat)
 	return 0;
 }
 
+static int pfe_set_properties(void *set_blob, struct pfe_prop_val prop_val,
+			      char *enet_path, char *mdio_path)
+{
+	do_fixup_by_path(set_blob, enet_path, "fsl,gemac-bus-id",
+			 &prop_val.busid, PFE_PROP_LEN, 1);
+	do_fixup_by_path(set_blob, enet_path, "fsl,gemac-phy-id",
+			 &prop_val.phyid, PFE_PROP_LEN, 1);
+	do_fixup_by_path(set_blob, enet_path, "fsl,mdio-mux-val",
+			 &prop_val.mux_val, PFE_PROP_LEN, 1);
+	do_fixup_by_path(set_blob, enet_path, "phy-mode",
+			 prop_val.phy_mode, strlen(prop_val.phy_mode) + 1, 1);
+	do_fixup_by_path(set_blob, mdio_path, "fsl,mdio-phy-mask",
+			 &prop_val.phy_mask, PFE_PROP_LEN, 1);
+	return 0;
+}
+
+static void fdt_fsl_fixup_of_pfe(void *blob)
+{
+	int i = 0;
+	struct pfe_prop_val prop_val;
+	void *l_blob = blob;
+
+	struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+	unsigned int srds_s1 = in_be32(&gur->rcwsr[4]) &
+		FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_MASK;
+	srds_s1 >>= FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_SHIFT;
+
+	for (i = 0; i < NUM_ETH_NODE; i++) {
+		switch (srds_s1) {
+		case SERDES_1_G_PROTOCOL:
+			if (i == 0) {
+				prop_val.busid = cpu_to_fdt32(
+						ETH_1_1G_BUS_ID);
+				prop_val.phyid = cpu_to_fdt32(
+						ETH_1_1G_PHY_ID);
+				prop_val.mux_val = cpu_to_fdt32(
+						ETH_1_1G_MDIO_MUX);
+				prop_val.phy_mask = cpu_to_fdt32(
+						ETH_1G_MDIO_PHY_MASK);
+				prop_val.phy_mode = "sgmii";
+				pfe_set_properties(l_blob, prop_val, ETH_1_PATH,
+						   ETH_1_MDIO);
+				} else {
+				prop_val.busid = cpu_to_fdt32(
+						ETH_2_1G_BUS_ID);
+				prop_val.phyid = cpu_to_fdt32(
+						ETH_2_1G_PHY_ID);
+				prop_val.mux_val = cpu_to_fdt32(
+						ETH_2_1G_MDIO_MUX);
+				prop_val.phy_mask = cpu_to_fdt32(
+						ETH_1G_MDIO_PHY_MASK);
+				prop_val.phy_mode = "rgmii";
+				pfe_set_properties(l_blob, prop_val, ETH_2_PATH,
+						   ETH_2_MDIO);
+				}
+		break;
+		case SERDES_2_5_G_PROTOCOL:
+			if (i == 0) {
+				prop_val.busid = cpu_to_fdt32(
+						ETH_1_2_5G_BUS_ID);
+				prop_val.phyid = cpu_to_fdt32(
+						ETH_1_2_5G_PHY_ID);
+				prop_val.mux_val = cpu_to_fdt32(
+						ETH_1_2_5G_MDIO_MUX);
+				prop_val.phy_mask = cpu_to_fdt32(
+						ETH_2_5G_MDIO_PHY_MASK);
+				prop_val.phy_mode = "sgmii-2500";
+				pfe_set_properties(l_blob, prop_val, ETH_1_PATH,
+						   ETH_1_MDIO);
+				} else {
+				prop_val.busid = cpu_to_fdt32(
+						ETH_2_2_5G_BUS_ID);
+				prop_val.phyid = cpu_to_fdt32(
+						ETH_2_2_5G_PHY_ID);
+				prop_val.mux_val = cpu_to_fdt32(
+						ETH_2_2_5G_MDIO_MUX);
+				prop_val.phy_mask = cpu_to_fdt32(
+						ETH_2_5G_MDIO_PHY_MASK);
+				prop_val.phy_mode = "sgmii-2500";
+				pfe_set_properties(l_blob, prop_val, ETH_2_PATH,
+						   ETH_2_MDIO);
+				}
+		break;
+		default:
+			printf("serdes:[%d]\n", srds_s1);
+		}
+	}
+}
+
 #ifdef CONFIG_OF_BOARD_SETUP
 int ft_board_setup(void *blob, bd_t *bd)
 {
 	arch_fixup_fdt(blob);
 
 	ft_cpu_setup(blob, bd);
+	fdt_fsl_fixup_of_pfe(blob);
 
 	return 0;
 }
diff --git a/board/freescale/ls1012aqds/ls1012aqds_pfe.h b/board/freescale/ls1012aqds/ls1012aqds_pfe.h
new file mode 100644
index 0000000..c279ef3
--- /dev/null
+++ b/board/freescale/ls1012aqds/ls1012aqds_pfe.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#define ETH_1_1G_BUS_ID		0x1
+#define ETH_1_1G_PHY_ID		0x1e
+#define ETH_1_1G_MDIO_MUX	0x2
+#define ETH_1G_MDIO_PHY_MASK	0xBFFFFFFD
+#define ETH_1_1G_PHY_MODE	"sgmii"
+#define ETH_2_1G_BUS_ID		0x1
+#define ETH_2_1G_PHY_ID		0x1
+#define ETH_2_1G_MDIO_MUX	0x1
+#define ETH_2_1G_PHY_MODE	"rgmii"
+
+#define ETH_1_2_5G_BUS_ID	0x0
+#define ETH_1_2_5G_PHY_ID	0x1
+#define ETH_1_2_5G_MDIO_MUX	0x2
+#define ETH_2_5G_MDIO_PHY_MASK	0xFFFFFFF9
+#define ETH_2_5G_PHY_MODE	"sgmii-2500"
+#define ETH_2_2_5G_BUS_ID	0x1
+#define ETH_2_2_5G_PHY_ID	0x2
+#define ETH_2_2_5G_MDIO_MUX	0x3
+
+#define SERDES_1_G_PROTOCOL	0x3508
+#define SERDES_2_5_G_PROTOCOL	0x2205
+
+#define PFE_PROP_LEN		4
+
+#define ETH_1_SOC_PATH		"/soc/pfe at 04000000/ethernet at 0"
+#define ETH_1_PATH		"/pfe at 04000000/ethernet at 0"
+#define ETH_2_SOC_PATH		"/soc/pfe at 04000000/ethernet at 1"
+#define ETH_2_PATH		"/pfe at 04000000/ethernet at 1"
+
+#define ETH_1_MDIO_SOC_PATH	"/soc/pfe at 04000000/ethernet at 0/mdio at 0"
+#define ETH_1_MDIO		"/pfe at 04000000/ethernet at 0/mdio at 0"
+#define ETH_2_MDIO_SOC_PATH	"/soc/pfe at 04000000/ethernet at 1/mdio at 0"
+#define ETH_2_MDIO		"/pfe at 04000000/ethernet at 1/mdio@0"
+
+#define NUM_ETH_NODE		2
+struct pfe_prop_val {
+	int busid;
+	int phyid;
+	int mux_val;
+	int phy_mask;
+	char *phy_mode;
+};
diff --git a/board/freescale/ls1012aqds/ls1012aqds_qixis.h b/board/freescale/ls1012aqds/ls1012aqds_qixis.h
index 584f604..7a1ba3d 100644
--- a/board/freescale/ls1012aqds/ls1012aqds_qixis.h
+++ b/board/freescale/ls1012aqds/ls1012aqds_qixis.h
@@ -11,7 +11,7 @@
 
 /* BRDCFG4[4:7] select EC1 and EC2 as a pair */
 #define BRDCFG4_EMISEL_MASK		0xe0
-#define BRDCFG4_EMISEL_SHIFT		5
+#define BRDCFG4_EMISEL_SHIFT		6
 
 /* SYSCLK */
 #define QIXIS_SYSCLK_66			0x0
diff --git a/board/freescale/ls1012ardb/Makefile b/board/freescale/ls1012ardb/Makefile
index 05fa9d9..bd80ce5 100644
--- a/board/freescale/ls1012ardb/Makefile
+++ b/board/freescale/ls1012ardb/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-y += ls1012ardb.o
+obj-y += eth.o
diff --git a/board/freescale/ls1012ardb/eth.c b/board/freescale/ls1012ardb/eth.c
new file mode 100644
index 0000000..286bc8a
--- /dev/null
+++ b/board/freescale/ls1012ardb/eth.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <netdev.h>
+#include <fm_eth.h>
+#include <fsl_mdio.h>
+#include <malloc.h>
+#include <fsl_dtsec.h>
+#include <asm/arch/soc.h>
+#include <asm/arch-fsl-layerscape/config.h>
+#include <asm/arch/fsl_serdes.h>
+
+#include <pfe_eth/pfe_eth.h>
+#include <asm/arch-fsl-layerscape/immap_lsch2.h>
+#include <i2c.h>
+
+#define DEFAULT_PFE_MDIO_NAME "PFE_MDIO"
+
+
+void reset_phy(void)
+{
+	/* Through reset IO expander reset both RGMII and SGMII PHYs */
+	i2c_reg_write(I2C_MUX_IO2_ADDR, 6, __PHY_MASK);
+	i2c_reg_write(I2C_MUX_IO2_ADDR, 2, __PHY_ETH2_MASK);
+	mdelay(10);
+	i2c_reg_write(I2C_MUX_IO2_ADDR, 2, __PHY_ETH1_MASK);
+	mdelay(10);
+	i2c_reg_write(I2C_MUX_IO2_ADDR, 2, 0xFF);
+	mdelay(50);
+}
+
+int board_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_FSL_PFE
+	struct mii_dev *bus;
+	struct mdio_info mac1_mdio_info;
+
+	reset_phy();
+
+	init_pfe_scfg_dcfg_regs();
+
+	mac1_mdio_info.reg_base = (void *)EMAC1_BASE_ADDR;
+	mac1_mdio_info.name = DEFAULT_PFE_MDIO_NAME;
+
+	bus = ls1012a_mdio_init(&mac1_mdio_info);
+	if (!bus) {
+		printf("Failed to register mdio\n");
+		return -1;
+	}
+
+	/* MAC1 */
+	ls1012a_set_mdio(0, miiphy_get_dev_by_name(DEFAULT_PFE_MDIO_NAME));
+	ls1012a_set_phy_address_mode(0, EMAC1_PHY_ADDR,
+				     PHY_INTERFACE_MODE_SGMII);
+
+	/* MAC2 */
+	ls1012a_set_mdio(1, miiphy_get_dev_by_name(DEFAULT_PFE_MDIO_NAME));
+	ls1012a_set_phy_address_mode(1, EMAC2_PHY_ADDR,
+				     PHY_INTERFACE_MODE_RGMII);
+
+	cpu_eth_init(bis);
+#endif
+	return pci_eth_init(bis);
+}
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c
index c6c1c71..41283db 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -90,10 +90,6 @@ int dram_init(void)
 	return 0;
 }
 
-int board_eth_init(bd_t *bis)
-{
-	return pci_eth_init(bis);
-}
 
 int board_early_init_f(void)
 {
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 5fe3218..e47bb7c 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -42,6 +42,11 @@
 #define __SW_REV_A		0xF8
 #define __SW_REV_B		0xF0
 
+#define I2C_MUX_IO2_ADDR		0x25
+#define __PHY_MASK			0xF9
+#define __PHY_ETH2_MASK		0xFB
+#define __PHY_ETH1_MASK		0xFD
+
 /*  MMC  */
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 5/9] armv8: fsl-lsch2: initialize pfe gemac
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (3 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 6/9] armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure Calvin Johnson
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Call gemac_initialize to initialize both gemacs of pfe.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index ef3e300..25cd8d7 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -21,6 +21,9 @@
 #include <efi_loader.h>
 #include <fm_eth.h>
 #include <fsl-mc/fsl_mc.h>
+#ifdef CONFIG_FSL_PFE
+#include <pfe_eth/pfe_eth.h>
+#endif
 #ifdef CONFIG_FSL_ESDHC
 #include <fsl_esdhc.h>
 #endif
@@ -476,6 +479,11 @@ int cpu_eth_init(bd_t *bis)
 {
 	int error = 0;
 
+#if defined(CONFIG_FSL_PFE)
+	gemac_initialize(bis, 0 , "pfe_eth0");
+	gemac_initialize(bis, 1 , "pfe_eth1");
+#endif
+
 #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
 	error = fsl_mc_ldpaa_init(bis);
 #endif
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 6/9] armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (4 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 5/9] armv8: fsl-lsch2: initialize pfe gemac Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-10-09  9:11 ` [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers Calvin Johnson
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

SoC specific PFE macros are defined and structure ccsr_scfg
is updated with members defined for PFE.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 .../include/asm/arch-fsl-layerscape/immap_lsch2.h  | 38 ++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
index 0f43832..a395a2f 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h
@@ -398,6 +398,21 @@ struct ccsr_gur {
 #define SCFG_SNPCNFGCR_SATARDSNP	0x00800000
 #define SCFG_SNPCNFGCR_SATAWRSNP	0x00400000
 
+/* RGMIIPCR bit definitions*/
+#define SCFG_RGMIIPCR_EN_AUTO		(0x00000008)
+#define SCFG_RGMIIPCR_SETSP_1000M	(0x00000004)
+#define SCFG_RGMIIPCR_SETSP_100M	(0x00000000)
+#define SCFG_RGMIIPCR_SETSP_10M		(0x00000002)
+#define SCFG_RGMIIPCR_SETFD		(0x00000001)
+
+/*PFEASBCR bit definitions */
+#define SCFG_PFEASBCR_ARCACHE0		(0x80000000)
+#define SCFG_PFEASBCR_AWCACHE0		(0x40000000)
+#define SCFG_PFEASBCR_ARCACHE1		(0x20000000)
+#define SCFG_PFEASBCR_AWCACHE1		(0x10000000)
+#define SCFG_PFEASBCR_ARSNP		(0x08000000)
+#define SCFG_PFEASBCR_AWSNP		(0x04000000)
+
 /* Supplemental Configuration Unit */
 struct ccsr_scfg {
 	u8 res_000[0x100-0x000];
@@ -415,7 +430,12 @@ struct ccsr_scfg {
 	u8 res_140[0x158-0x140];
 	u32 altcbar;
 	u32 qspi_cfg;
-	u8 res_160[0x180-0x160];
+	u8 res_160[0x164-0x160];
+	u32 wr_qos1;
+	u32 wr_qos2;
+	u32 rd_qos1;
+	u32 rd_qos2;
+	u8 res_174[0x180-0x174];
 	u32 dmamcr;
 	u8 res_184[0x188-0x184];
 	u32 gic_align;
@@ -446,7 +466,21 @@ struct ccsr_scfg {
 	u32 usb_refclk_selcr1;
 	u32 usb_refclk_selcr2;
 	u32 usb_refclk_selcr3;
-	u8 res_424[0x600-0x424];
+	u8 res_424[0x434-0x424];
+	u32 rgmiipcr;
+	u32 res_438;
+	u32 rgmiipsr;
+	u32 pfepfcssr1;
+	u32 pfeintencr1;
+	u32 pfepfcssr2;
+	u32 pfeintencr2;
+	u32 pfeerrcr;
+	u32 pfeeerrintencr;
+	u32 pfeasbcr;
+	u32 pfebsbcr;
+	u8 res_460[0x484-0x460];
+	u32 mdioselcr;
+	u8 res_468[0x600-0x488];
 	u32 scratchrw[4];
 	u8 res_610[0x680-0x610];
 	u32 corebcr;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (5 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 6/9] armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-11-24  5:55   ` Poonam Aggrwal
  2017-10-09  9:11 ` [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE Calvin Johnson
                   ` (2 subsequent siblings)
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Define init_pfe_scfg_dcfg_regs to configure scfg and dcfg
registers of pfe.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c        | 18 ++++++++++++++++++
 arch/arm/include/asm/arch-fsl-layerscape/soc.h |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 5c429d4..c6815f3 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -577,6 +577,24 @@ int setup_chip_volt(void)
 	return 0;
 }
 
+#ifdef CONFIG_FSL_PFE
+void init_pfe_scfg_dcfg_regs(void)
+{
+	struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
+
+	out_be32(&scfg->pfeasbcr,
+		 in_be32(&scfg->pfeasbcr) | SCFG_PFEASBCR_AWCACHE0);
+	out_be32(&scfg->pfebsbcr,
+		 in_be32(&scfg->pfebsbcr) | SCFG_PFEASBCR_AWCACHE0);
+
+	/* CCI-400 QoS settings for PFE */
+	out_be32(&scfg->wr_qos1, 0x0ff00000);
+	out_be32(&scfg->rd_qos1, 0x0ff00000);
+
+	out_be32((void *)CONFIG_SYS_DCSR_DCFG_ADDR + 0x524, 0x2000);
+}
+#endif
+
 void fsl_lsch2_early_init_f(void)
 {
 	struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR +
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
index 697f072..08a42b9 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
@@ -120,6 +120,9 @@ void fsl_lsch2_early_init_f(void);
 int setup_chip_volt(void);
 /* Setup core vdd in unit mV */
 int board_setup_core_volt(u32 vdd);
+#ifdef CONFIG_FSL_PFE
+void init_pfe_scfg_dcfg_regs(void);
+#endif
 #endif
 void ddr_enable_0v9_volt(bool en);
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (6 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-11-24  5:39   ` Poonam Aggrwal
  2017-10-09  9:11 ` [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A Calvin Johnson
  2017-10-23 14:58 ` [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series York Sun
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Enable non-secure access for PFE block.

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 arch/arm/include/asm/arch-fsl-layerscape/ns_access.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
index f46f1d8..fe97a93 100644
--- a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
@@ -26,6 +26,7 @@ enum csu_cslx_ind {
 	CSU_CSLX_PCIE3_IO,
 	CSU_CSLX_USB3 = 20,
 	CSU_CSLX_USB2,
+	CSU_CSLX_PFE = 23,
 	CSU_CSLX_SERDES = 32,
 	CSU_CSLX_QDMA,
 	CSU_CSLX_LPUART2,
@@ -105,6 +106,7 @@ static struct csu_ns_dev ns_dev[] = {
 	 {CSU_CSLX_PCIE3_IO, CSU_ALL_RW},
 	 {CSU_CSLX_USB3, CSU_ALL_RW},
 	 {CSU_CSLX_USB2, CSU_ALL_RW},
+	 {CSU_CSLX_PFE, CSU_ALL_RW},
 	 {CSU_CSLX_SERDES, CSU_ALL_RW},
 	 {CSU_CSLX_QDMA, CSU_ALL_RW},
 	 {CSU_CSLX_LPUART2, CSU_ALL_RW},
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (7 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE Calvin Johnson
@ 2017-10-09  9:11 ` Calvin Johnson
  2017-12-06  8:41   ` Prabhakar Kushwaha
  2017-10-23 14:58 ` [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series York Sun
  9 siblings, 1 reply; 21+ messages in thread
From: Calvin Johnson @ 2017-10-09  9:11 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
---
 configs/ls1012afrdm_qspi_defconfig |  1 +
 configs/ls1012aqds_qspi_defconfig  |  1 +
 configs/ls1012ardb_qspi_defconfig  |  1 +
 drivers/net/Kconfig                |  1 +
 drivers/net/Makefile               |  1 +
 drivers/net/pfe_eth/Kconfig        | 23 ++++++++++++++++++++++-
 include/configs/ls1012a_common.h   |  6 +++---
 include/configs/ls1012afrdm.h      |  7 +++++++
 include/configs/ls1012aqds.h       | 14 ++++++++++++++
 include/configs/ls1012ardb.h       |  8 ++++++++
 10 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/configs/ls1012afrdm_qspi_defconfig b/configs/ls1012afrdm_qspi_defconfig
index 84b5577..7db7a18 100644
--- a/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@ -32,6 +32,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/configs/ls1012aqds_qspi_defconfig b/configs/ls1012aqds_qspi_defconfig
index 2124273..4b9fdf5 100644
--- a/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@ -37,6 +37,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig
index 40349ce..d63e736 100644
--- a/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@ -35,6 +35,7 @@ CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
+CONFIG_FSL_PFE=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_DM_PCI_COMPAT=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 736aab2..c82c63b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -304,4 +304,5 @@ config FEC2_PHY_NORXERR
 	  The PHY does not have a RXERR line (RMII only).
 	  (so program the FEC to ignore it).
 
+source "drivers/net/pfe_eth/Kconfig"
 endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 94a4fd8..0572cde 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -75,3 +75,4 @@ obj-$(CONFIG_FSL_MEMAC) += fm/memac_phy.o
 obj-$(CONFIG_VSC9953) += vsc9953.o
 obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o
 obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
+obj-$(CONFIG_FSL_PFE) += pfe_eth/
diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
index b9996df..c05aeda 100644
--- a/drivers/net/pfe_eth/Kconfig
+++ b/drivers/net/pfe_eth/Kconfig
@@ -1,8 +1,29 @@
+menuconfig FSL_PFE
+	bool "Freescale PFE driver"
+	help
+	  This driver provides support for Freescale PFE.
+
+if FSL_PFE
+
 config UTIL_PE_DISABLED
 	bool
 	help
 	  Disable UTIL processor engine of PFE
 
-config SYS_FSL_PPFE_ADDR
+config SYS_FSL_PFE_ADDR
 	hex "PFE base address"
 	default 0x04000000
+
+config SYS_LS_PFE_FW_ADDR
+	hex "Flash address of PFE firmware"
+	default 0x40a00000
+
+config DDR_PFE_PHYS_BASEADDR
+	hex "PFE DDR physical base address"
+	default 0x03800000
+
+config DDR_PFE_BASEADDR
+	hex "PFE DDR base address"
+	default 0x83800000
+
+endif
diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index 52c2c3a..3df5586 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -113,9 +113,9 @@
 #define CONFIG_BOOTARGS		"console=ttyS0,115200 root=/dev/ram0 " \
 				"earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
 #undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND		"sf probe 0:0; sf read $kernel_load "\
-					"$kernel_start $kernel_size && "\
-					"bootm $kernel_load"
+#define CONFIG_BOOTCOMMAND	"pfe stop; sf probe 0:0; sf read $kernel_load "\
+				"$kernel_start $kernel_size && "\
+				"bootm $kernel_load"
 
 /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE		512	/* Console I/O Buffer Size */
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 544dea0..a3f8824 100644
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -9,6 +9,13 @@
 
 #include "ls1012a_common.h"
 
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x2
+#define EMAC2_PHY_ADDR          0x1
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_REALTEK
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index 16714bb..9873339 100644
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -9,6 +9,20 @@
 
 #include "ls1012a_common.h"
 
+/* PFE Ethernet */
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x1e
+#define EMAC2_PHY_ADDR          0x1
+#define	SGMII_2500_PHY1_ADDR	0x1
+#define	SGMII_2500_PHY2_ADDR	0x2
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_VITESSE
+#define CONFIG_PHY_REALTEK
+#define	CONFIG_PHY_AQUANTIA
+#define	CONFIG_PHYLIB_10G
+#define RGMII_RESET_WA
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index e47bb7c..e8f42e4 100644
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -9,6 +9,14 @@
 
 #include "ls1012a_common.h"
 
+/* PFE Ethernet */
+#ifdef CONFIG_FSL_PFE
+#define EMAC1_PHY_ADDR          0x2
+#define EMAC2_PHY_ADDR          0x1
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_REALTEK
+#endif
+
 /* DDR */
 #define CONFIG_DIMM_SLOTS_PER_CTLR	1
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series
  2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
                   ` (8 preceding siblings ...)
  2017-10-09  9:11 ` [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A Calvin Johnson
@ 2017-10-23 14:58 ` York Sun
  9 siblings, 0 replies; 21+ messages in thread
From: York Sun @ 2017-10-23 14:58 UTC (permalink / raw)
  To: u-boot

On 10/09/2017 02:09 AM, Calvin Johnson wrote:
> Hi,
> 
> This patch series introduces U-Boot support for NXP's LS1012A Packet Forwarding
> Engine (pfe_eth). LS1012A uses hardware packet forwarding engine to provide
> high performance Ethernet interfaces. The device includes two Ethernet ports.
> 
> Depends on https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F704305&data=01%7C01%7Cyork.sun%40nxp.com%7C78639ec10c954f60768a08d50ef573c5%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=cEXazXptrFnPf30yXCrwOvb%2B3DDekH4BZNmW1JavzO8%3D&reserved=0
> 
> Regards
> Calvin
> 
> Calvin Johnson (9):
>   drivers: net: pfe_eth: LS1012A PFE driver introduction
>   drivers: net: pfe_eth: provide pfe commands
>   drivers: net: pfe_eth: LS1012A PFE headers
>   board: freescale: ls1012a: enable network support on ls1012a platforms
>   armv8: fsl-lsch2: initialize pfe gemac
>   armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure
>   armv8: fsl-lsch2: configure pfe's scfg & dcfg registers
>   fsl: csu: enable ns access for PFE
>   configs: ls1012a: add pfe configuration for LS1012A

Joe,

Please review the new net driver proposed when you have a chance. Thanks.

York

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction
  2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
@ 2017-10-30 18:40   ` York Sun
  2017-12-05 20:13   ` Joe Hershberger
  1 sibling, 0 replies; 21+ messages in thread
From: York Sun @ 2017-10-30 18:40 UTC (permalink / raw)
  To: u-boot

On 10/09/2017 02:09 AM, Calvin Johnson wrote:
> This patch adds PFE driver into U-Boot.
> 
> Following are the main driver files:-
> pfe.c: provides low level helper functions to initialize PFE internal
> processor engines and other hardware blocks.
> pfe_driver.c: provides probe functions, initialization functions
> and packet send and receive functions.
> pfe_eth.c: provides high level gemac, phy and mdio initialization
> functions.
> pfe_firmware.c: provides functions to load firmware into PFE
> internal processor engines.
> 
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  drivers/net/pfe_eth/Kconfig        |    8 +
>  drivers/net/pfe_eth/Makefile       |   10 +
>  drivers/net/pfe_eth/pfe.c          | 1161 ++++++++++++++++++++++++++++++++++++
>  drivers/net/pfe_eth/pfe_driver.c   |  626 +++++++++++++++++++
>  drivers/net/pfe_eth/pfe_eth.c      |  545 +++++++++++++++++
>  drivers/net/pfe_eth/pfe_firmware.c |  230 +++++++
>  6 files changed, 2580 insertions(+)
>  create mode 100644 drivers/net/pfe_eth/Kconfig
>  create mode 100644 drivers/net/pfe_eth/Makefile
>  create mode 100644 drivers/net/pfe_eth/pfe.c
>  create mode 100644 drivers/net/pfe_eth/pfe_driver.c
>  create mode 100644 drivers/net/pfe_eth/pfe_eth.c
>  create mode 100644 drivers/net/pfe_eth/pfe_firmware.c
> 

Joe,

Did you get a chance to review this set?

York

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE
  2017-10-09  9:11 ` [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE Calvin Johnson
@ 2017-11-24  5:39   ` Poonam Aggrwal
  0 siblings, 0 replies; 21+ messages in thread
From: Poonam Aggrwal @ 2017-11-24  5:39 UTC (permalink / raw)
  To: u-boot

Hello Calvin,
Minor comments below.

Regards
Poonam

> -----Original Message-----
> From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Calvin
> Johnson
> Sent: Monday, October 09, 2017 2:42 PM
> To: u-boot at lists.denx.de
> Cc: joe.hershberger at ni.com; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE
Can be reworded.
nxp: arch/fsl-layerscape:
> 
> Enable non-secure access for PFE block.
may want to reword:
Enable accesses to PFE registers for Non Secure masters by CSU programming
> 
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  arch/arm/include/asm/arch-fsl-layerscape/ns_access.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
> b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
> index f46f1d8..fe97a93 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/ns_access.h
> @@ -26,6 +26,7 @@ enum csu_cslx_ind {
>  	CSU_CSLX_PCIE3_IO,
>  	CSU_CSLX_USB3 = 20,
>  	CSU_CSLX_USB2,
> +	CSU_CSLX_PFE = 23,
>  	CSU_CSLX_SERDES = 32,
>  	CSU_CSLX_QDMA,
>  	CSU_CSLX_LPUART2,
> @@ -105,6 +106,7 @@ static struct csu_ns_dev ns_dev[] = {
>  	 {CSU_CSLX_PCIE3_IO, CSU_ALL_RW},
>  	 {CSU_CSLX_USB3, CSU_ALL_RW},
>  	 {CSU_CSLX_USB2, CSU_ALL_RW},
> +	 {CSU_CSLX_PFE, CSU_ALL_RW},
>  	 {CSU_CSLX_SERDES, CSU_ALL_RW},
>  	 {CSU_CSLX_QDMA, CSU_ALL_RW},
>  	 {CSU_CSLX_LPUART2, CSU_ALL_RW},
> --
> 2.7.4
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers
  2017-10-09  9:11 ` [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers Calvin Johnson
@ 2017-11-24  5:55   ` Poonam Aggrwal
  2017-12-06  9:06     ` Calvin Johnson
  0 siblings, 1 reply; 21+ messages in thread
From: Poonam Aggrwal @ 2017-11-24  5:55 UTC (permalink / raw)
  To: u-boot

Hello Calvin

Please find few comments inline.

Regards
Poonam

> -----Original Message-----
> From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Calvin
> Johnson
> Sent: Monday, October 09, 2017 2:42 PM
> To: u-boot at lists.denx.de
> Cc: joe.hershberger at ni.com; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg
> registers
Reword: configure Qos, cacheable...attributes for PFE by programming SCFG and DFCG registers 
> 
> Define init_pfe_scfg_dcfg_regs to configure scfg and dcfg registers of pfe.
Consider to reword for more explanation
Configure "xyz cacheable attributes, via scfg
PFE QoS settings configured as  .... via scfg
dcfg ??
> 
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  arch/arm/cpu/armv8/fsl-layerscape/soc.c        | 18 ++++++++++++++++++
>  arch/arm/include/asm/arch-fsl-layerscape/soc.h |  3 +++
>  2 files changed, 21 insertions(+)
> 
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> index 5c429d4..c6815f3 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> @@ -577,6 +577,24 @@ int setup_chip_volt(void)
>  	return 0;
>  }
> 
> +#ifdef CONFIG_FSL_PFE
> +void init_pfe_scfg_dcfg_regs(void)
> +{
> +	struct ccsr_scfg *scfg = (struct ccsr_scfg
> *)CONFIG_SYS_FSL_SCFG_ADDR;
> +
> +	out_be32(&scfg->pfeasbcr,
> +		 in_be32(&scfg->pfeasbcr) | SCFG_PFEASBCR_AWCACHE0);
> +	out_be32(&scfg->pfebsbcr,
> +		 in_be32(&scfg->pfebsbcr) | SCFG_PFEASBCR_AWCACHE0);
> +
> +	/* CCI-400 QoS settings for PFE */
This is incomplete sentence, we should also tell what settings are being done.
> +	out_be32(&scfg->wr_qos1, 0x0ff00000);
> +	out_be32(&scfg->rd_qos1, 0x0ff00000);
Avoid hardcoding/magic numbers
> +
> +	out_be32((void *)CONFIG_SYS_DCSR_DCFG_ADDR + 0x524, 0x2000);
Should remove hardcoded values , 0x524, 0x2000.
0x524 does not show up in the LS1012A RM (Rev 0). Please check once.
Also adding one liner telling what the above settings mean will help .
> #endif
> +
>  void fsl_lsch2_early_init_f(void)
>  {
>  	struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR + diff
> --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
> b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
> index 697f072..08a42b9 100644
> --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h
> +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h
> @@ -120,6 +120,9 @@ void fsl_lsch2_early_init_f(void);  int
> setup_chip_volt(void);
>  /* Setup core vdd in unit mV */
>  int board_setup_core_volt(u32 vdd);
> +#ifdef CONFIG_FSL_PFE
> +void init_pfe_scfg_dcfg_regs(void);
> +#endif
>  #endif
>  void ddr_enable_0v9_volt(bool en);
> 
> --
> 2.7.4
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction
  2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
  2017-10-30 18:40   ` York Sun
@ 2017-12-05 20:13   ` Joe Hershberger
  2018-01-26  5:35     ` Calvin Johnson
  1 sibling, 1 reply; 21+ messages in thread
From: Joe Hershberger @ 2017-12-05 20:13 UTC (permalink / raw)
  To: u-boot

On Mon, Oct 9, 2017 at 4:11 AM, Calvin Johnson <calvin.johnson@nxp.com> wrote:
> This patch adds PFE driver into U-Boot.
>
> Following are the main driver files:-
> pfe.c: provides low level helper functions to initialize PFE internal
> processor engines and other hardware blocks.
> pfe_driver.c: provides probe functions, initialization functions
> and packet send and receive functions.
> pfe_eth.c: provides high level gemac, phy and mdio initialization
> functions.
> pfe_firmware.c: provides functions to load firmware into PFE
> internal processor engines.
>
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  drivers/net/pfe_eth/Kconfig        |    8 +
>  drivers/net/pfe_eth/Makefile       |   10 +
>  drivers/net/pfe_eth/pfe.c          | 1161 ++++++++++++++++++++++++++++++++++++
>  drivers/net/pfe_eth/pfe_driver.c   |  626 +++++++++++++++++++
>  drivers/net/pfe_eth/pfe_eth.c      |  545 +++++++++++++++++
>  drivers/net/pfe_eth/pfe_firmware.c |  230 +++++++
>  6 files changed, 2580 insertions(+)
>  create mode 100644 drivers/net/pfe_eth/Kconfig
>  create mode 100644 drivers/net/pfe_eth/Makefile
>  create mode 100644 drivers/net/pfe_eth/pfe.c
>  create mode 100644 drivers/net/pfe_eth/pfe_driver.c
>  create mode 100644 drivers/net/pfe_eth/pfe_eth.c
>  create mode 100644 drivers/net/pfe_eth/pfe_firmware.c
>
> diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
> new file mode 100644
> index 0000000..b9996df
> --- /dev/null
> +++ b/drivers/net/pfe_eth/Kconfig
> @@ -0,0 +1,8 @@
> +config UTIL_PE_DISABLED
> +       bool
> +       help
> +         Disable UTIL processor engine of PFE
> +
> +config SYS_FSL_PPFE_ADDR
> +       hex "PFE base address"
> +       default 0x04000000
> diff --git a/drivers/net/pfe_eth/Makefile b/drivers/net/pfe_eth/Makefile
> new file mode 100644
> index 0000000..e78f1bf
> --- /dev/null
> +++ b/drivers/net/pfe_eth/Makefile
> @@ -0,0 +1,10 @@
> +# Copyright 2015-2016 Freescale Semiconductor, Inc.
> +# Copyright 2017 NXP
> +#
> +# SPDX-License-Identifier:GPL-2.0+
> +
> +# Layerscape PFE driver
> +obj-y += pfe.o         \
> +        pfe_driver.o   \
> +        pfe_eth.o      \
> +        pfe_firmware.o
> diff --git a/drivers/net/pfe_eth/pfe.c b/drivers/net/pfe_eth/pfe.c
> new file mode 100644
> index 0000000..fc6631e
> --- /dev/null
> +++ b/drivers/net/pfe_eth/pfe.c
> @@ -0,0 +1,1161 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:GPL-2.0+
> + */
> +#include <pfe_eth/pfe_eth.h>
> +#include <pfe_eth/pfe/pfe.h>
> +
> +void *ddr_base_addr;
> +unsigned long ddr_phys_base_addr;
> +static struct pe_info pe[MAX_PE];
> +
> +/*
> + * Initializes the PFE library.
> + * Must be called before using any of the library functions.
> + *
> + * @param[in] cbus_base                CBUS virtual base address (as mapped in
> + *                             the host CPU address space)
> + * @param[in] ddr_base         DDR virtual base address (as mapped in
> + *                             the host CPU address space)
> + * @param[in] ddr_phys_base    DDR physical base address (as mapped in
> + *                             platform)
> + */
> +void pfe_lib_init(void *ddr_base, unsigned long ddr_phys_base)

Could you use some loops here to consolidate this code some?

> +{
> +       ddr_base_addr = ddr_base;
> +       ddr_phys_base_addr = ddr_phys_base;
> +
> +       pe[CLASS0_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(0);
> +       pe[CLASS0_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(0);
> +       pe[CLASS0_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS0_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS0_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS0_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[CLASS1_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(1);
> +       pe[CLASS1_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(1);
> +       pe[CLASS1_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS1_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS1_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS1_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[CLASS2_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(2);
> +       pe[CLASS2_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(2);
> +       pe[CLASS2_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS2_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS2_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS2_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[CLASS3_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(3);
> +       pe[CLASS3_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(3);
> +       pe[CLASS3_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS3_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS3_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS3_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[CLASS4_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(4);
> +       pe[CLASS4_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(4);
> +       pe[CLASS4_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS4_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS4_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS4_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[CLASS5_ID].dmem_base_addr = (u32)CLASS_DMEM_BASE_ADDR(5);
> +       pe[CLASS5_ID].pmem_base_addr = (u32)CLASS_IMEM_BASE_ADDR(5);
> +       pe[CLASS5_ID].pmem_size = (u32)CLASS_IMEM_SIZE;
> +       pe[CLASS5_ID].mem_access_wdata = (void *)CLASS_MEM_ACCESS_WDATA;
> +       pe[CLASS5_ID].mem_access_addr = (void *)CLASS_MEM_ACCESS_ADDR;
> +       pe[CLASS5_ID].mem_access_rdata = (void *)CLASS_MEM_ACCESS_RDATA;
> +
> +       pe[TMU0_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(0);
> +       pe[TMU0_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(0);
> +       pe[TMU0_ID].pmem_size = (u32)TMU_IMEM_SIZE;
> +       pe[TMU0_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
> +       pe[TMU0_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
> +       pe[TMU0_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
> +
> +       pe[TMU1_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(1);
> +       pe[TMU1_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(1);
> +       pe[TMU1_ID].pmem_size = (u32)TMU_IMEM_SIZE;
> +       pe[TMU1_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
> +       pe[TMU1_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
> +       pe[TMU1_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
> +
> +       pe[TMU3_ID].dmem_base_addr = (u32)TMU_DMEM_BASE_ADDR(3);
> +       pe[TMU3_ID].pmem_base_addr = (u32)TMU_IMEM_BASE_ADDR(3);
> +       pe[TMU3_ID].pmem_size = (u32)TMU_IMEM_SIZE;
> +       pe[TMU3_ID].mem_access_wdata = (void *)TMU_MEM_ACCESS_WDATA;
> +       pe[TMU3_ID].mem_access_addr = (void *)TMU_MEM_ACCESS_ADDR;
> +       pe[TMU3_ID].mem_access_rdata = (void *)TMU_MEM_ACCESS_RDATA;
> +
> +#if !defined(CONFIG_UTIL_PE_DISABLED)
> +       pe[UTIL_ID].dmem_base_addr = (u32)UTIL_DMEM_BASE_ADDR;
> +       pe[UTIL_ID].mem_access_wdata = (void *)UTIL_MEM_ACCESS_WDATA;
> +       pe[UTIL_ID].mem_access_addr = (void *)UTIL_MEM_ACCESS_ADDR;
> +       pe[UTIL_ID].mem_access_rdata = (void *)UTIL_MEM_ACCESS_RDATA;
> +#endif
> +}

[ ... ]

> diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c
> new file mode 100644
> index 0000000..5336ba7
> --- /dev/null
> +++ b/drivers/net/pfe_eth/pfe_driver.c
> @@ -0,0 +1,626 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#include <pfe_eth/pfe_eth.h>
> +#include <pfe_eth/pfe_firmware.h>
> +
> +static struct tx_desc_s *g_tx_desc;
> +static struct rx_desc_s *g_rx_desc;
> +
> +/*
> + * HIF Rx interface function
> + * Reads the rx descriptor from the current location (rx_to_read).
> + * - If the descriptor has a valid data/pkt, then get the data pointer
> + * - check for the input rx phy number
> + * - increments the rx data pointer by pkt_head_room_size
> + * - decrements the data length by pkt_head_room_size
> + * - handover the packet to caller.
> + *
> + * @param[out] pkt_ptr Pointer to store rx packet pointer
> + * @param[out] phy_port Pointer to store recv phy port
> + *
> + * @return     -1 if no packet, else returns length of packet.
> + */
> +int pfe_recv(unsigned int *pkt_ptr, int *phy_port)
> +{
> +       struct rx_desc_s *rx_desc = g_rx_desc;
> +       struct buf_desc *bd;
> +       int len = -1;
> +
> +       struct hif_header_s *hif_header;
> +
> +       bd = rx_desc->rx_base + rx_desc->rx_to_read;
> +
> +       if (bd->ctrl & BD_CTRL_DESC_EN)
> +               return len; /* No pending Rx packet */
> +
> +       /* this len include hif_header(8bytes) */
> +       len = bd->ctrl & 0xFFFF;
> +
> +       hif_header = (struct hif_header_s *)DDR_PFE_TO_VIRT(bd->data);
> +
> +       /* Get the recive port info from the packet */

Typo: receive

> +       debug(
> +               "Pkt recv'd: Pkt ptr(%p), len(%d), gemac_port(%d) status(%08x)\n",
> +               hif_header, len, hif_header->port_no, bd->status);
> +
> +#ifdef DEBUG
> +       {
> +               int i;
> +               unsigned char *p = (unsigned char *)hif_header;
> +
> +               for (i = 0; i < len; i++) {
> +                       if (!(i % 16))
> +                               printf("\n");
> +                       printf(" %02x", p[i]);
> +               }
> +               printf("\n");
> +       }
> +#endif
> +
> +       *pkt_ptr = (unsigned long)(hif_header + 1);
> +       *phy_port = hif_header->port_no;
> +       len -= sizeof(struct hif_header_s);
> +
> +       rx_desc->rx_to_read = (rx_desc->rx_to_read + 1)
> +                              & (rx_desc->rx_ring_size - 1);
> +
> +       /* reset bd control field */
> +       bd->ctrl = (MAX_FRAME_SIZE | BD_CTRL_LIFM | BD_CTRL_DESC_EN
> +                   | BD_CTRL_DIR);
> +       bd->status = 0;
> +
> +       /* Give START_STROBE to BDP to fetch the descriptor __NOW__,
> +        * BDP need not to wait for rx_poll_cycle time to fetch the descriptor,
> +        * In idle state (ie., no rx pkt), BDP will not fetch
> +        * the descriptor even if strobe is given(I think)
> +        */
> +       writel((readl(HIF_RX_CTRL) | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL);
> +
> +       return len;
> +}

[ ... ]

> diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c
> new file mode 100644
> index 0000000..8d8de40
> --- /dev/null
> +++ b/drivers/net/pfe_eth/pfe_eth.c
> @@ -0,0 +1,545 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#include <common.h>
> +#include <pfe_eth/pfe_eth.h>
> +
> +struct gemac_s gem_info[] = {
> +       /* PORT_0 configuration */ {
> +               /* GEMAC config */
> +               .gemac_mode = GMII,
> +               .gemac_speed = SPEED_1000M,
> +               .gemac_duplex = DUPLEX_FULL,
> +
> +               /* phy iface */
> +               .phy_address = EMAC1_PHY_ADDR,
> +               .phy_mode = PHY_INTERFACE_MODE_SGMII,
> +       },
> +       /* PORT_1 configuration */ {
> +               /* GEMAC config */
> +               .gemac_mode = GMII,
> +               .gemac_speed = SPEED_1000M,
> +               .gemac_duplex = DUPLEX_FULL,
> +
> +               /* phy iface */
> +               .phy_address = EMAC2_PHY_ADDR,
> +               .phy_mode = PHY_INTERFACE_MODE_RGMII,
> +       },
> +};
> +
> +#define MAX_GEMACS      2
> +
> +static struct ls1012a_eth_dev *gemac_list[MAX_GEMACS];
> +
> +#define MDIO_TIMEOUT    5000
> +
> +static inline void ls1012a_gemac_enable(void *gemac_base)
> +{
> +       writel(readl(gemac_base + EMAC_ECNTRL_REG) |
> +               EMAC_ECNTRL_ETHER_EN, gemac_base + EMAC_ECNTRL_REG);
> +}
> +
> +static inline void ls1012a_gemac_disable(void *gemac_base)
> +{
> +       writel(readl(gemac_base + EMAC_ECNTRL_REG) &
> +               ~EMAC_ECNTRL_ETHER_EN, gemac_base + EMAC_ECNTRL_REG);
> +}
> +
> +static inline void ls1012a_gemac_set_speed(void *gemac_base, u32 speed)
> +{
> +       struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
> +       u32 ecr = readl(gemac_base + EMAC_ECNTRL_REG) & ~EMAC_ECNTRL_SPEED;
> +       u32 rcr = readl(gemac_base + EMAC_RCNTRL_REG) & ~EMAC_RCNTRL_RMII_10T;
> +       u32 rgmii_pcr = in_be32(&scfg->rgmiipcr) &
> +                       ~(SCFG_RGMIIPCR_SETSP_1000M|SCFG_RGMIIPCR_SETSP_10M);
> +
> +       if (speed == _1000BASET) {
> +               ecr |= EMAC_ECNTRL_SPEED;
> +               rgmii_pcr |= SCFG_RGMIIPCR_SETSP_1000M;
> +       } else if (speed != _100BASET) {
> +               rcr |= EMAC_RCNTRL_RMII_10T;
> +               rgmii_pcr |= SCFG_RGMIIPCR_SETSP_10M;
> +       }
> +
> +       writel(ecr, gemac_base + EMAC_ECNTRL_REG);
> +       out_be32(&scfg->rgmiipcr, rgmii_pcr | SCFG_RGMIIPCR_SETFD);
> +
> +       /* remove loop back */
> +       rcr &= ~EMAC_RCNTRL_LOOP;
> +       /* enable flow control */
> +       rcr |= EMAC_RCNTRL_FCE;
> +
> +       /* Enable MII mode */
> +       rcr |= EMAC_RCNTRL_MII_MODE;
> +
> +       writel(rcr, gemac_base + EMAC_RCNTRL_REG);
> +
> +       /* Enable Tx full duplex */
> +       writel(readl(gemac_base + EMAC_TCNTRL_REG) | EMAC_TCNTRL_FDEN,
> +              gemac_base + EMAC_TCNTRL_REG);
> +}
> +
> +static inline void ls1012a_gemac_set_ethaddr(void *gemac_base, uchar *mac)
> +{
> +       writel((mac[0] << 24) + (mac[1] << 16) + (mac[2] << 8) + mac[3],
> +              gemac_base + EMAC_PHY_ADDR_LOW);
> +       writel((mac[4] << 24) + (mac[5] << 16) + 0x8808, gemac_base +
> +              EMAC_PHY_ADDR_HIGH);
> +}
> +
> +/** Stops or Disables GEMAC pointing to this eth iface.
> + *
> + * @param[in]   edev    Pointer to eth device structure.
> + *
> + * @return      none
> + */
> +static inline void ls1012a_eth_halt(struct eth_device *edev)
> +{
> +       struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)edev->priv;
> +
> +       ls1012a_gemac_disable(priv->gem->gemac_base);
> +
> +       gpi_disable(priv->gem->egpi_base);
> +}
> +
> +static int ls1012a_eth_init(struct eth_device *dev, bd_t *bd)
> +{
> +       struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
> +       struct gemac_s *gem = priv->gem;
> +       int speed;
> +
> +       /* set ethernet mac address */
> +       ls1012a_gemac_set_ethaddr(gem->gemac_base, dev->enetaddr);
> +
> +       writel(0x00000004, gem->gemac_base + EMAC_TFWR_STR_FWD);
> +       writel(0x00000005, gem->gemac_base + EMAC_RX_SECTIOM_FULL);
> +       writel(0x00003fff, gem->gemac_base + EMAC_TRUNC_FL);
> +       writel(0x00000030, gem->gemac_base + EMAC_TX_SECTION_EMPTY);
> +       writel(0x00000000, gem->gemac_base + EMAC_MIB_CTRL_STS_REG);

Why all the magic numbers?

> +
> +#ifdef CONFIG_PHYLIB
> +       /* Start up the PHY */
> +       if (phy_startup(priv->phydev)) {
> +               printf("Could not initialize PHY %s\n",
> +                      priv->phydev->dev->name);
> +               return -1;
> +       }
> +       speed = priv->phydev->speed;
> +       printf("Speed detected %x\n", speed);
> +       if (priv->phydev->duplex == DUPLEX_HALF) {
> +               printf("Half duplex not supported\n");
> +               return -1;
> +       }
> +#endif
> +
> +       ls1012a_gemac_set_speed(gem->gemac_base, speed);
> +
> +       /* Enable GPI */
> +       gpi_enable(gem->egpi_base);
> +
> +       /* Enable GEMAC */
> +       ls1012a_gemac_enable(gem->gemac_base);
> +
> +       return 0;
> +}
> +
> +static int ls1012a_eth_send(struct eth_device *dev, void *data, int length)
> +{
> +       struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
> +
> +       int rc;
> +       int i = 0;
> +
> +       rc = pfe_send(priv->gemac_port, data, length);
> +
> +       if (rc < 0) {
> +               printf("Tx Q full\n");
> +               return 0;
> +       }
> +
> +       while (1) {
> +               rc = pfe_tx_done();
> +               if (rc == 0)
> +                       break;
> +
> +                       udelay(100);
> +                       i++;
> +                       if (i == 30000)
> +                               printf("Tx timeout, send failed\n");
> +                       break;
> +       }
> +
> +       return 0;
> +}
> +
> +static int ls1012a_eth_recv(struct eth_device *dev)
> +{
> +       struct ls1012a_eth_dev *priv = (struct ls1012a_eth_dev *)dev->priv;
> +       u32 pkt_buf;
> +       int len;
> +       int phy_port;
> +
> +       len = pfe_recv(&pkt_buf, &phy_port);
> +
> +       if (len < 0)
> +               return 0; /* no packet in rx */
> +
> +       debug("Rx pkt: pkt_buf(%08x), phy_port(%d), len(%d)\n", pkt_buf,
> +             phy_port, len);
> +       if (phy_port != priv->gemac_port)  {
> +               printf("Rx pkt not on expected port\n");
> +               return 0;
> +       }
> +
> +       /* Pass the packet up to the protocol layers. */
> +       net_process_received_packet((void *)(long int)pkt_buf, len);

Please don't call this directly. The layer above will call it for you
if you return the size of the packet that is valid (assuming driver
model, see below).

> +       return 0;
> +}
> +
> +#if defined(CONFIG_PHYLIB)
> +
> +#define MDIO_TIMEOUT    5000
> +static int ls1012a_write_addr(struct mii_dev *bus, int phy_addr, int dev_addr,
> +                             int reg_addr)
> +{
> +       void *reg_base = bus->priv;
> +       u32 devadr;
> +       u32 phy;
> +       u32 reg_data;
> +       int timeout = MDIO_TIMEOUT;
> +
> +       devadr = ((dev_addr & EMAC_MII_DATA_RA_MASK) << EMAC_MII_DATA_RA_SHIFT);
> +       phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
> +
> +       reg_data = (EMAC_MII_DATA_TA | phy | devadr | reg_addr);
> +
> +
> +       writel(reg_data, reg_base + EMAC_MII_DATA_REG);
> +
> +       /*
> +        * wait for the MII interrupt
> +        */
> +       while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
> +               if (timeout-- <= 0) {
> +                       printf("Phy MDIO read/write timeout\n");
> +                       return -1;
> +               }
> +       }
> +
> +       /*
> +        * clear MII interrupt
> +        */
> +       writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
> +
> +
> +       return 0;
> +}
> +
> +static int ls1012a_phy_read(struct mii_dev *bus, int phy_addr, int dev_addr, int
> +                               reg_addr)
> +{
> +       void *reg_base = bus->priv;
> +       u32 reg;
> +       u32 phy;
> +       u32 reg_data;
> +       u16 val;
> +       int timeout = MDIO_TIMEOUT;
> +
> +       if (dev_addr == MDIO_DEVAD_NONE) {
> +                       reg = ((reg_addr & EMAC_MII_DATA_RA_MASK) <<
> +                      EMAC_MII_DATA_RA_SHIFT);
> +       } else {
> +               ls1012a_write_addr(bus, phy_addr, dev_addr, reg_addr);
> +               reg = ((dev_addr & EMAC_MII_DATA_RA_MASK) <<
> +                      EMAC_MII_DATA_RA_SHIFT);
> +       }
> +
> +       phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
> +
> +       if (dev_addr == MDIO_DEVAD_NONE)
> +               reg_data = (EMAC_MII_DATA_ST | EMAC_MII_DATA_OP_RD |
> +                           EMAC_MII_DATA_TA | phy | reg);
> +       else
> +               reg_data = (EMAC_MII_DATA_OP_CL45_RD | EMAC_MII_DATA_TA |
> +                           phy | reg);
> +
> +       writel(reg_data, reg_base + EMAC_MII_DATA_REG);
> +
> +       /*
> +        * wait for the MII interrupt
> +        */
> +       while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
> +               if (timeout-- <= 0) {
> +                       printf("Phy MDIO read/write timeout\n");
> +                       return -1;
> +               }
> +       }
> +
> +       /*
> +        * clear MII interrupt
> +        */
> +       writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
> +
> +       /*
> +        * it's now safe to read the PHY's register
> +        */
> +       val = (u16)readl(reg_base + EMAC_MII_DATA_REG);
> +       debug("%s: %p phy: 0x%x reg:0x%08x val:%#x\n", __func__, reg_base,
> +             phy_addr, reg_addr, val);
> +
> +       return val;
> +}
> +
> +static int ls1012a_phy_write(struct mii_dev *bus, int phy_addr, int dev_addr,
> +                               int reg_addr, u16 data)
> +{
> +       void *reg_base = bus->priv;
> +       u32 reg;
> +       u32 phy;
> +       u32 reg_data;
> +       int timeout = MDIO_TIMEOUT;
> +       int val;
> +
> +       if (dev_addr == MDIO_DEVAD_NONE) {
> +               reg = ((reg_addr & EMAC_MII_DATA_RA_MASK) <<
> +                      EMAC_MII_DATA_RA_SHIFT);
> +       } else {
> +               ls1012a_write_addr(bus, phy_addr, dev_addr, reg_addr);
> +               reg = ((dev_addr & EMAC_MII_DATA_RA_MASK) <<
> +                      EMAC_MII_DATA_RA_SHIFT);
> +       }
> +
> +       phy = ((phy_addr & EMAC_MII_DATA_PA_MASK) << EMAC_MII_DATA_PA_SHIFT);
> +
> +       if (dev_addr == MDIO_DEVAD_NONE)
> +               reg_data = (EMAC_MII_DATA_ST | EMAC_MII_DATA_OP_WR |
> +                           EMAC_MII_DATA_TA | phy | reg | data);
> +       else
> +               reg_data = (EMAC_MII_DATA_OP_CL45_WR | EMAC_MII_DATA_TA |
> +                           phy | reg | data);
> +
> +       writel(reg_data, reg_base + EMAC_MII_DATA_REG);
> +
> +       /*
> +        * wait for the MII interrupt
> +        */
> +       while (!(readl(reg_base + EMAC_IEVENT_REG) & EMAC_IEVENT_MII)) {
> +               if (timeout-- <= 0) {
> +                       printf("Phy MDIO read/write timeout\n");
> +                       return -1;
> +               }
> +       }
> +
> +       /*
> +        * clear MII interrupt
> +        */
> +       writel(EMAC_IEVENT_MII, reg_base + EMAC_IEVENT_REG);
> +
> +       debug("%s: phy: %02x reg:%02x val:%#x\n", __func__, phy_addr,
> +             reg_addr, data);
> +
> +       return val;
> +}
> +
> +struct mii_dev *ls1012a_mdio_init(struct mdio_info *mdio_info)
> +{
> +       struct mii_dev *bus;
> +       int ret;
> +       u32 mdio_speed;
> +       u32 pclk = 250000000;
> +
> +       bus = mdio_alloc();
> +       if (!bus) {
> +               printf("mdio_alloc failed\n");
> +               return NULL;
> +       }
> +       bus->read = ls1012a_phy_read;
> +       bus->write = ls1012a_phy_write;
> +       /* MAC1 MDIO used to communicate with external PHYS */
> +       bus->priv = mdio_info->reg_base;
> +       sprintf(bus->name, mdio_info->name);
> +
> +       /* configure mdio speed */
> +       mdio_speed = (DIV_ROUND_UP(pclk, 4000000) << EMAC_MII_SPEED_SHIFT);
> +       mdio_speed |= EMAC_HOLDTIME(0x5);
> +       writel(mdio_speed, mdio_info->reg_base + EMAC_MII_CTRL_REG);
> +
> +       ret = mdio_register(bus);
> +       if (ret) {
> +               printf("mdio_register failed\n");
> +               free(bus);
> +               return NULL;
> +       }
> +       return bus;
> +}
> +
> +static void ls1012a_configure_serdes(struct ls1012a_eth_dev *priv)
> +{
> +       struct mii_dev bus;
> +       int value, sgmii_2500 = 0;
> +       struct gemac_s *gem = priv->gem;
> +
> +       if (gem->phy_mode == PHY_INTERFACE_MODE_SGMII_2500)
> +               sgmii_2500 = 1;
> +
> +       printf("%s %d\n", __func__, priv->gemac_port);
> +
> +       /* PCS configuration done with corresponding GEMAC */
> +       bus.priv = gem_info[priv->gemac_port].gemac_base;
> +
> +       ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x0);
> +       ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x1);
> +       ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x2);
> +       ls1012a_phy_read(&bus, 0, MDIO_DEVAD_NONE, 0x3);
> +
> +       /* Reset serdes */
> +       ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x0, 0x8000);
> +
> +       /* SGMII IF mode + AN enable only for 1G SGMII, not for 2.5G */
> +       value = PHY_SGMII_IF_MODE_SGMII;
> +       if (!sgmii_2500)
> +               value |= PHY_SGMII_IF_MODE_AN;
> +       else
> +               value |= PHY_SGMII_IF_MODE_SGMII_GBT;
> +
> +       ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x14, value);
> +
> +       /* Dev ability according to SGMII specification */
> +       value = PHY_SGMII_DEV_ABILITY_SGMII;
> +       ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x4, value);
> +
> +       /* These values taken from validation team */
> +       if (!sgmii_2500) {
> +               ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x13, 0x0);
> +               ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x12, 0x400);
> +       } else {
> +               ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x13, 0x7);
> +               ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0x12, 0xa120);
> +       }
> +
> +       /* Restart AN */
> +       value = PHY_SGMII_CR_DEF_VAL;
> +       if (!sgmii_2500)
> +               value |= PHY_SGMII_CR_RESET_AN;
> +       ls1012a_phy_write(&bus, 0, MDIO_DEVAD_NONE, 0, value);
> +}
> +
> +void ls1012a_set_mdio(int dev_id, struct mii_dev *bus)
> +{
> +       gem_info[dev_id].bus = bus;
> +}
> +
> +void ls1012a_set_phy_address_mode(int dev_id, int phy_id, int phy_mode)
> +{
> +       gem_info[dev_id].phy_address = phy_id;
> +       gem_info[dev_id].phy_mode  = phy_mode;
> +}
> +
> +int ls1012a_phy_configure(struct ls1012a_eth_dev *priv, int dev_id, int phy_id)
> +{
> +       struct phy_device *phydev = NULL;
> +       struct eth_device *dev = priv->dev;
> +       struct gemac_s *gem = priv->gem;
> +       struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR;
> +
> +       /* Configure SGMII  PCS */
> +       if (gem->phy_mode == PHY_INTERFACE_MODE_SGMII ||
> +           gem->phy_mode == PHY_INTERFACE_MODE_SGMII_2500) {
> +               out_be32(&scfg->mdioselcr, 0x00000000);
> +               ls1012a_configure_serdes(priv);
> +       }
> +
> +       /* By this time on-chip SGMII initialization is done
> +        * we can switch mdio interface to external PHYs
> +        */
> +       out_be32(&scfg->mdioselcr, 0x80000000);
> +
> +       if (!gem->bus)
> +               return -1;
> +       phydev = phy_connect(gem->bus, phy_id, dev, gem->phy_mode);
> +       if (!phydev) {
> +               printf("phy_connect failed\n");
> +               return -1;
> +       }
> +
> +       phy_config(phydev);
> +
> +       priv->phydev = phydev;
> +
> +       return 0;
> +}
> +#endif
> +
> +int gemac_initialize(bd_t *bis, int dev_id, char *devname)
> +{
> +       struct eth_device *dev;
> +       struct ls1012a_eth_dev *priv;
> +       struct pfe *pfe;
> +       int i;
> +
> +       if (dev_id > 1) {
> +               printf("Invalid port\n");
> +               return -1;
> +       }
> +
> +       dev = (struct eth_device *)malloc(sizeof(struct eth_device));

Please don't add a new driver that uses the legacy API. Make this a
driver model driver.

> +       if (!dev)
> +               return -1;
> +
> +       memset(dev, 0, sizeof(struct eth_device));
> +
> +       priv = (struct ls1012a_eth_dev *)malloc(sizeof(struct ls1012a_eth_dev));
> +       if (!priv)
> +               return -1;
> +
> +       gemac_list[dev_id] = priv;
> +       priv->gemac_port = dev_id;
> +       priv->gem = &gem_info[priv->gemac_port];
> +       priv->dev = dev;
> +
> +       pfe = &priv->pfe;
> +
> +       pfe->cbus_baseaddr = (void *)CONFIG_SYS_FSL_PFE_ADDR;
> +       pfe->ddr_baseaddr = (void *)CONFIG_DDR_PFE_BASEADDR;
> +       pfe->ddr_phys_baseaddr = (unsigned long)CONFIG_DDR_PFE_PHYS_BASEADDR;
> +
> +       sprintf(dev->name, devname);
> +       dev->priv = priv;
> +       dev->init = ls1012a_eth_init;
> +       dev->halt = ls1012a_eth_halt;
> +       dev->send = ls1012a_eth_send;
> +       dev->recv = ls1012a_eth_recv;
> +
> +       /* Tell u-boot to get the addr from the env */
> +       for (i = 0; i < 6; i++)
> +               dev->enetaddr[i] = 0;
> +
> +       pfe_probe(pfe);
> +
> +       switch (priv->gemac_port)  {
> +       case EMAC_PORT_0:
> +       default:
> +               priv->gem->gemac_base = EMAC1_BASE_ADDR;
> +               priv->gem->egpi_base = EGPI1_BASE_ADDR;
> +               break;
> +       case EMAC_PORT_1:
> +               priv->gem->gemac_base = EMAC2_BASE_ADDR;
> +               priv->gem->egpi_base = EGPI2_BASE_ADDR;
> +               break;
> +       }
> +
> +#if defined(CONFIG_PHYLIB)
> +       if (ls1012a_phy_configure(priv, dev_id,
> +                                 gem_info[priv->gemac_port].phy_address))
> +               return -1;
> +#endif
> +
> +       eth_register(dev);
> +
> +       return 0;
> +}

[ ... ]

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands
  2017-10-09  9:11 ` [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands Calvin Johnson
@ 2017-12-05 20:32   ` Joe Hershberger
  0 siblings, 0 replies; 21+ messages in thread
From: Joe Hershberger @ 2017-12-05 20:32 UTC (permalink / raw)
  To: u-boot

On Mon, Oct 9, 2017 at 4:11 AM, Calvin Johnson <calvin.johnson@nxp.com> wrote:
> pfe_command provides command line support for several features that
> support pfe like starting or stopping the pfe, checking the health
> of the processor engines and checking status of different unit inside
> pfe.
>
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers
  2017-10-09  9:11 ` [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers Calvin Johnson
@ 2017-12-05 21:16   ` Joe Hershberger
  0 siblings, 0 replies; 21+ messages in thread
From: Joe Hershberger @ 2017-12-05 21:16 UTC (permalink / raw)
  To: u-boot

On Mon, Oct 9, 2017 at 4:11 AM, Calvin Johnson <calvin.johnson@nxp.com> wrote:
> Contains all the pfe header files.
>
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  include/pfe_eth/pfe/cbus.h           |  75 +++++++++++++++
>  include/pfe_eth/pfe/cbus/bmu.h       |  40 ++++++++
>  include/pfe_eth/pfe/cbus/class_csr.h | 181 +++++++++++++++++++++++++++++++++++
>  include/pfe_eth/pfe/cbus/emac.h      | 150 +++++++++++++++++++++++++++++
>  include/pfe_eth/pfe/cbus/gpi.h       |  62 ++++++++++++
>  include/pfe_eth/pfe/cbus/hif.h       |  68 +++++++++++++
>  include/pfe_eth/pfe/cbus/hif_nocpy.h |  40 ++++++++
>  include/pfe_eth/pfe/cbus/tmu_csr.h   | 148 ++++++++++++++++++++++++++++
>  include/pfe_eth/pfe/cbus/util_csr.h  |  47 +++++++++
>  include/pfe_eth/pfe/pfe.h            | 178 ++++++++++++++++++++++++++++++++++
>  include/pfe_eth/pfe_driver.h         |  55 +++++++++++
>  include/pfe_eth/pfe_eth.h            | 111 +++++++++++++++++++++
>  include/pfe_eth/pfe_firmware.h       |  17 ++++
>  13 files changed, 1172 insertions(+)
>  create mode 100644 include/pfe_eth/pfe/cbus.h
>  create mode 100644 include/pfe_eth/pfe/cbus/bmu.h
>  create mode 100644 include/pfe_eth/pfe/cbus/class_csr.h
>  create mode 100644 include/pfe_eth/pfe/cbus/emac.h
>  create mode 100644 include/pfe_eth/pfe/cbus/gpi.h
>  create mode 100644 include/pfe_eth/pfe/cbus/hif.h
>  create mode 100644 include/pfe_eth/pfe/cbus/hif_nocpy.h
>  create mode 100644 include/pfe_eth/pfe/cbus/tmu_csr.h
>  create mode 100644 include/pfe_eth/pfe/cbus/util_csr.h
>  create mode 100644 include/pfe_eth/pfe/pfe.h
>  create mode 100644 include/pfe_eth/pfe_driver.h
>  create mode 100644 include/pfe_eth/pfe_eth.h
>  create mode 100644 include/pfe_eth/pfe_firmware.h
>
> diff --git a/include/pfe_eth/pfe/cbus.h b/include/pfe_eth/pfe/cbus.h
> new file mode 100644
> index 0000000..ec31481
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus.h
> @@ -0,0 +1,75 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _CBUS_H_
> +#define _CBUS_H_
> +
> +#include "cbus/emac.h"
> +#include "cbus/gpi.h"
> +#include "cbus/bmu.h"
> +#include "cbus/hif.h"
> +#include "cbus/tmu_csr.h"
> +#include "cbus/class_csr.h"
> +#include "cbus/hif_nocpy.h"
> +#include "cbus/util_csr.h"
> +
> +#define CBUS_BASE_ADDR         ((void *)CONFIG_SYS_FSL_PFE_ADDR)
> +
> +/* PFE Control and Status Register Desciption */
> +#define EMAC1_BASE_ADDR                (CBUS_BASE_ADDR + 0x200000)
> +#define EGPI1_BASE_ADDR                (CBUS_BASE_ADDR + 0x210000)
> +#define EMAC2_BASE_ADDR                (CBUS_BASE_ADDR + 0x220000)
> +#define EGPI2_BASE_ADDR                (CBUS_BASE_ADDR + 0x230000)
> +#define BMU1_BASE_ADDR         (CBUS_BASE_ADDR + 0x240000)
> +#define BMU2_BASE_ADDR         (CBUS_BASE_ADDR + 0x250000)
> +#define ARB_BASE_ADDR          (CBUS_BASE_ADDR + 0x260000)
> +#define DDR_CONFIG_BASE_ADDR   (CBUS_BASE_ADDR + 0x270000)
> +#define HIF_BASE_ADDR          (CBUS_BASE_ADDR + 0x280000)
> +#define HGPI_BASE_ADDR         (CBUS_BASE_ADDR + 0x290000)
> +#define LMEM_BASE_ADDR         (CBUS_BASE_ADDR + 0x300000)
> +#define LMEM_SIZE              0x10000
> +#define LMEM_END               (LMEM_BASE_ADDR + LMEM_SIZE)
> +#define TMU_CSR_BASE_ADDR      (CBUS_BASE_ADDR + 0x310000)
> +#define CLASS_CSR_BASE_ADDR    (CBUS_BASE_ADDR + 0x320000)
> +#define HIF_NOCPY_BASE_ADDR    (CBUS_BASE_ADDR + 0x350000)
> +#define UTIL_CSR_BASE_ADDR     (CBUS_BASE_ADDR + 0x360000)
> +#define CBUS_GPT_BASE_ADDR     (CBUS_BASE_ADDR + 0x370000)
> +
> +/*
> + * defgroup XXX_MEM_ACCESS_ADDR PE memory access through CSR
> + * XXX_MEM_ACCESS_ADDR register bit definitions.
> + */
> +/* Internal Memory Write. */
> +#define PE_MEM_ACCESS_WRITE            (1<<31)
> +/* Internal Memory Read. */
> +#define PE_MEM_ACCESS_READ             (0<<31)
> +
> +#define PE_MEM_ACCESS_IMEM             (1<<15)
> +#define PE_MEM_ACCESS_DMEM             (1<<16)

Please use the BIT() macro for this sort of define.

> +/* Byte Enables of the Internal memory access. These are interpred in BE */
> +#define PE_MEM_ACCESS_BYTE_ENABLE(offset, size)        (((((1 << (size)) - 1) << (4 \
> +                                                       - (offset) - (size)))\
> +                                                       & 0xf) << 24)

This is pretty unreadable. If you can improve it, please do.

> +/* PFE cores states */
> +#define CORE_DISABLE   0x00000000
> +#define CORE_ENABLE    0x00000001
> +#define CORE_SW_RESET  0x00000002
> +
> +/* LMEM defines */
> +#define LMEM_HDR_SIZE          0x0010
> +#define LMEM_BUF_SIZE_LN2      0x7
> +#define LMEM_BUF_SIZE          (1 << LMEM_BUF_SIZE_LN2)
> +
> +/* DDR defines */
> +#define DDR_HDR_SIZE           0x0100
> +#define DDR_BUF_SIZE_LN2       0xb
> +#define DDR_BUF_SIZE           (1 << DDR_BUF_SIZE_LN2)
> +
> +/* Clock generation through PLL */
> +#define PLL_CLK_EN     1
> +
> +#endif /* _CBUS_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/bmu.h b/include/pfe_eth/pfe/cbus/bmu.h
> new file mode 100644
> index 0000000..f707cc3
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/bmu.h
> @@ -0,0 +1,40 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _BMU_H_
> +#define _BMU_H_
> +
> +#define BMU_VERSION            0x000
> +#define BMU_CTRL               0x004
> +#define BMU_UCAST_CONFIG       0x008
> +#define BMU_UCAST_BASE_ADDR    0x00c
> +#define BMU_BUF_SIZE           0x010
> +#define BMU_BUF_CNT            0x014
> +#define BMU_THRES              0x018
> +#define BMU_INT_SRC            0x020
> +#define BMU_INT_ENABLE         0x024
> +#define BMU_ALLOC_CTRL         0x030
> +#define BMU_FREE_CTRL          0x034
> +#define BMU_FREE_ERR_ADDR      0x038
> +#define BMU_CURR_BUF_CNT       0x03c
> +#define BMU_MCAST_CNT          0x040
> +#define BMU_MCAST_ALLOC_CTRL   0x044
> +#define BMU_REM_BUF_CNT                0x048
> +#define BMU_LOW_WATERMARK      0x050
> +#define BMU_HIGH_WATERMARK     0x054
> +#define BMU_INT_MEM_ACCESS     0x100
> +
> +struct bmu_cfg {
> +       u32 baseaddr;
> +       u32 count;
> +       u32 size;
> +};
> +
> +#define BMU1_BUF_SIZE  LMEM_BUF_SIZE_LN2
> +#define BMU2_BUF_SIZE  DDR_BUF_SIZE_LN2
> +
> +#endif /* _BMU_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/class_csr.h b/include/pfe_eth/pfe/cbus/class_csr.h
> new file mode 100644
> index 0000000..413707f
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/class_csr.h
> @@ -0,0 +1,181 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _CLASS_CSR_H_
> +#define _CLASS_CSR_H_
> +
> +/*
> + * @file class_csr.h.
> + * class_csr - block containing all the classifier control and status register.
> + * Mapped on CBUS and accessible from all PE's and ARM.
> + */
> +#define CLASS_VERSION                  (CLASS_CSR_BASE_ADDR + 0x000)
> +#define CLASS_TX_CTRL                  (CLASS_CSR_BASE_ADDR + 0x004)
> +#define CLASS_INQ_PKTPTR               (CLASS_CSR_BASE_ADDR + 0x010)
> +/* (ddr_hdr_size[24:16], lmem_hdr_size[5:0]) */
> +#define CLASS_HDR_SIZE                 (CLASS_CSR_BASE_ADDR + 0x014)
> +/* LMEM header size for the Classifier block.
> + * Data in the LMEM is written from this offset.
> + */
> +#define CLASS_HDR_SIZE_LMEM(off)       ((off) & 0x3f)
> +/* DDR header size for the Classifier block.
> + * Data in the DDR is written from this offset.
> + */
> +#define CLASS_HDR_SIZE_DDR(off)                (((off) & 0x1ff) << 16)
> +
> +/* DMEM address of first [15:0] and second [31:16] buffers on QB side. */
> +#define CLASS_PE0_QB_DM_ADDR0          (CLASS_CSR_BASE_ADDR + 0x020)
> +/* DMEM address of third [15:0] and fourth [31:16] buffers on QB side. */
> +#define CLASS_PE0_QB_DM_ADDR1          (CLASS_CSR_BASE_ADDR + 0x024)
> +
> +/* DMEM address of first [15:0] and second [31:16] buffers on RO side. */
> +#define CLASS_PE0_RO_DM_ADDR0          (CLASS_CSR_BASE_ADDR + 0x060)
> +/* DMEM address of third [15:0] and fourth [31:16] buffers on RO side. */
> +#define CLASS_PE0_RO_DM_ADDR1          (CLASS_CSR_BASE_ADDR + 0x064)
> +
> +/*
> + * @name Class PE memory access. Allows external PE's and HOST to
> + * read/write PMEM/DMEM memory ranges for each classifier PE.
> + */
> +#define CLASS_MEM_ACCESS_ADDR          (CLASS_CSR_BASE_ADDR + 0x100)
> +/* Internal Memory Access Write Data [31:0] */
> +#define CLASS_MEM_ACCESS_WDATA         (CLASS_CSR_BASE_ADDR + 0x104)
> +/* Internal Memory Access Read Data [31:0] */
> +#define CLASS_MEM_ACCESS_RDATA         (CLASS_CSR_BASE_ADDR + 0x108)
> +#define CLASS_TM_INQ_ADDR              (CLASS_CSR_BASE_ADDR + 0x114)
> +#define CLASS_PE_STATUS                        (CLASS_CSR_BASE_ADDR + 0x118)
> +
> +#define CLASS_PE_SYS_CLK_RATIO         (CLASS_CSR_BASE_ADDR + 0x200)
> +#define CLASS_AFULL_THRES              (CLASS_CSR_BASE_ADDR + 0x204)
> +#define CLASS_GAP_BETWEEN_READS                (CLASS_CSR_BASE_ADDR + 0x208)
> +#define CLASS_MAX_BUF_CNT              (CLASS_CSR_BASE_ADDR + 0x20c)
> +#define CLASS_TSQ_FIFO_THRES           (CLASS_CSR_BASE_ADDR + 0x210)
> +#define CLASS_TSQ_MAX_CNT              (CLASS_CSR_BASE_ADDR + 0x214)
> +#define CLASS_IRAM_DATA_0              (CLASS_CSR_BASE_ADDR + 0x218)
> +#define CLASS_IRAM_DATA_1              (CLASS_CSR_BASE_ADDR + 0x21c)
> +#define CLASS_IRAM_DATA_2              (CLASS_CSR_BASE_ADDR + 0x220)
> +#define CLASS_IRAM_DATA_3              (CLASS_CSR_BASE_ADDR + 0x224)
> +
> +#define CLASS_BUS_ACCESS_ADDR          (CLASS_CSR_BASE_ADDR + 0x228)
> +/* bit 23:0 of PE peripheral address are stored in CLASS_BUS_ACCESS_ADDR */
> +#define CLASS_BUS_ACCESS_ADDR_MASK     (0x0001FFFF)
> +
> +#define CLASS_BUS_ACCESS_WDATA         (CLASS_CSR_BASE_ADDR + 0x22c)
> +#define CLASS_BUS_ACCESS_RDATA         (CLASS_CSR_BASE_ADDR + 0x230)
> +
> +/*
> + * (route_entry_size[9:0], route_hash_size[23:16]
> + * (this is actually ln2(size)))
> + */
> +#define CLASS_ROUTE_HASH_ENTRY_SIZE    (CLASS_CSR_BASE_ADDR + 0x234)
> +#define CLASS_ROUTE_ENTRY_SIZE(size)    ((size) & 0x1ff)
> +#define CLASS_ROUTE_HASH_SIZE(hash_bits) (((hash_bits) & 0xff) << 16)
> +
> +#define CLASS_ROUTE_TABLE_BASE         (CLASS_CSR_BASE_ADDR + 0x238)
> +#define CLASS_ROUTE_MULTI              (CLASS_CSR_BASE_ADDR + 0x23c)
> +#define CLASS_SMEM_OFFSET              (CLASS_CSR_BASE_ADDR + 0x240)
> +#define CLASS_LMEM_BUF_SIZE            (CLASS_CSR_BASE_ADDR + 0x244)
> +#define CLASS_VLAN_ID                  (CLASS_CSR_BASE_ADDR + 0x248)
> +#define CLASS_BMU1_BUF_FREE            (CLASS_CSR_BASE_ADDR + 0x24c)
> +#define CLASS_USE_TMU_INQ              (CLASS_CSR_BASE_ADDR + 0x250)
> +#define CLASS_VLAN_ID1                 (CLASS_CSR_BASE_ADDR + 0x254)
> +
> +#define CLASS_BUS_ACCESS_BASE          (CLASS_CSR_BASE_ADDR + 0x258)
> +/* bit 31:24 of PE peripheral address are stored in CLASS_BUS_ACCESS_BASE */
> +#define CLASS_BUS_ACCESS_BASE_MASK     (0xFF000000)
> +
> +#define CLASS_HIF_PARSE                        (CLASS_CSR_BASE_ADDR + 0x25c)
> +
> +#define CLASS_HOST_PE0_GP              (CLASS_CSR_BASE_ADDR + 0x260)
> +#define CLASS_PE0_GP                   (CLASS_CSR_BASE_ADDR + 0x264)
> +#define CLASS_HOST_PE1_GP              (CLASS_CSR_BASE_ADDR + 0x268)
> +#define CLASS_PE1_GP                   (CLASS_CSR_BASE_ADDR + 0x26c)
> +#define CLASS_HOST_PE2_GP              (CLASS_CSR_BASE_ADDR + 0x270)
> +#define CLASS_PE2_GP                   (CLASS_CSR_BASE_ADDR + 0x274)
> +#define CLASS_HOST_PE3_GP              (CLASS_CSR_BASE_ADDR + 0x278)
> +#define CLASS_PE3_GP                   (CLASS_CSR_BASE_ADDR + 0x27c)
> +#define CLASS_HOST_PE4_GP              (CLASS_CSR_BASE_ADDR + 0x280)
> +#define CLASS_PE4_GP                   (CLASS_CSR_BASE_ADDR + 0x284)
> +#define CLASS_HOST_PE5_GP              (CLASS_CSR_BASE_ADDR + 0x288)
> +#define CLASS_PE5_GP                   (CLASS_CSR_BASE_ADDR + 0x28c)
> +
> +#define CLASS_PE_INT_SRC               (CLASS_CSR_BASE_ADDR + 0x290)
> +#define CLASS_PE_INT_ENABLE            (CLASS_CSR_BASE_ADDR + 0x294)
> +
> +#define CLASS_TPID0_TPID1              (CLASS_CSR_BASE_ADDR + 0x298)
> +#define CLASS_TPID2                    (CLASS_CSR_BASE_ADDR + 0x29c)
> +
> +#define CLASS_L4_CHKSUM_ADDR           (CLASS_CSR_BASE_ADDR + 0x2a0)
> +
> +#define CLASS_PE0_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2a4)
> +#define CLASS_PE1_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2a8)
> +#define CLASS_PE2_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2ac)
> +#define CLASS_PE3_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2b0)
> +#define CLASS_PE4_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2b4)
> +#define CLASS_PE5_DEBUG                        (CLASS_CSR_BASE_ADDR + 0x2b8)
> +
> +#define CLASS_STATE                    (CLASS_CSR_BASE_ADDR + 0x2bc)
> +#define CLASS_AXI_CTRL                 (CLASS_CSR_BASE_ADDR + 0x2d0)
> +
> +/* CLASS defines */
> +#define CLASS_PBUF_SIZE                        0x100   /* Fixed by hardware */
> +#define CLASS_PBUF_HEADER_OFFSET       0x80    /* Can be configured */
> +
> +#define CLASS_PBUF0_BASE_ADDR          0x000   /* Can be configured */
> +/* Can be configured */
> +#define CLASS_PBUF1_BASE_ADDR  (CLASS_PBUF0_BASE_ADDR + CLASS_PBUF_SIZE)
> +/* Can be configured */
> +#define CLASS_PBUF2_BASE_ADDR  (CLASS_PBUF1_BASE_ADDR + CLASS_PBUF_SIZE)
> +/* Can be configured */
> +#define CLASS_PBUF3_BASE_ADDR  (CLASS_PBUF2_BASE_ADDR + CLASS_PBUF_SIZE)
> +
> +#define CLASS_PBUF0_HEADER_BASE_ADDR   (CLASS_PBUF0_BASE_ADDR +\
> +                                               CLASS_PBUF_HEADER_OFFSET)
> +#define CLASS_PBUF1_HEADER_BASE_ADDR   (CLASS_PBUF1_BASE_ADDR +\
> +                                               CLASS_PBUF_HEADER_OFFSET)
> +#define CLASS_PBUF2_HEADER_BASE_ADDR   (CLASS_PBUF2_BASE_ADDR +\
> +                                               CLASS_PBUF_HEADER_OFFSET)
> +#define CLASS_PBUF3_HEADER_BASE_ADDR   (CLASS_PBUF3_BASE_ADDR +\
> +                                               CLASS_PBUF_HEADER_OFFSET)
> +
> +#define CLASS_PE0_RO_DM_ADDR0_VAL      ((CLASS_PBUF1_BASE_ADDR << 16) |\
> +                                               CLASS_PBUF0_BASE_ADDR)
> +#define CLASS_PE0_RO_DM_ADDR1_VAL      ((CLASS_PBUF3_BASE_ADDR << 16) |\
> +                                               CLASS_PBUF2_BASE_ADDR)
> +
> +#define CLASS_PE0_QB_DM_ADDR0_VAL      ((CLASS_PBUF1_HEADER_BASE_ADDR << 16)\
> +                                               | CLASS_PBUF0_HEADER_BASE_ADDR)
> +#define CLASS_PE0_QB_DM_ADDR1_VAL      ((CLASS_PBUF3_HEADER_BASE_ADDR << 16)\
> +                                               | CLASS_PBUF2_HEADER_BASE_ADDR)
> +
> +#define CLASS_ROUTE_SIZE               128
> +#define CLASS_ROUTE_HASH_BITS          20
> +#define CLASS_ROUTE_HASH_MASK          ((1 << CLASS_ROUTE_HASH_BITS) - 1)
> +
> +#define TWO_LEVEL_ROUTE                (1 << 0)
> +#define PHYNO_IN_HASH          (1 << 1)
> +#define HW_ROUTE_FETCH         (1 << 3)
> +#define HW_BRIDGE_FETCH                (1 << 5)
> +#define IP_ALIGNED             (1 << 6)
> +#define ARC_HIT_CHECK_EN       (1 << 7)
> +#define CLASS_TOE              (1 << 11)
> +#define HASH_NORMAL            (0 << 12)
> +#define HASH_CRC_PORT          (1 << 12)
> +#define HASH_CRC_IP            (2 << 12)
> +#define HASH_CRC_PORT_IP       (3 << 12)

You can use the GENMASK() macro for this type of define.

> +#define QB2BUS_LE              (1 << 15)
> +
> +#define        TCP_CHKSUM_DROP         (1 << 0)
> +#define        UDP_CHKSUM_DROP         (1 << 1)
> +#define        IPV4_CHKSUM_DROP        (1 << 9)
> +
> +struct class_cfg {
> +       u32 route_table_baseaddr;
> +       u32 route_table_hash_bits;
> +};
> +
> +#endif /* _CLASS_CSR_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/emac.h b/include/pfe_eth/pfe/cbus/emac.h
> new file mode 100644
> index 0000000..3cfcd99
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/emac.h
> @@ -0,0 +1,150 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _EMAC_H_
> +#define _EMAC_H_
> +
> +#define EMAC_IEVENT_REG                0x004
> +#define EMAC_IMASK_REG         0x008
> +#define EMAC_R_DES_ACTIVE_REG  0x010
> +#define EMAC_X_DES_ACTIVE_REG  0x014
> +#define EMAC_ECNTRL_REG                0x024
> +#define EMAC_MII_DATA_REG      0x040
> +#define EMAC_MII_CTRL_REG      0x044
> +#define EMAC_MIB_CTRL_STS_REG  0x064
> +#define EMAC_RCNTRL_REG                0x084
> +#define EMAC_TCNTRL_REG                0x0C4
> +#define EMAC_PHY_ADDR_LOW      0x0E4
> +#define EMAC_PHY_ADDR_HIGH     0x0E8
> +#define EMAC_TFWR_STR_FWD      0x144
> +#define EMAC_RX_SECTIOM_FULL   0x190
> +#define EMAC_TX_SECTION_EMPTY  0x1A0
> +#define EMAC_TRUNC_FL          0x1B0
> +
> +/* GEMAC definitions and settings */
> +#define EMAC_PORT_0                    0
> +#define EMAC_PORT_1                    1
> +
> +/* GEMAC Bit definitions */
> +#define EMAC_IEVENT_HBERR                0x80000000
> +#define EMAC_IEVENT_BABR                 0x40000000
> +#define EMAC_IEVENT_BABT                 0x20000000
> +#define EMAC_IEVENT_GRA                  0x10000000
> +#define EMAC_IEVENT_TXF                  0x08000000
> +#define EMAC_IEVENT_TXB                  0x04000000
> +#define EMAC_IEVENT_RXF                  0x02000000
> +#define EMAC_IEVENT_RXB                  0x01000000
> +#define EMAC_IEVENT_MII                  0x00800000
> +#define EMAC_IEVENT_EBERR                0x00400000
> +#define EMAC_IEVENT_LC                   0x00200000
> +#define EMAC_IEVENT_RL                   0x00100000
> +#define EMAC_IEVENT_UN                   0x00080000
> +
> +#define EMAC_IMASK_HBERR                 0x80000000
> +#define EMAC_IMASK_BABR                  0x40000000
> +#define EMAC_IMASKT_BABT                 0x20000000
> +#define EMAC_IMASK_GRA                   0x10000000
> +#define EMAC_IMASKT_TXF                  0x08000000
> +#define EMAC_IMASK_TXB                   0x04000000
> +#define EMAC_IMASKT_RXF                  0x02000000
> +#define EMAC_IMASK_RXB                   0x01000000
> +#define EMAC_IMASK_MII                   0x00800000
> +#define EMAC_IMASK_EBERR                 0x00400000
> +#define EMAC_IMASK_LC                    0x00200000
> +#define EMAC_IMASKT_RL                   0x00100000
> +#define EMAC_IMASK_UN                    0x00080000
> +
> +#define EMAC_RCNTRL_MAX_FL_SHIFT         16
> +#define EMAC_RCNTRL_LOOP                 0x00000001
> +#define EMAC_RCNTRL_DRT                  0x00000002
> +#define EMAC_RCNTRL_MII_MODE             0x00000004
> +#define EMAC_RCNTRL_PROM                 0x00000008
> +#define EMAC_RCNTRL_BC_REJ               0x00000010
> +#define EMAC_RCNTRL_FCE                  0x00000020
> +#define EMAC_RCNTRL_RGMII                0x00000040
> +#define EMAC_RCNTRL_SGMII                0x00000080
> +#define EMAC_RCNTRL_RMII                 0x00000100
> +#define EMAC_RCNTRL_RMII_10T             0x00000200
> +#define EMAC_RCNTRL_CRC_FWD             0x00004000
> +
> +#define EMAC_TCNTRL_GTS                  0x00000001
> +#define EMAC_TCNTRL_HBC                  0x00000002
> +#define EMAC_TCNTRL_FDEN                 0x00000004
> +#define EMAC_TCNTRL_TFC_PAUSE            0x00000008
> +#define EMAC_TCNTRL_RFC_PAUSE            0x00000010
> +
> +#define EMAC_ECNTRL_RESET                0x00000001      /* reset the EMAC */
> +#define EMAC_ECNTRL_ETHER_EN             0x00000002      /* enable the EMAC */
> +#define EMAC_ECNTRL_SPEED                0x00000020
> +#define EMAC_ECNTRL_DBSWAP               0x00000100
> +
> +#define EMAC_X_WMRK_STRFWD               0x00000100
> +
> +#define EMAC_X_DES_ACTIVE_TDAR           0x01000000
> +#define EMAC_R_DES_ACTIVE_RDAR           0x01000000
> +
> +/*
> + * The possible operating speeds of the MAC, currently supporting 10, 100 and
> + * 1000Mb modes.
> + */
> +enum mac_speed {SPEED_10M, SPEED_100M, SPEED_1000M, SPEED_1000M_PCS};
> +
> +#define GMII   1
> +#define MII    2
> +#define RMII   3
> +#define RGMII  4
> +#define SGMII  5
> +
> +#define DUPLEX_HALF    0x00
> +#define DUPLEX_FULL    0x01

These seem very generic and will pollute the namespace. Please prefix
or remove or reuse common header.

> +
> +/* Default configuration */
> +#define EMAC0_DEFAULT_DUPLEX_MODE      FULLDUPLEX
> +#define EMAC0_DEFAULT_EMAC_MODE                RGMII
> +#define EMAC0_DEFAULT_EMAC_SPEED       SPEED_1000M
> +
> +#define EMAC1_DEFAULT_DUPLEX_MODE      FULLDUPLEX
> +#define EMAC1_DEFAULT_EMAC_MODE                SGMII
> +#define EMAC1_DEFAULT_EMAC_SPEED       SPEED_1000M
> +
> +/* MII-related definitios */
> +#define EMAC_MII_DATA_ST         0x40000000      /* Start of frame delimiter */
> +#define EMAC_MII_DATA_OP_RD      0x20000000      /* Perform a read operation */
> +#define EMAC_MII_DATA_OP_CL45_RD 0x30000000      /* Perform a read operation */
> +#define EMAC_MII_DATA_OP_WR      0x10000000      /* Perform a write operation */
> +#define EMAC_MII_DATA_OP_CL45_WR 0x10000000      /* Perform a write operation */
> +#define EMAC_MII_DATA_PA_MSK     0x0f800000      /* PHY Address field mask */
> +#define EMAC_MII_DATA_RA_MSK     0x007c0000      /* PHY Register field mask */
> +#define EMAC_MII_DATA_TA         0x00020000      /* Turnaround */
> +#define EMAC_MII_DATA_DATAMSK    0x0000ffff      /* PHY data field */
> +
> +#define EMAC_MII_DATA_RA_SHIFT   18      /* MII Register address bits */
> +#define EMAC_MII_DATA_RA_MASK   0x1F      /* MII Register address mask */
> +#define EMAC_MII_DATA_PA_SHIFT   23      /* MII PHY address bits */
> +#define EMAC_MII_DATA_PA_MASK    0x1F      /* MII PHY address mask */
> +
> +#define EMAC_MII_DATA_RA(v) ((v & EMAC_MII_DATA_RA_MASK) <<\
> +                               EMAC_MII_DATA_RA_SHIFT)
> +#define EMAC_MII_DATA_PA(v) ((v & EMAC_MII_DATA_RA_MASK) <<\
> +                               EMAC_MII_DATA_PA_SHIFT)
> +#define EMAC_MII_DATA(v)    (v & 0xffff)
> +
> +#define EMAC_MII_SPEED_SHIFT   1
> +#define EMAC_HOLDTIME_SHIFT    8
> +#define EMAC_HOLDTIME_MASK     0x7
> +#define EMAC_HOLDTIME(v)    ((v & EMAC_HOLDTIME_MASK) << EMAC_HOLDTIME_SHIFT)
> +
> +/* Internal PHY Registers - SGMII */
> +#define PHY_SGMII_CR_PHY_RESET      0x8000
> +#define PHY_SGMII_CR_RESET_AN       0x0200
> +#define PHY_SGMII_CR_DEF_VAL        0x1140
> +#define PHY_SGMII_DEV_ABILITY_SGMII 0x4001
> +#define PHY_SGMII_IF_MODE_AN        0x0002
> +#define PHY_SGMII_IF_MODE_SGMII     0x0001
> +#define PHY_SGMII_IF_MODE_SGMII_GBT 0x0008
> +
> +#endif /* _EMAC_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/gpi.h b/include/pfe_eth/pfe/cbus/gpi.h
> new file mode 100644
> index 0000000..f86f3f9
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/gpi.h
> @@ -0,0 +1,62 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _GPI_H_
> +#define _GPI_H_
> +
> +#define GPI_VERSION                    0x00
> +#define GPI_CTRL                       0x04
> +#define GPI_RX_CONFIG                  0x08
> +#define GPI_HDR_SIZE                   0x0c
> +#define GPI_BUF_SIZE                   0x10
> +#define GPI_LMEM_ALLOC_ADDR            0x14
> +#define GPI_LMEM_FREE_ADDR             0x18
> +#define GPI_DDR_ALLOC_ADDR             0x1c
> +#define GPI_DDR_FREE_ADDR              0x20
> +#define GPI_CLASS_ADDR                 0x24
> +#define GPI_DRX_FIFO                   0x28
> +#define GPI_TRX_FIFO                   0x2c
> +#define GPI_INQ_PKTPTR                 0x30
> +#define GPI_DDR_DATA_OFFSET            0x34
> +#define GPI_LMEM_DATA_OFFSET           0x38
> +#define GPI_TMLF_TX                    0x4c
> +#define GPI_DTX_ASEQ                   0x50
> +#define GPI_FIFO_STATUS                        0x54
> +#define GPI_FIFO_DEBUG                 0x58
> +#define GPI_TX_PAUSE_TIME              0x5c
> +#define GPI_LMEM_SEC_BUF_DATA_OFFSET   0x60
> +#define GPI_DDR_SEC_BUF_DATA_OFFSET    0x64
> +#define GPI_TOE_CHKSUM_EN              0x68
> +#define GPI_OVERRUN_DROPCNT            0x6c
> +#define GPI_AXI_CTRL                   0x70
> +
> +struct gpi_cfg {
> +       u32 lmem_rtry_cnt;
> +       u32 tmlf_txthres;
> +       u32 aseq_len;
> +};
> +
> +/* GPI commons defines */
> +#define GPI_LMEM_BUF_EN                0x1
> +#define GPI_DDR_BUF_EN         0x1
> +
> +/* EGPI 1 defines */
> +#define EGPI1_LMEM_RTRY_CNT    0x40
> +#define EGPI1_TMLF_TXTHRES     0xBC
> +#define EGPI1_ASEQ_LEN         0x50
> +
> +/* EGPI 2 defines */
> +#define EGPI2_LMEM_RTRY_CNT    0x40
> +#define EGPI2_TMLF_TXTHRES     0xBC
> +#define EGPI2_ASEQ_LEN         0x40
> +
> +/* HGPI defines */
> +#define HGPI_LMEM_RTRY_CNT     0x40
> +#define HGPI_TMLF_TXTHRES      0xBC
> +#define HGPI_ASEQ_LEN          0x40
> +
> +#endif /* _GPI_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/hif.h b/include/pfe_eth/pfe/cbus/hif.h
> new file mode 100644
> index 0000000..f602b58
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/hif.h
> @@ -0,0 +1,68 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _HIF_H_
> +#define _HIF_H_
> +
> +/*
> + * @file hif.h.
> + * hif - PFE hif block control and status register.
> + * Mapped on CBUS and accessible from all PE's and ARM.
> + */
> +#define HIF_VERSION            (HIF_BASE_ADDR + 0x00)
> +#define HIF_TX_CTRL            (HIF_BASE_ADDR + 0x04)
> +#define HIF_TX_CURR_BD_ADDR    (HIF_BASE_ADDR + 0x08)
> +#define HIF_TX_ALLOC           (HIF_BASE_ADDR + 0x0c)
> +#define HIF_TX_BDP_ADDR                (HIF_BASE_ADDR + 0x10)
> +#define HIF_TX_STATUS          (HIF_BASE_ADDR + 0x14)
> +#define HIF_RX_CTRL            (HIF_BASE_ADDR + 0x20)
> +#define HIF_RX_BDP_ADDR                (HIF_BASE_ADDR + 0x24)
> +#define HIF_RX_STATUS          (HIF_BASE_ADDR + 0x30)
> +#define HIF_INT_SRC            (HIF_BASE_ADDR + 0x34)
> +#define HIF_INT_ENABLE         (HIF_BASE_ADDR + 0x38)
> +#define HIF_POLL_CTRL          (HIF_BASE_ADDR + 0x3c)
> +#define HIF_RX_CURR_BD_ADDR    (HIF_BASE_ADDR + 0x40)
> +#define HIF_RX_ALLOC           (HIF_BASE_ADDR + 0x44)
> +#define HIF_TX_DMA_STATUS      (HIF_BASE_ADDR + 0x48)
> +#define HIF_RX_DMA_STATUS      (HIF_BASE_ADDR + 0x4c)
> +#define HIF_INT_COAL           (HIF_BASE_ADDR + 0x50)
> +#define HIF_AXI_CTRL           (HIF_BASE_ADDR + 0x54)
> +
> +/* HIF_TX_CTRL bits */
> +#define HIF_CTRL_DMA_EN                        (1<<0)
> +#define HIF_CTRL_BDP_POLL_CTRL_EN      (1<<1)
> +#define HIF_CTRL_BDP_CH_START_WSTB     (1<<2)
> +
> +/* HIF_RX_STATUS bits */
> +#define BDP_CSR_RX_DMA_ACTV    (1<<16)
> +
> +/* HIF_INT_ENABLE bits */
> +#define HIF_INT_EN             (1 << 0)
> +#define HIF_RXBD_INT_EN                (1 << 1)
> +#define HIF_RXPKT_INT_EN       (1 << 2)
> +#define HIF_TXBD_INT_EN                (1 << 3)
> +#define HIF_TXPKT_INT_EN       (1 << 4)
> +
> +/* HIF_POLL_CTRL bits*/
> +#define HIF_RX_POLL_CTRL_CYCLE 0x0400
> +#define HIF_TX_POLL_CTRL_CYCLE 0x0400
> +
> +/* Buffer descriptor control bits */
> +#define BD_CTRL_BUFLEN_MASK    (0xffff)
> +#define BD_BUF_LEN(x)  (x & BD_CTRL_BUFLEN_MASK)
> +#define BD_CTRL_CBD_INT_EN     (1 << 16)
> +#define BD_CTRL_PKT_INT_EN     (1 << 17)
> +#define BD_CTRL_LIFM           (1 << 18)
> +#define BD_CTRL_LAST_BD                (1 << 19)
> +#define BD_CTRL_DIR            (1 << 20)
> +#define BD_CTRL_PKT_XFER       (1 << 24)
> +#define BD_CTRL_DESC_EN                (1 << 31)
> +#define BD_CTRL_PARSE_DISABLE  (1 << 25)
> +#define BD_CTRL_BRFETCH_DISABLE        (1 << 26)
> +#define BD_CTRL_RTFETCH_DISABLE        (1 << 27)
> +
> +#endif /* _HIF_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/hif_nocpy.h b/include/pfe_eth/pfe/cbus/hif_nocpy.h
> new file mode 100644
> index 0000000..c2d6f6d
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/hif_nocpy.h
> @@ -0,0 +1,40 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _HIF_NOCPY_H_
> +#define _HIF_NOCPY_H_
> +
> +#define HIF_NOCPY_VERSION              (HIF_NOCPY_BASE_ADDR + 0x00)
> +#define HIF_NOCPY_TX_CTRL              (HIF_NOCPY_BASE_ADDR + 0x04)
> +#define HIF_NOCPY_TX_CURR_BD_ADDR      (HIF_NOCPY_BASE_ADDR + 0x08)
> +#define HIF_NOCPY_TX_ALLOC             (HIF_NOCPY_BASE_ADDR + 0x0c)
> +#define HIF_NOCPY_TX_BDP_ADDR          (HIF_NOCPY_BASE_ADDR + 0x10)
> +#define HIF_NOCPY_TX_STATUS            (HIF_NOCPY_BASE_ADDR + 0x14)
> +#define HIF_NOCPY_RX_CTRL              (HIF_NOCPY_BASE_ADDR + 0x20)
> +#define HIF_NOCPY_RX_BDP_ADDR          (HIF_NOCPY_BASE_ADDR + 0x24)
> +#define HIF_NOCPY_RX_STATUS            (HIF_NOCPY_BASE_ADDR + 0x30)
> +#define HIF_NOCPY_INT_SRC              (HIF_NOCPY_BASE_ADDR + 0x34)
> +#define HIF_NOCPY_INT_ENABLE           (HIF_NOCPY_BASE_ADDR + 0x38)
> +#define HIF_NOCPY_POLL_CTRL            (HIF_NOCPY_BASE_ADDR + 0x3c)
> +#define HIF_NOCPY_RX_CURR_BD_ADDR      (HIF_NOCPY_BASE_ADDR + 0x40)
> +#define HIF_NOCPY_RX_ALLOC             (HIF_NOCPY_BASE_ADDR + 0x44)
> +#define HIF_NOCPY_TX_DMA_STATUS                (HIF_NOCPY_BASE_ADDR + 0x48)
> +#define HIF_NOCPY_RX_DMA_STATUS                (HIF_NOCPY_BASE_ADDR + 0x4c)
> +#define HIF_NOCPY_RX_INQ0_PKTPTR       (HIF_NOCPY_BASE_ADDR + 0x50)
> +#define HIF_NOCPY_RX_INQ1_PKTPTR       (HIF_NOCPY_BASE_ADDR + 0x54)
> +#define HIF_NOCPY_TX_PORT_NO           (HIF_NOCPY_BASE_ADDR + 0x60)
> +#define HIF_NOCPY_LMEM_ALLOC_ADDR      (HIF_NOCPY_BASE_ADDR + 0x64)
> +#define HIF_NOCPY_CLASS_ADDR           (HIF_NOCPY_BASE_ADDR + 0x68)
> +#define HIF_NOCPY_TMU_PORT0_ADDR       (HIF_NOCPY_BASE_ADDR + 0x70)
> +#define HIF_NOCPY_TMU_PORT1_ADDR       (HIF_NOCPY_BASE_ADDR + 0x74)
> +#define HIF_NOCPY_TMU_PORT2_ADDR       (HIF_NOCPY_BASE_ADDR + 0x7c)
> +#define HIF_NOCPY_TMU_PORT3_ADDR       (HIF_NOCPY_BASE_ADDR + 0x80)
> +#define HIF_NOCPY_TMU_PORT4_ADDR       (HIF_NOCPY_BASE_ADDR + 0x84)
> +#define HIF_NOCPY_INT_COAL             (HIF_NOCPY_BASE_ADDR + 0x90)
> +#define HIF_NOCPY_AXI_CTRL             (HIF_NOCPY_BASE_ADDR + 0x94)
> +
> +#endif /* _HIF_NOCPY_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/tmu_csr.h b/include/pfe_eth/pfe/cbus/tmu_csr.h
> new file mode 100644
> index 0000000..2fc8dbe
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/tmu_csr.h
> @@ -0,0 +1,148 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _TMU_CSR_H_
> +#define _TMU_CSR_H_
> +
> +#define TMU_VERSION                    (TMU_CSR_BASE_ADDR + 0x000)
> +#define TMU_INQ_WATERMARK              (TMU_CSR_BASE_ADDR + 0x004)
> +#define TMU_PHY_INQ_PKTPTR             (TMU_CSR_BASE_ADDR + 0x008)
> +#define TMU_PHY_INQ_PKTINFO            (TMU_CSR_BASE_ADDR + 0x00c)
> +#define TMU_PHY_INQ_FIFO_CNT           (TMU_CSR_BASE_ADDR + 0x010)
> +#define TMU_SYS_GENERIC_CONTROL                (TMU_CSR_BASE_ADDR + 0x014)
> +#define TMU_SYS_GENERIC_STATUS         (TMU_CSR_BASE_ADDR + 0x018)
> +#define TMU_SYS_GEN_CON0               (TMU_CSR_BASE_ADDR + 0x01c)
> +#define TMU_SYS_GEN_CON1               (TMU_CSR_BASE_ADDR + 0x020)
> +#define TMU_SYS_GEN_CON2               (TMU_CSR_BASE_ADDR + 0x024)
> +#define TMU_SYS_GEN_CON3               (TMU_CSR_BASE_ADDR + 0x028)
> +#define TMU_SYS_GEN_CON4               (TMU_CSR_BASE_ADDR + 0x02c)
> +#define TMU_TEQ_DISABLE_DROPCHK                (TMU_CSR_BASE_ADDR + 0x030)
> +#define TMU_TEQ_CTRL                   (TMU_CSR_BASE_ADDR + 0x034)
> +#define TMU_TEQ_QCFG                   (TMU_CSR_BASE_ADDR + 0x038)
> +#define TMU_TEQ_DROP_STAT              (TMU_CSR_BASE_ADDR + 0x03c)
> +#define TMU_TEQ_QAVG                   (TMU_CSR_BASE_ADDR + 0x040)
> +#define TMU_TEQ_WREG_PROB              (TMU_CSR_BASE_ADDR + 0x044)
> +#define TMU_TEQ_TRANS_STAT             (TMU_CSR_BASE_ADDR + 0x048)
> +#define TMU_TEQ_HW_PROB_CFG0           (TMU_CSR_BASE_ADDR + 0x04c)
> +#define TMU_TEQ_HW_PROB_CFG1           (TMU_CSR_BASE_ADDR + 0x050)
> +#define TMU_TEQ_HW_PROB_CFG2           (TMU_CSR_BASE_ADDR + 0x054)
> +#define TMU_TEQ_HW_PROB_CFG3           (TMU_CSR_BASE_ADDR + 0x058)
> +#define TMU_TEQ_HW_PROB_CFG4           (TMU_CSR_BASE_ADDR + 0x05c)
> +#define TMU_TEQ_HW_PROB_CFG5           (TMU_CSR_BASE_ADDR + 0x060)
> +#define TMU_TEQ_HW_PROB_CFG6           (TMU_CSR_BASE_ADDR + 0x064)
> +#define TMU_TEQ_HW_PROB_CFG7           (TMU_CSR_BASE_ADDR + 0x068)
> +#define TMU_TEQ_HW_PROB_CFG8           (TMU_CSR_BASE_ADDR + 0x06c)
> +#define TMU_TEQ_HW_PROB_CFG9           (TMU_CSR_BASE_ADDR + 0x070)
> +#define TMU_TEQ_HW_PROB_CFG10          (TMU_CSR_BASE_ADDR + 0x074)
> +#define TMU_TEQ_HW_PROB_CFG11          (TMU_CSR_BASE_ADDR + 0x078)
> +#define TMU_TEQ_HW_PROB_CFG12          (TMU_CSR_BASE_ADDR + 0x07c)
> +#define TMU_TEQ_HW_PROB_CFG13          (TMU_CSR_BASE_ADDR + 0x080)
> +#define TMU_TEQ_HW_PROB_CFG14          (TMU_CSR_BASE_ADDR + 0x084)
> +#define TMU_TEQ_HW_PROB_CFG15          (TMU_CSR_BASE_ADDR + 0x088)
> +#define TMU_TEQ_HW_PROB_CFG16          (TMU_CSR_BASE_ADDR + 0x08c)
> +#define TMU_TEQ_HW_PROB_CFG17          (TMU_CSR_BASE_ADDR + 0x090)
> +#define TMU_TEQ_HW_PROB_CFG18          (TMU_CSR_BASE_ADDR + 0x094)
> +#define TMU_TEQ_HW_PROB_CFG19          (TMU_CSR_BASE_ADDR + 0x098)
> +#define TMU_TEQ_HW_PROB_CFG20          (TMU_CSR_BASE_ADDR + 0x09c)
> +#define TMU_TEQ_HW_PROB_CFG21          (TMU_CSR_BASE_ADDR + 0x0a0)
> +#define TMU_TEQ_HW_PROB_CFG22          (TMU_CSR_BASE_ADDR + 0x0a4)
> +#define TMU_TEQ_HW_PROB_CFG23          (TMU_CSR_BASE_ADDR + 0x0a8)
> +#define TMU_TEQ_HW_PROB_CFG24          (TMU_CSR_BASE_ADDR + 0x0ac)
> +#define TMU_TEQ_HW_PROB_CFG25          (TMU_CSR_BASE_ADDR + 0x0b0)
> +#define TMU_TDQ_IIFG_CFG               (TMU_CSR_BASE_ADDR + 0x0b4)
> +/* [9:0] Scheduler Enable for each of the scheduler in the TDQ.
> + * This is a global Enable for all schedulers in PHY0
> + */
> +#define TMU_TDQ0_SCH_CTRL              (TMU_CSR_BASE_ADDR + 0x0b8)
> +#define TMU_LLM_CTRL                   (TMU_CSR_BASE_ADDR + 0x0bc)
> +#define TMU_LLM_BASE_ADDR              (TMU_CSR_BASE_ADDR + 0x0c0)
> +#define TMU_LLM_QUE_LEN                        (TMU_CSR_BASE_ADDR + 0x0c4)
> +#define TMU_LLM_QUE_HEADPTR            (TMU_CSR_BASE_ADDR + 0x0c8)
> +#define TMU_LLM_QUE_TAILPTR            (TMU_CSR_BASE_ADDR + 0x0cc)
> +#define TMU_LLM_QUE_DROPCNT            (TMU_CSR_BASE_ADDR + 0x0d0)
> +#define TMU_INT_EN                     (TMU_CSR_BASE_ADDR + 0x0d4)
> +#define TMU_INT_SRC                    (TMU_CSR_BASE_ADDR + 0x0d8)
> +#define TMU_INQ_STAT                   (TMU_CSR_BASE_ADDR + 0x0dc)
> +#define TMU_CTRL                       (TMU_CSR_BASE_ADDR + 0x0e0)
> +
> +/* [31] Mem Access Command. 0 = Internal Memory Read, 1 = Internal
> + * memory Write [27:24] Byte Enables of the Internal memory access [23:0]
> + * Address of the internal memory. This address is used to access both the
> + * PM and DM of all the PE's
> + */
> +#define TMU_MEM_ACCESS_ADDR            (TMU_CSR_BASE_ADDR + 0x0e4)
> +
> +/* Internal Memory Access Write Data */
> +#define TMU_MEM_ACCESS_WDATA           (TMU_CSR_BASE_ADDR + 0x0e8)
> +/* Internal Memory Access Read Data. The commands are blocked at the
> + * mem_access only
> + */
> +#define TMU_MEM_ACCESS_RDATA           (TMU_CSR_BASE_ADDR + 0x0ec)
> +
> +/* [31:0] PHY0 in queue address (must be initialized with one of the
> + * xxx_INQ_PKTPTR cbus addresses)
> + */
> +#define TMU_PHY0_INQ_ADDR              (TMU_CSR_BASE_ADDR + 0x0f0)
> +/* [31:0] PHY1 in queue address (must be initialized with one of the
> + * xxx_INQ_PKTPTR cbus addresses)
> + */
> +#define TMU_PHY1_INQ_ADDR              (TMU_CSR_BASE_ADDR + 0x0f4)
> +/* [31:0] PHY3 in queue address (must be initialized with one of the
> + * xxx_INQ_PKTPTR cbus addresses)
> + */
> +#define TMU_PHY3_INQ_ADDR              (TMU_CSR_BASE_ADDR + 0x0fc)
> +#define TMU_BMU_INQ_ADDR               (TMU_CSR_BASE_ADDR + 0x100)
> +#define TMU_TX_CTRL                    (TMU_CSR_BASE_ADDR + 0x104)
> +
> +#define TMU_PE_SYS_CLK_RATIO           (TMU_CSR_BASE_ADDR + 0x114)
> +#define TMU_PE_STATUS                  (TMU_CSR_BASE_ADDR + 0x118)
> +#define TMU_TEQ_MAX_THRESHOLD          (TMU_CSR_BASE_ADDR + 0x11c)
> +
> +/* [31:0] PHY4 in queue address (must be initialized with one of the
> + * xxx_INQ_PKTPTR cbus addresses)
> + */
> +#define TMU_PHY4_INQ_ADDR              (TMU_CSR_BASE_ADDR + 0x134)
> +
> +/* [9:0] Scheduler Enable for each of the scheduler in the TDQ. This
> + * is a global Enable for all schedulers in PHY1
> + */
> +#define TMU_TDQ1_SCH_CTRL              (TMU_CSR_BASE_ADDR + 0x138)
> +/* [9:0] Scheduler Enable for each of the scheduler in the TDQ. This
> + * is a global Enable for all schedulers in PHY3
> + */
> +#define TMU_TDQ3_SCH_CTRL              (TMU_CSR_BASE_ADDR + 0x140)
> +
> +#define TMU_BMU_BUF_SIZE               (TMU_CSR_BASE_ADDR + 0x144)
> +/* [31:0] PHY5 in queue address (must be initialized with one of the
> + * xxx_INQ_PKTPTR cbus addresses)
> + */
> +#define TMU_PHY5_INQ_ADDR              (TMU_CSR_BASE_ADDR + 0x148)
> +
> +#define TMU_AXI_CTRL                   (TMU_CSR_BASE_ADDR + 0x17c)
> +
> +#define SW_RESET               (1 << 0) /* Global software reset */
> +#define INQ_RESET              (1 << 2)
> +#define TEQ_RESET              (1 << 3)
> +#define TDQ_RESET              (1 << 4)
> +#define PE_RESET               (1 << 5)
> +#define MEM_INIT               (1 << 6)
> +#define MEM_INIT_DONE          (1 << 7)
> +#define LLM_INIT               (1 << 8)
> +#define LLM_INIT_DONE          (1 << 9)
> +#define ECC_MEM_INIT_DONE      (1<<10)
> +
> +struct tmu_cfg {
> +       u32 llm_base_addr;
> +       u32 llm_queue_len;
> +};
> +
> +/* Not HW related for pfe_ctrl/pfe common defines */
> +#define DEFAULT_MAX_QDEPTH     80
> +#define DEFAULT_Q0_QDEPTH      511 /* We keep 1 large queue for host tx qos */
> +#define DEFAULT_TMU3_QDEPTH    127
> +
> +#endif /* _TMU_CSR_H_ */
> diff --git a/include/pfe_eth/pfe/cbus/util_csr.h b/include/pfe_eth/pfe/cbus/util_csr.h
> new file mode 100644
> index 0000000..bac4114
> --- /dev/null
> +++ b/include/pfe_eth/pfe/cbus/util_csr.h
> @@ -0,0 +1,47 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _UTIL_CSR_H_
> +#define _UTIL_CSR_H_
> +
> +#define UTIL_VERSION                   (UTIL_CSR_BASE_ADDR + 0x000)
> +#define UTIL_TX_CTRL                   (UTIL_CSR_BASE_ADDR + 0x004)
> +#define UTIL_INQ_PKTPTR                        (UTIL_CSR_BASE_ADDR + 0x010)
> +
> +#define UTIL_HDR_SIZE                  (UTIL_CSR_BASE_ADDR + 0x014)
> +
> +#define UTIL_PE0_QB_DM_ADDR0           (UTIL_CSR_BASE_ADDR + 0x020)
> +#define UTIL_PE0_QB_DM_ADDR1           (UTIL_CSR_BASE_ADDR + 0x024)
> +#define UTIL_PE0_RO_DM_ADDR0           (UTIL_CSR_BASE_ADDR + 0x060)
> +#define UTIL_PE0_RO_DM_ADDR1           (UTIL_CSR_BASE_ADDR + 0x064)
> +
> +#define UTIL_MEM_ACCESS_ADDR           (UTIL_CSR_BASE_ADDR + 0x100)
> +#define UTIL_MEM_ACCESS_WDATA          (UTIL_CSR_BASE_ADDR + 0x104)
> +#define UTIL_MEM_ACCESS_RDATA          (UTIL_CSR_BASE_ADDR + 0x108)
> +
> +#define UTIL_TM_INQ_ADDR               (UTIL_CSR_BASE_ADDR + 0x114)
> +#define UTIL_PE_STATUS                 (UTIL_CSR_BASE_ADDR + 0x118)
> +
> +#define UTIL_PE_SYS_CLK_RATIO          (UTIL_CSR_BASE_ADDR + 0x200)
> +#define UTIL_AFULL_THRES               (UTIL_CSR_BASE_ADDR + 0x204)
> +#define UTIL_GAP_BETWEEN_READS         (UTIL_CSR_BASE_ADDR + 0x208)
> +#define UTIL_MAX_BUF_CNT               (UTIL_CSR_BASE_ADDR + 0x20c)
> +#define UTIL_TSQ_FIFO_THRES            (UTIL_CSR_BASE_ADDR + 0x210)
> +#define UTIL_TSQ_MAX_CNT               (UTIL_CSR_BASE_ADDR + 0x214)
> +#define UTIL_IRAM_DATA_0               (UTIL_CSR_BASE_ADDR + 0x218)
> +#define UTIL_IRAM_DATA_1               (UTIL_CSR_BASE_ADDR + 0x21c)
> +#define UTIL_IRAM_DATA_2               (UTIL_CSR_BASE_ADDR + 0x220)
> +#define UTIL_IRAM_DATA_3               (UTIL_CSR_BASE_ADDR + 0x224)
> +
> +#define UTIL_BUS_ACCESS_ADDR           (UTIL_CSR_BASE_ADDR + 0x228)
> +#define UTIL_BUS_ACCESS_WDATA          (UTIL_CSR_BASE_ADDR + 0x22c)
> +#define UTIL_BUS_ACCESS_RDATA          (UTIL_CSR_BASE_ADDR + 0x230)
> +
> +#define UTIL_INQ_AFULL_THRES           (UTIL_CSR_BASE_ADDR + 0x234)
> +#define UTIL_AXI_CTRL                  (UTIL_CSR_BASE_ADDR + 0x240)
> +
> +#endif /* _UTIL_CSR_H_ */
> diff --git a/include/pfe_eth/pfe/pfe.h b/include/pfe_eth/pfe/pfe.h
> new file mode 100644
> index 0000000..1c73a95
> --- /dev/null
> +++ b/include/pfe_eth/pfe/pfe.h
> @@ -0,0 +1,178 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _PFE_H_
> +#define _PFE_H_
> +
> +#include <elf.h>
> +#include "cbus.h"
> +
> +#define PFE_LS1012A_RESET_WA
> +#define CONFIG_UTIL_PE_DISABLED
> +
> +#define CLASS_DMEM_BASE_ADDR(i)        (0x00000000 | ((i) << 20))
> +/* Only valid for mem access register interface */
> +#define CLASS_IMEM_BASE_ADDR(i)        (0x00000000 | ((i) << 20))
> +#define CLASS_DMEM_SIZE                0x00002000
> +#define CLASS_IMEM_SIZE                0x00008000
> +
> +#define TMU_DMEM_BASE_ADDR(i)  (0x00000000 + ((i) << 20))
> +/* Only valid for mem access register interface */
> +#define TMU_IMEM_BASE_ADDR(i)  (0x00000000 + ((i) << 20))
> +#define TMU_DMEM_SIZE          0x00000800
> +#define TMU_IMEM_SIZE          0x00002000
> +
> +#define UTIL_DMEM_BASE_ADDR    0x00000000
> +#define UTIL_DMEM_SIZE         0x00002000
> +
> +#define PE_LMEM_BASE_ADDR      0xc3010000
> +#define PE_LMEM_SIZE           0x8000
> +#define PE_LMEM_END            (PE_LMEM_BASE_ADDR + PE_LMEM_SIZE)
> +
> +#define DMEM_BASE_ADDR         0x00000000
> +#define DMEM_SIZE              0x2000          /* TMU has less... */
> +#define DMEM_END               (DMEM_BASE_ADDR + DMEM_SIZE)
> +
> +#define PMEM_BASE_ADDR         0x00010000
> +#define PMEM_SIZE              0x8000          /* TMU has less... */
> +#define PMEM_END               (PMEM_BASE_ADDR + PMEM_SIZE)
> +
> +/* Memory ranges check from PE point of view/memory map */
> +#define IS_DMEM(addr, len)     (((unsigned long)(addr) >= DMEM_BASE_ADDR) &&\
> +                                       (((unsigned long)(addr) +\
> +                                       (len)) <= DMEM_END))
> +#define IS_PMEM(addr, len)     (((unsigned long)(addr) >= PMEM_BASE_ADDR) &&\
> +                                       (((unsigned long)(addr) +\
> +                                       (len)) <= PMEM_END))
> +#define IS_PE_LMEM(addr, len)  (((unsigned long)(addr) >= PE_LMEM_BASE_ADDR\
> +                                       ) && (((unsigned long)(addr)\
> +                                       + (len)) <= PE_LMEM_END))
> +
> +#define IS_PFE_LMEM(addr, len) (((unsigned long)(addr) >=\
> +                                       CBUS_VIRT_TO_PFE(LMEM_BASE_ADDR)) &&\
> +                                       (((unsigned long)(addr) + (len)) <=\
> +                                       CBUS_VIRT_TO_PFE(LMEM_END)))
> +#define IS_PHYS_DDR(addr, len) (((unsigned long)(addr) >=\
> +                                       PFE_DDR_PHYS_BASE_ADDR) &&\
> +                                       (((unsigned long)(addr) + (len)) <=\
> +                                       PFE_DDR_PHYS_END))
> +
> +/* Host View Address */
> +extern void *ddr_base_addr;
> +
> +#define DDR_BASE_ADDR          ddr_base_addr
> +
> +/* PFE View Address */
> +/* DDR physical base address as seen by PE's. */
> +#define PFE_DDR_PHYS_BASE_ADDR 0x03800000
> +#define PFE_DDR_PHYS_SIZE      0xC000000
> +#define PFE_DDR_PHYS_END       (PFE_DDR_PHYS_BASE_ADDR + PFE_DDR_PHYS_SIZE)
> +/* CBUS physical base address as seen by PE's. */
> +#define PFE_CBUS_PHYS_BASE_ADDR        0xc0000000
> +
> +/* Host<->PFE Mapping */
> +#define DDR_PFE_TO_VIRT(p)     ((unsigned long int)((p) + 0x80000000))
> +#define CBUS_VIRT_TO_PFE(v)    (((v) - CBUS_BASE_ADDR) +\
> +                                       PFE_CBUS_PHYS_BASE_ADDR)
> +#define CBUS_PFE_TO_VIRT(p)    (((p) - PFE_CBUS_PHYS_BASE_ADDR) +\
> +                                       CBUS_BASE_ADDR)
> +
> +enum {
> +       CLASS0_ID = 0,
> +       CLASS1_ID,
> +       CLASS2_ID,
> +       CLASS3_ID,
> +       CLASS4_ID,
> +       CLASS5_ID,
> +
> +       TMU0_ID,
> +       TMU1_ID,
> +       TMU2_ID,
> +       TMU3_ID,
> +#if !defined(CONFIG_UTIL_PE_DISABLED)
> +       UTIL_ID,
> +#endif
> +       MAX_PE
> +};
> +
> +#define CLASS_MASK     ((1 << CLASS0_ID) | (1 << CLASS1_ID) | (1 << CLASS2_ID)\
> +                               | (1 << CLASS3_ID) | (1 << CLASS4_ID) |\
> +                               (1 << CLASS5_ID))
> +#define CLASS_MAX_ID   CLASS5_ID
> +
> +#define TMU_MASK       ((1 << TMU0_ID) | (1 << TMU1_ID) | (1 << TMU3_ID))
> +#define TMU_MAX_ID     TMU3_ID
> +
> +#if !defined(CONFIG_UTIL_PE_DISABLED)
> +#define UTIL_MASK      (1 << UTIL_ID)
> +#endif
> +
> +/*
> + * PE information.
> + * Structure containing PE's specific information. It is used to create
> + * generic C functions common to all PE's.
> + * Before using the library functions this structure needs to be
> + * initialized with the different registers virtual addresses
> + * (according to the ARM MMU mmaping). The default initialization supports a
> + * virtual == physical mapping.
> + *
> + */
> +struct pe_info {
> +       u32 dmem_base_addr;             /* PE's dmem base address */
> +       u32 pmem_base_addr;             /* PE's pmem base address */
> +       u32 pmem_size;                  /* PE's pmem size */
> +
> +       void *mem_access_wdata;        /* PE's _MEM_ACCESS_WDATA
> +                                       * register address
> +                                       */
> +       void *mem_access_addr;         /* PE's _MEM_ACCESS_ADDR
> +                                       * register address
> +                                       */
> +       void *mem_access_rdata;        /* PE's _MEM_ACCESS_RDATA
> +                                       * register address
> +                                       */
> +};
> +
> +void pe_lmem_read(u32 *dst, u32 len, u32 offset);
> +void pe_lmem_write(u32 *src, u32 len, u32 offset);
> +
> +void pe_dmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len);
> +void pe_pmem_memcpy_to32(int id, u32 dst, const void *src, unsigned int len);
> +
> +u32 pe_pmem_read(int id, u32 addr, u8 size);
> +void pe_dmem_write(int id, u32 val, u32 addr, u8 size);
> +u32 pe_dmem_read(int id, u32 addr, u8 size);
> +void class_bus_write(u32 val, u32 addr, u8 size);
> +u32 class_bus_read(u32 addr, u8 size);
> +
> +int pe_load_elf_section(int id, const void *data, Elf32_Shdr *shdr);
> +
> +void pfe_lib_init(void *ddr_base, unsigned long ddr_phys_base);
> +
> +void bmu_init(void *base, struct bmu_cfg *cfg);
> +void bmu_enable(void *base);
> +
> +void gpi_init(void *base, struct gpi_cfg *cfg);
> +void gpi_enable(void *base);
> +void gpi_disable(void *base);
> +
> +void class_init(struct class_cfg *cfg);
> +void class_enable(void);
> +void class_disable(void);
> +
> +void tmu_init(struct tmu_cfg *cfg);
> +void tmu_enable(u32 pe_mask);
> +void tmu_disable(u32 pe_mask);
> +
> +void hif_init(void);
> +void hif_tx_enable(void);
> +void hif_tx_disable(void);
> +void hif_rx_enable(void);
> +void hif_rx_disable(void);
> +void hif_rx_desc_disable(void);
> +
> +#endif /* _PFE_H_ */
> diff --git a/include/pfe_eth/pfe_driver.h b/include/pfe_eth/pfe_driver.h
> new file mode 100644
> index 0000000..28997b4
> --- /dev/null
> +++ b/include/pfe_eth/pfe_driver.h
> @@ -0,0 +1,55 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef __PFE_DRIVER_H__
> +#define __PFE_DRIVER_H__
> +
> +#include "pfe/pfe.h"
> +
> +#define HIF_RX_DESC_NT         64
> +#define        HIF_TX_DESC_NT          64
> +
> +#define RX_BD_BASEADDR         (HIF_DESC_BASEADDR)
> +#define TX_BD_BASEADDR         (HIF_DESC_BASEADDR + HIF_TX_DESC_SIZE)
> +
> +#define MIN_PKT_SIZE           56
> +#define MAX_FRAME_SIZE         2048
> +
> +struct __packed hif_header_s {
> +       u8      port_no; /* Carries input port no for host rx packets and
> +                         * output port no for tx pkts
> +                         */
> +       u8 reserved0;
> +       u32 reserved2;
> +};
> +
> +struct __packed buf_desc {
> +       u32 ctrl;
> +       u32 status;
> +       u32 data;
> +       u32 next;
> +};
> +
> +struct rx_desc_s {
> +       struct buf_desc *rx_base;
> +       unsigned int rx_base_pa;
> +       int rx_to_read;
> +       int rx_ring_size;
> +};
> +
> +struct tx_desc_s {
> +       struct buf_desc *tx_base;
> +       unsigned int tx_base_pa;
> +       int tx_to_send;
> +       int tx_ring_size;
> +};
> +
> +int pfe_send(int phy_port, void *data, int length);
> +int pfe_recv(unsigned int *pkt_ptr, int *phy_port);
> +int pfe_tx_done(void);
> +
> +#endif
> diff --git a/include/pfe_eth/pfe_eth.h b/include/pfe_eth/pfe_eth.h
> new file mode 100644
> index 0000000..8b4bc67
> --- /dev/null
> +++ b/include/pfe_eth/pfe_eth.h
> @@ -0,0 +1,111 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#ifndef _LS1012a_ETH_H_
> +#define _LS1012a_ETH_H_
> +
> +#include <linux/sizes.h>
> +#include <asm/io.h>
> +#include <miiphy.h>
> +#include <malloc.h>
> +#include "pfe_driver.h"
> +
> +#define BMU2_DDR_BASEADDR      0
> +#define BMU2_BUF_COUNT         (3 * SZ_1K)
> +#define BMU2_DDR_SIZE          (DDR_BUF_SIZE * BMU2_BUF_COUNT)
> +
> +#define HIF_RX_PKT_DDR_BASEADDR (BMU2_DDR_BASEADDR + BMU2_DDR_SIZE)
> +#define HIF_RX_PKT_DDR_SIZE     (HIF_RX_DESC_NT * DDR_BUF_SIZE)
> +#define HIF_TX_PKT_DDR_BASEADDR (HIF_RX_PKT_DDR_BASEADDR + HIF_RX_PKT_DDR_SIZE)
> +#define HIF_TX_PKT_DDR_SIZE     (HIF_TX_DESC_NT * DDR_BUF_SIZE)
> +
> +#define HIF_DESC_BASEADDR       (HIF_TX_PKT_DDR_BASEADDR + HIF_TX_PKT_DDR_SIZE)
> +#define HIF_RX_DESC_SIZE        (16 * HIF_RX_DESC_NT)
> +#define HIF_TX_DESC_SIZE        (16 * HIF_TX_DESC_NT)
> +
> +#define UTIL_CODE_BASEADDR     0x780000
> +#define UTIL_CODE_SIZE         (128 * SZ_1K)
> +
> +#define UTIL_DDR_DATA_BASEADDR (UTIL_CODE_BASEADDR + UTIL_CODE_SIZE)
> +#define UTIL_DDR_DATA_SIZE     (64 * SZ_1K)
> +
> +#define CLASS_DDR_DATA_BASEADDR        (UTIL_DDR_DATA_BASEADDR + UTIL_DDR_DATA_SIZE)
> +#define CLASS_DDR_DATA_SIZE    (32 * SZ_1K)
> +
> +#define TMU_DDR_DATA_BASEADDR  (CLASS_DDR_DATA_BASEADDR + CLASS_DDR_DATA_SIZE)
> +#define TMU_DDR_DATA_SIZE      (32 * SZ_1K)
> +
> +#define TMU_LLM_BASEADDR       (TMU_DDR_DATA_BASEADDR + TMU_DDR_DATA_SIZE)
> +#define TMU_LLM_QUEUE_LEN      (16 * 256)
> +       /* Must be power of two and at least 16 * 8 = 128 bytes */
> +#define TMU_LLM_SIZE           (4 * 16 * TMU_LLM_QUEUE_LEN)
> +       /* (4 TMU's x 16 queues x queue_len) */
> +
> +#define ROUTE_TABLE_BASEADDR   0x800000
> +#define ROUTE_TABLE_HASH_BITS_MAX      15 /* 32K entries */
> +#define ROUTE_TABLE_HASH_BITS          8  /* 256 entries */
> +#define ROUTE_TABLE_SIZE       ((1 << ROUTE_TABLE_HASH_BITS_MAX) \
> +                               * CLASS_ROUTE_SIZE)
> +
> +#define        PFE_TOTAL_DATA_SIZE     (ROUTE_TABLE_BASEADDR + ROUTE_TABLE_SIZE)
> +
> +#if PFE_TOTAL_DATA_SIZE > (12 * SZ_1M)
> +#error DDR mapping above 12MiB
> +#endif
> +
> +/* LMEM Mapping */
> +#define BMU1_LMEM_BASEADDR     0
> +#define BMU1_BUF_COUNT         256
> +#define BMU1_LMEM_SIZE         (LMEM_BUF_SIZE * BMU1_BUF_COUNT)
> +
> +struct gemac_s {
> +       void *gemac_base;
> +       void *egpi_base;
> +
> +       /* GEMAC config */
> +       int gemac_mode;
> +       int gemac_speed;
> +       int gemac_duplex;
> +       int flags;
> +       /* phy iface */
> +       int phy_address;
> +       int phy_mode;
> +       struct mii_dev *bus;
> +
> +};
> +
> +struct mdio_info {
> +       void *reg_base;
> +       char *name;
> +};
> +
> +struct pfe {
> +       unsigned long ddr_phys_baseaddr;
> +       void *ddr_baseaddr;
> +       void *cbus_baseaddr;
> +};
> +
> +struct ls1012a_eth_dev {
> +       int gemac_port;
> +
> +       struct gemac_s *gem;
> +       struct pfe      pfe;
> +
> +       struct eth_device *dev;
> +#ifdef CONFIG_PHYLIB
> +       struct phy_device *phydev;
> +#endif
> +};
> +
> +int pfe_probe(struct pfe *pfe);
> +int pfe_remove(struct pfe *pfe);
> +struct mii_dev *ls1012a_mdio_init(struct mdio_info *mdio_info);
> +void ls1012a_set_mdio(int dev_id, struct mii_dev *bus);
> +void ls1012a_set_phy_address_mode(int dev_id, int phy_id, int phy_mode);
> +int gemac_initialize(bd_t *bis, int dev_id, char *devname);
> +
> +#endif /*_LS1012a_ETH_H_ */
> diff --git a/include/pfe_eth/pfe_firmware.h b/include/pfe_eth/pfe_firmware.h
> new file mode 100644
> index 0000000..588b2ae
> --- /dev/null
> +++ b/include/pfe_eth/pfe_firmware.h
> @@ -0,0 +1,17 @@
> +/*
> + * Copyright 2015-2016 Freescale Semiconductor, Inc.
> + * Copyright 2017 NXP
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +/** @file
> + *  Contains all the defines to handle parsing and loading of PE firmware files.
> + */
> +#ifndef __PFE_FIRMWARE_H__
> +#define __PFE_FIRMWARE_H__
> +
> +int pfe_firmware_init(void);
> +void pfe_firmware_exit(void);
> +
> +#endif
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms
  2017-10-09  9:11 ` [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms Calvin Johnson
@ 2017-12-05 21:20   ` Joe Hershberger
  0 siblings, 0 replies; 21+ messages in thread
From: Joe Hershberger @ 2017-12-05 21:20 UTC (permalink / raw)
  To: u-boot

On Mon, Oct 9, 2017 at 4:11 AM, Calvin Johnson <calvin.johnson@nxp.com> wrote:
> Ethernet support on all three LS1012A platforms(FRDM, QDS and RDB) is
> enabled with this patch.
>
> eth.c files for all 3 platforms contain board ethernet initialization
> function and also function to reset phy.
>
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  board/freescale/ls1012afrdm/Makefile          |   1 +
>  board/freescale/ls1012afrdm/eth.c             |  86 +++++++++
>  board/freescale/ls1012afrdm/ls1012afrdm.c     |   5 -
>  board/freescale/ls1012aqds/Makefile           |   1 +
>  board/freescale/ls1012aqds/eth.c              | 263 ++++++++++++++++++++++++++
>  board/freescale/ls1012aqds/ls1012aqds.c       |  97 +++++++++-
>  board/freescale/ls1012aqds/ls1012aqds_pfe.h   |  48 +++++
>  board/freescale/ls1012aqds/ls1012aqds_qixis.h |   2 +-
>  board/freescale/ls1012ardb/Makefile           |   1 +
>  board/freescale/ls1012ardb/eth.c              |  70 +++++++
>  board/freescale/ls1012ardb/ls1012ardb.c       |   4 -
>  include/configs/ls1012ardb.h                  |   5 +
>  12 files changed, 568 insertions(+), 15 deletions(-)
>  create mode 100644 board/freescale/ls1012afrdm/eth.c
>  create mode 100644 board/freescale/ls1012aqds/eth.c
>  create mode 100644 board/freescale/ls1012aqds/ls1012aqds_pfe.h
>  create mode 100644 board/freescale/ls1012ardb/eth.c

It seems reasonable to add support for each platform in individual patches.

-Joe

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A
  2017-10-09  9:11 ` [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A Calvin Johnson
@ 2017-12-06  8:41   ` Prabhakar Kushwaha
  0 siblings, 0 replies; 21+ messages in thread
From: Prabhakar Kushwaha @ 2017-12-06  8:41 UTC (permalink / raw)
  To: u-boot


> -----Original Message-----
> From: Calvin Johnson [mailto:calvin.johnson at nxp.com]
> Sent: Monday, October 09, 2017 2:42 PM
> To: u-boot at lists.denx.de
> Cc: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>; York Sun
> <york.sun@nxp.com>; joe.hershberger at ni.com; Calvin Johnson
> <calvin.johnson@nxp.com>; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A
> 
> Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> ---
>  configs/ls1012afrdm_qspi_defconfig |  1 +
>  configs/ls1012aqds_qspi_defconfig  |  1 +
>  configs/ls1012ardb_qspi_defconfig  |  1 +
>  drivers/net/Kconfig                |  1 +
>  drivers/net/Makefile               |  1 +
>  drivers/net/pfe_eth/Kconfig        | 23 ++++++++++++++++++++++-
>  include/configs/ls1012a_common.h   |  6 +++---
>  include/configs/ls1012afrdm.h      |  7 +++++++
>  include/configs/ls1012aqds.h       | 14 ++++++++++++++
>  include/configs/ls1012ardb.h       |  8 ++++++++
>  10 files changed, 59 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/ls1012afrdm_qspi_defconfig
> b/configs/ls1012afrdm_qspi_defconfig
> index 84b5577..7db7a18 100644
> --- a/configs/ls1012afrdm_qspi_defconfig
> +++ b/configs/ls1012afrdm_qspi_defconfig
> @@ -32,6 +32,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/configs/ls1012aqds_qspi_defconfig
> b/configs/ls1012aqds_qspi_defconfig
> index 2124273..4b9fdf5 100644
> --- a/configs/ls1012aqds_qspi_defconfig
> +++ b/configs/ls1012aqds_qspi_defconfig
> @@ -37,6 +37,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/configs/ls1012ardb_qspi_defconfig
> b/configs/ls1012ardb_qspi_defconfig
> index 40349ce..d63e736 100644
> --- a/configs/ls1012ardb_qspi_defconfig
> +++ b/configs/ls1012ardb_qspi_defconfig
> @@ -35,6 +35,7 @@ CONFIG_DM_SPI_FLASH=y
>  CONFIG_SPI_FLASH=y
>  CONFIG_NETDEVICES=y
>  CONFIG_E1000=y
> +CONFIG_FSL_PFE=y
>  CONFIG_PCI=y
>  CONFIG_DM_PCI=y
>  CONFIG_DM_PCI_COMPAT=y
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 736aab2..c82c63b 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -304,4 +304,5 @@ config FEC2_PHY_NORXERR
>  	  The PHY does not have a RXERR line (RMII only).
>  	  (so program the FEC to ignore it).
> 
> +source "drivers/net/pfe_eth/Kconfig"
>  endif # NETDEVICES
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 94a4fd8..0572cde 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -75,3 +75,4 @@ obj-$(CONFIG_FSL_MEMAC) += fm/memac_phy.o
>  obj-$(CONFIG_VSC9953) += vsc9953.o
>  obj-$(CONFIG_PIC32_ETH) += pic32_mdio.o pic32_eth.o
>  obj-$(CONFIG_DWC_ETH_QOS) += dwc_eth_qos.o
> +obj-$(CONFIG_FSL_PFE) += pfe_eth/
> diff --git a/drivers/net/pfe_eth/Kconfig b/drivers/net/pfe_eth/Kconfig
> index b9996df..c05aeda 100644
> --- a/drivers/net/pfe_eth/Kconfig
> +++ b/drivers/net/pfe_eth/Kconfig
> @@ -1,8 +1,29 @@
> +menuconfig FSL_PFE
> +	bool "Freescale PFE driver"
> +	help
> +	  This driver provides support for Freescale PFE.
> +
> +if FSL_PFE
> +
>  config UTIL_PE_DISABLED
>  	bool
>  	help
>  	  Disable UTIL processor engine of PFE
> 
> -config SYS_FSL_PPFE_ADDR
> +config SYS_FSL_PFE_ADDR
>  	hex "PFE base address"
>  	default 0x04000000
> +
> +config SYS_LS_PFE_FW_ADDR
> +	hex "Flash address of PFE firmware"
> +	default 0x40a00000
> +

Why this parameter in Kconfig. 
This address is hard-coded per platform as defined in standard LSDK flash layout. 

--pk

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers
  2017-11-24  5:55   ` Poonam Aggrwal
@ 2017-12-06  9:06     ` Calvin Johnson
  0 siblings, 0 replies; 21+ messages in thread
From: Calvin Johnson @ 2017-12-06  9:06 UTC (permalink / raw)
  To: u-boot

Hi Poonam,

> -----Original Message-----
> From: Poonam Aggrwal
> Sent: Friday, November 24, 2017 11:25 AM
> To: Calvin Johnson <calvin.johnson@nxp.com>; u-boot at lists.denx.de
> Cc: joe.hershberger at ni.com; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: RE: [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg
> registers
> 
> Hello Calvin
> 
> Please find few comments inline.
> 
> Regards
> Poonam
> 
> > -----Original Message-----
> > From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Calvin
> > Johnson
> > Sent: Monday, October 09, 2017 2:42 PM
> > To: u-boot at lists.denx.de
> > Cc: joe.hershberger at ni.com; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> > Subject: [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg
> > registers
> Reword: configure Qos, cacheable...attributes for PFE by programming SCFG
> and DFCG registers
> >
> > Define init_pfe_scfg_dcfg_regs to configure scfg and dcfg registers of pfe.
> Consider to reword for more explanation
> Configure "xyz cacheable attributes, via scfg
> PFE QoS settings configured as  .... via scfg
> dcfg ??
> >
> > Signed-off-by: Calvin Johnson <calvin.johnson@nxp.com>
> > Signed-off-by: Anjaneyulu Jagarlmudi <anji.jagarlmudi@nxp.com>
> > ---
> >  arch/arm/cpu/armv8/fsl-layerscape/soc.c        | 18 ++++++++++++++++++
> >  arch/arm/include/asm/arch-fsl-layerscape/soc.h |  3 +++
> >  2 files changed, 21 insertions(+)
> >
> > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> > b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> > index 5c429d4..c6815f3 100644
> > --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> > +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
> > @@ -577,6 +577,24 @@ int setup_chip_volt(void)
> >  	return 0;
> >  }
> >
> > +#ifdef CONFIG_FSL_PFE
> > +void init_pfe_scfg_dcfg_regs(void)
> > +{
> > +	struct ccsr_scfg *scfg = (struct ccsr_scfg
> > *)CONFIG_SYS_FSL_SCFG_ADDR;
> > +
> > +	out_be32(&scfg->pfeasbcr,
> > +		 in_be32(&scfg->pfeasbcr) | SCFG_PFEASBCR_AWCACHE0);
> > +	out_be32(&scfg->pfebsbcr,
> > +		 in_be32(&scfg->pfebsbcr) | SCFG_PFEASBCR_AWCACHE0);
> > +
> > +	/* CCI-400 QoS settings for PFE */
> This is incomplete sentence, we should also tell what settings are being
> done.
> > +	out_be32(&scfg->wr_qos1, 0x0ff00000);
> > +	out_be32(&scfg->rd_qos1, 0x0ff00000);
> Avoid hardcoding/magic numbers
> > +
> > +	out_be32((void *)CONFIG_SYS_DCSR_DCFG_ADDR + 0x524, 0x2000);
> Should remove hardcoded values , 0x524, 0x2000.
> 0x524 does not show up in the LS1012A RM (Rev 0). Please check once.
> Also adding one liner telling what the above settings mean will help .

Thanks for your comments. Will take care of them in v2 of the series.

Regards
Calvin

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction
  2017-12-05 20:13   ` Joe Hershberger
@ 2018-01-26  5:35     ` Calvin Johnson
  0 siblings, 0 replies; 21+ messages in thread
From: Calvin Johnson @ 2018-01-26  5:35 UTC (permalink / raw)
  To: u-boot

Hi Joe,

> -----Original Message-----
> From: Joe Hershberger [mailto:joe.hershberger at ni.com]
> Sent: Wednesday, December 06, 2017 1:44 AM
> To: Calvin Johnson <calvin.johnson@nxp.com>
> Cc: u-boot <u-boot@lists.denx.de>; Joe Hershberger
> <joe.hershberger@ni.com>; Anji Jagarlmudi <anji.jagarlmudi@nxp.com>
> Subject: Re: [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver
> introduction
> 
> On Mon, Oct 9, 2017 at 4:11 AM, Calvin Johnson <calvin.johnson@nxp.com>
> wrote:
> > This patch adds PFE driver into U-Boot.

[snip]

> > +       if (dev_id > 1) {
> > +               printf("Invalid port\n");
> > +               return -1;
> > +       }
> > +
> > +       dev = (struct eth_device *)malloc(sizeof(struct eth_device));
> 
> Please don't add a new driver that uses the legacy API. Make this a
> driver model driver.

PFE IP has two MACs.  
In the legacy driver model, we were registering two ethernet devices/interfaces, pfe_eth0 and pfe_eth1.

With the new driver model, I'm wondering whether we can do the same.
IIUC, U_BOOT_DEVICE corresponds to PFE IP on the LS1012A platform and  struct eth_pdata corresponds to
each MAC. Is this correct?

If yes, how can we register two interfaces, pfe_eth0 and pfe_eth1? Please advice.

Thanks
Calvin

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2018-01-26  5:35 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-09  9:11 [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series Calvin Johnson
2017-10-09  9:11 ` [U-Boot] [PATCH 1/9] drivers: net: pfe_eth: LS1012A PFE driver introduction Calvin Johnson
2017-10-30 18:40   ` York Sun
2017-12-05 20:13   ` Joe Hershberger
2018-01-26  5:35     ` Calvin Johnson
2017-10-09  9:11 ` [U-Boot] [PATCH 2/9] drivers: net: pfe_eth: provide pfe commands Calvin Johnson
2017-12-05 20:32   ` Joe Hershberger
2017-10-09  9:11 ` [U-Boot] [PATCH 3/9] drivers: net: pfe_eth: LS1012A PFE headers Calvin Johnson
2017-12-05 21:16   ` Joe Hershberger
2017-10-09  9:11 ` [U-Boot] [PATCH 4/9] board: freescale: ls1012a: enable network support on ls1012a platforms Calvin Johnson
2017-12-05 21:20   ` Joe Hershberger
2017-10-09  9:11 ` [U-Boot] [PATCH 5/9] armv8: fsl-lsch2: initialize pfe gemac Calvin Johnson
2017-10-09  9:11 ` [U-Boot] [PATCH 6/9] armv8: fsl-lsch2: add pfe macros and update ccsr_scfg structure Calvin Johnson
2017-10-09  9:11 ` [U-Boot] [PATCH 7/9] armv8: fsl-lsch2: configure pfe's scfg & dcfg registers Calvin Johnson
2017-11-24  5:55   ` Poonam Aggrwal
2017-12-06  9:06     ` Calvin Johnson
2017-10-09  9:11 ` [U-Boot] [PATCH 8/9] fsl: csu: enable ns access for PFE Calvin Johnson
2017-11-24  5:39   ` Poonam Aggrwal
2017-10-09  9:11 ` [U-Boot] [PATCH 9/9] configs: ls1012a: add pfe configuration for LS1012A Calvin Johnson
2017-12-06  8:41   ` Prabhakar Kushwaha
2017-10-23 14:58 ` [U-Boot] [PATCH 0/9] LS1012A PFE driver patch series York Sun

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.