Some enhancement for the command mode

This commit adds option to display configuration in command mode.
Currently only some of the global configuration are added. Others
could be added later when needed.

This commit also has a change to incease bfdump timeout to 10s.

RM #4669177
RM #4670238

Signed-off-by: Liming Sun <[email protected]>

Author: lsun100

man/rshim.8

@@ -106,6 +106,9 @@ OPTIONS:
     -m, --bfdump
     Start debug dump which is sent to the standard output.
 
+    -p, --get-config <NAME | all>
+    Get configuration value by name or use 'all' to see the list.
+
     -r, --reg <addr.[32|64] [value]>
     Read/write registers.
 

src/rshim.c

@@ -224,7 +224,7 @@ char *rshim_static_dev_name;
 /* Default configuration file. */
 const char *rshim_cfg_file = DEFAULT_RSHIM_CONFIG_FILE;
 static int rshim_display_level;
-static int rshim_boot_timeout = 300;
+int rshim_boot_timeout = 300;
 int rshim_drop_mode = -1;
 int rshim_usb_reset_delay = 1;
 bool rshim_has_usb_reset_delay;
@@ -3446,6 +3446,9 @@ int main(int argc, char *argv[])
     }
   }
 
+  /* Load configuration. */
+  rshim_load_cfg();
+
   /* Handle command mode separately. */
   if (rshim_cmdmode) {
     return rshim_cmdmode_run(argc, argv);
@@ -3491,8 +3494,6 @@ int main(int argc, char *argv[])
     }
   }
 
-  rshim_load_cfg();
-
   /* In force mode, we will send a one-time ownership request command for each
    * rshim backend if they are found to be detached (aka. in drop mode) */
   if (rshim_force_mode) {

src/rshim.h

@@ -42,6 +42,7 @@ extern int rshim_log_level;
 extern bool rshim_daemon_mode;
 extern int rshim_drop_mode;
 extern bool rshim_force_mode;
+extern int rshim_boot_timeout;
 extern int rshim_usb_timeout;
 extern int rshim_usb_reset_delay;
 extern bool rshim_has_usb_reset_delay;

src/rshim_cmdmode.c

@@ -12,6 +12,8 @@
 
 #include "rshim.h"
 
+#define RSHIM_BFDUMP_TIMEOUT 10
+
 int rshim_cmd_fd = -1;
 rshim_backend_t *rshim_cmd_bd = NULL;
 
@@ -191,7 +193,7 @@ static int bfdump_poll(rsh_scratchpad3_t *sp)
       break;
 
     time(&t1);
-    if (difftime(t1, t0) > 2)
+    if (difftime(t1, t0) > RSHIM_BFDUMP_TIMEOUT)
       return -ETIMEDOUT;
 
     usleep(1000);
@@ -352,6 +354,31 @@ static void set_signals(void)
   sigaction(SIGPIPE, &sa, NULL);
 }
 
+static void dump_config(char *name)
+{
+  if (!name) {
+    printf("Invalid command\n");
+    return;
+  }
+
+  if (!strcmp(name, "USB_TIMEOUT")) {
+    printf("%d\n", rshim_usb_timeout);
+  } else if (!strcmp(name, "BOOT_TIMEOUT")) {
+    printf("%d\n", rshim_boot_timeout);
+  } else if (!strcmp(name, "PCIE_RESET_DELAY")) {
+    printf("%d\n", rshim_pcie_reset_delay);
+  } else if (!strcmp(name, "USB_RESET_DELAY")) {
+    printf("%d\n", rshim_usb_reset_delay);
+  } else if (!strcmp(name, "all")) {
+    printf("BOOT_TIMEOUT      %d\n", rshim_boot_timeout);
+    printf("PCIE_RESET_DELAY  %d\n", rshim_pcie_reset_delay);
+    printf("USB_RESET_DELAY   %d\n", rshim_usb_reset_delay);
+    printf("USB_TIMEOUT       %d\n", rshim_usb_timeout);
+  } else {
+    printf("Invalid command\n");
+  }
+}
+
 static void print_help(void)
 {
   printf("Usage: rshim [options]\n");
@@ -361,21 +388,23 @@ static void print_help(void)
   printf("    -g, --get-debug         get debug code\n");
   printf("    -m, --bfdump            debug dump\n");
   printf("    -r, --reg <addr.[32|64] [value]> read/write register\n");
+  printf("    -p, --get-config <NAME | all> get config value\n");
   printf("    -s, --set-debug <0 | 1> set debug code\n");
   printf("  -h, --help                show help info\n");
   printf("  -i, --index               use device path /dev/rshim<i>/\n");
 }
 
 int rshim_cmdmode_run(int argc, char *argv[])
 {
-  static const char short_options[] = "cghimr:s:";
+  static const char short_options[] = "cghimp:r:s:";
   static struct option long_options[] = {
     { "get-debug", no_argument, NULL, 'g' },
     { "help", no_argument, NULL, 'h' },
     { "index", required_argument, NULL, 'i' },
     { "bfdump", no_argument, NULL, 'm' },
     { "reg", required_argument, NULL, 'r' },
     { "set-debug", required_argument, NULL, 's' },
+    { "get-config", required_argument, NULL, 'p' },
     { NULL, 0, NULL, 0 }
   };
   uint64_t addr = 0, value = 0;
@@ -416,6 +445,10 @@ int rshim_cmdmode_run(int argc, char *argv[])
         rc = bfdump();
         break;
 
+    case 'p':
+        dump_config(optarg);
+        break;
+
     case 'r':
       /* Syntax: <addr.[32|64]> [value] */
       strncpy(tmp, (char *)optarg, sizeof(tmp) - 1);