Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d389fec6 authored by Taku Izumi's avatar Taku Izumi Committed by Jesse Barnes
Browse files

ACPI/PCI: Set support bit for MSI in support field of _OSC 



Currently linux doesn't have any code to set the "MSI supported" bit in
Support Fireld of _OSC. This patch adds the code for that.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent ab20440c

drivers/pci/msi.c

+21 −0
Original line number Diff line number Diff line
@@ -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();

}

drivers/pci/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -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