From 6647392766e4f18d43cd3814dfe46baf0ab89682 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Wed, 7 Jan 2015 12:55:14 -0800 Subject: [PATCH] dptx: Modified the asserts for the establish link function. Since the check link status function is no longer being called within the establish link function, some additional assertions need to be done. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/dptx/src/xdptx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/dptx/src/xdptx.c b/XilinxProcessorIPLib/drivers/dptx/src/xdptx.c index 5bf7247a..6f9a2d23 100644 --- a/XilinxProcessorIPLib/drivers/dptx/src/xdptx.c +++ b/XilinxProcessorIPLib/drivers/dptx/src/xdptx.c @@ -424,9 +424,12 @@ u32 XDptx_EstablishLink(XDptx *InstancePtr) XDPTX_LINK_BW_SET_270GBPS) || (InstancePtr->LinkConfig.LinkRate == XDPTX_LINK_BW_SET_540GBPS)); - /* The lane count will be checked in XDptx_CheckLinkStatus. */ - Xil_AssertNonvoid(InstancePtr->RxConfig.LaneStatusAdjReqs != NULL); - Xil_AssertNonvoid(InstancePtr->RxConfig.DpcdRxCapsField != NULL); + Xil_AssertNonvoid((InstancePtr->LinkConfig.LaneCount == + XDPTX_LANE_COUNT_SET_1) || + (InstancePtr->LinkConfig.LaneCount == + XDPTX_LANE_COUNT_SET_2) || + (InstancePtr->LinkConfig.LaneCount == + XDPTX_LANE_COUNT_SET_4)); XDptx_ResetPhy(InstancePtr, XDPTX_PHY_CONFIG_PHY_RESET_MASK);