dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch

23d2ea
From d92788a92466b22fb10c2d3f6c9c68d0002227b3 Mon Sep 17 00:00:00 2001
39700a
From: Vladimir Serbinenko <phcoder@gmail.com>
39700a
Date: Thu, 20 Feb 2014 10:11:43 +0100
23d2ea
Subject: [PATCH 060/198] * grub-core/disk/ahci.c: Ignore NPORTS field and rely
23d2ea
 on PI exclusively.
39700a
39700a
---
39700a
 ChangeLog             | 5 +++++
39700a
 grub-core/disk/ahci.c | 2 +-
39700a
 2 files changed, 6 insertions(+), 1 deletion(-)
39700a
39700a
diff --git a/ChangeLog b/ChangeLog
39700a
index 5237631..be41aa5 100644
39700a
--- a/ChangeLog
39700a
+++ b/ChangeLog
39700a
@@ -1,3 +1,8 @@
39700a
+2014-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
39700a
+
39700a
+	* grub-core/disk/ahci.c: Ignore NPORTS field and rely on PI
39700a
+	exclusively.
39700a
+
39700a
 2014-02-04  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
39700a
 
39700a
 	Add bootpath parser for open firmware.
39700a
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
39700a
index 5e4a639..89365cd 100644
39700a
--- a/grub-core/disk/ahci.c
39700a
+++ b/grub-core/disk/ahci.c
39700a
@@ -322,7 +322,7 @@ grub_ahci_pciinit (grub_pci_device_t dev,
39700a
 
39700a
   grub_dprintf ("ahci", "GLC:%x\n", hba->global_control);
39700a
 
39700a
-  nports = (hba->cap & GRUB_AHCI_HBA_CAP_NPORTS_MASK) + 1;
39700a
+  nports = (GRUB_AHCI_HBA_CAP_NPORTS_MASK) + 1;
39700a
 
39700a
   grub_dprintf ("ahci", "%d AHCI ports, PI = 0x%x\n", nports,
39700a
 		hba->ports_implemented);
39700a
-- 
23d2ea
2.7.4
39700a