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

Timestamp:

Nov 10, 2013, 4:56:20 PM (12 years ago)

Author:

David Azarewicz

Message:

Fix for hardware that reports incorrect status.
Now report both real and fake devices when SCSI emulation is enabled.

File:

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

trunk/src/os2ahci/ahci.c

@@ -315 +315 @@
     /* more ports in port_map than in HOST_CAP & 0x1f */
     ports = ai->hw_ports;
-    dprintf("implemented port map (0x%lx) contains more "
-            "ports than nr_ports (%d), using nr_ports\n",
-            ai->port_map, ports);
+    dprintf("implemented port map (0x%lx) contains more ports than nr_ports (%d), using nr_ports\n", ai->port_map, ports);
     ai->port_map = (1UL << ports) - 1UL;
   }
@@ -347 +345 @@
   readl(ai->mmio + HOST_CTL);
 
-  if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 &&
-      ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
+  if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 && ai->pci_vendor == PCI_VENDOR_ID_INTEL) {
 
     /* This BIOS apparently accesses the controller via SATA registers and
@@ -410 +407 @@
 }
 
+#ifdef NOT_USED
 int ahci_reset_controller(AD_INFO *ai)
 {
@@ -416 +414 @@
 
     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.
-     */
+
+    /* we must be in AHCI mode, before using anything AHCI-specific, such as HOST_RESET. */
     ahci_enable_ahci(ai);
 
@@ -445 +442 @@
     ahci_enable_ahci(ai);
 
-    /* Some registers might be cleared on reset.  Restore
-     * initial values.
-     */
+    /* Some registers might be cleared on reset.  Restore initial values. */
     ahci_restore_initial_config(ai);
 
@@ -465 +460 @@
     return 0;
 }
+#endif
 
 /******************************************************************************
@@ -769 +765 @@
   writel(port_mmio + PORT_SCR_ERR, tmp);
 
-  /* power up and spin up the drive if necessary */
-  if (((tmp = readl(port_mmio + PORT_CMD)) & (PORT_CMD_SPIN_UP|PORT_CMD_POWER_ON)) != (PORT_CMD_SPIN_UP|PORT_CMD_POWER_ON)) {
-    writel(port_mmio + PORT_CMD, tmp | PORT_CMD_SPIN_UP | PORT_CMD_POWER_ON);
-  }
+  /* Some hardware reports incorrect status so just set these bits unconditionally */
+  tmp = readl(port_mmio + PORT_CMD);
+  tmp &= ~PORT_CMD_ALPE; /* turn off agressive power management */
+  tmp |= (PORT_CMD_SPIN_UP | PORT_CMD_POWER_ON); /* power up and spin up the drive */
+  writel(port_mmio + PORT_CMD, tmp);
 
   /* set link speed and power management options */
@@ -1309 +1306 @@
     rc = timer_check_and_block(&Timer);
     if (rc) {
-      dprintf(" Timeout", tmp);
+      dprintf(" Timeout");
       break;
     }
   }
 
-  if ((tmp = readl(port_mmio + PORT_SCR_ERR)) != 0) {
+  tmp = readl(port_mmio + PORT_SCR_ERR);
+  if (tmp & PORT_ERR_FAIL_BITS) {
     dprintf(" SERR = 0x%08lx", tmp);
     rc = 1;