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