Turn down default logging level.
[fw/stlink] / gdbserver / gdb-server.c
index df2e2b87d38b79214454a6d300fdb7296bb2d871..e7676219ce8151d84d80498ccd0a75cf7275fb08 100644 (file)
@@ -6,6 +6,7 @@
  license that can be found in the LICENSE file.
 */
 
+#include <getopt.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <signal.h>
 
 #include <stlink-common.h>
 
 #include "gdb-remote.h"
 
+#define DEFAULT_LOGGING_LEVEL 50
+#define DEFAULT_GDB_LISTEN_PORT 4242
+
+#define STRINGIFY_inner(name) #name
+#define STRINGIFY(name) STRINGIFY_inner(name)
+
 #define FLASH_BASE 0x08000000
 #define FLASH_PAGE (sl->flash_pgsz)
 #define FLASH_PAGE_MASK (~((1 << 10) - 1))
@@ -32,160 +40,153 @@ static const char* current_memory_map = NULL;
  * Chip IDs are explained in the appropriate programming manual for the
  * DBGMCU_IDCODE register (0xE0042000)
  */
-struct chip_params {
-       uint32_t chip_id;
-       char* description;
-        uint32_t flash_size_reg;
-       uint32_t max_flash_size, flash_pagesize;
-       uint32_t sram_size;
-       uint32_t bootrom_base, bootrom_size;
-} const devices[] = {
-       { 0x410, "F1 Medium-density device", 0x1ffff7e0,
-         0x20000,  0x400, 0x5000,  0x1ffff000, 0x800  }, // table 2, pm0063
-       { 0x411, "F2 device", 0, /* No flash size register found in the docs*/
-         0x100000,   0x20000, 0x20000, 0x1ff00000, 0x7800  }, // table 1, pm0059
-       { 0x412, "F1 Low-density device", 0x1ffff7e0,
-         0x8000,   0x400, 0x2800,  0x1ffff000, 0x800  }, // table 1, pm0063
-       { 0x413, "F4 device", 0x1FFF7A10,
-         0x100000,   0x20000, 0x20000,  0x1ff00000, 0x7800  }, // table 1, pm0081
-       { 0x414, "F1 High-density device", 0x1ffff7e0,
-         0x80000,  0x800, 0x10000, 0x1ffff000, 0x800  },  // table 3 pm0063 
-          // This ignores the EEPROM! (and uses the page erase size,
-          // not the sector write protection...)
-       { 0x416, "L1 Med-density device", 0x1FF8004C, // table 1, pm0062
-          0x20000, 0x100, 0x4000, 0x1ff00000, 0x1000 },
-       { 0x418, "F1 Connectivity line device", 0x1ffff7e0,
-         0x40000,  0x800, 0x10000, 0x1fffb000, 0x4800 },
-       { 0x420, "F1 Medium-density value line device", 0x1ffff7e0,
-         0x20000,  0x400, 0x2000,  0x1ffff000, 0x800  },
-       { 0x428, "F1 High-density value line device", 0x1ffff7e0,
-         0x80000,  0x800, 0x8000,  0x1ffff000, 0x800  },
-       { 0x430, "F1 XL-density device", 0x1ffff7e0,  // pm0068
-         0x100000, 0x800, 0x18000, 0x1fffe000, 0x1800 },
-       { 0 }
-};
 
-int serve(stlink_t *sl, int port);
-char* make_memory_map(const struct chip_params *params, uint32_t flash_size);
+#define CORE_M3_R1 0x1BA00477
+#define CORE_M3_R2 0x4BA00477
+#define CORE_M4_R0 0x2BA01477
 
