Changeset 160 for trunk/src/os2ahci/ahci.c

Timestamp:

May 31, 2013, 2:03:41 AM (12 years ago)

Author:

David Azarewicz

Message:

fixed trap dump kernel exit, some work on suspend/resume routines

File:

• trunk/src/os2ahci/ahci.c (modified) (7 diffs)

trunk/src/os2ahci/ahci.c

@@ -162 +162 @@
 
   /* print AHCI register debug information */
+  #ifdef DEBUG
   if (debug) {
-    printf("AHCI global controller registers:\n");
+    aprintf("AHCI global controller registers:\n");
     for (i = 0; i <= HOST_CAP2 / sizeof(u32); i++) {
       u32 val = ai->bios_config[i];
-      printf(" %02x: %08lx", i, val);
+      aprintf(" %02x: %08lx", i, val);
 
       if (i == HOST_CAP) {
-        printf_nts(" -");
-        if (val & HOST_CAP_64)         printf_nts(" 64bit");
-        if (val & HOST_CAP_NCQ)        printf_nts(" ncq");
-        if (val & HOST_CAP_SNTF)       printf_nts(" sntf");
-        if (val & HOST_CAP_MPS)        printf_nts(" mps");
-        if (val & HOST_CAP_SSS)        printf_nts(" sss");
-        if (val & HOST_CAP_ALPM)       printf_nts(" alpm");
-        if (val & HOST_CAP_LED)        printf_nts(" led");
-        if (val & HOST_CAP_CLO)        printf_nts(" clo");
-        if (val & HOST_CAP_ONLY)       printf_nts(" ahci_only");
-        if (val & HOST_CAP_PMP)        printf_nts(" pmp");
-        if (val & HOST_CAP_FBS)        printf_nts(" fbs");
-        if (val & HOST_CAP_PIO_MULTI)  printf_nts(" pio_multi");
-        if (val & HOST_CAP_SSC)        printf_nts(" ssc");
-        if (val & HOST_CAP_PART)       printf_nts(" part");
-        if (val & HOST_CAP_CCC)        printf_nts(" ccc");
-        if (val & HOST_CAP_EMS)        printf_nts(" ems");
-        if (val & HOST_CAP_SXS)        printf_nts(" sxs");
-        printf_nts(" cmd_slots:%d", (u16) ((val >> 8) & 0x1f) + 1);
-        printf_nts(" ports:%d",     (u16) (val & 0x1f) + 1);
+        ntprintf(" -");
+        if (val & HOST_CAP_64)         ntprintf(" 64bit");
+        if (val & HOST_CAP_NCQ)        ntprintf(" ncq");
+        if (val & HOST_CAP_SNTF)       ntprintf(" sntf");
+        if (val & HOST_CAP_MPS)        ntprintf(" mps");
+        if (val & HOST_CAP_SSS)        ntprintf(" sss");
+        if (val & HOST_CAP_ALPM)       ntprintf(" alpm");
+        if (val & HOST_CAP_LED)        ntprintf(" led");
+        if (val & HOST_CAP_CLO)        ntprintf(" clo");
+        if (val & HOST_CAP_ONLY)       ntprintf(" ahci_only");
+        if (val & HOST_CAP_PMP)        ntprintf(" pmp");
+        if (val & HOST_CAP_FBS)        ntprintf(" fbs");
+        if (val & HOST_CAP_PIO_MULTI)  ntprintf(" pio_multi");
+        if (val & HOST_CAP_SSC)        ntprintf(" ssc");
+        if (val & HOST_CAP_PART)       ntprintf(" part");
+        if (val & HOST_CAP_CCC)        ntprintf(" ccc");
+        if (val & HOST_CAP_EMS)        ntprintf(" ems");
+        if (val & HOST_CAP_SXS)        ntprintf(" sxs");
+        ntprintf(" cmd_slots:%d", (u16) ((val >> 8) & 0x1f) + 1);
+        ntprintf(" ports:%d",     (u16) (val & 0x1f) + 1);
 
       } else if (i == HOST_CTL) {
-        printf_nts(" -");
-        if (val & HOST_AHCI_EN)        printf_nts(" ahci_enabled");
-        if (val & HOST_IRQ_EN)         printf_nts(" irq_enabled");
-        if (val & HOST_RESET)          printf_nts(" resetting");
+        ntprintf(" -");
+        if (val & HOST_AHCI_EN)        ntprintf(" ahci_enabled");
+        if (val & HOST_IRQ_EN)         ntprintf(" irq_enabled");
+        if (val & HOST_RESET)          ntprintf(" resetting");
 
       } else if (i == HOST_CAP2) {
-        printf_nts(" -");
-        if (val & HOST_CAP2_BOH)       printf_nts(" boh");
-        if (val & HOST_CAP2_NVMHCI)    printf_nts(" nvmhci");
-        if (val & HOST_CAP2_APST)      printf_nts(" apst");
+        ntprintf(" -");
+        if (val & HOST_CAP2_BOH)       ntprintf(" boh");
+        if (val & HOST_CAP2_NVMHCI)    ntprintf(" nvmhci");
+        if (val & HOST_CAP2_APST)      ntprintf(" apst");
       }
-      printf_nts("\n");
-    }
-  }
+      ntprintf("\n");
+    }
+  }
+  #endif
 
   /* Save working copies of CAP, CAP2 and port_map and remove broken feature
@@ -337 +339 @@
       }
     }
-
-    /* Wait some time to give the COMRESET a chance to complete (usually, at
-     * least hard disks complete the reset within a few milliseonds)
-     */
-    msleep(20);
   }
 
