Changeset 155 for trunk

Timestamp:

Apr 15, 2013, 11:46:26 PM (12 years ago)

Author:

David Azarewicz

Message:

debugging updates

Location:

trunk/src/os2ahci

Files:

• Makefile (modified) (1 diff)
• ahci.c (modified) (4 diffs)
• ahci.h (modified) (1 diff)
• ata.c (modified) (2 diffs)
• atapi.c (modified) (3 diffs)
• init.asm (modified) (3 diffs)
• os2ahci.c (modified) (5 diffs)

trunk/src/os2ahci/Makefile

@@ -146 +146 @@
     @%append $^@ /* Autogenerated by Makefile */
     @%append $^@ $#define VERSION $(BLD_MAJOR)$(BLD_MINOR) /* driver version (2 implied decimals) */
+    @%append $^@ $#define DVENDOR "$(VENDOR)"
     @AddToFile $^@,$#define BLD_YEAR,DATEYEAR
     @AddToFile $^@,$#define BLD_MONTH,DATEMONTH

trunk/src/os2ahci/ahci.c

@@ -559 +559 @@
     if (ai->port_map & (1UL << p)) {
 
-      dprintf("ahci_scan_ports: Wait till not busy on port %d\n", p);
+      ddprintf("ahci_scan_ports: Wait till not busy on port %d\n", p);
       /* wait until all active commands have completed on this port */
       while (ahci_port_busy(ai, p)) {
@@ -720 +720 @@
   int timeout;
 
-  ddprintf("ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
+  dprintf("ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
   if (debug > 1) {
     printf(" PORT_CMD       = 0x%lx\n", readl(port_mmio + PORT_CMD));
@@ -784 +784 @@
 
   /* start port so we can receive the COMRESET FIS */
-  ddprintf("ahci_reset_port: starting port %d again\n", p);
+  dprintf("ahci_reset_port: starting port %d again\n", p);
   ahci_start_port(ai, p, ei);
 
@@ -1457 +1457 @@
   u32 done_mask;
 
-  ddprintf("port interrupt for adapter #%d, port #%d, stack frame %Fp\n", ad_no(ai),
-           p, (void _far *) &done_queue);
-  memset(&done_queue, 0x00, sizeof(done_queue));
-
   /* get interrupt status and clear it right away */
   irq_stat = readl(port_mmio + PORT_IRQ_STAT);
   writel(port_mmio + PORT_IRQ_STAT, irq_stat);
   readl(port_mmio + PORT_IRQ_STAT); /* flush */
+
+  ddprintf("port interrupt for adapter %d port %d stat %lx stack frame %Fp\n",
+        ad_no(ai), p, irq_stat, (void _far *)&done_queue);
+  memset(&done_queue, 0x00, sizeof(done_queue));
 
   if (irq_stat & PORT_IRQ_ERROR) {

trunk/src/os2ahci/ahci.h

@@ -57 +57 @@
  */
 #define AHCI_PCI_BAR            5
-#define AHCI_MAX_PORTS          32
+#define AHCI_MAX_PORTS          16 /* Spec says 32, but we only support 16 */
 #define AHCI_MAX_SG             48 /* hardware max is 64K */
 #define AHCI_MAX_SG_ELEMENT_LEN (1UL << 22)

trunk/src/os2ahci/ata.c

@@ -741 +741 @@
 
   io->BlocksXferred += add_workspace(iorb)->blocks;
-  dprintf("ata_read_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
+  ddprintf("ata_read_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
 
   if (io->BlocksXferred >= io->BlockCount) {
@@ -908 +908 @@
 
   io->BlocksXferred += add_workspace(iorb)->blocks;
-  dprintf("ata_write_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
+  ddprintf("ata_write_pp(): blocks transferred = %d\n", (int) io->BlocksXferred);
 
   if (io->BlocksXferred >= io->BlockCount) {

trunk/src/os2ahci/atapi.c

@@ -51 +51 @@
 int atapi_get_geometry(IORBH _far *iorb, int slot)
 {
+  dprintf("atapi_get_geometry called\n");
   iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -60 +61 @@
 int atapi_unit_ready(IORBH _far *iorb, int slot)
 {
-  ddprintf("atapi_unit_ready called\n");
+  dprintf("atapi_unit_ready called\n");
   iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
   return(-1);
@@ -274 +275 @@
   size_t sense_buf_len = ATAPI_SENSE_LEN;
 
+  dprintf("atapi_req_sense\n");
+
   if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
       iorb->StatusBlockLen >= sizeof(*ssb) && iorb->pStatusBlock != 0) {

trunk/src/os2ahci/init.asm

@@ -34 +34 @@
 
 DEVHDR          SEGMENT WORD PUBLIC 'DATA'
-_dev_hdr        dd      _legacy_hdr             ; next device header
+_dev_hdr        dd      _next_hdr               ; next device header
                 dw      DEVLEV_3 + DEV_CHAR_DEV + DEV_IDC ; flags for ADD drivers
                 dw      OFFSET _asm_strat       ; strategy routine
@@ -43 +43 @@
                 dw      0
 
+if 1
 ; This is here to support old SMART tools. This is a really bad thing to do as it will
 ; cause problems in the future. The SMART tools should be fixed instead.
-_legacy_hdr     dd      -1                      ; no headers after this one
+_next_hdr       dd      -1                      ; no headers after this one
                 dw      DEVLEV_3 + DEV_CHAR_DEV ; flags for ADD drivers
                 dw      OFFSET _asm_strat       ; strategy routine
@@ -53 +54 @@
                 dd      0
                 dw      0
+else
+_next_hdr       equ -1
+endif
 
 DEVHDR          ENDS

trunk/src/os2ahci/os2ahci.c

@@ -106 +106 @@
   drv_name,                        /* driver name */
   "AHCI SATA Driver",              /* driver description */
-  "GNU",                           /* vendor name */
+  DVENDOR,                         /* vendor name */
   CMVERSION_MAJOR,                 /* RM interface version major */
   CMVERSION_MINOR,                 /* RM interface version minor */
@@ -246 +246 @@
         /* set COM port base address for debug messages */
         drv_parm_int(s, com_base, u16, 16);
+        if (com_base == 1) com_base = 0x3f8;
+        if (com_base == 2) com_base = 0x2f8;
         break;
 
@@ -811 +813 @@
 
       /* DAZ turn off COM port output if on */
-      com_base = 0;
+      //com_base = 0;
 
       /* release all adapters */
@@ -1241 +1243 @@
     }
 
-    if (debug >= min_debug) {
+    if (debug > min_debug) {
       printf("IORB %Fp queued (cmd = %d/%d, queue = %Fp [%s], timeout = %ld)\n",
              iorb, iorb->CommandCode, iorb->CommandModifier, queue, queue_type,
@@ -1344 +1346 @@
   iorb->Status |= IORB_DONE;
 
-  dprintf("IORB %Fp complete (status = 0x%04x, error = 0x%04x)\n",
+  ddprintf("IORB %Fp complete (status = 0x%04x, error = 0x%04x)\n",
           iorb, iorb->Status, iorb->ErrorCode);