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

Timestamp:

Feb 22, 2011, 2:25:44 AM (14 years ago)

Author:

chris

Message:

• Further fixes to automatic ATAPI sense handling, now supporting sense buffers larger than 64 bytes if requested by initiator (cdrecord wanted 96 bytes)
• Separate, and internally handled, spinlock for libc malloc/free calls to reduce chances of memory corruption if somebody forgets to get the driver-level spinlock before calling malloc/free. There was no real problem with that, just some awkward code fragments which look much better now.
• Link power management implemented
• More generic support for adapter/port options so all of them can now have a global, adapter or port scope
• Generic support for inverting driver options (i.e. turn them off with '!')
• Thorough PCI scan is now the default; the reason it wasn't so far was a delay in Virtualbox but that was never a problem on real hardware
• SCSI emulation for ATAPI devices; this can be enabled on global, adapter or port scope

File:

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

trunk/src/os2ahci/ahci.c

@@ -413 +413 @@
   int i;
 
-  spin_lock(drv_lock);
-  id_buf = malloc(ATA_ID_WORDS * sizeof(u16));
-  spin_unlock(drv_lock);
-  if (id_buf == NULL) {
+  if ((id_buf = malloc(ATA_ID_WORDS * sizeof(u16))) == NULL) {
     return(-1);
   }
@@ -499 +496 @@
     ahci_restore_bios_config(ai);
   }
-  spin_lock(drv_lock);
   free(id_buf);
-  spin_unlock(drv_lock);
   return(0);
 }
@@ -613 +608 @@
   writel(ai->mmio + HOST_IRQ_STAT, 1UL << p);
 
-  /* set link speed */
-  tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x000000f0UL;
-  writel(port_mmio + PORT_SCR_CTL, tmp | (link_speed[ad_no(ai)][p] << 4));
+  /* set link speed and power management options */
+  tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x00000ff0UL;
+  tmp |= ((u32) link_speed[ad_no(ai)][p] & 0x0f) << 4;
+  tmp |= ((u32) link_power[ad_no(ai)][p] & 0x0f) << 8;
+  writel(port_mmio + PORT_SCR_CTL, tmp);
 
   /* issue COMRESET on the port */
@@ -873 +870 @@
   AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
   P_INFO *port = ai->ports + iorb_unit_port(iorb);
-  ULONG timeout = (iorb->Timeout > 0) ? iorb->Timeout * 1000 : DEFAULT_TIMEOUT;
+  ULONG timeout;
   u8 _far *port_mmio = port_base(ai, iorb_unit_port(iorb));
   u16 cmd_max = ai->cmd_max;
   int i;
+
+  /* determine timeout in milliseconds */
+  switch (iorb->Timeout) {
+  case 0:
+    timeout = DEFAULT_TIMEOUT;
+    break;
+  case 0xffffffffUL:
+    timeout = 0xffffffffUL;
+    break;
+  default:
+    timeout = iorb->Timeout * 1000;
+    break;
+  }
 
   /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
@@ -1296 +1306 @@
   for (iorb = done_queue.root; iorb != NULL; iorb = next) {
     next = iorb->pNxtIORB;
-    complete_iorb(iorb);
+    iorb_complete(iorb);
   }
 }
@@ -1541 +1551 @@
 
   /* try to detect virtualbox environment to enable a hack for IRQ routing */
-  if (ai == ad_infos && p == 7 &&
-      ai->pci->vendor == 0x8086 && ai->pci->device == 0x2829 &&
+  if (ai == ad_infos && ai->pci->vendor == 0x8086 && ai->pci->device == 0x2829 &&
       !memcmp(ata_dev_name(id_buf), "VBOX HARDDISK", 13)) {
     /* running inside virtualbox */