Ticket #12357: ahci-rework-v3.diff

src/add-ons/kernel/busses/scsi/ahci/ahci_defs.h

@@ -97 +97 @@
 #define IPM_TRANSITIONS_TO_PARTIAL_DISABLED 0x1
 #define IPM_TRANSITIONS_TO_SLUMBER_DISABLED 0x2
 
+// Device signatures
+#define SATA_SIG_ATA            0x00000101 // SATA drive
+#define SATA_SIG_ATAPI          0xEB140101 // ATAPI drive
+#define SATA_SIG_SEMB           0xC33C0101 // Enclosure management bridge
+#define SATA_SIG_PM             0x96690101 // Port multiplier
 
 typedef struct {
     uint32      clb;            // Command List Base Address
@@ -130 +135 @@
     PORT_CMD_ATAPI  = (1 << 24),    // Device is ATAPI
     PORT_CMD_CR     = (1 << 15),    // Command List Running (DMA active)
     PORT_CMD_FR     = (1 << 14),    // FIS Receive Running
-    PORT_CMD_FER    = (1 << 4),     // FIS Receive Enable
+    PORT_CMD_FRE    = (1 << 4),     // FIS Receive Enable
     PORT_CMD_CLO    = (1 << 3),     // Command List Override
     PORT_CMD_POD    = (1 << 2),     // Power On Device
     PORT_CMD_SUD    = (1 << 1),     // Spin-up Device

src/add-ons/kernel/busses/scsi/ahci/ahci_port.cpp

@@ -54 +54 @@
     fSectorCount(0),
     fIsATAPI(false),
     fTestUnitReadyActive(false),
-    fResetPort(false),
+    fSoftReset(false),
     fError(false),
     fTrimSupported(false)
 {
@@ -120 +120 @@
     fRegs->is = fRegs->is;
 
     // clear error bits
-    fRegs->serr = fRegs->serr;
+    _ClearErrorRegister();
 
     // power up device
     fRegs->cmd |= PORT_CMD_POD;
@@ -131 +131 @@
     // activate link
     fRegs->cmd = (fRegs->cmd & ~PORT_CMD_ICC_MASK) | PORT_CMD_ICC_ACTIVE;
 
-    // enable FIS receive
-    fRegs->cmd |= PORT_CMD_FER;
+    // enable FIS receive (enabled when fb set, only to be disabled when unset)
+    fRegs->cmd |= PORT_CMD_FRE;
 
     FlushPostedWrites();
 
@@ -146 +146 @@
 {
     TRACE("AHCIPort::Init2 port %d\n", fIndex);
 
-    // start DMA engine
-    fRegs->cmd |= PORT_CMD_ST;
+    // enable port
+    Enable();
 
     // enable interrupts
     fRegs->ie = PORT_INT_MASK;
 
     FlushPostedWrites();
 
-    ResetPort(true);
+    // reset port and probe info
+    SoftReset();
 
     TRACE("ie   0x%08" B_PRIx32 "\n", fRegs->ie);
     TRACE("is   0x%08" B_PRIx32 "\n", fRegs->is);
@@ -172 +173 @@
 
     fDevicePresent = (fRegs->ssts & 0xf) == 0x3;
 
+    TRACE("%s: port %d, device %s\n", __func__, fIndex,
+        fDevicePresent ? "present" : "absent");
+
     return B_OK;
 }
 
@@ -181 +185 @@
 {
     TRACE("AHCIPort::Uninit port %d\n", fIndex);
 
-    // disable FIS receive
-    fRegs->cmd &= ~PORT_CMD_FER;
+    // Spec v1.3.1, §10.3.2 - Shut down port before unsetting FRE
 
-    // wait for receive completion, up to 500ms
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK) {
-        TRACE("AHCIPort::Uninit port %d error FIS rx still running\n", fIndex);
+    // shutdown the port
+    if (!Disable()) {
+        ERROR("%s: port %d error, unable to shutdown before FRE clear!\n",
+            __func__, fIndex);
+        return;
     }
 
-    // stop DMA engine
-    fRegs->cmd &= ~PORT_CMD_ST;
-
-    // wait for DMA completion
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
-        TRACE("AHCIPort::Uninit port %d error DMA engine still running\n",
-            fIndex);
-    }
+    // Clear FRE and wait for completion
+    fRegs->cmd &= ~PORT_CMD_FRE;
+    if (wait_until_clear(&fRegs->cmd, PORT_CMD_FR, 500000) < B_OK)
+        ERROR("%s: port %d error FIS rx still running\n", __func__, fIndex);
 
     // disable interrupts
     fRegs->ie = 0;
@@ -218 +219 @@
 AHCIPort::ResetDevice()
 {
     // perform a hard reset
-    if (!_HardReset())
+    if (PortReset() != B_OK) {
+        ERROR("%s: port %d unable to hard reset device\n", __func__, fIndex);
         return;
+    }
 
     if (wait_until_set(&fRegs->ssts, 0x1, 100000) < B_OK)
         TRACE("AHCIPort::ResetDevice port %d no device detected\n", fIndex);
@@ -238 +241 @@
 
 
 status_t
-AHCIPort::ResetPort(bool forceDeviceReset)
+AHCIPort::SoftReset()
 {
-    if (!fTestUnitReadyActive)
-        TRACE("AHCIPort::ResetPort port %d\n", fIndex);
+    TRACE("AHCIPort::SoftReset port %d\n", fIndex);
 
-    // stop DMA engine
-    fRegs->cmd &= ~PORT_CMD_ST;
-    FlushPostedWrites();
+    // Spec v1.3.1, §10.4.1 Software Reset
+    // A single device on one port is reset, HBA and phy comm remain intact.
 
-    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
-        TRACE("AHCIPort::ResetPort port %d error DMA engine doesn't stop\n",
-            fIndex);
+    // stop port, flush transactions
+    if (!Disable()) {
+        // If the port doesn't power off, move on to a stronger reset.
+        ERROR("%s: port %d soft reset failed. Moving on to port reset.\n",
+            __func__, fIndex);
+        return PortReset();
     }
 
-    bool deviceBusy = fRegs->tfd & (ATA_BSY | ATA_DRQ);
-
-    if (!fTestUnitReadyActive) {
-        TRACE("AHCIPort::ResetPort port %d, deviceBusy %d, "
-            "forceDeviceReset %d\n", fIndex, deviceBusy, forceDeviceReset);
+    // If the port is still busy, move on to port reset.
+    if (fRegs->tfd & (ATA_BSY | ATA_DRQ)) {
+        ERROR("%s: port %d still busy. Moving on to port reset.\n",
+            __func__, fIndex);
+        return PortReset();
     }
 
-    if (deviceBusy || forceDeviceReset)
-        ResetDevice();
+    // TODO: Proper Software reset here
+    return PortReset();
+    // ********************************
 
-    // start DMA engine
-    fRegs->cmd |= PORT_CMD_ST;
-    FlushPostedWrites();
+    // start port
+    Enable();
 
     return PostReset();
 }
 
 
 status_t
-AHCIPort::PostReset()
+AHCIPort::PortReset()
 {
-    if (!fTestUnitReadyActive)
-        TRACE("AHCIPort::PostReset port %d\n", fIndex);
+    TRACE("AHCIPort::PortReset port %d\n", fIndex);
 
-    if ((fRegs->ssts & 0xf) != 0x3 || (fRegs->tfd & 0xff) == 0x7f) {
-        TRACE("AHCIPort::PostReset port %d: no device\n", fIndex);
-        return B_OK;
+    // Spec v1.3.1, §10.4.2 Port Reset
+    // Physical comm between HBA and port disabled. More Intrusive
+    if (!Disable()) {
+        ERROR("%s: port %d unable to reset!\n", __func__, fIndex);
+        return B_ERROR;
     }
 
+    fRegs->sctl = (fRegs->sctl & ~SATA_CONTROL_DET_MASK)
+        | DET_INITIALIZATION << SATA_CONTROL_DET_SHIFT;
+    FlushPostedWrites();
+    spin(1100);
+        // You must wait 1ms at minimum
+    fRegs->sctl = (fRegs->sctl & ~SATA_CONTROL_DET_MASK)
+        | DET_NO_INITIALIZATION << SATA_CONTROL_DET_SHIFT;
+    FlushPostedWrites();
+
+    if (wait_until_set(&fRegs->ssts, 0x3, 500000) < B_OK) {
+        TRACE("AHCIPort::PortReset port %d device present but no phy "
+            "communication\n", fIndex);
+        return B_ERROR;
+    }
+
+    //if ((fRegs->tfd & 0xff) == 0x7f) {
+    //  TRACE("AHCIPort::PostReset port %d: no device\n", fIndex);
+    //  return B_OK;
+    //}
+
+    Enable();
+
+    return PostReset();
+}
+
+
+status_t
+AHCIPort::PostReset()
+{
     if ((fRegs->tfd & 0xff) == 0xff)
         snooze(200000);
 
@@ -292 +326 @@
 
     wait_until_clear(&fRegs->tfd, ATA_BSY, 31000000);
 
-    fIsATAPI = fRegs->sig == 0xeb140101;
-
+    fIsATAPI = fRegs->sig == SATA_SIG_ATAPI;
     if (fIsATAPI)
         fRegs->cmd |= PORT_CMD_ATAPI;
     else
@@ -302 +335 @@
 
     if (!fTestUnitReadyActive) {
         TRACE("device signature 0x%08" B_PRIx32 " (%s)\n", fRegs->sig,
-            fRegs->sig == 0xeb140101 ? "ATAPI" : fRegs->sig == 0x00000101
+            fRegs->sig == SATA_SIG_ATAPI ? "ATAPI" : fRegs->sig == SATA_SIG_ATA
                 ? "ATA" : "unknown");
     }
 
+    _ClearErrorRegister();
+
     return B_OK;
 }
 
@@ -374 +409 @@
     }
 
     // read and clear SError
-    uint32 serr = fRegs->serr;
-    fRegs->serr = serr;
+    _ClearErrorRegister();
 
     if (is & PORT_INT_TFE) {
         if (!fTestUnitReadyActive)
             TRACE("Task File Error\n");
 
-        fResetPort = true;
+        fSoftReset = true;
         fError = true;
     }
     if (is & PORT_INT_HBF) {
         TRACE("Host Bus Fatal Error\n");
-        fResetPort = true;
+        fSoftReset = true;
         fError = true;
     }
     if (is & PORT_INT_HBD) {
         TRACE("Host Bus Data Error\n");
-        fResetPort = true;
+        fSoftReset = true;
         fError = true;
     }
     if (is & PORT_INT_IF) {
         TRACE("Interface Fatal Error\n");
-        fResetPort = true;
+        fSoftReset = true;
         fError = true;
     }
     if (is & PORT_INT_INF) {
@@ -404 +438 @@
     }
     if (is & PORT_INT_OF) {
         TRACE("Overflow\n");
-        fResetPort = true;
+        fSoftReset = true;
         fError = true;
     }
     if (is & PORT_INT_IPM) {
@@ -412 +446 @@
     }
     if (is & PORT_INT_PRC) {
         TRACE("PhyReady Change\n");
-//      fResetPort = true;
+//      fSoftReset = true;
     }
     if (is & PORT_INT_PC) {
         TRACE("Port Connect Change\n");
         // Spec v1.3, §6.2.2.3 Recovery of Unsolicited COMINIT
-
-        // perform a hard reset
-        if (!_HardReset())
-            return;
-
-        // clear error bits to clear PxSERR.DIAG.X
+        // Spec v1.3.1, §7.4 Interaction of command list and port change status
+        // TODO: Issue COMRESET ?
+        //PortReset();
+        //HBAReset(); ???
         _ClearErrorRegister();
     }
     if (is & PORT_INT_UF) {
         TRACE("Unknown FIS\n");
-        fResetPort = true;
+        fSoftReset = true;
     }
 
     if (fError) {
@@ -452 +484 @@
     status_t status = get_memory_map_etc(B_CURRENT_TEAM, data, dataSize,
         entries, &entriesUsed);
     if (status != B_OK) {
-        TRACE("AHCIPort::FillPrdTable get_memory_map() failed: %s\n",
-            strerror(status));
+        TRACE("%s: get_memory_map() failed: %s\n", __func__, strerror(status));
         return B_ERROR;
     }
 
@@ -500 +531 @@
         sgCount--;
     }
     if (*prdCount == 0) {
-        TRACE("AHCIPort::FillPrdTable: count is 0\n");
+        TRACE("%s: count is 0\n", __func__);
         return B_ERROR;
     }
     if (dataSize > 0) {
@@ -1059 +1090 @@
 
     if (wait_until_clear(&fRegs->tfd, ATA_BSY | ATA_DRQ, 1000000) < B_OK) {
         TRACE("ExecuteAtaRequest port %d: device is busy\n", fIndex);
-        ResetPort();
+        SoftReset();
         FinishTransfer();
         request->Abort();
         return;
@@ -1094 +1125 @@
     TRACE("tfd  0x%08" B_PRIx32 "\n", fRegs->tfd);
 */
 
-    if (fResetPort || status == B_TIMED_OUT) {
-        fResetPort = false;
-        ResetPort();
+    if (fSoftReset || status == B_TIMED_OUT) {
+        fSoftReset = false;
+        SoftReset();
     }
 
     size_t bytesTransfered = fCommandList->prdbc;
@@ -1322 +1353 @@
 
 
 bool
-AHCIPort::_HardReset()
+AHCIPort::Enable()
 {
+    // Spec v1.3.1, §10.3.1 Start (PxCMD.ST)
+    TRACE("%s: port %d\n", __func__, fIndex);
     if ((fRegs->cmd & PORT_CMD_ST) != 0) {
-        // We shouldn't perform a reset, but at least document it
-        TRACE("AHCIPort::_HardReset() PORT_CMD_ST set, behaviour undefined\n");
+        TRACE("%s: Starting port already running!\n", __func__);
         return false;
     }
 
-    fRegs->sctl = (fRegs->sctl & ~SATA_CONTROL_DET_MASK)
-        | DET_INITIALIZATION << SATA_CONTROL_DET_SHIFT;
+    if ((fRegs->cmd & PORT_CMD_FRE) == 0) {
+        TRACE("%s: Unable to start port without FRE enabled!\n", __func__);
+        return false;
+    }
+
+    // Clear DMA engine and wait for completion
+    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
+        TRACE("%s: port %d error DMA engine still running\n", __func__,
+            fIndex);
+        return false;
+    }
+    // Start port
+    fRegs->cmd |= PORT_CMD_ST;
     FlushPostedWrites();
-    spin(1100);
-        // You must wait 1ms at minimum
-    fRegs->sctl = (fRegs->sctl & ~SATA_CONTROL_DET_MASK)
-        | DET_NO_INITIALIZATION << SATA_CONTROL_DET_SHIFT;
+    return true;
+}
+
+
+bool
+AHCIPort::Disable()
+{
+    TRACE("%s: port %d\n", __func__, fIndex);
+
+    if ((fRegs->cmd & PORT_CMD_ST) == 0) {
+        TRACE("%s: port %d attempting to disable stopped port.\n",
+            __func__, fIndex);
+    }
+
+    // Disable port
+    fRegs->cmd &= ~PORT_CMD_ST;
     FlushPostedWrites();
 
+    // Spec v1.3.1, §10.4.2 Port Reset - assume hung after 500 mil.
+    // Clear DMA engine and wait for completion
+    if (wait_until_clear(&fRegs->cmd, PORT_CMD_CR, 500000) < B_OK) {
+        TRACE("%s: port %d error DMA engine still running\n", __func__,
+            fIndex);
+        return false;
+    }
+
     return true;
 }
 

src/add-ons/kernel/busses/scsi/ahci/ahci_port.h

@@ -48 +48 @@
     void        ExecuteSataRequest(sata_request *request, bool isWrite = false);
 
     void        ResetDevice();
-    status_t    ResetPort(bool forceDeviceReset = false);
+    status_t    SoftReset();
+    status_t    PortReset();
     status_t    PostReset();
+
+    bool        Enable();
+    bool        Disable();
+
     void        FlushPostedWrites();
     void        DumpD2HFis();
 
@@ -57 +62 @@
     status_t    WaitForTransfer(int *tfd, bigtime_t timeout);
     void        FinishTransfer();
 
-    inline  bool                _HardReset();
     inline  void                _ClearErrorRegister();
 
 //  uint8 *     SetCommandFis(volatile command_list_entry *cmd, volatile fis *fis, const void *data, size_t dataSize);
@@ -79 +83 @@
     uint64                          fSectorCount;
     bool                            fIsATAPI;
     bool                            fTestUnitReadyActive;
-    bool                            fResetPort;
+    bool                            fSoftReset;
     bool                            fError;
     bool                            fTrimSupported;
     uint32                          fMaxTrimRangeBlocks;