Changeset 79

Timestamp:

Feb 24, 2011, 9:56:54 PM (14 years ago)

Author:

chris

Message:

• fixed debug print code in readl/writel (stack offset after printf() call was wrong after I removed the port offset token a few weeks ago and this was never tested)
• added some logic to prevent PCI devices from being detected twice -- first by a thorough scan and then again by a class-based scan
• still not working on ICH8 notebook; already found out that a port reset is required for this particular hardware (Dell D630) but the boot process is still hanging...

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (1 diff)
• init.asm (modified) (2 diffs)
• os2ahci.def (modified) (1 diff)
• pci.c (modified) (2 diffs)
• version.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -626 +626 @@
 
   /* wait for communication to be re-established after port reset */
-  while (((tmp = readl(port_mmio + PORT_SCR_STAT) & 3)) != 3) {
+  while (((tmp = readl(port_mmio + PORT_SCR_STAT)) & 3) != 3) {
     mdelay(10);
     timeout -= 10;

trunk/src/os2ahci/init.asm

@@ -148 +148 @@
                 PUSH    OFFSET readl_dbg_fmt
                 CALL    _printf
-                ADD     SP, 12
+                ADD     SP, 10
                 POP     EDX             ; restore value read from MMIO port
 
@@ -189 +189 @@
                 PUSH    OFFSET writel_dbg_fmt
                 CALL    _printf
-                ADD     SP, 12
+                ADD     SP, 10
 
 no_debug2:      LEAVE

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20110221#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20110224#@OS/2 AHCI Adapter Device Driver'
 protmode
 

trunk/src/os2ahci/pci.c

@@ -411 +411 @@
   int ad_indx = 0;
   int i;
+  int n;
 
   ddprintf("scanning PCI bus...\n");
@@ -461 +462 @@
       if (rc == OH_SUCCESS) {
         /* found a device */
-        if (ad_ignore & (1U << ad_indx++)) {
-          /* ignore this adapter */
-          continue;
-        }
-        add_pci_device(pci_ids + i, &data);
+        int already_found = 0;
+
+        /* increment index for next loop */
         if (++index > 180) {
           /* something's wrong here... */
           return;
         }
+
+        /* check whether we already found this device */
+        for (n = 0; n < ad_info_cnt; n++) {
+          if (ad_infos[n].bus == data.find_device.bus &&
+              ad_infos[n].dev_func == data.find_device.dev_func) {
+            /* this device has already been found (e.g. via thorough scan) */
+            already_found = 1;
+            break;
+          }
+        }
+            
+        if (already_found || (ad_ignore & (1U << ad_indx++))) {
+          /* ignore this device; it has either already been found via a
+           * thorough scan or has been specified to be ignored via command
+           * line option */
+          continue;
+        }
+
+        /* add this PCI device to ad_infos[] */
+        add_pci_device(pci_ids + i, &data);
       }
 

trunk/src/os2ahci/version.h

@@ -6 +6 @@
 
 
-#define VERSION            104       /* driver version (2 implied decimals) */
+#define VERSION            105       /* driver version (2 implied decimals) */
 
 /* BLDLEVEL information (in C source modules added via macro