From 3f00de9c207fb4b3f9e45fd775650404ce087aac Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:46:17 +0100 Subject: [PATCH 053/152] * grub-core/disk/ahci.c: Add safety cleanups. --- ChangeLog | 4 ++++ grub-core/disk/ahci.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9bb1817..15300b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-01-29 Vladimir Serbinenko + * grub-core/disk/ahci.c: Add safety cleanups. + +2014-01-29 Vladimir Serbinenko + * grub-core/disk/ahci.c: Allocate and clean space for all possible 32 slots to avoid pointing to uninited area. diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c index d63fd09..643e691 100644 --- 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) -- 1.9.3