Changeset 93b84b3 in mainline

Timestamp:

2005-12-12T16:30:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ebbdb8f

Parents:

af9a7c5

Message:

Fixed weird simics panic.
Run kconsole, if we panic. This currently works in gxemul,
simics. In mips we need to modify the simulator.
On ia32 we need a function, that would speak directly to the chip
and fetch the character using polling.

Files:

• arch/mips32/src/drivers/msim.c (modified) (2 diffs)
• arch/mips32/src/drivers/serial.c (modified) (2 diffs)
• arch/mips32/src/panic.S (modified) (1 diff)
• generic/include/console/chardev.h (modified) (1 diff)
• generic/src/console/console.c (modified) (3 diffs)
• generic/src/console/kconsole.c (modified) (6 diffs)
• generic/src/lib/func.c (modified) (2 diffs)

arch/mips32/src/drivers/msim.c

@@ -38 +38 @@
 static void msim_enable(chardev_t *dev);
 static void msim_disable(chardev_t *dev);
+static char msim_do_read(chardev_t *dev);
 
 static chardev_operations_t msim_ops = {
         .resume = msim_enable,
         .suspend = msim_disable,
-        .write = msim_write
+        .write = msim_write,
+        .read = msim_do_read,
 };
 
@@ -64 +66 @@
 
 #include <print.h>
+/** Read character using polling, assume interrupts disabled */
+static char msim_do_read(chardev_t *dev)
+{
+        char ch;
+
+        while (1) {
+                ch = *((volatile char *) MSIM_KBD_ADDRESS);
+                if (ch) {
+                        if (ch == '\r')
+                                return '\n';
+                        if (ch == 0x7f)
+                                return '\b';
+                        return ch;
+                }
+        }
+}
+
 /** Process keyboard interrupt. */
 static void msim_interrupt(int n, void *stack)
 {
-        char ch;
+        char ch = 0;
 
         ch = *((char *) MSIM_KBD_ADDRESS);

arch/mips32/src/drivers/serial.c

@@ -72 +72 @@
 }
 
-static chardev_operations_t serial_ops = {
-        .resume = serial_enable,
-        .suspend = serial_disable,
-        .write = serial_write
-};
+/** Read character from serial port, wait until available */
+static char serial_do_read(chardev_t *dev)
+{
+        serial_t *sd = (serial_t *)dev->data;
+        char ch;
+
+        while (!(SERIAL_READ_LSR(sd->port) & 1))
+                ;
+        ch = SERIAL_READ(sd->port);
+
+        if (ch =='\r')
+                ch = '\n';
+        return ch;
+}
+
 
 /** Process keyboard interrupt. Does not work in simics? */
@@ -93 +103 @@
 }
 
+
+
+static chardev_operations_t serial_ops = {
+        .resume = serial_enable,
+        .suspend = serial_disable,
+        .write = serial_write,
+        .read = serial_do_read
+};
 
 iroutine old_timer;

arch/mips32/src/panic.S

@@ -39 +39 @@
 /* From printf return directly to halt() */     
 panic_printf:
-        lui $ra, %hi(halt)
+        jal printf
+        nop
+        j halt
+        nop
+/* This code does not work, god knows why */            
+/*      lui $ra, %hi(halt)
         j printf
-        ori $ra, %lo(halt)
+        ori $ra, %lo(halt) */

generic/include/console/chardev.h

@@ -42 +42 @@
         void (* resume)(chardev_t *);           /**< Resume pushing characters. */
         void (* write)(chardev_t *, char c);    /**< Write character to stream. */
+        /** Read character directly from device, assume interrupts disabled */
+        char (* read)(chardev_t *); 
 };
 

generic/src/console/console.c

@@ -35 +35 @@
 #include <typedefs.h>
 #include <arch.h>
+#include <func.h>
+#include <print.h>
 
 /** Standard input character device. */
@@ -50 +52 @@
         __u8 ch;
         ipl_t ipl;
+
+        if (haltstate) {
+                /* If we are here, we are hopefully on the processor, that 
+                 * issued the 'halt' command, so proceed to read the character
+                 * directly from input
+                 */
+                if (chardev->op->read)
+                        return chardev->op->read(chardev);
+                /* no other way of interacting with user, halt */
+                printf("cpu: halted - no kconsole\n");
+                cpu_halt();
+        }
 
         waitq_sleep(&chardev->wq);
@@ -115 +129 @@
 void putchar(char c)
 {
-        stdout->op->write(stdout, c);
+        if (stdout->op->write)
+                stdout->op->write(stdout, c);
 }

generic/src/console/kconsole.c

@@ -248 +248 @@
                         putchar(c);
                         break;
-                } if (c == '\b') {
+                } if (c == '\b') { /* Backspace */
                         if (position == 0)
                                 continue;
@@ -262 +262 @@
                         continue;
                 }
-                if (c == '\t') {
+                if (c == '\t') { /* Tabulator */
                         int found;
 
@@ -310 +310 @@
                         continue;
                 }
-                if (c == 0x1b) {
+                if (c == 0x1b) { /* Special command */
                         mod = _getc(input);
                         c = _getc(input);
@@ -318 +318 @@
 
                         if (c == 0x33 && _getc(input) == 0x7e) {
+                                /* Delete */
                                 if (position == curlen)
                                         continue;
@@ -332 +333 @@
                                 position = 0;
                         } 
-                        else if (c == 0x46) {
+                        else if (c == 0x46) {  /* End */
                                 for (i=position;i<curlen;i++)
                                         putchar(current[i]);
@@ -356 +357 @@
                                 rdln_print_c(' ',curlen);
                                 rdln_print_c('\b',curlen);
-                                if (c == 0x41)
+                                if (c == 0x41) /* Up */
                                         histposition--;
                                 else

generic/src/lib/func.c

@@ -33 +33 @@
 #include <arch.h>
 #include <typedefs.h>
+#include <console/kconsole.h>
 
 __u32   haltstate = 0; /**< Halt flag */
@@ -46 +47 @@
         haltstate = 1;
         interrupts_disable();
+#ifdef CONFIG_DEBUG
+        printf("\n");
+        kconsole(NULL); /* Run kconsole as a last resort to user */
+#endif      
+
         if (CPU)
                 printf("cpu%d: halted\n", CPU->id);