From ef1799f31fa2a11467373077058b8b5a3838c4b1 Mon Sep 17 00:00:00 2001 From: Thomas Richter Date: Thu, 22 Feb 2024 14:57:15 +0100 Subject: [PATCH] s390-tools/libutil: Add machine type 3932 Add support for machine type 3932. Print identical product name for machine types 8561 and 8562. Signed-off-by: Thomas Richter Suggested-by: Christian Borntraeger Acked-by: Christian Borntraeger Signed-off-by: Steffen Eiden --- include/lib/util_arch.h | 1 + libutil/util_arch.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/lib/util_arch.h b/include/lib/util_arch.h index 86029115..3d82d49d 100644 --- a/include/lib/util_arch.h +++ b/include/lib/util_arch.h @@ -27,6 +27,7 @@ enum util_arch_machine_type { UTIL_ARCH_MACHINE_TYPE_Z15 = 8561, UTIL_ARCH_MACHINE_TYPE_Z15_T02 = 8562, UTIL_ARCH_MACHINE_TYPE_Z16 = 3931, + UTIL_ARCH_MACHINE_TYPE_Z16_A02 = 3932, }; int util_arch_machine_type(void); diff --git a/libutil/util_arch.c b/libutil/util_arch.c index d7825389..9b2ef45b 100644 --- a/libutil/util_arch.c +++ b/libutil/util_arch.c @@ -90,10 +90,10 @@ const char *util_arch_machine_type_to_str(int type) case UTIL_ARCH_MACHINE_TYPE_Z14_ZR1: return "IBM z14 ZR1"; case UTIL_ARCH_MACHINE_TYPE_Z15: - return "IBM z15"; case UTIL_ARCH_MACHINE_TYPE_Z15_T02: - return "IBM z15 Model T02"; + return "IBM z15"; case UTIL_ARCH_MACHINE_TYPE_Z16: + case UTIL_ARCH_MACHINE_TYPE_Z16_A02: return "IBM z16"; default: return "Unknown machine type"; @@ -111,6 +111,7 @@ unsigned long util_arch_hsa_maxsize(void) case UTIL_ARCH_MACHINE_TYPE_Z15: case UTIL_ARCH_MACHINE_TYPE_Z15_T02: case UTIL_ARCH_MACHINE_TYPE_Z16: + case UTIL_ARCH_MACHINE_TYPE_Z16_A02: return HSA_SIZE_512M; default: return HSA_SIZE_32M;