* grub-core/disk/ahci.c: Do not enable I/O decoding and keep

	enabling busmaster for the end.

diff --git a/ChangeLog b/ChangeLog
index ce0ea891c822bbb0943d16d88157baa4454c401b..8c374506529b3cd2135f1bd934064e7db3bbad6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/ahci.c: Do not enable I/O decoding and keep
+       enabling busmaster for the end.
+
 2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkfont.c: Downgrade warnings about unhandled features

diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 0b13fb8ebeddfe99299755355c63c76f11f6f3a1..18c13270c65b40242fb7f4b2717c5badd2268a46 100644 (file)
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -194,10 +194,8 @@ grub_ahci_pciinit (grub_pci_device_t dev,
     return 0;
 
   addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-  grub_pci_write_word (addr, grub_pci_read_word (addr) | 
-                   GRUB_PCI_COMMAND_IO_ENABLED
-                   | GRUB_PCI_COMMAND_MEM_ENABLED
-                   | GRUB_PCI_COMMAND_BUS_MASTER);
+  grub_pci_write_word (addr, grub_pci_read_word (addr)
+                   | GRUB_PCI_COMMAND_MEM_ENABLED);
 
   hba = grub_pci_device_map_range (dev, bar & GRUB_PCI_ADDR_MEM_MASK,
                                   sizeof (hba));
@@ -621,6 +619,10 @@ grub_ahci_pciinit (grub_pci_device_t dev,
     if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].sig >> 16) == 0xeb14)
       adevs[i]->atapi = 1;
 
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+  grub_pci_write_word (addr, grub_pci_read_word (addr)
+                   | GRUB_PCI_COMMAND_BUS_MASTER);
+
   for (i = 0; i < nports; i++)
     if (adevs[i])
       {