lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

intel_scu_ipc: detect CPU type automatically

Browse Source 
Intel SCU message formats depend upon the processor type. Replace the
module option with automatic detection of the processor type.

Signed-off-by: Sreedhara DS <sreedhara.ds@intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Sreedhara DS
2010-07-26 10:02:25 +01:00
committed by Matthew Garrett
parent a00cd11b39
commit 14d10f0a48
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/platform/x86/intel_scu_ipc.c
View File

@@ -23,7 +23,7 @@
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/setup.h> #include <asm/mrst.h>
#include <asm/intel_scu_ipc.h> #include <asm/intel_scu_ipc.h>
/* IPC defines the following message types */ /* IPC defines the following message types */
@@ -78,12 +78,9 @@ struct intel_scu_ipc_dev {
static struct intel_scu_ipc_dev ipcdev; /* Only one for now */ static struct intel_scu_ipc_dev ipcdev; /* Only one for now */
static int platform = 1; #define PLATFORM_LANGWELL 1
module_param(platform, int, 0); #define PLATFORM_PENWELL 2
MODULE_PARM_DESC(platform, "1 for moorestown platform"); static int platform; /* Platform type */
/* /*
* IPC Read Buffer (Read Only): * IPC Read Buffer (Read Only):
@@ -817,6 +814,14 @@ static struct pci_driver ipc_driver = {
static int __init intel_scu_ipc_init(void) static int __init intel_scu_ipc_init(void)
{ {
if (boot_cpu_data.x86 == 6 &&
boot_cpu_data.x86_model == 0x27 &&
boot_cpu_data.x86_mask == 1)
platform = PLATFORM_PENWELL;
else if (boot_cpu_data.x86 == 6 &&
boot_cpu_data.x86_model == 0x26)
platform = PLATFORM_LANGWELL;
return pci_register_driver(&ipc_driver); return pci_register_driver(&ipc_driver);
} }