diff options
| author |   Ravikiran G Thirumalai <kiran@scalex86.org> | 2008-03-20 00:39:02 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:41:08 +0200 |
| commit | 3250c91ada16a06de5afef55bce7b766c894d75c (patch) | |
| tree | bfca81c8f9a1c3e95d7aa7257c258515593ca382 /arch/x86/kernel/vsmp_64.c | |
| parent | x86: make struct mpc_config_translation NUMAQ-only (diff) | |
| download | linux-dev-3250c91ada16a06de5afef55bce7b766c894d75c.tar.xz linux-dev-3250c91ada16a06de5afef55bce7b766c894d75c.zip | |
x86: vSMP: Fix is_vsmp_box()
is_vsmp_box() currently does not work on vSMPowered systems, as pci cfg
space is not read correctly -- This patch fixes it.
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
| -rw-r--r-- | arch/x86/kernel/vsmp_64.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index a00961d42e75..eb25584c54c3 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c @@ -84,8 +84,10 @@ int is_vsmp_box(void) return vsmp; /* Check if we are running on a ScaleMP vSMP box */ - if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) == - (PCI_VENDOR_ID_SCALEMP || (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16))) + if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) == + PCI_VENDOR_ID_SCALEMP) && + (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) == + PCI_DEVICE_ID_SCALEMP_VSMP_CTL)) vsmp = 1; return vsmp; |