Skip to contentSkip to conversation

powerpc/t1024: update fman liodn for mac1

PATCH New Shengzhou Liu 2 participants 2 messages May 14, 2015 – Jul 31, 2015 PowerPC

lore
Share & tools
lore

Shengzhou Liu

author
#0 lore raw

PATCH 1/1 powerpc/t1024: update fman liodn for mac1

MAC1 acts as 1G/10G dual-role MAC on T1024. We introduce macro SET_FMAN_RX_10G_TYPE2_LIODN for 10G MACs which have same Port ID and same offset of address with 1G MAC. Update it to match with the setting of fman in t1024 device tree, otherwise there is no 'fsl,liodn' in /proc/device-tree/soc at ffe000000/fman at 400000/port at 88000/

Signed-off-by Shengzhou Liu <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/t1024_ids.c | 3 +--
 arch/powerpc/include/asm/fsl_liodn.h | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc85xx/t1024_ids.c +1 -2
index 132689b..8a1092e 100644
@@ -51,11 +51,10 @@ int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 struct liodn_id_table fman1_liodn_tbl[] = {
-	SET_FMAN_RX_1G_LIODN(1, 0, 88),
+	SET_FMAN_RX_10G_TYPE2_LIODN(1, 0, 88),
 	SET_FMAN_RX_1G_LIODN(1, 1, 89),
 	SET_FMAN_RX_1G_LIODN(1, 2, 90),
 	SET_FMAN_RX_1G_LIODN(1, 3, 91),
-	SET_FMAN_RX_10G_LIODN(1, 0, 94),
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 #endif
arch/powerpc/include/asm/fsl_liodn.h +6 -0
index 811f034..6206bee 100644
@@ -145,6 +145,12 @@ extern void fdt_fixup_liodn(void *blob);
 		FM_PPID_RX_PORT_OFFSET(fmNum, enetNum + 16), \
 		CONFIG_SYS_FSL_FM##fmNum##_RX##enetNum##_10G_OFFSET) \
 
+/* enetNum is 0, 1, 2... so we + 8 for type-2 10g to get to HW Port ID */
+#define SET_FMAN_RX_10G_TYPE2_LIODN(fmNum, enetNum, liodn) \
+	SET_LIODN_ENTRY_1("fsl,fman-port-10g-rx", liodn, \
+		FM_PPID_RX_PORT_OFFSET(fmNum, enetNum + 8), \
+		CONFIG_SYS_FSL_FM##fmNum##_RX##enetNum##_1G_OFFSET) \
+
 /*
  * handle both old and new versioned SEC properties:
  * "fsl,secX.Y" became "fsl,sec-vX.Y" during development
Signature · 1 line
2.1.0.27.g96db324
#1 lore raw

PATCH 1/1 powerpc/t1024: update fman liodn for mac1

Quoted 9 lines · Shengzhou Liu

MAC1 acts as 1G/10G dual-role MAC on T1024. We introduce macro SET_FMAN_RX_10G_TYPE2_LIODN for 10G MACs which have same Port ID and same offset of address with 1G MAC. Update it to match with the setting of fman in t1024 device tree, otherwise there is no 'fsl,liodn' in /proc/device-tree/soc at ffe000000/fman at 400000/port at 88000/

Signed-off-by Shengzhou Liu <[email protected]>

---

Applied to u-boot-mpc85xx master.

Thanks.

York