dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch

28f7f8
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
39700a
From: Vladimir Serbinenko <phcoder@gmail.com>
39700a
Date: Wed, 29 Jan 2014 23:43:25 +0100
28f7f8
Subject: [PATCH] * grub-core/disk/ahci.c: Do not enable I/O decoding and keep
28f7f8
 enabling busmaster for the end.
39700a
39700a
---
39700a
 grub-core/disk/ahci.c | 10 ++++++----
28f7f8
 ChangeLog             |  5 +++++
39700a
 2 files changed, 11 insertions(+), 4 deletions(-)
39700a
39700a
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
28f7f8
index 0b13fb8ebed..18c13270c65 100644
39700a
--- a/grub-core/disk/ahci.c
39700a
+++ b/grub-core/disk/ahci.c
39700a
@@ -194,10 +194,8 @@ grub_ahci_pciinit (grub_pci_device_t dev,
39700a
     return 0;
39700a
 
39700a
   addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
39700a
-  grub_pci_write_word (addr, grub_pci_read_word (addr) | 
39700a
-		    GRUB_PCI_COMMAND_IO_ENABLED
39700a
-		    | GRUB_PCI_COMMAND_MEM_ENABLED
39700a
-		    | GRUB_PCI_COMMAND_BUS_MASTER);
39700a
+  grub_pci_write_word (addr, grub_pci_read_word (addr)
39700a
+		    | GRUB_PCI_COMMAND_MEM_ENABLED);
39700a
 
39700a
   hba = grub_pci_device_map_range (dev, bar & GRUB_PCI_ADDR_MEM_MASK,
39700a
 				   sizeof (hba));
39700a
@@ -621,6 +619,10 @@ grub_ahci_pciinit (grub_pci_device_t dev,
39700a
     if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].sig >> 16) == 0xeb14)
39700a
       adevs[i]->atapi = 1;
39700a
 
39700a
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
39700a
+  grub_pci_write_word (addr, grub_pci_read_word (addr)
39700a
+		    | GRUB_PCI_COMMAND_BUS_MASTER);
39700a
+
39700a
   for (i = 0; i < nports; i++)
39700a
     if (adevs[i])
39700a
       {
28f7f8
diff --git a/ChangeLog b/ChangeLog
28f7f8
index 9837c7f8d38..51eba95f36f 100644
28f7f8
--- a/ChangeLog
28f7f8
+++ b/ChangeLog
28f7f8
@@ -1,3 +1,8 @@
28f7f8
+2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
28f7f8
+
28f7f8
+	* grub-core/disk/ahci.c: Do not enable I/O decoding and keep
28f7f8
+	enabling busmaster for the end.
28f7f8
+
28f7f8
 2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
28f7f8
 
28f7f8
 	* util/grub-mkfont.c: Downgrade warnings about unhandled features