Attachment #481721 for bug #714455

View | Details | Raw Unified | Return to bug 714455
Collapse All | Expand All

Lines 593-599 static int __devinit acpi_pci_root_add(s Link Here

(-)linux-2.6.37-openSUSE-11.4/drivers/acpi/pci_root.c (-1 / +1 lines)
593	/* Indicate support for various _OSC capabilities. */	593	/* Indicate support for various _OSC capabilities. */
594	if (pci_ext_cfg_avail(root->bus->self))	594	if (pci_ext_cfg_avail(root->bus->self))
595	flags \|= OSC_EXT_PCI_CONFIG_SUPPORT;	595	flags \|= OSC_EXT_PCI_CONFIG_SUPPORT;
596	if (pcie_aspm_enabled())	596	if (pcie_aspm_support_enabled())
597	flags \|= OSC_ACTIVE_STATE_PWR_SUPPORT \|	597	flags \|= OSC_ACTIVE_STATE_PWR_SUPPORT \|
598	OSC_CLOCK_PWR_CAPABILITY_SUPPORT;	598	OSC_CLOCK_PWR_CAPABILITY_SUPPORT;
599	if (pci_msi_enabled())	599	if (pci_msi_enabled())

Lines 69-74 struct pcie_link_state { Link Here

(-)linux-2.6.37-openSUSE-11.4/drivers/pci/pcie/aspm.c (+7 lines)
69	};	69	};
70		70
71	static int aspm_disabled, aspm_force;	71	static int aspm_disabled, aspm_force;
		72	static bool aspm_support_enabled = true;
72	static DEFINE_MUTEX(aspm_lock);	73	static DEFINE_MUTEX(aspm_lock);
73	static LIST_HEAD(link_list);	74	static LIST_HEAD(link_list);
74		75
Lines 889-894 static int __init pcie_aspm_disable(char Link Here
889	{	890	{
890	if (!strcmp(str, "off")) {	891	if (!strcmp(str, "off")) {
891	aspm_disabled = 1;	892	aspm_disabled = 1;
		893	aspm_support_enabled = false;
892	printk(KERN_INFO "PCIe ASPM is disabled\n");	894	printk(KERN_INFO "PCIe ASPM is disabled\n");
893	} else if (!strcmp(str, "force")) {	895	} else if (!strcmp(str, "force")) {
894	aspm_force = 1;	896	aspm_force = 1;
Lines 917-919 int pcie_aspm_enabled(void) Link Here
917	}	919	}
918	EXPORT_SYMBOL(pcie_aspm_enabled);	920	EXPORT_SYMBOL(pcie_aspm_enabled);
919		921
		922	bool pcie_aspm_support_enabled(void)
		923	{
		924	return aspm_support_enabled;
		925	}
		926	EXPORT_SYMBOL(pcie_aspm_support_enabled);




#endif

#ifndef CONFIG_PCIEASPM
static inline int pcie_aspm_enabled(void) { return 0; }
static inline bool pcie_aspm_support_enabled(void) { return false; }
	return 0;
}
#else
extern int pcie_aspm_enabled(void);
extern bool pcie_aspm_support_enabled(void);
#endif

#ifndef CONFIG_PCIE_ECRC

Return to bug 714455

Lines 1007-1018 extern int unregister_msi_get_owner(int Link Here

(-)linux-2.6.37-openSUSE-11.4/include/linux/pci.h (-4 / +3 lines)
1007	#endif	1007	#endif
1008		1008
1009	#ifndef CONFIG_PCIEASPM	1009	#ifndef CONFIG_PCIEASPM
1010	static inline int pcie_aspm_enabled(void)	1010	static inline int pcie_aspm_enabled(void) { return 0; }
1011	{	1011	static inline bool pcie_aspm_support_enabled(void) { return false; }
1012	return 0;
1013	}
1014	#else	1012	#else
1015	extern int pcie_aspm_enabled(void);	1013	extern int pcie_aspm_enabled(void);
		1014	extern bool pcie_aspm_support_enabled(void);
1016	#endif	1015	#endif
1017		1016
1018	#ifndef CONFIG_PCIE_ECRC	1017	#ifndef CONFIG_PCIE_ECRC