summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2008-02-27 18:41:38 -0700
committerTony Luck <tony.luck@intel.com>2008-03-04 14:26:50 -0800
commit6ed0dc5ba811ce682f48988bf114669265e1120d (patch)
treed5a2dfdd7d183634899e72021a9a981838e3a771 /include
parent022f9268854e88adcc343de77a440d6e82f74c2e (diff)
[IA64] workaround tiger ia64_sal_get_physical_id_info hang
This fixes regression introduced in 113134fcbca83619be4c68d0ca66db6093777b5d Intel Tiger platforms hang when calling SAL_GET_PHYSICAL_ID_INFO instead of properly returning -1 for unimplemented, so add a version check. SGI Altix platforms have an incorrect SAL version hard-coded into their prom -- they encode 2.9, but actually implement 3.2 -- so fix it up and allow ia64_sal_get_physical_id_info to keep working. Signed-off-by: Alex Chiang <achiang@hp.com> Acked-by: Russ Anderson <rja@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/sal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index 2251118894ae..f4904db3b057 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -807,6 +807,10 @@ static inline s64
ia64_sal_physical_id_info(u16 *splid)
{
struct ia64_sal_retval isrv;
+
+ if (sal_revision < SAL_VERSION_CODE(3,2))
+ return -1;
+
SAL_CALL(isrv, SAL_PHYSICAL_ID_INFO, 0, 0, 0, 0, 0, 0, 0);
if (splid)
*splid = isrv.v0;