Changeset 641

Timestamp:

10/10/02 21:46:47 (6 years ago)

Author:

ebiederm

Message:

AUTHORS
- Add myself
src/cpu/p5/delay_tsc.c
- Fix the indentation
- Don't have the new calibrate_tsc function directly

update global variables.

src/include/smp/start_stop.h
- Change #ifdef SMP to #if SMP == 1
src/include/string.h
- Declare sprintf
src/lib/elfboot.c
- Minor fixes to verify_loaded_image
- Change all of the new debugging messages to printk_spew
src/lib/inflate.c
- Remove sensless warning message fixes
src/lib/linuxpci.c
- move declaration of sprintf to string.h
- Better detection of read only bars in pci_get_resource
- Remove pci_noop
- Remove warning about set_pci_dev_ops not being finished
src/lib/src.c
- change #ifdef SERIAL_POST to #if SERIAL_POST in post_code

Location:

trunk/LinuxBIOSv1

Files:

• AUTHORS (modified) (1 diff)
• src/cpu/p5/delay_tsc.c (modified) (2 diffs)
• src/include/smp/start_stop.h (modified) (1 diff)
• src/include/string.h (modified) (1 diff)
• src/lib/elfboot.c (modified) (4 diffs)
• src/lib/inflate.c (modified) (1 diff)
• src/lib/linuxpci.c (modified) (7 diffs)
• src/lib/subr.c (modified) (1 diff)

trunk/LinuxBIOSv1/AUTHORS

@@ -2 +2 @@
 Contributors (in alpha order):
 
+Eric Biederman <ebiederman@lnxi.com> - 440GX SPD, elfboot, mkelfImage, Athlon SMP, P4 Xeon, etc
 Jeff Garzik <jgarzik@mandrakesoft.com> - The essential /dev/fb! First freebios
 James Hendricks <jimi@lanl.gov> - SMP for 440GX among many other things

trunk/LinuxBIOSv1/src/cpu/p5/delay_tsc.c

@@ -99 +99 @@
 static unsigned long long calibrate_tsc(void)
 {
-    unsigned long long retval, start, end, delta;
-    unsigned long allones = (unsigned long) -1, result;
-    unsigned long startlow, starthigh;
-    unsigned long endlow, endhigh;
-    unsigned long count;
-
-    rdtsc(startlow,starthigh);
-    // no udivdi3, dammit.
-    // so we count to 1<< 20 and then right shift 20
-    for(count = 0; count < (1<<20); count ++)
-        outb(0x80, 0x80);
-    rdtsc(endlow,endhigh);
-
-    // make delta be (endhigh - starthigh) + (endlow - startlow)
-    // but >> 20
-    // do it this way to avoid gcc warnings.
-    start = starthigh;
-    start <<= 32;
-    start |= startlow;
-    end = endhigh;
-    end <<= 32;
-    end |= endlow;
-    delta = end - start;
-    // at this point we have a delta for 1,000,000 outbs. Now rescale for one microsecond.
-    delta >>= 20;
-    // save this for microsecond timing.
-    clocks_per_usec = delta;
-#define DEBUG
-#ifdef DEBUG
-    printk_notice("end %x:%x, start %x:%x\n",
-        endhigh, endlow, starthigh, startlow);
-    printk_notice("32-bit delta %d\n", (unsigned long) delta);
-#endif
-
-    retval = clocks_per_usec;
-#ifdef DEBUG
-    printk_notice(__FUNCTION__ " 32-bit result is %d\n", result);
-#endif
-    return retval;
+        unsigned long long retval, start, end, delta;
+        unsigned long allones = (unsigned long) -1, result;
+        unsigned long startlow, starthigh;
+        unsigned long endlow, endhigh;
+        unsigned long count;
+        
+        rdtsc(startlow,starthigh);
+        // no udivdi3, dammit.
+        // so we count to 1<< 20 and then right shift 20
+        for(count = 0; count < (1<<20); count ++)
+                outb(0x80, 0x80);
+        rdtsc(endlow,endhigh);
+        
+        // make delta be (endhigh - starthigh) + (endlow - startlow)
+        // but >> 20
+        // do it this way to avoid gcc warnings.
+        start = starthigh;
+        start <<= 32;
+        start |= startlow;
+        end = endhigh;
+        end <<= 32;
+        end |= endlow;
+        delta = end - start;
+        // at this point we have a delta for 1,000,000 outbs. Now rescale for one microsecond.
+        delta >>= 20;
+        // save this for microsecond timing.
+        result = delta;
+        printk_spew("end %x:%x, start %x:%x\n",
+                endhigh, endlow, starthigh, startlow);
+        printk_spew("32-bit delta %d\n", (unsigned long) delta);
+        
+        printk_spew(__FUNCTION__ " 32-bit result is %d\n", result);
+        return retval;
 }
 
