Changeset 183

Timestamp:

Dec 13, 2016, 10:52:53 PM (9 years ago)

Author:

David Azarewicz

Message:

Moved dma buffer pointers.

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (2 diffs)
• ahci.h (modified) (1 diff)
• os2ahci.h (modified) (3 diffs)
• pci.c (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -635 +635 @@
 
       #ifdef DAZ_NEW_CODE
-      ai->dma_buf[p] = MemAllocAlign(AHCI_PORT_PRIV_DMA_SZ, 1024);
-      ai->dma_buf_phys[p] = MemPhysAdr(ai->dma_buf[p]);
+      ai->ports[p].dma_buf = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+      ai->ports[p].dma_buf_phys = MemPhysAdr(ai->ports[p].dma_buf);
       #endif
 
@@ -671 +671 @@
       ai->port_map &= ~(1UL << p);
       #ifdef DAZ_NEW_CODE
-      if (ai->dma_buf[p]) MemFree(ai->dma_buf[p]);
-      ai->dma_buf[p] = NULL;
+      if (ai->ports[p].dma_buf) MemFree(ai->ports[p].dma_buf);
+      ai->ports[p].dma_buf = NULL;
       #endif
     }

trunk/src/os2ahci/ahci.h

@@ -66 +66 @@
 
 /* port-specific DMA scratch buffer aligned to 1024 bytes */
-#define AHCI_PORT_PRIV_DMA_SZ   (((sizeof(AHCI_PORT_DMA) + 1023U) / 1024U) * 1024U)
+//DAZ #define AHCI_PORT_PRIV_DMA_SZ   (((sizeof(AHCI_PORT_DMA) + 1023U) / 1024U) * 1024U)
+#define AHCI_PORT_PRIV_DMA_SZ   sizeof(AHCI_PORT_DMA)
 
 #define AHCI_IRQ_ON_SG          (1UL << 31)

trunk/src/os2ahci/os2ahci.h

@@ -124 +124 @@
 /* Get AHCI port MMIO base from AD_INFO and port number. */
 #define port_base(ai, p) ((u8 *) (ai)->mmio + 0x100 + (p) * 0x80)
-#define port_dma_base(ai, p) ((AHCI_PORT_DMA *) ((ai)->dma_buf[(p)]))
-#define port_dma_base_phys(ai, p) ((ai)->dma_buf_phys[(p)])
+#define port_dma_base(ai, p) ((AHCI_PORT_DMA *) ((ai)->ports[(p)].dma_buf))
+#define port_dma_base_phys(ai, p) ((ai)->ports[p].dma_buf_phys)
 
 /* Convert an SATA adapter/port/device address into a 16-bit IORB unit handle
@@ -253 +253 @@
   volatile u32  ncq_cmds;              /* bitmap for NCQ commands issued */
   volatile u32  reg_cmds;              /* bitmap for regular commands issued */
+  u32           dma_buf_phys;          /* physical address of DMA scratch buffer */
+  u8           *dma_buf;               /* DMA scatch buffers */
 
   struct {
@@ -300 +302 @@
   u32           mmio_size;             /* size of MMIO region */
   u8           *mmio;                  /* pointer to this adapter's MMIO region */
-
-  u32           dma_buf_phys[AHCI_MAX_PORTS];          /* physical address of DMA scratch buffer */
-  u8           *dma_buf[AHCI_MAX_PORTS]; /* DMA scatch buffers */
 
   P_INFO        ports[AHCI_MAX_PORTS]; /* SATA ports on this adapter */

trunk/src/os2ahci/pci.c

@@ -633 +633 @@
   for (i = 0; i < ad_info->hw_ports; i++)
   {
-    ad_info->dma_buf[i] = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
-    ad_info->dma_buf_phys[i] = MemPhysAdr(ad_info->dma_buf[i]);
+    ad_info->ports[i].dma_buf = MemAlloc(AHCI_PORT_PRIV_DMA_SZ);
+    ad_info->ports[i].dma_buf_phys = MemPhysAdr(ad_info->ports[i].dma_buf);
   }
   #endif