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