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.
52 lines
1.8 KiB
52 lines
1.8 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Vladimir Serbinenko <phcoder@gmail.com> |
|
Date: Wed, 29 Jan 2014 23:43:25 +0100 |
|
Subject: [PATCH] * grub-core/disk/ahci.c: Do not enable I/O decoding and keep |
|
enabling busmaster for the end. |
|
|
|
--- |
|
grub-core/disk/ahci.c | 10 ++++++---- |
|
ChangeLog | 5 +++++ |
|
2 files changed, 11 insertions(+), 4 deletions(-) |
|
|
|
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c |
|
index 0b13fb8ebed..18c13270c65 100644 |
|
--- 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]) |
|
{ |
|
diff --git a/ChangeLog b/ChangeLog |
|
index 9837c7f8d38..51eba95f36f 100644 |
|
--- 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
|
|
|