* grub-core/disk/ahci.c: Add safety cleanups.

diff --git a/ChangeLog b/ChangeLog
index b2b54b95224327a8f3d9d201d40bedc3887824c5..148607f034ac0b08fa9828d408eb03cefbce0616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/ahci.c: Add safety cleanups.
+
 2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/ahci.c: Allocate and clean space for all possible 32

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index d63fd09fdc628ec04fd752b239eba115a418b2a1..643e691ef806da13ac71d27621d71cf950045d83 100644 (file)
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -454,6 +454,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
        adevs[i]->hba->ports[adevs[i]->port].fis_base = grub_dma_get_phys (adevs[i]->rfis);
        adevs[i]->hba->ports[adevs[i]->port].command_list_base
          = grub_dma_get_phys (adevs[i]->command_list_chunk);
+       adevs[i]->hba->ports[adevs[i]->port].command_issue = 0;
        adevs[i]->hba->ports[adevs[i]->port].command |= GRUB_AHCI_HBA_PORT_CMD_FRE;
       }
 
@@ -600,6 +601,9 @@ grub_ahci_pciinit (grub_pci_device_t dev,
        failed_adevs[i] = adevs[i];
        adevs[i] = 0;
       }
+
+  grub_dprintf ("ahci", "cleaning up failed devs\n");
+
   for (i = 0; i < nports; i++)
     if (failed_adevs[i] && (fr_running & (1 << i)))
       failed_adevs[i]->hba->ports[failed_adevs[i]->port].command &= ~GRUB_AHCI_HBA_PORT_CMD_FRE;
@@ -855,6 +859,12 @@ grub_ahci_reset_port (struct grub_ahci_device *dev, int force)
     {
       struct grub_disk_ata_pass_through_parms parms2;
       dev->hba->ports[dev->port].command &= ~GRUB_AHCI_HBA_PORT_CMD_ST;
+      dev->hba->ports[dev->port].command_issue = 0;
+      dev->command_list[0].config = 0;
+      dev->command_table[0].prdt[0].unused = 0;
+      dev->command_table[0].prdt[0].size = 0;
+      dev->command_table[0].prdt[0].data_base = 0;
+
       endtime = grub_get_time_ms () + 1000;
       while ((dev->hba->ports[dev->port].command & GRUB_AHCI_HBA_PORT_CMD_CR))
        if (grub_get_time_ms () > endtime)