-int main(int argc, char** argv) {
+typedef struct _st_state_t {
+    // things from command line, bleh
+    int stlink_version;
+    // "/dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTE531X6-if00-port0" is only 58 chars
+    char devicename[100];
+    int logging_level;
+       int listen_port;
+} st_state_t;
 
-       stlink_t *sl = NULL;
-
-       const char * HelpStr =  "Usage:\n"
-                                                               "\t st-util port [/dev/sgX]\n"
-                                                               "\t st-util [port]\n"
-                                                               "\t st-util --help\n";
-
-       switch(argc) {
-
-               default: {
-                       fprintf(stderr, HelpStr, NULL);
-                       return 1;
-               }
 
-               case 3 : {
-                       //sl = stlink_quirk_open(argv[2], 0);
-                        // FIXME - hardcoded to usb....
-                        sl = stlink_open_usb(argv[2], 10);
-                       if(sl == NULL) return 1;
+int serve(stlink_t *sl, int port);
+char* make_memory_map(stlink_t *sl);
+
+
+int parse_options(int argc, char** argv, st_state_t *st) {
+    static struct option long_options[] = {
+        {"help", no_argument, NULL, 'h'},
+        {"verbose", optional_argument, NULL, 'v'},
+        {"device", required_argument, NULL, 'd'},
+        {"stlink_version", required_argument, NULL, 's'},
+        {"stlinkv1", no_argument, NULL, '1'},
+               {"listen_port", required_argument, NULL, 'p'},
+        {0, 0, 0, 0},
+    };
+       const char * help_str = "%s - usage:\n\n"
+       "  -h, --help\t\tPrint this help\n"
+       "  -vXX, --verbose=XX\tspecify a specific verbosity level (0..99)\n"
+       "  -v, --verbose\tspecify generally verbose logging\n"
+       "  -d <device>, --device=/dev/stlink2_1\n"
+       "\t\t\tWhere is your stlink device connected?\n"
+       "  -s X, --stlink_version=X\n"
+       "\t\t\tChoose what version of stlink to use, (defaults to 2)\n"
+       "  -1, --stlinkv1\tForce stlink version 1\n"
+       "  -p 4242, --listen_port=1234\n"
+       "\t\t\tSet the gdb server listen port. "
+       "(default port: " STRINGIFY(DEFAULT_GDB_LISTEN_PORT) ")\n"
+       ;
+
+
+    int option_index = 0;
+    int c;
+    int q;
+    while ((c = getopt_long(argc, argv, "hv::d:s:1p:", long_options, &option_index)) != -1) {
+        switch (c) {
+        case 0:
+            printf("XXXXX Shouldn't really normally come here, only if there's no corresponding option\n");
+            printf("option %s", long_options[option_index].name);
+            if (optarg) {
+                printf(" with arg %s", optarg);
+            }
+            printf("\n");
+            break;
+        case 'h':
+            printf(help_str, argv[0]);
+            exit(EXIT_SUCCESS);
+            break;
+        case 'v':
+            if (optarg) {
+                st->logging_level = atoi(optarg);
+            } else {
+                st->logging_level = DEFAULT_LOGGING_LEVEL;
+            }
+            break;
+        case 'd':
+            if (strlen(optarg) > sizeof (st->devicename)) {
+                fprintf(stderr, "device name too long: %zd\n", strlen(optarg));
+            } else {
+                strcpy(st->devicename, optarg);
+            }
+            break;
+               case '1':
+                       st->stlink_version = 1;
                        break;
-               }
-
-               case 2 : {
-                       if (strcmp(argv[1], "--help") == 0) {
-                               fprintf(stdout, HelpStr, NULL);
-                               return 1;
-                       }
-               }
-
-               case 1 : { // Search ST-LINK (from /dev/sg0 to /dev/sg99)
-                       const int DevNumMax = 99;
-                       int ExistDevCount = 0;
-
-                       for(int DevNum = 0; DevNum <= DevNumMax; DevNum++)
-                       {
-                               if(DevNum < 10) {
-                                       char DevName[] = "/dev/sgX";
-                                       const int X_index = 7;
-                                       DevName[X_index] = DevNum + '0';
-                                       if ( !access(DevName, F_OK) ) {
-                                               sl = stlink_quirk_open(DevName, 0);
-                                               ExistDevCount++;
-                                       }
-                               }
-                               else if(DevNum < 100) {
-                                       char DevName[] = "/dev/sgXY";
-                                       const int X_index = 7;
-                                       const int Y_index = 8;
-                                       DevName[X_index] = DevNum/10 + '0';
-                                       DevName[Y_index] = DevNum%10 + '0';
-                                       if ( !access(DevName, F_OK) ) {
-                                               sl = stlink_quirk_open(DevName, 0);
-                                               ExistDevCount++;
-                                       }
-                               }
-                               if(sl != NULL) break;
+               case 's':
+                       sscanf(optarg, "%i", &q);
+                       if (q < 0 || q > 2) {
+                               fprintf(stderr, "stlink version %d unknown!\n", q);
+                               exit(EXIT_FAILURE);
                        }
-
-                       if(sl == NULL) {
-                               fprintf(stdout, "\nNumber of /dev/sgX devices found: %i \n",
-                                               ExistDevCount);
-                               fprintf(stderr, "ST-LINK not found\n");
-                               return 1;
+                       st->stlink_version = q;
+                       break;
+               case 'p':
+                       sscanf(optarg, "%i", &q);
+                       if (q < 0) {
+                               fprintf(stderr, "Can't use a negative port to listen on: %d\n", q);
+                               exit(EXIT_FAILURE);
                        }
+                       st->listen_port = q;
                        break;
-               }
-       }
-
-       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
-               stlink_enter_swd_mode(sl);
+        }
+    }
+
+    if (optind < argc) {
+        printf("non-option ARGV-elements: ");
+        while (optind < argc)
+            printf("%s ", argv[optind++]);
+        printf("\n");
+    }
+    return 0;
+}
 
-       uint32_t chip_id = stlink_chip_id(sl);
-       printf("Chip ID is %08x.\n", chip_id);
 
-       const struct chip_params* params = NULL;
+int main(int argc, char** argv) {
 
-       for(int i = 0; i < sizeof(devices) / sizeof(devices[0]); i++) {
-               if(devices[i].chip_id == (chip_id & 0xFFF)) {
-                       params = &devices[i];
-                       break;
-               }
-       }
+       stlink_t *sl = NULL;
 
-       if(params == NULL) {
-               fprintf(stderr, "Cannot recognize the connected device!\n");
-               return 0;
+       st_state_t state;
+       memset(&state, 0, sizeof(state));
+       // set defaults...
+       state.stlink_version = 2;
+       state.logging_level = DEFAULT_LOGGING_LEVEL;
+       state.listen_port = DEFAULT_GDB_LISTEN_PORT;
+       parse_options(argc, argv, &state);
+       switch (state.stlink_version) {
+       case 2:
+               sl = stlink_open_usb(state.logging_level);
+               if(sl == NULL) return 1;
+               break;
+       case 1:
+               sl = stlink_v1_open(state.logging_level);
+               if(sl == NULL) return 1;
+               break;
+    }
+    
+       uint32_t chip_id = sl->chip_id;
+       uint32_t core_id = sl->core_id;
+
+       /* Fix chip_id for F4 */
+       if (((chip_id & 0xFFF) == 0x411) && (core_id == CORE_M4_R0)) {
+         printf("Fixing wrong chip_id for STM32F4 Rev A errata\n");
+         chip_id = 0x413;
        }
 
-       printf("Device connected: %s\n", params->description);
-       printf("Device parameters: SRAM: 0x%x bytes, Flash: up to 0x%x bytes in pages of 0x%x bytes\n",
-               params->sram_size, params->max_flash_size, params->flash_pagesize);
-
-       FLASH_PAGE = params->flash_pagesize;
-
-       uint32_t flash_size;
+       printf("Chip ID is %08x, Core ID is  %08x.\n", chip_id, core_id);
 
-       stlink_read_mem32(sl, params->flash_size_reg, 4);
-       flash_size = sl->q_buf[0] | (sl->q_buf[1] << 8);
-
-       printf("Flash size is %d KiB.\n", flash_size);
-       // memory map is in 1k blocks.
-       current_memory_map = make_memory_map(params, flash_size * 0x400);
-
-       int port;
-
-       if(argc == 1) {
-                // not on 64bit?
-               //srand((unsigned int)&port);
-               port = rand()/65535;
-       }
-       else {
-               port = atoi(argv[1]);
-       }
+       current_memory_map = make_memory_map(sl);
 
-       while(serve(sl, port) == 0);
+       while(serve(sl, state.listen_port) == 0);
 
+       /* Switch back to mass storage mode before closing. */
+       stlink_run(sl);
+       stlink_exit_debug_mode(sl);
        stlink_close(sl);
 
        return 0;
@@ -207,16 +208,16 @@ static const char* const memory_map_template =
   "  <memory type=\"rom\" start=\"0x1ffff800\" length=\"0x8\"/>"        // option byte area
   "</memory-map>";
 
-char* make_memory_map(const struct chip_params *params, uint32_t flash_size) {
+char* make_memory_map(stlink_t *sl) {
        /* This will be freed in serve() */
        char* map = malloc(4096);
        map[0] = '\0';
 
        snprintf(map, 4096, memory_map_template,
-                       flash_size,
-                       params->sram_size,
-                       flash_size, params->flash_pagesize,
-                       params->bootrom_base, params->bootrom_size);
+                       sl->flash_size,
+                       sl->sram_size,
+                       sl->flash_size, sl->flash_pgsz,
+                       sl->sys_base, sl->sys_size);
 
        return map;
 }
@@ -583,6 +584,7 @@ int serve(stlink_t *sl, int port) {
        printf("Listening at *:%d...\n", port);
 
        int client = accept(sock, NULL, NULL);
+       signal (SIGINT, SIG_DFL);
        if(client < 0) {
                perror("accept");
                return 1;
@@ -639,8 +641,9 @@ int serve(stlink_t *sl, int port) {
                        if(!strcmp(queryName, "Supported")) {
                                reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
                        } else if(!strcmp(queryName, "Xfer")) {
-                               char *type, *op, *annex, *s_addr, *s_length;
+                               char *type, *op, *s_addr, *s_length;
                                char *tok = params;
+                               char *annex __attribute__((unused));
 
                                type     = strsep(&tok, ":");
                                op       = strsep(&tok, ":");