x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
PATCH 1/1 x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
Enable 64-bit ACPI MFCG support for SGI UV2 platform. The check is similar to the check on UV1. UV2 has a different oem_id string.
--- arch/x86/pci/mmconfig-shared.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/pci/mmconfig-shared.c +2 -1
@@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(if (cfg->address <0xFFFFFFFF )return 0 ; -if (!strcmp (mcfg->header.oem_id,"SGI" )) +if (!strcmp (mcfg->header.oem_id,"SGI" ) || + !strcmp (mcfg->header.oem_id,"SGI2" ))return 0 ;if (mcfg->header.revision >=1 ) {
Quoted 15 lines · Jack Steiner
Enable 64-bit ACPI MFCG support for SGI UV2 platform. The check is similar to the check on UV1. UV2 has a different
oem_idstring.Signed-off-by Jack Steiner <[email protected]>--- arch/x86/pci/mmconfig-shared.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Index:
linux/arch/x86/pci/mmconfig-shared.c
===================================================================
arch/x86/pci/mmconfig-shared.c static int __init acpi_mcfg_check_entry( · line 523
Quoted 6 lines
arch/x86/pci/mmconfig-shared.c +2
-1@@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(if (cfg->address <0xFFFFFFFF )return 0 ; -if (!strcmp (mcfg->header.oem_id,"SGI" )) +if (!strcmp (mcfg->header.oem_id,"SGI" ) || + !strcmp (mcfg->header.oem_id,"SGI2" ))
Wouldnt strncmp(,,3) cover any future SGI3, SGI4 strings as well?
Thanks,
Ingo
Quoted 21 lines · Ingo Molnar
Quoted 18 lines · Jack Steiner
Enable 64-bit ACPI MFCG support for SGI UV2 platform. The check is similar to the check on UV1. UV2 has a different
oem_idstring.Signed-off-by Jack Steiner <[email protected]>--- arch/x86/pci/mmconfig-shared.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Index:
linux/arch/x86/pci/mmconfig-shared.c
===================================================================arch/x86/pci/mmconfig-shared.c +0
-0@@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(if (cfg->address <0xFFFFFFFF )return 0 ;
Quoted 5 lines
arch/x86/pci/mmconfig-shared.c static int __init acpi_mcfg_check_entry( · line 523
Quoted 3 lines
arch/x86/pci/mmconfig-shared.c +2
-1-if (!strcmp (mcfg->header.oem_id,"SGI" )) +if (!strcmp (mcfg->header.oem_id,"SGI" ) || + !strcmp (mcfg->header.oem_id,"SGI2" ))Wouldnt
strncmp(,,3)cover any future SGI3, SGI4 strings as well?
I considered that but was not certain whether I could safely claim all oemid's starting with "SGI".
There is a weak precedent in x2apic_uv_x.c - only SGI & SGI2 will be recognized as an SGI platform. An id such as SGIABC will be treated as a non SGI platform.
--- jack
Commit-ID: 6885685923ee786f26e7b170e3b961ac0fa14037 Gitweb: http://git.kernel.org/tip/6885685923ee786f26e7b170e3b961ac0fa14037 Author: Jack Steiner <[email protected]> AuthorDate: Thu, 2 Jun 2011 14:59:43 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 3 Jun 2011 16:00:03 +0200
x66, UV: Enable 64-bit ACPI MFCG support for SGI UV2 platform
Enable 64-bit ACPI MFCG support for SGI UV2 platform. The check is similar to the check on UV1. UV2 has a different oem_id string.
--- arch/x86/pci/mmconfig-shared.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/pci/mmconfig-shared.c +2 -1
@@ -519,7 +519,8 @@ static int __init acpi_mcfg_check_entry(struct acpi_table_mcfg *mcfg,if (cfg->address <0xFFFFFFFF )return 0 ; -if (!strcmp (mcfg->header.oem_id,"SGI" )) +if (!strcmp (mcfg->header.oem_id,"SGI" ) || + !strcmp (mcfg->header.oem_id,"SGI2" ))return 0 ;if (mcfg->header.revision >=1 ) {