58fe9aa736
- Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones <pjones@redhat.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From 7f4e3839c9b872f0981e1ecdecfa2bd91065f99c Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Thu, 20 Feb 2014 10:11:43 +0100
|
|
Subject: [PATCH 060/152] * grub-core/disk/ahci.c: Ignore NPORTS field
|
|
and rely on PI exclusively.
|
|
|
|
---
|
|
ChangeLog | 5 +++++
|
|
grub-core/disk/ahci.c | 2 +-
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 5237631..be41aa5 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,8 @@
|
|
+2014-02-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
+ * grub-core/disk/ahci.c: Ignore NPORTS field and rely on PI
|
|
+ exclusively.
|
|
+
|
|
2014-02-04 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
|
|
|
|
Add bootpath parser for open firmware.
|
|
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
|
|
index 5e4a639..89365cd 100644
|
|
--- a/grub-core/disk/ahci.c
|
|
+++ b/grub-core/disk/ahci.c
|
|
@@ -322,7 +322,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
|
|
|
|
grub_dprintf ("ahci", "GLC:%x\n", hba->global_control);
|
|
|
|
- nports = (hba->cap & GRUB_AHCI_HBA_CAP_NPORTS_MASK) + 1;
|
|
+ nports = (GRUB_AHCI_HBA_CAP_NPORTS_MASK) + 1;
|
|
|
|
grub_dprintf ("ahci", "%d AHCI ports, PI = 0x%x\n", nports,
|
|
hba->ports_implemented);
|
|
--
|
|
1.9.3
|
|
|