@@ -456 +453 @@
 }
 
-int ahci_reset_controller(AD_INFO *ai)
-{
-    u32 tmp;
-    TIMER Timer;
-
-    dprintf("controller reset starting on adapter %d\n", ad_no(ai));
-    /* we must be in AHCI mode, before using anything
-     * AHCI-specific, such as HOST_RESET.
-     */
-    ahci_enable_ahci(ai);
-
-    /* global controller reset */
-    tmp = readl(ai->mmio + HOST_CTL);
-    if ((tmp & HOST_RESET) == 0) {
-        writel(ai->mmio + HOST_CTL, tmp | HOST_RESET);
-        readl(ai->mmio + HOST_CTL); /* flush */
-    }
-
-    /*
-     * to perform host reset, OS should set HOST_RESET
-     * and poll until this bit is read to be "0".
-     * reset must complete within 1 second, or
-     * the hardware should be considered fried.
-     */
-    timer_init(&Timer, 1000);
-    while (((tmp = readl(ai->mmio + HOST_CTL)) & HOST_RESET) != 0) {
-      if (timer_check_and_block(&Timer)) {
-        dprintf("controller reset failed (0x%lx)\n", tmp);
-        return(-1);
-      }
-    }
-
-    /* turn on AHCI mode */
-    ahci_enable_ahci(ai);
-
-    /* Some registers might be cleared on reset.  Restore
-     * initial values.
-     */
-    ahci_restore_initial_config(ai);
-
-    if (ai->pci->vendor == PCI_VENDOR_ID_INTEL) {
-      u32 tmp16 = 0;
-
-      ddprintf("ahci_reset_controller: intel detected\n");
-      /* configure PCS */
-      pci_read_conf(ai->bus, ai->dev_func, 0x92, sizeof(u16), &tmp16);
-      if ((tmp16 & ai->port_map) != ai->port_map) {
-        ddprintf("ahci_reset_controller: updating PCS %x/%x\n", (u16)tmp16, ai->port_map);
-        tmp16 |= ai->port_map;
-        pci_write_conf(ai->bus, ai->dev_func, 0x92, sizeof(u16), tmp16);
-      }
-    }
-
-    return 0;
-}
-
 /******************************************************************************
  * Scan all ports for connected devices and fill in the corresponding device
@@ -547 +488 @@
     ahci_save_bios_config(ai);
   }
-
-  ahci_reset_controller(ai);
 
   if (ahci_enable_ahci(ai)) {
@@ -723 +662 @@
   dprintf("ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
   if (debug > 1) {
-    printf(" PORT_CMD       = 0x%lx\n", readl(port_mmio + PORT_CMD));
-    printf("ahci_reset_port: command engine status:\n");
-    printf(" PORT_SCR_ACT   = 0x%lx\n", readl(port_mmio + PORT_SCR_ACT));
-    printf(" PORT_CMD_ISSUE = 0x%lx\n", readl(port_mmio + PORT_CMD_ISSUE));
-    printf("link/device status:\n");
-    printf(" PORT_SCR_STAT  = 0x%lx\n", readl(port_mmio + PORT_SCR_STAT));
-    printf(" PORT_SCR_CTL   = 0x%lx\n", readl(port_mmio + PORT_SCR_CTL));
-    printf(" PORT_SCR_ERR   = 0x%lx\n", readl(port_mmio + PORT_SCR_ERR));
-    printf(" PORT_TFDATA    = 0x%lx\n", readl(port_mmio + PORT_TFDATA));
-    printf("interrupt status:\n");
-    printf(" PORT_IRQ_STAT  = 0x%lx\n", readl(port_mmio + PORT_IRQ_STAT));
-    printf(" PORT_IRQ_MASK  = 0x%lx\n", readl(port_mmio + PORT_IRQ_MASK));
-    printf(" HOST_IRQ_STAT  = 0x%lx\n", readl(ai->mmio + HOST_IRQ_STAT));
+    aprintf(" PORT_CMD       = 0x%lx\n", readl(port_mmio + PORT_CMD));
+    aprintf("ahci_reset_port: command engine status:\n");
+    aprintf(" PORT_SCR_ACT   = 0x%lx\n", readl(port_mmio + PORT_SCR_ACT));
+    aprintf(" PORT_CMD_ISSUE = 0x%lx\n", readl(port_mmio + PORT_CMD_ISSUE));
+    aprintf("link/device status:\n");
+    aprintf(" PORT_SCR_STAT  = 0x%lx\n", readl(port_mmio + PORT_SCR_STAT));
+    aprintf(" PORT_SCR_CTL   = 0x%lx\n", readl(port_mmio + PORT_SCR_CTL));
+    aprintf(" PORT_SCR_ERR   = 0x%lx\n", readl(port_mmio + PORT_SCR_ERR));
+    aprintf(" PORT_TFDATA    = 0x%lx\n", readl(port_mmio + PORT_TFDATA));
+    aprintf("interrupt status:\n");
+    aprintf(" PORT_IRQ_STAT  = 0x%lx\n", readl(port_mmio + PORT_IRQ_STAT));
+    aprintf(" PORT_IRQ_MASK  = 0x%lx\n", readl(port_mmio + PORT_IRQ_MASK));
+    aprintf(" HOST_IRQ_STAT  = 0x%lx\n", readl(ai->mmio + HOST_IRQ_STAT));
   }
 
@@ -1565 +1504 @@
    */
   if (irq_stat & PORT_IRQ_UNK_FIS) {
+    #ifdef DEBUG
     u32 _far *unk = (u32 _far *) (port_dma_base(ai, p)->rx_fis + RX_FIS_UNK);
-    dprintf("warning: unknown FIS %08lx %08lx %08lx %08lx\n",
-            unk[0], unk[1], unk[2], unk[3]);
+    dprintf("warning: unknown FIS %08lx %08lx %08lx %08lx\n", unk[0], unk[1], unk[2], unk[3]);
+    #endif
     reset_port = 1;
   }
@@ -1688 +1628 @@
 void ahci_execute_ata(IORBH _far *iorb)
 {
+  #ifdef DEBUG
   int a = iorb_unit_adapter(iorb);
   int p = iorb_unit_port(iorb);
   int d = iorb_unit_device(iorb);
+  #endif
 
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,