Changeset 35 for trunk

Timestamp:

Nov 4, 2010, 4:23:33 PM (15 years ago)

Author:

markus

Message:

working on interrupts, bug not found so far

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (9 diffs)
• os2ahci.c (modified) (1 diff)
• os2ahci.def (modified) (1 diff)
• os2ahci.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -368 +368 @@
 
   if (ctl & HOST_AHCI_EN) {
-    /* AHCI mode already enbled */
+    /* AHCI mode already enabled */
     return(0);
   }
@@ -441 +441 @@
       /* start/reset port; if no device is attached, this is expected to fail */
       if (init_reset) {
-        ddprintf("resetting port #%d\n", p);
+        ddprintf("init-resetting port #%d\n", p);
         rc = ahci_reset_port(ai, p, 0);
       } else {
@@ -459 +459 @@
                                 AP_VADDR, (void _far *) id_buf, 512,
                                 AP_END);
-
       if (rc != 0 || id_buf[ATA_ID_CONFIG] & (1U << 15)) {
         /* this might be an ATAPI device; run IDENTIFY_PACKET_DEVICE */
@@ -471 +470 @@
         ddphex(id_buf, 512, "ATA_IDENTIFY(_PACKET) results:\n");
         ahci_setup_device(ai, p, 0, id_buf);
+
       } else {
         /* no device attached to this port */
@@ -546 +546 @@
   }
 
+  /* clear any pending adapter-level interrupts */
+  writel(ai->mmio + HOST_IRQ_STAT, readl(ai->mmio + HOST_IRQ_STAT));
+  readl(ai->mmio + HOST_IRQ_STAT); /* flush */
+
   /* enable adapter-level interrupts */
   writel(ai->mmio + HOST_CTL, HOST_IRQ_EN);
@@ -586 +590 @@
   /* clear pending port IRQs */
   tmp = readl(port_mmio + PORT_IRQ_STAT);
+  ddprintf("PORT_IRQ_STAT was 0x%lx\n", tmp);
   if (tmp) {
     writel(port_mmio + PORT_IRQ_STAT, tmp);
@@ -1024 +1029 @@
 
 /******************************************************************************
+ * set device into IDLE mode (spin down); this was used during
+ * debugging/testing and is still there since it does not hurt...
+ * If 'idle' is != 0, the idle timeout is set to 5 seconds, otherwise it
+ * is turned off.
+ */
+int ahci_set_dev_idle(AD_INFO *ai, int p, int idle)
+{
+  ddprintf("sending IDLE=%d command to port %d\n", idle, p);
+  return ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_IDLE, AP_COUNT,
+                              idle ? 1 : 0, AP_END);
+}
+
+/******************************************************************************
  * Execute polled ATA/ATAPI command. This function will block until the command
  * has completed or the timeout has expired, thus it should only be used during
@@ -1081 +1099 @@
  *
  * On entry, OS/2 will have processor interrupts enabled because we're using
- * shared IRQs but we won't be preempted by another interrupt on the same IRQ
+ * shared IRQs but we won't be preempted by another interrupt on the same
  * IRQ level until we indicated EOI. We'll keep it this way, only requesting
  * the driver-level spinlock when actually changing the driver state (IORB
@@ -1420 +1438 @@
   } else {
     /* complete ATA-specific device information */
-    if (!disable_ncq[ad_no(ai)][p]) {
+    if (disable_ncq[ad_no(ai)][p]) {
+      /* MT: set ncq_max to 1 if NCQ is disabled for this port */
+      ai->ports[p].devs[d].ncq_max = 1;
+    } else {
       ai->ports[p].devs[d].ncq_max = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
     }
+
     if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x0400U) {
       ai->ports[p].devs[d].lba48   = 1;

trunk/src/os2ahci/os2ahci.c

@@ -190 +190 @@
       case 'r':
         /* reset ports during initialization */
-        init_reset = 1;
+        init_reset = 1;
         break;
 

trunk/src/os2ahci/os2ahci.def

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

trunk/src/os2ahci/os2ahci.h

@@ -406 +406 @@
 extern int     ahci_exec_polled_cmd         (AD_INFO *ai, int p, int d,
                                              int timeout, int cmd, ...);
+extern int     ahci_set_dev_idle            (AD_INFO *ai, int p, int idle);
 
 extern int     ahci_intr                    (u16 irq);