eth: msys: add 'enabled' field to MSYS MAC info board structure
Add functionality to set MAC port status: enabled/disabled
Change-Id: I12717fdece7be1b6e2ed9d868802deecdae5c230
Signed-off-by: Bassel Saba <basselsa@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/22633
Reviewed-by: Omri Itach <omrii@marvell.com>
Tested-by: Omri Itach <omrii@marvell.com>
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
index cb3643c..b3724ba 100755
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.c
@@ -308,10 +308,11 @@
*******************************************************************************/
MV_BOOL mvBoardIsEthConnected(MV_U32 ethNum)
{
- if (ethNum <= mvCtrlEthMaxPortGet())
+ if ((ethNum <= board->numBoardMacInfo) &&
+ (board->pBoardMacInfo[ethNum].boardMacEnabled == MV_TRUE))
return MV_TRUE;
-
- return MV_FALSE;
+ else
+ return MV_FALSE;
}
/*******************************************************************************
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
index 5722f19..ce1fe5b 100755
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvLib.h
@@ -196,6 +196,7 @@
MV_BOARD_MAC_SPEED boardMacSpeed;
MV_32 boardEthSmiAddr;
MV_32 boardEthSmiAddr0;
+ MV_BOOL boardMacEnabled;
} MV_BOARD_MAC_INFO;
typedef struct _boardMppInfo {
diff --git a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
index a6945fc..006a638 100644
--- a/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
+++ b/board/mv_ebu/msys/msys_family/boardEnv/mvBoardEnvSpec.c
@@ -98,8 +98,8 @@
MV_BOARD_MAC_INFO bobcat2_customer_board_0_InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, 0x0, 0x0 },
- {BOARD_MAC_SPEED_AUTO, 0x1, 0x1 },
+ {BOARD_MAC_SPEED_AUTO, 0x0, 0x0, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, 0x1, 0x1, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO bobcat2_customer_board_0_InfoBoardModTypeInfo[] = {
@@ -205,8 +205,8 @@
MV_BOARD_MAC_INFO bobk_customer_board_0_InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
- {BOARD_MAC_SPEED_AUTO, 0x0, 0x0 },
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_FALSE},
+ {BOARD_MAC_SPEED_AUTO, 0x0, 0x0, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO bobk_customer_board_0_InfoBoardModTypeInfo[] = {
@@ -316,8 +316,8 @@
MV_BOARD_MAC_INFO alleycat3_customer_board_0_InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
- {BOARD_MAC_SPEED_AUTO, -1, -1 }
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE}
};
MV_BOARD_MODULE_TYPE_INFO alleycat3_customer_board_0_InfoBoardModTypeInfo[] = {
@@ -425,8 +425,8 @@
MV_BOARD_MAC_INFO db_dx_bc2InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO db_dx_bc2InfoBoardModTypeInfo[] = {
@@ -516,8 +516,8 @@
MV_BOARD_MAC_INFO rd_dx_bc2InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_1000M, 0x0, 0x0 },
- {BOARD_MAC_SPEED_1000M, 0x1, 0x1 },
+ {BOARD_MAC_SPEED_1000M, 0x0, 0x0, MV_TRUE},
+ {BOARD_MAC_SPEED_1000M, 0x1, 0x1, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO rd_dx_bc2InfoBoardModTypeInfo[] = {
@@ -602,7 +602,7 @@
MV_BOARD_MAC_INFO bc2_rd_mtlInfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_1000M, 0x0, 0x0 },
+ {BOARD_MAC_SPEED_1000M, 0x0, 0x0, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO bc2_rd_mtlInfoBoardModTypeInfo[] = {
@@ -699,8 +699,8 @@
MV_BOARD_MAC_INFO db_dx_bobkInfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
- {BOARD_MAC_SPEED_AUTO, 0x0, 0x0 },
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_FALSE},
+ {BOARD_MAC_SPEED_AUTO, 0x0, 0x0, MV_TRUE},
};
MV_BOARD_MODULE_TYPE_INFO db_dx_bobkInfoBoardModTypeInfo[] = {
@@ -811,8 +811,8 @@
MV_BOARD_MAC_INFO db_dx_ac3InfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_32 boardEthSmiAddr , MV_32 boardEthSmiAddr0;}} */
- {BOARD_MAC_SPEED_AUTO, -1, -1 },
- {BOARD_MAC_SPEED_AUTO, -1, -1 }
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, -1, -1, MV_TRUE}
};
MV_BOARD_MODULE_TYPE_INFO db_dx_ac3InfoBoardModTypeInfo[] = {
@@ -1137,10 +1137,10 @@
MV_BOARD_MAC_INFO db78X60amcInfoBoardMacInfo[] = {
/* {{MV_BOARD_MAC_SPEED boardMacSpeed, MV_U8 boardEthSmiAddr}} */
- {BOARD_MAC_SPEED_AUTO, 0x1, 0x0},
- {BOARD_MAC_SPEED_AUTO, 0xD, 0x0},
- {BOARD_MAC_SPEED_AUTO, 0xC, 0x0},
- {BOARD_MAC_SPEED_AUTO, 0x0, 0x0}
+ {BOARD_MAC_SPEED_AUTO, 0x1, 0x0, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, 0xD, 0x0, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, 0xC, 0x0, MV_TRUE},
+ {BOARD_MAC_SPEED_AUTO, 0x0, 0x0, MV_TRUE}
};
