Changeset 82 for trunk/src/os2ahci/ahci.c

Timestamp:

Mar 2, 2011, 11:48:03 PM (14 years ago)

Author:

chris

Message:

Version 1.09
============

• Added new command line parameter, "/4", which will force a track size of 56 sectors to be reported in geometry requests. This will improve performance for newer HDs with 4K sectors and file systems which use block sizes larger than 512 bytes (FAT, JFS, ...) because all partitions will be aligned on 4K (8 sector) boundaries.

• Changed AP_DEVICE parameter to ata_cmd() from 16 bits to 8 bits -- the corresponding field in ATA_CMD has always been 8 bits and there's no point discarding the lower 8 bits of the AP_DEVICE parameter as a general rule. Besides, it confused me in the end...

• Always return some kind of error in ata_req_sense() because this function will only be called when we received an error interrupt; atapi_req_sense() already does this.

• Cosmetic changes

File:

• trunk/src/os2ahci/ahci.c (modified) (8 diffs)

trunk/src/os2ahci/ahci.c

@@ -298 +298 @@
       ai->pci->vendor == PCI_VENDOR_ID_INTEL) {
 
-    /* This BIOS apparently accesses this controller via SATA registers and
+    /* This BIOS apparently accesses the controller via SATA registers and
      * the AHCI spec says that we should issue a COMRESET on each port after
      * disabling AHCI mode to allow the SATA controller to re-recognize attached
@@ -402 +402 @@
   if (ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) {
     /* BIOS uses AHCI, too, so we need to restore the port settings;
-     * restoring PORT_CMD way well start the port again but that's what
+     * restoring PORT_CMD may well start the port again but that's what
      * this function is all about.
      */
@@ -579 +579 @@
     }
   }
-
   if (i >= irq_map_cnt) {
     dprintf("registering interrupt #%d\n", ai->irq);
-
     if (DevHelp_SetIRQ(mk_NPFN(irq_handlers[irq_map_cnt]), ai->irq, 1) != 0) {
       dprintf("failed to register shared interrupt\n");
-
       if (DevHelp_SetIRQ(mk_NPFN(irq_handlers[irq_map_cnt]), ai->irq, 0) != 0) {
         dprintf("failed to register exclusive interrupt\n");
@@ -672 +669 @@
 
   /* set link speed and power management options */
+  ddprintf("setting link speed and power management options\n");
   tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x00000ff0UL;
   tmp |= ((u32) link_speed[ad_no(ai)][p] & 0x0f) << 4;
@@ -678 +676 @@
 
   /* issue COMRESET on the port */
+  ddprintf("issuing COMRESET on port\n");
   tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x0000000fUL;
   writel(port_mmio + PORT_SCR_CTL, tmp | 1);
@@ -704 +703 @@
 
   /* start port so we can receive the COMRESET FIS */
+  ddprintf("starting port again\n");
   ahci_start_port(ai, p, ei);
 
@@ -989 +989 @@
 
     if (!init_complete) {
+      /* no IRQ handlers or context hooks availabe at this point */
       ai->busy = 1;
       spin_unlock(drv_lock);
@@ -1014 +1015 @@
 
       if ((*cmds & (1UL << port->cmd_slot)) == 0) {
-        /* prepare command */
+        /* found idle command slot; prepare command */
         if (func(iorb, port->cmd_slot)) {
           /* Command preparation failed, or no HW command required; IORB