Fixed xbutil issue for ert disable followed by enable mode (#7742)

saifuddin-xilinx · web-flow · commit fa4c0045003f · 2023-10-11T20:43:32.000-07:00
Signed-off-by: Saifuddin &lt;saifuddi@xilinx.com&gt;
diff --git a/src/runtime_src/core/common/drv/kds_core.c b/src/runtime_src/core/common/drv/kds_core.c
@@ -621,8 +621,8 @@ kds_submit_ert(struct kds_sched *kds, struct kds_command *xcmd)
 		return -EINVAL;
 	}
 
-	ert->submit(ert, xcmd);
 	set_xcmd_timestamp(xcmd, KDS_QUEUED);
+	ert->submit(ert, xcmd);
 	return 0;
 }
 
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_kds.c
@@ -2259,6 +2259,8 @@ static int xocl_kds_update_xgq(struct xocl_dev *xdev, int slot_hdl,
 		XDEV(xdev)->kds.ert_disable = true;
 		goto create_regular_cu;
 	}
+	else
+		XDEV(xdev)->kds.ert_disable = false;
 
 	// Soft Kernel Info
 	scu_info = kzalloc(MAX_CUS * sizeof(struct xrt_cu_info), GFP_KERNEL);

Original file line number	Diff line number	Diff line change
`@@ -621,8 +621,8 @@ kds_submit_ert(struct kds_sched kds, struct kds_command xcmd)`
`621`	`621`	`return -EINVAL;`
`622`	`622`	`}`
`623`	`623`
`624`		`- ert->submit(ert, xcmd);`
`625`	`624`	`set_xcmd_timestamp(xcmd, KDS_QUEUED);`
	`625`	`+ ert->submit(ert, xcmd);`
`626`	`626`	`return 0;`
`627`	`627`	`}`
`628`	`628`
Original file line number	Diff line number	Diff line change
`@@ -2259,6 +2259,8 @@ static int xocl_kds_update_xgq(struct xocl_dev *xdev, int slot_hdl,`
`2259`	`2259`	`XDEV(xdev)->kds.ert_disable = true;`
`2260`	`2260`	`goto create_regular_cu;`
`2261`	`2261`	`}`
	`2262`	`+ else`
	`2263`	`+ XDEV(xdev)->kds.ert_disable = false;`
`2262`	`2264`
`2263`	`2265`	`// Soft Kernel Info`
`2264`	`2266`	`scu_info = kzalloc(MAX_CUS * sizeof(struct xrt_cu_info), GFP_KERNEL);`