Changeset 211 for trunk/src/os2ahci/ahci.h

Timestamp:

Jul 24, 2023, 5:51:46 PM (2 years ago)

Author:

David Azarewicz

Message:

Added workaround to help with VirtualBox issues.
Improved diagnostic messages.
Changed how timeouts are reset and how ctx hooks are triggered.
Added quirk for devices with issues executing some standard commands.
Changed to make /N the default.

File:

• trunk/src/os2ahci/ahci.h (modified) (2 diffs)

trunk/src/os2ahci/ahci.h

@@ -77 +77 @@
 #define RX_FIS_SDB              0x58 /* offset of SDB FIS data */
 #define RX_FIS_UNK              0x60 /* offset of Unknown FIS data */
-
-#define board_ahci              0
-#define board_ahci_vt8251       1
-#define board_ahci_ign_iferr    2
-#define board_ahci_sb600        3
-#define board_ahci_mv           4
-#define board_ahci_sb700        5 /* for SB700 and SB800 */
-#define board_ahci_mcp65        6
-#define board_ahci_nopmp        7
-#define board_ahci_yesncq       8
-#define board_ahci_nosntf       9
 
 /* global controller registers */
@@ -156 +145 @@
 
 /* PORT_IRQ_{STAT,MASK} bits */
-#define PORT_IRQ_COLD_PRES      (1UL << 31) /* cold presence detect */
-#define PORT_IRQ_TF_ERR         (1UL << 30) /* task file error */
-#define PORT_IRQ_HBUS_ERR       (1UL << 29) /* host bus fatal error */
-#define PORT_IRQ_HBUS_DATA_ERR  (1UL << 28) /* host bus data error */
-#define PORT_IRQ_IF_ERR         (1UL << 27) /* interface fatal error */
-#define PORT_IRQ_IF_NONFATAL    (1UL << 26) /* interface non-fatal error */
-#define PORT_IRQ_OVERFLOW       (1UL << 24) /* xfer exhausted available S/G */
-#define PORT_IRQ_BAD_PMP        (1UL << 23) /* incorrect port multiplier */
-#define PORT_IRQ_PHYRDY         (1UL << 22) /* PhyRdy changed */
-#define PORT_IRQ_DEV_ILCK       (1UL << 7)  /* device interlock */
-#define PORT_IRQ_CONNECT        (1UL << 6)  /* port connect change status */
-#define PORT_IRQ_SG_DONE        (1UL << 5)  /* descriptor processed */
-#define PORT_IRQ_UNK_FIS        (1UL << 4)  /* unknown FIS rx'd */
-#define PORT_IRQ_SDB_FIS        (1UL << 3)  /* Set Device Bits FIS rx'd */
-#define PORT_IRQ_DMAS_FIS       (1UL << 2)  /* DMA Setup FIS rx'd */
-#define PORT_IRQ_PIOS_FIS       (1UL << 1)  /* PIO Setup FIS rx'd */
-#define PORT_IRQ_D2H_REG_FIS    (1UL << 0)  /* D2H Register FIS rx'd */
+#define PORT_IRQ_COLD_PRES      (1UL << 31) /* 80000000 cold presence detect */
+#define PORT_IRQ_TF_ERR         (1UL << 30) /* 40000000 task file error */
+#define PORT_IRQ_HBUS_ERR       (1UL << 29) /* 20000000 host bus fatal error */
+#define PORT_IRQ_HBUS_DATA_ERR  (1UL << 28) /* 10000000 host bus data error */
+#define PORT_IRQ_IF_ERR         (1UL << 27) /* 08000000 interface fatal error */
+#define PORT_IRQ_IF_NONFATAL    (1UL << 26) /* 04000000 interface non-fatal error */
+#define PORT_IRQ_OVERFLOW       (1UL << 24) /* 01000000 xfer exhausted available S/G */
+#define PORT_IRQ_BAD_PMP        (1UL << 23) /* 00800000 incorrect port multiplier */
+#define PORT_IRQ_PHYRDY         (1UL << 22) /* 00400000 PhyRdy changed */
+#define PORT_IRQ_DEV_ILCK       (1UL << 7)  /* 00000080 device interlock */
+#define PORT_IRQ_CONNECT        (1UL << 6)  /* 00000040 port connect change status */
+#define PORT_IRQ_SG_DONE        (1UL << 5)  /* 00000020 descriptor processed */
+#define PORT_IRQ_UNK_FIS        (1UL << 4)  /* 00000010 unknown FIS rx'd */
+#define PORT_IRQ_SDB_FIS        (1UL << 3)  /* 00000008 Set Device Bits FIS rx'd */
+#define PORT_IRQ_DMAS_FIS       (1UL << 2)  /* 00000004 DMA Setup FIS rx'd */
+#define PORT_IRQ_PIOS_FIS       (1UL << 1)  /* 00000002 PIO Setup FIS rx'd */
+#define PORT_IRQ_D2H_REG_FIS    (1UL << 0)  /* 00000001 D2H Register FIS rx'd */
 #define PORT_IRQ_FREEZE         (PORT_IRQ_HBUS_ERR | PORT_IRQ_IF_ERR   | \
                                  PORT_IRQ_CONNECT  | PORT_IRQ_PHYRDY   | \