1 files changed, 20 insertions, 8 deletions

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index 0dbcdfbb6fd0..4802eb5840e1 100644
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -31,15 +31,21 @@ char kdb_prompt_str[CMD_BUFLEN];
 
 int kdb_trap_printk;
 
-static void kgdb_transition_check(char *buffer)
+static int kgdb_transition_check(char *buffer)
 {
-        int slen = strlen(buffer);
-        if (strncmp(buffer, "$?#3f", slen) != 0 &&
-            strncmp(buffer, "$qSupported", slen) != 0 &&
-            strncmp(buffer, "+$qSupported", slen) != 0) {
+        if (buffer[0] != '+' && buffer[0] != '$') {
                 KDB_STATE_SET(KGDB_TRANS);
                 kdb_printf("%s", buffer);
+        } else {
+                int slen = strlen(buffer);
+                if (slen > 3 && buffer[slen - 3] == '#') {
+                        kdb_gdb_state_pass(buffer);
+                        strcpy(buffer, "kgdb");
+                        KDB_STATE_SET(DOING_KGDB);
+                        return 1;
+                }
         }
+        return 0;
 }
 
 static int kdb_read_get_key(char *buffer, size_t bufsize)
@@ -251,6 +257,10 @@ poll_again:
         case 13: /* enter */
                 *lastchar++ = '\n';
                 *lastchar++ = '\0';
+                if (!KDB_STATE(KGDB_TRANS)) {
+                        KDB_STATE_SET(KGDB_TRANS);
+                        kdb_printf("%s", buffer);
+                }
                 kdb_printf("\n");
                 return buffer;
         case 4: /* Del */
@@ -382,10 +392,12 @@ poll_again:
                                  * printed characters if we think that
                                  * kgdb is connecting, until the check
                                  * fails */
-                                if (!KDB_STATE(KGDB_TRANS))
-                                        kgdb_transition_check(buffer);
-                                else
+                                if (!KDB_STATE(KGDB_TRANS)) {
+                                        if (kgdb_transition_check(buffer))
+                                                return buffer;
+                                } else {
                                         kdb_printf("%c", key);
+                                }
                         }
                         /* Special escape to kgdb */
                         if (lastchar - buffer >= 5 &&