@@ -150 +144 @@
 
         if (!clocks_per_usec) {
-                calibrate_tsc();
+                clocks_per_usec = calibrate_tsc();
                 printk_info("clocks_per_usec: %u\n", clocks_per_usec);
         }

trunk/LinuxBIOSv1/src/include/smp/start_stop.h

@@ -2 +2 @@
 #define SMP_START_STOP_H
 
-#ifdef SMP
+#if SMP == 1
 #include <smp/atomic.h>
 unsigned long this_processors_id(void);

trunk/LinuxBIOSv1/src/include/string.h

@@ -33 +33 @@
 extern int memcmp(const void *s1, const void *s2, size_t n);
 
+extern int sprintf(char * buf, const char *fmt, ...);
 #endif /* STRING_H */

trunk/LinuxBIOSv1/src/lib/elfboot.c

@@ -68 +68 @@
         checksum = add_ip_checksums(bytes, checksum, 
                 compute_ip_checksum(phdr, ehdr->e_phnum*sizeof(*phdr)));
-        bytes += sizeof(*phdr);
+        bytes += ehdr->e_phnum*sizeof(*phdr);
         for(ptr = head->phdr_next; ptr != head; ptr = ptr->phdr_next) {
                 checksum = add_ip_checksums(bytes, checksum,
@@ -575 +575 @@
         if (!verify_loaded_image(cb_chain, ehdr, phdr, &head)) 
                 goto out;
-/*
- */
 
         printk_info("verified segments\n");
@@ -627 +625 @@
                 ehdr = (Elf_ehdr *)(&header[i]);
                 if (memcmp(ehdr->e_ident, ELFMAG, 4) != 0) {
-                        printk_debug("NO header at %d\n", i);
+                        printk_spew("NO header at %d\n", i);
                         continue;
                 }
@@ -646 +644 @@
                 ehdr = 0;
         }
-        printk_debug("header_offset is %d\n", header_offset);
+        printk_spew("header_offset is %d\n", header_offset);
         if (header_offset == -1) {
                 goto out;
         }
 
-        printk_debug("Try to load at offset 0x%x\n", header_offset);
+        printk_spew("Try to load at offset 0x%x\n", header_offset);
         result = elfload(stream, mem, 
                 header + header_offset , ELF_HEAD_SIZE - header_offset);

trunk/LinuxBIOSv1/src/lib/inflate.c

@@ -1098 +1098 @@
     }
     (ulg)get_byte();    /* Get timestamp */
-    ((ulg)get_byte());// << 8;
-    ((ulg)get_byte());// << 16;
-    ((ulg)get_byte());// << 24;
+    ((ulg)get_byte()) << 8;
+    ((ulg)get_byte()) << 16;
+    ((ulg)get_byte()) << 24;
 
     (void)get_byte();  /* Ignore extra flags for the moment */

trunk/LinuxBIOSv1/src/lib/linuxpci.c

@@ -24 +24 @@
 #include <subr.h>
 
-// yes we could do Yet Another Include File, but ...
-int sprintf(char * buf, const char *fmt, ...);
+
 
 /**
@@ -120 +119 @@
 static void pci_get_resource(struct pci_dev *dev, struct resource *resource, unsigned long index)
 {
-        uint32_t addr, size;
+        uint32_t addr, size, base;
         unsigned long type;
 
@@ -143 +142 @@
         pci_write_config_dword(dev, index, ~0);
         pci_read_config_dword(dev,  index, &size);
+
+        /* get the minimum value the bar can be set to */
+        pci_write_config_dword(dev, index, 0);
+        pci_read_config_dword(dev, index, &base);
 
         /* restore addr */
@@ -158 +161 @@
          * read back as 0 for both address and size. 
          */
-        if (addr == size) {
+        if ((addr == size) && (addr == base)) {
                 if (size != 0) {
                         printk_debug(
@@ -319 +322 @@
 {
         unsigned long base, limit;
-        unsigned long bridge_align = MEM_BRIDGE_ALIGN; // stupid warnings.
+        unsigned long bridge_align = MEM_BRIDGE_ALIGN;
         unsigned char buf[10];
         
@@ -448 +451 @@
 }
 
-
-// probably dead.
-#if 0
-static void pci_noop(struct pci_dev *dev)
-{
-        return;
-}
-#endif
 struct pci_dev_operations default_pci_ops_dev = {
         .read_resources = pci_dev_read_resources,
@@ -484 +479 @@
                 }
         }
-#warning set_pci_dev_ops not yet finished
         /* If I don't have a specific driver use the default operations */
         switch(dev->hdr_type & 0x7f) {  /* header type */

trunk/LinuxBIOSv1/src/lib/subr.c

@@ -90 +90 @@
 void post_code(uint8_t value)
 {
-#ifdef SERIAL_POST
+#if SERIAL_POST
         unsigned long hi, lo;
         // DAMMIT! This just broke!