Changeset 211 for trunk/src/os2ahci/ata.c

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/ata.c (modified) (7 diffs)

trunk/src/os2ahci/ata.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2021 David Azarewicz <david@88watts.net>
+ * Copyright (c) 2013-2023 David Azarewicz <david@88watts.net>
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -121 +121 @@
       if (ata_cmd.lba_l & 0xf0000000UL)
       {
-        dprintf(0,"error: LBA-28 address %d has more than 28 bits\n", ata_cmd.lba_l);
+        dprintf(0, DBG_PREFIX": error: LBA-28 address %d has more than 28 bits\n", ata_cmd.lba_l);
         return(ATA_CMD_INVALID_PARM);
       }
@@ -172 +172 @@
 
     default:
-      dprintf(0,"error: v_ata_cmd() called with invalid parameter type (%d)\n", (int) ap);
+      dprintf(0, DBG_PREFIX": error: called with invalid parameter type (%d)\n", (int) ap);
       return(ATA_CMD_INVALID_PARM);
     }
@@ -255 +255 @@
         if (sg_size)
         {
-          dprintf(0, __func__": unaligned SG element\n");
+          dprintf(0, DBG_PREFIX": unaligned SG element\n");
           return -1;
         }
-        dprintf(0, __func__": too many S/G elements\n");
+        dprintf(0, DBG_PREFIX": too many S/G elements\n");
         return(i - 1);
       }
       if ((sg_addr & 1) || (chunk & 1))
       {
-        DPRINTF(0, DBG_PREFIX": warning: ata_cmd() called with unaligned S/G element(s)\n");
+        DPRINTF(0, DBG_PREFIX": warning: called with unaligned S/G element(s)\n");
         return(ATA_CMD_UNALIGNED_ADDR);
       }
@@ -278 +278 @@
 
   #if DEBUG & DBG_DETAILED
-  dprintf(0,"ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
+  dprintf(0, DBG_PREFIX": ATA command for %d.%d.%d, slot %d:\n", ad_no(ai), p, d, slot);
   dHexDump(0,cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr: ");
   dHexDump(0,&ata_cmd, sizeof(ata_cmd), "ata_cmd: ");
@@ -549 +549 @@
     {
       /* more than 32 bits for number of sectors */
-      dprintf(0,"warning: limiting disk %d.%d.%d to 2TB\n",
+      dprintf(0, DBG_PREFIX": warning: limiting disk %d.%d.%d to 2TB\n",
               iorb_unit_adapter(pIorb), iorb_unit_port(pIorb),
               iorb_unit_device(pIorb));
@@ -651 +651 @@
   int rc;
 
-  if (ullLba >= (1UL << 28) || count > 256 || add_workspace(pIorb)->is_ncq)
+  if (add_workspace(pIorb)->is_ncq || ullLba >= (1 << 28) || count > 256 || (ullLba+count) >= (1 << 28))
   {
     /* need LBA48 for this command */