Changeset daea4bf in mainline

Timestamp:

2006-02-18T15:33:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

8b80b72

Parents:

052da81

Message:

Some arc bios tweaks. Wanted to print configuration data, but
the ARC seems to return strange values.
Newport graphics card does not seem to be easy to port, give up now.

Location:

arch/mips32

Files:

• include/drivers/arc.h (modified) (2 diffs)
• src/drivers/arc.c (modified) (6 diffs)
• src/mips32.c (modified) (1 diff)

arch/mips32/include/drivers/arc.h

@@ -37 +37 @@
 /* Frame size used by ARC */
 #define ARC_FRAME 4096
+
+typedef enum {
+        CmResourceTypeNull = 0,
+        CmResourceTypePort,
+        CmResourceTypeInterrupt,
+        CmResourceTypeMemory,
+        CmResourceTypeDma,
+        CmResourceTypeDeviceSpecific,
+        CmResourceTypeVendor,
+        CmResourceTypeProductName,
+        CmResourceTypeSerialNumber
+}cm_resource_type;
+
+typedef struct {
+        __u8 type;
+        __u8 sharedisposition;
+        __u16 flags;
+        union {
+                struct {
+                        long long start; /* 64-bit phys address */
+                        unsigned long length;
+                }port;
+                struct {
+                        unsigned long level;
+                        unsigned long vector;
+                        unsigned long reserved1;
+                }interrupt;
+                struct {
+                        long long start; /* 64-bit phys address */
+                        unsigned long length;
+                }memory;
+        }u;
+}__attribute__ ((packed)) cm_resource_descriptor;
+
+typedef struct {
+        __u16 version;
+        __u16 revision;
+        unsigned long count;
+        cm_resource_descriptor descr[1];
+}__attribute__ ((packed)) cm_resource_list;
 
 typedef enum {
@@ -212 +252 @@
 
 extern int arc_init(void);
-extern void arc_print_memory_map(void);
 extern int arc_enabled(void);
-extern void arc_print_devices(void);
 void arc_frame_init(void);
 void arc_console(void);

arch/mips32/src/drivers/arc.c

@@ -39 +39 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
+#include <mm/slab.h>
 
 /* This is a good joke, SGI HAS different types than NT bioses... */
@@ -112 +113 @@
 }
 
+
+/** Print configuration data that ARC reports about component */
+static void arc_print_confdata(arc_component *c)
+{
+        cm_resource_list *configdata;
+        int i;
+
+        if (!c->configdatasize)
+                return; /* No configuration data */
+
+        configdata = malloc(c->configdatasize, 0);
+
+        if (arc_entry->getconfigurationdata(configdata, c)) {
+                free(configdata);
+                return;
+        }
+        /* Does not seem to return meaningful data, don't use now */
+        free(configdata);
+        return;
+        
+        for (i=0; i < configdata->count; i++) {
+                switch (configdata->descr[i].type) {
+                case CmResourceTypePort:
+                        printf("Port: %P-size:%d ",
+                               (__address)configdata->descr[i].u.port.start,
+                               configdata->descr[i].u.port.length);
+                        break;
+                case CmResourceTypeInterrupt:
+                        printf("Irq: level(%d) vector(%d) ",
+                               configdata->descr[i].u.interrupt.level,
+                               configdata->descr[i].u.interrupt.vector);
+                        break;
+                case CmResourceTypeMemory:
+                        printf("Memory: %P-size:%d ",
+                               (__address)configdata->descr[i].u.port.start,
+                               configdata->descr[i].u.port.length);
+                        break;
+                default:
+                        break;
+                }
+        }
+
+        free(configdata);
+}
+
+/** Print information about component */
 static void arc_print_component(arc_component *c)
 {
@@ -118 +165 @@
         printf("%s: ",ctypes[c->type]);
         for (i=0;i < c->identifier_len;i++)
-                arc_putchar(c->identifier[i]);
-        arc_putchar('\n');
-}
-
-void arc_print_devices(void)
+                printf("%c",c->identifier[i]);
+
+        printf(" ");
+        arc_print_confdata(c);
+        printf("\n");
+}
+
+/**
+ * Read from ARC bios configuration data and print it
+ */
+static int cmd_arc_print_devices(cmd_arg_t *argv)
 {
         arc_component *c,*next;
-
-        if (!arc_enabled())
-                return;
 
         c = arc_entry->getchild(NULL);
@@ -138 +188 @@
                                 c = arc_entry->getparent(c);
                         if (!c)
-                                return;
+                                return 0;
                 }
                 c = next;
         }
-}
-
-void arc_print_memory_map(void)
+        return 1;
+}
+static cmd_info_t devlist_info = {
+        .name = "arcdevlist",
+        .description = "Print arc device list",
+        .func = cmd_arc_print_devices,
+        .argc = 0
+};
+
+
+/** Read from arc bios memory map and print it
+ *
+ */
+static int cmd_arc_print_memmap(cmd_arg_t *argv)
 {
         arc_memdescriptor_t *desc;
-
-        if (!arc_enabled())
-                return;
 
         printf("Memory map:\n");
@@ -161 +219 @@
                 desc = arc_entry->getmemorydescriptor(desc);
         }
-}
+        return 1;
+}
+static cmd_info_t memmap_info = {
+        .name = "arcmemmap",
+        .description = "Print arc memory map",
+        .func = cmd_arc_print_memmap,
+        .argc = 0
+};
 
 /** Print charactor to console */
@@ -208 +273 @@
         cmd_initialize(&reboot_info);
         cmd_register(&reboot_info);
+        cmd_initialize(&memmap_info);
+        cmd_register(&memmap_info);
+        cmd_initialize(&devlist_info);
+        cmd_register(&devlist_info);
 
         return 0;

arch/mips32/src/mips32.c

@@ -94 +94 @@
         console_init();
         debugger_init();
-        arc_print_memory_map();
-        arc_print_devices();
         /* Setup usermode...*/
         config.init_addr = INIT_ADDRESS;