Changeset 110 for trunk/src/os2ahci/libc.c

Timestamp:

Jun 21, 2011, 2:39:30 PM (14 years ago)

Author:

Markus Thielen

Message:

contains CMs changes for unaligned buffers; removed unused stack var; let driver continue boot on unknown command line switch

File:

• trunk/src/os2ahci/libc.c (modified) (9 diffs)

trunk/src/os2ahci/libc.c

@@ -96 +96 @@
 static u8 heap_buf[HEAP_SIZE];
 static u8 heap_units[HEAP_UNIT_CNT];
+static ULONG heap_phys_addr;
 
 /* ----------------------------- start of code ----------------------------- */
@@ -106 +107 @@
   DevHelp_CreateSpinLock(&mem_lock);
   DevHelp_CreateSpinLock(&com_lock);
+
+  DevHelp_VirtToPhys(heap_buf, &heap_phys_addr);
 }
 
@@ -347 +350 @@
   va_list va;
   const unsigned char _far *buf = p;
-  long pos = 0;
   int i;
 
@@ -378 +380 @@
     printf("\n");
 
-    pos += 16;
     buf += 16;
     len -= 16;
@@ -424 +425 @@
   }
   return(0);
+}
+
+/******************************************************************************
+ * Copy block from S/G list to virtual address or vice versa.
+ */
+void sg_memcpy(SCATGATENTRY _far *sg_list, USHORT sg_cnt, ULONG sg_off,
+               void _far *buf, USHORT len, SG_MEMCPY_DIRECTION dir)
+{
+  USHORT mode_flag;
+  USHORT i;
+  USHORT l;
+  ULONG phys_addr;
+  ULONG pos = 0;
+  char _far *p;
+
+  /* walk through S/G list to find the elements involved in the operation */
+  for (i = 0; i < sg_cnt && len > 0; i++) {
+    if (pos <= sg_off && pos + sg_list[i].XferBufLen > sg_off) {
+
+      /* this S/G element intersects with the block to be copied */
+      phys_addr = sg_list[i].ppXferBuf + (sg_off - pos);
+      if ((l = sg_list[i].XferBufLen - (sg_off - pos)) > len) {
+        l = len;
+      }
+
+      if (DevHelp_PhysToVirt(phys_addr, l, (PVOID) &p, &mode_flag)) {
+        panic("sg_memcpy(): DevHelp_PhysToVirt() failed");
+      }
+      if (dir == SG_TO_BUF) {
+        memcpy(buf, p, l);
+      } else {
+        memcpy(p, buf, l);
+      }
+      sg_off += l;
+      buf = (char _far *) buf + l;
+      len -= l;
+    }
+    
+    pos += sg_list[i].XferBufLen;
+  }
 }
 
@@ -550 +591 @@
 
 /******************************************************************************
+ * Return the physical address of a pointer inside the heap buffer. This is
+ * necessary because DevHelp_VirtToPhys() can't be called at interrupt time
+ * and we need physical addresses for heap objects when requeueing unaligned
+ * IORBs inside ahci_intr -> trigger_engine.
+ *
+ * If the pointer is not a heap pointer, this function falls back to calling
+ * DevHelp_VirtToPhys with all consequences (i.e. a trap when this is done
+ * at interrupt time).
+ */
+ULONG virt_to_phys(void _far *ptr)
+{
+  if (ptr < heap_buf || ptr > heap_buf + sizeof(heap_buf)) {
+    ULONG addr;
+
+    if (DevHelp_VirtToPhys(ptr, &addr) != 0) {
+      panic("virt_to_phys(): invalid pointer or execution mode");
+    }
+    return(addr);
+  }
+
+  return(heap_phys_addr + ((char _far *) ptr - (char _far *) heap_buf));
+}
+
+/******************************************************************************
  * Calibrate 'mdelay()' loop. This is done by setting up a 1 second timer
  * with a callback that sets 'mdelay_done' to MD_CALIBRATION_END. Then it
@@ -681 +746 @@
  * interrupts were already disabled or != 0, if not.
  *
- * NOTE: SMP systems must use spinlocks, thus this function will only be
- *       compiled on non-SMP builds.
- */
-#ifndef OS2AHCI_SMP
+ * NOTE: SMP systems should use spinlocks.
+ */
 int disable(void)
 {
@@ -699 +762 @@
   return(rc);
 }
-#endif
 
 /******************************************************************************
@@ -705 +767 @@
  * that the presence of _asm statements will disable compiler optimizations.
  *
- * NOTE: SMP systems must use spinlocks, thus this function will only be
- *       compiled on non-SMP builds.
- */
-#ifndef OS2AHCI_SMP
+ * NOTE: SMP systems should use spinlocks.
+ */
 void enable(void)
 {
   _asm sti;
 }
-#endif
 
 /******************************************************************************