| Message ID | 1498162744-840346-1-git-send-email-pasha.tatashin@oracle.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
From: Pavel Tatashin <pasha.tatashin@oracle.com> Date: Thu, 22 Jun 2017 16:19:04 -0400 > There is a typo in a comment that propogated into code: > upa-portis instead of upa-portid > > This problem was detected by code inspection, and I am not sure if it > effects any current systems. It was not reproduced by QEMU. > > It is likely that all existing implementations of OpenBoot have cpuid > property in cpu node. > > Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com> > Reported-by: Steven Sistare <steven.sistare@oracle.com> > Reviewed-by: Steven Sistare <steven.sistare@oracle.com> You can actually check the situation out in the prtconfs repository: git://git.kernel.org/pub/scm/linux/kernel/git/davem/prtconfs.git And as can be clearly seen there many UPA based systems only have the 'upa-portid' property and do not have a 'cpuid' one in the cpu node. Was this bug introduced by the recent timer changes? It looks like it is, and when you are fixing bugs caused by commit X you must list it in a properly formatted "Fixes: " tag so that everyone can tell where the bug was introduced and therefore what, if any, trees the bug fix needs be backported to. The format is: Fixes: $(SHA1_ID) ("Commit message header line") The SHA1_ID is to be listed with 12 digits of signifigance. The Fixes: tag comes at the beginnig of the signoffs, acks, and other tags and the end of the commit message. No empty lines should occur between the Fixes: and other tags. Thank you. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Oh, finally, you should also always specify the target GIT tree for a change which in this case is "sparc-next", in your subject line. Something like: Subject: [PATCH sparc-next] sparc64: Fix typo in property name. Thanks. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thank you Dave, I have addressed your comments and resent updated patch. Pasha On 06/25/2017 03:32 PM, David Miller wrote: > > Oh, finally, you should also always specify the target GIT tree > for a change which in this case is "sparc-next", in your subject > line. Something like: > > Subject: [PATCH sparc-next] sparc64: Fix typo in property name. > > Thanks. > -- > To unsubscribe from this list: send the line "unsubscribe sparclinux" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/kernel/prom_64.c b/arch/sparc/kernel/prom_64.c index 20cc5d8..baeaeed 100644 --- a/arch/sparc/kernel/prom_64.c +++ b/arch/sparc/kernel/prom_64.c @@ -381,7 +381,7 @@ bool arch_find_n_match_cpu_physical_id(struct device_node *cpun, int this_cpu_id; /* On hypervisor based platforms we interrogate the 'reg' - * property. On everything else we look for a 'upa-portis', + * property. On everything else we look for a 'upa-portid', * 'portid', or 'cpuid' property. */ diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c index f584c53..564f0e4 100644 --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c @@ -175,8 +175,8 @@ static unsigned long cpuid_to_freq(phandle node, int cpuid) if (prom_getproperty(node, "device_type", type, sizeof(type)) != -1) is_cpu_node = (strcmp(type, "cpu") == 0); - /* try upa-portis then cpuid to get cpuid, see prom_64.c */ - if (is_cpu_node && (prom_getint(node, "upa-portis") == cpuid || + /* try upa-portid then cpuid to get cpuid, see prom_64.c */ + if (is_cpu_node && (prom_getint(node, "upa-portid") == cpuid || prom_getint(node, "cpuid") == cpuid)) freq = prom_getintdefault(node, "clock-frequency", 0); if (!freq)