diff options
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/kernel/prom.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index eb6538b58008..47727a6f7346 100644 --- a/arch/ppc64/kernel/prom.c +++ b/arch/ppc64/kernel/prom.c | |||
@@ -884,6 +884,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
884 | { | 884 | { |
885 | char *type = get_flat_dt_prop(node, "device_type", NULL); | 885 | char *type = get_flat_dt_prop(node, "device_type", NULL); |
886 | u32 *prop; | 886 | u32 *prop; |
887 | unsigned long size; | ||
887 | 888 | ||
888 | /* We are scanning "cpu" nodes only */ | 889 | /* We are scanning "cpu" nodes only */ |
889 | if (type == NULL || strcmp(type, "cpu") != 0) | 890 | if (type == NULL || strcmp(type, "cpu") != 0) |
@@ -929,6 +930,17 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
929 | cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC; | 930 | cur_cpu_spec->cpu_user_features |= PPC_FEATURE_HAS_ALTIVEC; |
930 | } | 931 | } |
931 | 932 | ||
933 | /* | ||
934 | * Check for an SMT capable CPU and set the CPU feature. We do | ||
935 | * this by looking at the size of the ibm,ppc-interrupt-server#s | ||
936 | * property | ||
937 | */ | ||
938 | prop = (u32 *)get_flat_dt_prop(node, "ibm,ppc-interrupt-server#s", | ||
939 | &size); | ||
940 | cur_cpu_spec->cpu_features &= ~CPU_FTR_SMT; | ||
941 | if (prop && ((size / sizeof(u32)) > 1)) | ||
942 | cur_cpu_spec->cpu_features |= CPU_FTR_SMT; | ||
943 | |||
932 | return 0; | 944 | return 0; |
933 | } | 945 | } |
934 | 946 | ||