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.

RM #4670238

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

Author: lsun100

man/rshim.8

@@ -100,6 +100,9 @@ Run rshim as command line rather than as driver. The following sub-commands are
     -g, --get-debug
     Get the current debug setting.
 
+    -p, --get-config <NAME | all>
+    Get configuration value by name or use 'all' to see the list.
+
     -s, set-debug <0 | 1>
     Set the debug setting.
 .in

src/rshim.c

@@ -220,7 +220,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;
@@ -3303,6 +3303,7 @@ static void print_help(void)
   printf("  -b, --backend             backend name (usb, pcie or pcie-lf)\n");
   printf("  -c, --cmdmode             run in command line mode\n");
   printf("    -g, --get-debug         get debug mode\n");
+  printf("    -p, --get-config <NAME | all> get config value\n");
   printf("    -s, --set-debug <0 | 1> set debug mode\n");
   printf("  -d, --device              device to attach\n");
   printf("  -f, --foreground          run in foreground\n");
@@ -3316,14 +3317,15 @@ static void print_help(void)
 
 int main(int argc, char *argv[])
 {
-  static const char short_options[] = "b:cd:fgFhi:l:nsv";
+  static const char short_options[] = "b:cd:fgFhi:l:np:sv";
   static struct option long_options[] = {
     { "backend", required_argument, NULL, 'b' },
     { "cmdmode", no_argument, NULL, 'c' },
     { "device", required_argument, NULL, 'd' },
     { "foreground", no_argument, NULL, 'f' },
     { "force", no_argument, NULL, 'F' },
     { "get-debug", no_argument, NULL, 'g' },
+    { "get-config", required_argument, NULL, 'p' },
     { "help", no_argument, NULL, 'h' },
     { "index", required_argument, NULL, 'i' },
     { "log-level", required_argument, NULL, 'l' },

src/rshim.h

@@ -41,6 +41,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

@@ -42,11 +42,40 @@ static int rshim_getset_debug(rshim_backend_t *bd, bool get, uint32_t *setting)
   return 0;
 }
 
+static int dump_config(char *name)
+{
+  if (!name) {
+    printf("Invalid command\n");
+    return -EINVAL;
+  }
+
+  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");
+    return -EINVAL;
+  }
+
+  return 0;
+}
+
 int rshim_cmdmode_run(int argc, char *argv[])
 {
-  static const char short_options[] = "cgs:";
+  static const char short_options[] = "cgp:s:";
   static struct option long_options[] = {
     { "get-debug", no_argument, NULL, 'g' },
+    { "get-config", required_argument, NULL, 'p' },
     { "set-debug", required_argument, NULL, 's' },
     { NULL, 0, NULL, 0 }
   };
@@ -82,6 +111,10 @@ int rshim_cmdmode_run(int argc, char *argv[])
       printf("0x%x\n", setting);
       break;
 
+    case 'p':
+      rc = dump_config(optarg);
+      break;
+
     case 's':
       setting = atoi(optarg);
       rc = rshim_getset_debug(bd, false, &setting);