Robertmj patch1 (#36)

* sync load/clear/rescan tuning from 16xl concurrency testing.

* Applied ETIMEDOUT patch, code cleanup.

* Setup to return the unchanged return code from the fpga_mgmt lib

Author: AWSrobertmj

sdk/userspace/fpga_libs/fpga_mgmt/fpga_mgmt_cmd.c

@@ -415,7 +415,7 @@ fpga_mgmt_send_cmd(int slot_id,
 	bool done = false;
 	while (!done) {
 		ret = fpga_hal_mbox_read(handle, (void *)rsp, len);
-		fail_on(ret = (ret) ? ETIMEDOUT : 0, err_code, "Error: operation timed out");
+		fail_on(ret = (ret) ? -ETIMEDOUT : 0, err_code, "Error: operation timed out");
 
 		ret = fpga_mgmt_afi_validate_header(cmd, rsp, *len);
 		if (ret == 0) {
@@ -426,7 +426,6 @@ fpga_mgmt_send_cmd(int slot_id,
 			retries++;
 		}
 	}
-	fail_on(ret != 0, err, CLI_INTERNAL_ERR_STR);
 
 	return 0;
 err:

sdk/userspace/fpga_libs/fpga_pci/fpga_pci_sysfs.c

@@ -600,9 +600,17 @@ fpga_pci_remove_app_pf(struct fpga_pci_resource_map *app_map)
     ret = fpga_pci_write_one2file(sysfs_name);
     fail_on_quiet(ret != 0, err, "cli_write_one2file failed");
 
+#if 0 
 	/** Check that the app_pf does not exist */
+	/** 
+	 * NOTE:
+	 * A concurrent (remove)+rescan action on another FPGA slot will make this 
+	 * FPGA's app_pf visible again, so we should not error out here if we see
+	 * that the app_pf is still present.  
+	 */
 	ret = fpga_pci_check_app_pf_sysfs(sysfs_name, false); /** exists==false */
     fail_on_quiet(ret != 0, err, "fpga_pci_check_app_pf_sysfs failed");
+#endif
 
 	errno = 0;
     return 0;

sdk/userspace/fpga_mgmt_tools/src/fpga_local_cmd.c

@@ -247,7 +247,7 @@ cli_show_image_info(struct fpga_mgmt_image_info *info)
 static int
 cli_attach(void)
 {
-	int ret;
+	int ret = FPGA_ERR_FAIL;
 
 	if (f1.opcode == CLI_CMD_DESCRIBE_SLOTS) {
 		/** 
@@ -266,7 +266,7 @@ cli_attach(void)
 out:
 	return 0;
 err:
-	return FPGA_ERR_FAIL;
+	return ret;
 }
 
 /**
@@ -362,7 +362,7 @@ command_describe(void)
 
 	return 0;
 err:
-	return FPGA_ERR_FAIL;
+	return ret;
 }
 
 /**
@@ -393,7 +393,7 @@ command_describe_slots(void)
 	}
 	return 0;
 err:
-	return FPGA_ERR_FAIL;
+	return ret;
 }
 
 /**

sdk/userspace/fpga_mgmt_tools/src/fpga_local_cmd.h

@@ -81,7 +81,7 @@ enum {
 /**
  * Request timeout: timeout * delay_msec
  */
-#define CLI_REQUEST_TIMEOUT_DFLT   	25
+#define CLI_REQUEST_TIMEOUT_DFLT   	50
 #define CLI_REQUEST_DELAY_MSEC_DFLT	200	
 
 /**