Changeset 42

Timestamp:

Nov 10, 2010, 11:14:21 AM (15 years ago)

Author:

markus

Message:

fixed NCQ disabling via switch

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (2 diffs)
• os2ahci.c (modified) (2 diffs)
• os2ahci.def (modified) (1 diff)
• pci.c (modified) (10 diffs)

trunk/src/os2ahci/ahci.c

@@ -1441 +1441 @@
   ai->ports[p].devs[d].removable = (id_buf[ATA_ID_CONFIG] & 0x0080U) != 0;
   ai->ports[p].devs[d].dev_type  = UIB_TYPE_DISK;
-
+  
   if (id_buf[ATA_ID_CONFIG] & 0x8000U) {
     /* this is an ATAPI device; augment device information */
@@ -1453 +1453 @@
       /* MT: set ncq_max to 1 if NCQ is disabled for this port */
       ai->ports[p].devs[d].ncq_max = 1;
+      dprintf("NCQ off for a:%d p:%d\n", (int) ad_no(ai), p);
     } else {
       ai->ports[p].devs[d].ncq_max = id_buf[ATA_ID_QUEUE_DEPTH] & 0x001fU;
+      dprintf("NCQ max=%d for a:%d p:%d\n", ai->ports[p].devs[d].ncq_max, (int) ad_no(ai), p);
     }
 

trunk/src/os2ahci/os2ahci.c

@@ -155 +155 @@
   /* parse command line parameters */
   cmd_line = (char _far *) ((u32) ddd_pl & 0xffff0000l) + ddd_pl->cmd_line_args;
-  adapter_index = 0;
-  port_index = 0;
 
   for (s = cmd_line; *s != 0; s++) {
@@ -238 +236 @@
     }
   }
+
+  phex(disable_ncq, sizeof(disable_ncq), "disable_ncq dump:\n");
 
   /* scan PCI bus for supported devices */

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20101109#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20101110#@OS/2 AHCI Adapter Device Driver'
 protmode
 

trunk/src/os2ahci/pci.c

@@ -34 +34 @@
  * OEMHLP constants for PCI access
  */
-#define GENERIC_IOCTL       0x10 
+#define GENERIC_IOCTL       0x10
 #define OH_CATEGORY         0x00
 #define OH_FUNC_PCI         0x0b
@@ -100 +100 @@
 
 } OH_PARM;
-  
+
 /******************************************************************************
  * OEMHLP IOCtl data union. The data area is generally used as output from the
@@ -238 +238 @@
 
   /* ATI */
-  { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600,        "SB600"      }, /* ATI SB600 */
+  { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600,        chip_sb600   }, /* ATI SB600 */
   { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb700,        chip_sb700   }, /* ATI SB700/800 */
   { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb700,        chip_sb700   }, /* ATI SB700/800 */
@@ -415 +415 @@
   }
 
-  /* Go through the list of PCI IDs and search for each device 
+  /* Go through the list of PCI IDs and search for each device
    *
    * NOTES:
@@ -538 +538 @@
   if (pci_read_conf(bus, dev_func, 0x08, sizeof(ULONG), &val) != OH_SUCCESS) {
     return;
-  } 
+  }
   class = (u32) (val >> 8);
 
@@ -744 +744 @@
   ad_info->irq      = irq;
   ad_info->mmio_phys = resource.MEMResource.MemBase;
-    
+
   /* allocate memory for port-specific DMA scratch buffers */
   if (DevHelp_AllocPhys((long) AHCI_PORT_PRIV_DMA_SZ * AHCI_MAX_PORTS,
@@ -925 +925 @@
    * to be called to a stack variable because the inter-device driver calling
    * convention forces us to set DS to the device driver's data segment and ES
-   * to the segment of the request packet. 
+   * to the segment of the request packet.
    */
   func = oemhlp.ProtIDCEntry;
@@ -970 +970 @@
 
   switch(id) {
-    
+
     case PCI_VENDOR_ID_AL:
       return "Ali";
@@ -1003 +1003 @@
       break;
     }
-    
+
   return "Generic";
 
@@ -1017 +1017 @@
 
   for (i = 0; pci_ids[i].vendor != 0; i++) {
-    
+
     if (pci_ids[i].device == device) {
       return pci_ids[i].chipname;
     }
-  
+
   }