Patchwork S390: Add new s390 platform z15.

login
register
mail settings
Submitter Stefan Liebler
Date Oct. 18, 2019, 8:53 a.m.
Message ID <395d8974-33b3-ec24-5970-f7f482750be1@linux.ibm.com>
Download mbox | patch
Permalink /patch/35131/
State New
Headers show

Comments

Stefan Liebler - Oct. 18, 2019, 8:53 a.m.
Hi,

The new IBM z15 is added to platform string array.
The macro _DL_PLATFORMS_COUNT is incremented.

Bye,
Stefan
Florian Weimer - Oct. 18, 2019, 10:41 a.m.
* Stefan Liebler:

> The new IBM z15 is added to platform string array.
> The macro _DL_PLATFORMS_COUNT is incremented.

I think you can commit this without review as the s390 machine
maintainer.

That being said, I verified that "z15" is the spelling used on the IBM
web site, so this change looks appropriate.  Do you recommend
backporting this change?

Thanks,
Florian
Stefan Liebler - Oct. 18, 2019, 12:59 p.m.
On 10/18/19 12:41 PM, Florian Weimer wrote:
> * Stefan Liebler:
> 
>> The new IBM z15 is added to platform string array.
>> The macro _DL_PLATFORMS_COUNT is incremented.
> 
> I think you can commit this without review as the s390 machine
> maintainer.
> 
> That being said, I verified that "z15" is the spelling used on the IBM
> web site, so this change looks appropriate.  Do you recommend
> backporting this change?
> 
> Thanks,
> Florian
> 
committed.

As the new hwcaps have already been introduced in glibc 2.30, I think it 
would make sense to have it there, too.
("S390: Add new hwcap values for new cpu architecture arch13."
https://sourceware.org/git/?p=glibc.git;a=commit;h=1a7df49c92f62e14d8727f083fd055eba7c91ad9)

Just as reference:
kernel commit "s390: add support for IBM z15 machines"
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=a0e2251132995b962281aa80ab54a9288f9e0b6b
Stefan Liebler - Oct. 18, 2019, 1:10 p.m.
On 10/18/19 2:59 PM, Stefan Liebler wrote:
> On 10/18/19 12:41 PM, Florian Weimer wrote:
>> * Stefan Liebler:
>>
>>> The new IBM z15 is added to platform string array.
>>> The macro _DL_PLATFORMS_COUNT is incremented.
>>
>> I think you can commit this without review as the s390 machine
>> maintainer.
>>
>> That being said, I verified that "z15" is the spelling used on the IBM
>> web site, so this change looks appropriate.  Do you recommend
>> backporting this change?
>>
>> Thanks,
>> Florian
>>
> committed.
> 
> As the new hwcaps have already been introduced in glibc 2.30, I think it 
> would make sense to have it there, too.
> ("S390: Add new hwcap values for new cpu architecture arch13."
> https://sourceware.org/git/?p=glibc.git;a=commit;h=1a7df49c92f62e14d8727f083fd055eba7c91ad9) 
> 
I've just backported this commit to glibc release branch 2.30.

> 
> Just as reference:
> kernel commit "s390: add support for IBM z15 machines"
> https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=a0e2251132995b962281aa80ab54a9288f9e0b6b 
> 
>

Patch

commit 3a108fc9a31f6ca2b484c6c9c946d219565eb9b7
Author: Stefan Liebler <stli@linux.ibm.com>
Date:   Fri Oct 18 10:00:06 2019 +0200

    S390: Add new s390 platform z15.
    
    The new IBM z15 is added to platform string array.
    The macro _DL_PLATFORMS_COUNT is incremented.

diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
index 2ad69f8f4b..22e52e3d3c 100644
--- a/sysdeps/s390/dl-procinfo.c
+++ b/sysdeps/s390/dl-procinfo.c
@@ -63,11 +63,11 @@  PROCINFO_CLASS const char _dl_s390_cap_flags[19][9]
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_s390_platforms
 #else
-PROCINFO_CLASS const char _dl_s390_platforms[9][7]
+PROCINFO_CLASS const char _dl_s390_platforms[10][7]
 #endif
 #ifndef PROCINFO_DECL
 = {
-    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14"
+    "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15"
   }
 #endif
 #if !defined SHARED || defined PROCINFO_DECL
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
index 7d25724a23..c9913b06b7 100644
--- a/sysdeps/s390/dl-procinfo.h
+++ b/sysdeps/s390/dl-procinfo.h
@@ -23,7 +23,7 @@ 
 
 #define _DL_HWCAP_COUNT 19
 
-#define _DL_PLATFORMS_COUNT	9
+#define _DL_PLATFORMS_COUNT	10
 
 /* The kernel provides up to 32 capability bits with elf_hwcap.  */
 #define _DL_FIRST_PLATFORM	32