From 5b5d6d1373cce30e6a5aced90c6c708032f1c189 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Wed, 25 Nov 2009 21:06:51 +0900
Subject: [PATCH] --- yaml --- r: 174835 b: refs/heads/master c:
 f9f45604edcf87ac86a9d68ca54106c5fb743719 h: refs/heads/master i:   174833:
 91105a34c444fcf72e13e8af933b9a9cfab874d1   174831:
 4a9a7b88786d48bb2ea5937d4281bf71a27b5de6 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/pci/pcie/portdrv.h      | 20 +++-----------------
 trunk/drivers/pci/pcie/portdrv_core.c | 13 ++++++-------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index aedf7a9400ab..f3b9cc57f5dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 694f88ef7ada0d99e304f687ba92e268a594358b
+refs/heads/master: f9f45604edcf87ac86a9d68ca54106c5fb743719
diff --git a/trunk/drivers/pci/pcie/portdrv.h b/trunk/drivers/pci/pcie/portdrv.h
index cc1f8435ee20..aaeb9d21cba5 100644
--- a/trunk/drivers/pci/pcie/portdrv.h
+++ b/trunk/drivers/pci/pcie/portdrv.h
@@ -11,24 +11,10 @@
 
 #include <linux/compiler.h>
 
-#if !defined(PCI_CAP_ID_PME)
-#define PCI_CAP_ID_PME			1
-#endif
-
-#if !defined(PCI_CAP_ID_EXP)
-#define PCI_CAP_ID_EXP			0x10
-#endif
-
-#define PORT_TYPE_MASK			0xf
-#define PORT_TO_SLOT_MASK		0x100
-#define SLOT_HP_CAPABLE_MASK		0x40
-#define PCIE_CAPABILITIES_REG		0x2
-#define PCIE_SLOT_CAPABILITIES_REG	0x14
-#define PCIE_PORT_DEVICE_MAXSERVICES	4
-#define PCIE_PORT_MSI_VECTOR_MASK	0x1f
+#define PCIE_PORT_DEVICE_MAXSERVICES   4
 /*
- * According to the PCI Express Base Specification 2.0, the indices of the MSI-X
- * table entires used by port services must not exceed 31
+ * According to the PCI Express Base Specification 2.0, the indices of
+ * the MSI-X table entires used by port services must not exceed 31
  */
 #define PCIE_PORT_MAX_MSIX_ENTRIES	32
 
diff --git a/trunk/drivers/pci/pcie/portdrv_core.c b/trunk/drivers/pci/pcie/portdrv_core.c
index 9318b96bb255..413262eb95b7 100644
--- a/trunk/drivers/pci/pcie/portdrv_core.c
+++ b/trunk/drivers/pci/pcie/portdrv_core.c
@@ -109,8 +109,8 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
 		 * used to generate the interrupt message."
 		 */
 		pos = pci_pcie_cap(dev);
-		pci_read_config_word(dev, pos + PCIE_CAPABILITIES_REG, &reg16);
-		entry = (reg16 >> 9) & PCIE_PORT_MSI_VECTOR_MASK;
+		pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
+		entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9;
 		if (entry >= nr_entries)
 			goto Error;
 
@@ -230,12 +230,11 @@ static int get_port_device_capability(struct pci_dev *dev)
 	u32 reg32;
 
 	pos = pci_pcie_cap(dev);
-	pci_read_config_word(dev, pos + PCIE_CAPABILITIES_REG, &reg16);
+	pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
 	/* Hot-Plug Capable */
-	if (reg16 & PORT_TO_SLOT_MASK) {
-		pci_read_config_dword(dev, 
-			pos + PCIE_SLOT_CAPABILITIES_REG, &reg32);
-		if (reg32 & SLOT_HP_CAPABLE_MASK)
+	if (reg16 & PCI_EXP_FLAGS_SLOT) {
+		pci_read_config_dword(dev, pos + PCI_EXP_SLTCAP, &reg32);
+		if (reg32 & PCI_EXP_SLTCAP_HPC)
 			services |= PCIE_PORT_SERVICE_HP;
 	}
 	/* AER capable */