You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
2.2 KiB
57 lines
2.2 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Vladimir Serbinenko <phcoder@gmail.com> |
|
Date: Wed, 29 Jan 2014 23:46:17 +0100 |
|
Subject: [PATCH] * grub-core/disk/ahci.c: Add safety cleanups. |
|
|
|
--- |
|
grub-core/disk/ahci.c | 10 ++++++++++ |
|
ChangeLog | 4 ++++ |
|
2 files changed, 14 insertions(+) |
|
|
|
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c |
|
index d63fd09fdc6..643e691ef80 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) |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 9bb18177793..15300b020c6 100644 |
|
--- 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
|
|
|