Changeset 193 for trunk/src/os2ahci/ioctl.c

Timestamp:

Dec 12, 2017, 11:08:37 PM (8 years ago)

Author:

David Azarewicz

Message:

Fixed IOCtl pass-thru interface.
Cosmetic changes to user interface.
Removed old IBM smartctl exe from distribution.

File:

• trunk/src/os2ahci/ioctl.c (modified) (7 diffs)

trunk/src/os2ahci/ioctl.c

@@ -55 +55 @@
   SCATGATENTRY        sg_lst[AHCI_MAX_SG / 2]; /* scatter/gather list */
   ULONG               sg_cnt;                  /* number of S/G elements */
-  struct _KernVMLock_t *lh;                  /* lock handle for VMLock() */
+  struct _KernVMLock_t lh;                     /* lock handle for KernVMLock() */
 } IOCTL_CONTEXT;
 
 /* -------------------------- function prototypes -------------------------- */
 
-static USHORT do_smart  (BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l,
-                         void *buf);
-static int    map_unit  (BYTE unit, USHORT *a, USHORT *p,
-                         USHORT *d);
+static USHORT do_smart(BYTE unit, BYTE sub_func, BYTE cnt, BYTE lba_l, void *buf);
+static int map_unit(BYTE unit, USHORT *a, USHORT *p, USHORT *d);
 
 extern IORBH FAR16DATA * (__far16 *Far16AdrOfIoctlWakeup16)(IORBH FAR16DATA*);
@@ -168 +166 @@
   memset(ic, 0x00, sizeof(*ic));
 
+  /* lock DMA transfer buffer into memory and construct S/G list */
+  if (req->buflen > 0)
+  {
+    if (KernVMLock(VMDHL_LONG | !((req->flags & PT_WRITE) ? VMDHL_WRITE : 0),
+                       req->buf, req->buflen, &ic->lh, (KernPageList_t*)&ic->sg_lst, &ic->sg_cnt) != 0)
+    {
+      /* couldn't lock buffer and/or produce a S/G list */
+      MemFree(ic);
+      return(RPDONE | RPERR_PARAMETER);
+    }
+  }
+
   /* fill in adapter passthrough fields */
   ic->iorb.iorbh.Length           = sizeof(ic->iorb);
@@ -200 +210 @@
 
   /* Wait for IORB completion. */
-  spin_lock(drv_lock);
+
+  //DAZ 20171206 spin_lock(drv_lock);
   while (!(ic->iorb.iorbh.Status & IORB_DONE))
   {
-    KernBlock((ULONG)&ic->iorb.iorbh, 30000, 0, NULL, NULL);
-  }
-  spin_unlock(drv_lock);
+    KernBlock(CastFar16ToULONG(MemFar16Adr(&ic->iorb.iorbh)), 30000, 0, NULL, NULL);
+  }
+  //DAZ 20171206 spin_unlock(drv_lock);
 
   ret = RPDONE;
@@ -270 +281 @@
       memcpy(sense_buf, ic->sense, min(ic->ssb.ReqSenseLen, req->sense_len));
     }
-
   }
   else if ((req->flags & PT_ATAPI) == 0)
@@ -282 +292 @@
 
   MemFree(ic);
+  if (req->buflen > 0) KernVMUnlock(&ic->lh);
   return(ret);
 }
@@ -393 +404 @@
 {
   DSKSP_CommandParameters *cp = (DSKSP_CommandParameters *)Far16ToFlat(ioctl->ioctl.pvParm);
-  USHORT size = 0;
   USHORT ret;
   UCHAR unit;
-  UCHAR parm;
+  UCHAR parm = 0;
+  void *pData = NULL;
 
   unit = cp->byPhysicalUnit;
 
-  /* verify addressability of data buffer (depends on SMART function) */
-  switch (ioctl->ioctl.bFunction)
-  {
-
-  case DSKSP_SMART_GETSTATUS:
-    size = sizeof(ULONG);
-    break;
-
-  case DSKSP_SMART_GET_ATTRIBUTES:
-  case DSKSP_SMART_GET_THRESHOLDS:
-  case DSKSP_SMART_GET_LOG:
-    size = 512;
-    break;
-  }
-
-  if (size > 0)
-  {
-    parm = *(UCHAR*)Far16ToFlat(ioctl->ioctl.pvData);
+  if (ioctl->ioctl.pvData)
+  {
+    pData = (void*)Far16ToFlat(ioctl->ioctl.pvData);
+    parm = *(UCHAR*)pData;
   }
 
@@ -444 +441 @@
 
   case DSKSP_SMART_GETSTATUS:
-    ret = do_smart(unit, ATA_SMART_STATUS, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
+    ret = do_smart(unit, ATA_SMART_STATUS, 0, 0, pData);
     break;
 
   case DSKSP_SMART_GET_ATTRIBUTES:
-    ret = do_smart(unit, ATA_SMART_READ_VALUES, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
+    ret = do_smart(unit, ATA_SMART_READ_VALUES, 0, 0, pData);
     break;
 
   case DSKSP_SMART_GET_THRESHOLDS:
-    ret = do_smart(unit, ATA_SMART_READ_THRESHOLDS, 0, 0, Far16ToFlat(ioctl->ioctl.pvData));
+    ret = do_smart(unit, ATA_SMART_READ_THRESHOLDS, 0, 0, pData);
     break;
 
   case DSKSP_SMART_GET_LOG:
-    ret = do_smart(unit, ATA_SMART_READ_LOG, 1, parm, Far16ToFlat(ioctl->ioctl.pvData));
+    ret = do_smart(unit, ATA_SMART_READ_LOG, 1, parm, pData);
     break;