From b6a7235f8bbb8bc13ffd635e05b763f62b7adc03 Mon Sep 17 00:00:00 2001
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
Date: Fri, 17 Oct 2008 13:52:51 +0900
Subject: [PATCH] --- yaml --- r: 117204 b: refs/heads/master c:
 d389fec6a2aec1ea7d47833f36a0413a619c8c12 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/msi.c | 21 +++++++++++++++++++++
 trunk/drivers/pci/pci.c |  3 +++
 trunk/drivers/pci/pci.h |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c5d6868e0b5e..fea06e493e68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab20440c376ff0454cb93904a888212d874fbb6b
+refs/heads/master: d389fec6a2aec1ea7d47833f36a0413a619c8c12
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index d2812013fd22..74801f7df9c9 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -759,3 +759,24 @@ void pci_msi_init_pci_dev(struct pci_dev *dev)
 {
 	INIT_LIST_HEAD(&dev->msi_list);
 }
+
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#include <linux/pci-acpi.h>
+static void __devinit msi_acpi_init(void)
+{
+	if (acpi_pci_disabled)
+		return;
+	pci_osc_support_set(OSC_MSI_SUPPORT);
+	pcie_osc_support_set(OSC_MSI_SUPPORT);
+}
+#else
+static inline void msi_acpi_init(void) { }
+#endif /* CONFIG_ACPI */
+
+void __devinit msi_init(void)
+{
+	if (!pci_msi_enable)
+		return;
+	msi_acpi_init();
+}
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 4db261e13e69..aee73cf251b6 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1933,6 +1933,9 @@ static int __devinit pci_init(void)
 	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
 		pci_fixup_device(pci_fixup_final, dev);
 	}
+
+	msi_init();
+
 	return 0;
 }
 
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index b205ab866a1d..9de87e9f98f5 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -98,9 +98,11 @@ extern unsigned int pci_pm_d3_delay;
 #ifdef CONFIG_PCI_MSI
 void pci_no_msi(void);
 extern void pci_msi_init_pci_dev(struct pci_dev *dev);
+extern void __devinit msi_init(void);
 #else
 static inline void pci_no_msi(void) { }
 static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }
+static inline void msi_init(void) { }
 #endif
 
 #ifdef CONFIG_PCIEAER