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

Timestamp:

Feb 18, 2011, 10:09:10 PM (14 years ago)

Author:

chris

Message:

• APM support
• Generic IOCTL interface for adapter passthrough commands (ATA and ATAPI)
• Fixes to ATAPI sense data handling
• Cosmetic changes to debug reporting
• Fixed missing interrupt enable flag for PIO transfer completions
• Added command line switch /I to ignore specific adapters

File:

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

trunk/src/os2ahci/ahci.c

@@ -591 +591 @@
 
   dprintf("resetting port %d.%d\n", ad_no(ai), p);
+  ddprintf(" PORT_CMD_ISSUE = 0x%lx\n", readl(port_mmio + PORT_CMD_ISSUE));
+  ddprintf(" PORT_SCR_ACT   = 0x%lx\n", readl(port_mmio + PORT_SCR_ACT));
+  ddprintf(" PORT_SCR_ERR   = 0x%lx\n", readl(port_mmio + PORT_SCR_ERR));
+  ddprintf(" PORT_TFDATA    = 0x%lx\n", readl(port_mmio + PORT_TFDATA));
+  ddprintf(" PORT_IRQ_STAT  = 0x%lx\n", readl(port_mmio + PORT_IRQ_STAT));
+  ddprintf(" PORT_IRQ_MASK  = 0x%lx\n", readl(port_mmio + PORT_IRQ_MASK));
+  ddprintf(" HOST_IRQ_STAT  = 0x%lx\n", readl(ai->mmio + HOST_IRQ_STAT));
 
   /* stop port engines (we don't care whether there is an error doing so) */
@@ -597 +604 @@
   /* clear SError */
   tmp = readl(port_mmio + PORT_SCR_ERR);
-  ddprintf(" PORT_SCR_ERR  = 0x%lx\n", tmp);
   writel(port_mmio + PORT_SCR_ERR, tmp);
 
   /* 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);
   }
-  ddprintf(" PORT_IRQ_STAT = 0x%lx\n", tmp);
-  ddprintf(" PORT_IRQ_MASK = 0x%lx\n", readl(port_mmio + PORT_IRQ_MASK));
-  ddprintf(" HOST_IRQ_STAT = 0x%lx\n", readl(ai->mmio + HOST_IRQ_STAT));
   writel(ai->mmio + HOST_IRQ_STAT, 1UL << p);
 
@@ -701 +703 @@
                                       PORT_IRQ_UNK_FIS |
                                       PORT_IRQ_SDB_FIS |
+                                      PORT_IRQ_DMAS_FIS |
+                                      PORT_IRQ_PIOS_FIS |
                                       PORT_IRQ_D2H_REG_FIS);
   } else {
@@ -759 +763 @@
 
   /* disable port interrupts */
-  writel(port_mmio + PORT_IRQ_MASK, PORT_IRQ_TF_ERR);
+  writel(port_mmio + PORT_IRQ_MASK, 0);
 
   /* disable FIS reception */
@@ -839 +843 @@
 
   return((timeout <= 0) ? -1 : 0);
+}
+
+/******************************************************************************
+ * Determine whether a port is busy executing commands.
+ */
+ahci_port_busy(AD_INFO *ai, int p)
+{
+  u8 _far *port_mmio = port_base(ai, p);
+
+  return(readl(port_mmio + PORT_SCR_ACT) != 0 ||
+         readl(port_mmio + PORT_CMD_ISSUE) != 0);
 }
 
@@ -931 +946 @@
         ADD_StartTimerMS(&aws->timer, timeout, (PFN) timeout_callback, iorb, 0);
 
-        /* update IORB */
+        /* issue command to hardware */
+        *cmds |= (1UL << port->cmd_slot);
         aws->queued_hw = 1;
         aws->cmd_slot = port->cmd_slot;
 
-        /* issue command to hardware */
         ddprintf("issuing command on slot %d\n", port->cmd_slot);
-        *cmds |= (1UL << port->cmd_slot);
         if (aws->is_ncq) {
           writel(port_mmio + PORT_SCR_ACT, (1UL << port->cmd_slot));
@@ -1423 +1437 @@
 
 /******************************************************************************
- * Execute ATA command.
+ * Execute ATA command. Please note that this is allowed for both ATA and
+ * ATAPI devices because ATAPI devices will process some ATA commands as well.
  */
 void ahci_execute_ata(IORBH _far *iorb)
@@ -1433 +1448 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
-
-  if (ad_infos[a].ports[p].devs[d].atapi) {
-    iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
-    iorb_done(iorb);
-  } else {
-    ahci_exec_iorb(iorb, 0, ata_execute_ata);
-  }
+        "ahci_execute_ata(%d.%d.%d): ", a, p, d);
+
+  ahci_exec_iorb(iorb, 0, ata_execute_ata);
 }