lwip141: Correct tx bd ring assigments in xemacpsif

Correct assignment of TX BD ring in init_dma() and emacps_error_handler(). Signed-off-by: Rahul Bhansali <rahul.bhansali@xilinx.com> Signed-off-by: Harini Katakam <harinik@xilinx.com> Acked-by: Anirudha Sarangi <anirudh@xilinx.com> Acked-by: Anirudha Sarangi <anirudh@xilinx.com>
Xilinx · Oct 30, 2017 · aafd211 · aafd211
1 parent 58607d8
commit aafd211
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/ThirdParty/sw_services/lwip141/data/lwip141.mld b/ThirdParty/sw_services/lwip141/data/lwip141.mld
@@ -7,7 +7,7 @@ BEGIN LIBRARY lwip141
   OPTION desc = "lwIP TCP/IP Stack library: lwIP v1.4.1";
   OPTION app_linker_flags = "-Wl,--start-group,-lxil,-llwip4,-lgcc,-lc,--end-group";
   OPTION requires_os = (standalone xilkernel freertos901_xilinx);
-  OPTION VERSION = 1.9;
+  OPTION VERSION = 2.0;
   OPTION NAME = lwip141;
 
   PARAM name = api_mode, desc = "Mode of operation for lwIP (RAW API/Sockets API)", type = enum, values = ("RAW API" = RAW_API, "SOCKET API" = SOCKET_API), default = RAW_API;

diff --git a/ThirdParty/sw_services/lwip141/src/ChangeLog b/ThirdParty/sw_services/lwip141/src/ChangeLog
@@ -1,5 +1,8 @@
 Change Log for lwip
 =================================
+2017-10-27
+	* Correct assigments of TX BD ring in init_dma() and
+	  emacps_error_handler().
 2017-09-20
 	* Disable L1 prefetch for ARMv8 in init_axi_dma function in xaxiemacif_dma.c.
 2017-09-12

diff --git a/ThirdParty/sw_services/lwip141/src/contrib/ports/xilinx/netif/xemacpsif_dma.c b/ThirdParty/sw_services/lwip141/src/contrib/ports/xilinx/netif/xemacpsif_dma.c
@@ -753,10 +753,10 @@ XStatus init_dma(struct xemac_s *xemac)
 		XEmacPs_Out32((xemacpsif->emacps.Config.BaseAddress + XEMACPS_RXQ1BASE_OFFSET),
 				   (UINTPTR)bdrxterminate);
 		XEmacPs_BdClear(bdtxterminate);
-		XEmacPs_BdSetStatus(bdrxterminate, (XEMACPS_TXBUF_USED_MASK |
+		XEmacPs_BdSetStatus(bdtxterminate, (XEMACPS_TXBUF_USED_MASK |
 						XEMACPS_TXBUF_WRAP_MASK));
 		XEmacPs_Out32((xemacpsif->emacps.Config.BaseAddress + XEMACPS_TXQBASE_OFFSET),
-				   (UINTPTR)bdrxterminate);
+				   (UINTPTR)bdtxterminate);
 	}
 
 

diff --git a/ThirdParty/sw_services/lwip141/src/contrib/ports/xilinx/netif/xemacpsif_hw.c b/ThirdParty/sw_services/lwip141/src/contrib/ports/xilinx/netif/xemacpsif_hw.c
@@ -209,7 +209,7 @@ void emacps_error_handler(void *arg,u8 Direction, u32 ErrorWord)
 	xemac = (struct xemac_s *)(arg);
 	xemacpsif = (xemacpsif_s *)(xemac->state);
 	rxring = &XEmacPs_GetRxRing(&xemacpsif->emacps);
-	txring = &XEmacPs_GetRxRing(&xemacpsif->emacps);
+	txring = &XEmacPs_GetTxRing(&xemacpsif->emacps);
 
 	if (ErrorWord != 0) {
 		switch (Direction) {

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -31,6 +31,10 @@ axidma_v9_5:
 CR#987026 Fixed issue poll_multi_pkt example fails on a53
 Fixed race condition in the XAxiDma_Reset() API.
 
+lwip141_2_0:
+Correct assigment of TX BD ring in init_dma() and
+emacps_error_handler().
+
 Changes for 2017.3
 ===============================