| Message ID | 20190715142304.215018-3-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x/cpumodel fixes for 4.1 | expand |
On 15.07.19 16:23, Christian Borntraeger wrote: > David suggested to keep everything in sync as 4.1 is not yet released. > This patch fixes the name "vxbeh" into "vxp". > > To simplify the backports this patch will not change VECTOR_BCD_ENH as > this is just an internal name. That will be done by an extra patch that > does not need to be backported. > > Suggested-by: David Hildenbrand <david@redhat.com> > Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") > Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > target/s390x/cpu_features_def.inc.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h > index 3118a9f89228..99f58a89318a 100644 > --- a/target/s390x/cpu_features_def.inc.h > +++ b/target/s390x/cpu_features_def.inc.h > @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil > DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") > DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") > DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") > -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") > DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") > > Reviewed-by: David Hildenbrand <david@redhat.com>
On 15/07/2019 16.23, Christian Borntraeger wrote: > David suggested to keep everything in sync as 4.1 is not yet released. > This patch fixes the name "vxbeh" into "vxp". > > To simplify the backports this patch will not change VECTOR_BCD_ENH as > this is just an internal name. That will be done by an extra patch that > does not need to be backported. > > Suggested-by: David Hildenbrand <david@redhat.com> > Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") > Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > target/s390x/cpu_features_def.inc.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h > index 3118a9f89228..99f58a89318a 100644 > --- a/target/s390x/cpu_features_def.inc.h > +++ b/target/s390x/cpu_features_def.inc.h > @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil > DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") > DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") > DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") > -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") We already have: DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") ... so I rather expected something like "vxpde" here instead? Or is there a reason for just using "vxp"? Thomas
On 15.07.19 17:02, Thomas Huth wrote: > On 15/07/2019 16.23, Christian Borntraeger wrote: >> David suggested to keep everything in sync as 4.1 is not yet released. >> This patch fixes the name "vxbeh" into "vxp". >> >> To simplify the backports this patch will not change VECTOR_BCD_ENH as >> this is just an internal name. That will be done by an extra patch that >> does not need to be backported. >> >> Suggested-by: David Hildenbrand <david@redhat.com> >> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") >> Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") >> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> >> --- >> target/s390x/cpu_features_def.inc.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h >> index 3118a9f89228..99f58a89318a 100644 >> --- a/target/s390x/cpu_features_def.inc.h >> +++ b/target/s390x/cpu_features_def.inc.h >> @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil >> DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") >> DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") >> DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") >> -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >> +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > > We already have: > > DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") > > ... so I rather expected something like "vxpde" here instead? Or is there a reason > for just using "vxp"? Matching what the Linux kernel has. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/arch/s390/kernel/processor.c?id=a8fd61688dfad6fdce95fa64cacd8a66595697b8 > > Thomas >
On 15.07.19 17:50, Christian Borntraeger wrote: > > > On 15.07.19 17:02, Thomas Huth wrote: >> On 15/07/2019 16.23, Christian Borntraeger wrote: >>> David suggested to keep everything in sync as 4.1 is not yet released. >>> This patch fixes the name "vxbeh" into "vxp". >>> >>> To simplify the backports this patch will not change VECTOR_BCD_ENH as >>> this is just an internal name. That will be done by an extra patch that >>> does not need to be backported. >>> >>> Suggested-by: David Hildenbrand <david@redhat.com> >>> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") >>> Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") >>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> >>> --- >>> target/s390x/cpu_features_def.inc.h | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h >>> index 3118a9f89228..99f58a89318a 100644 >>> --- a/target/s390x/cpu_features_def.inc.h >>> +++ b/target/s390x/cpu_features_def.inc.h >>> @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil >>> DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") >>> DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") >>> DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") >>> -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >>> +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >> >> We already have: >> >> DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") >> >> ... so I rather expected something like "vxpde" here instead? Or is there a reason >> > for just using "vxp"? > > Matching what the Linux kernel has. > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/arch/s390/kernel/processor.c?id=a8fd61688dfad6fdce95fa64cacd8a66595697b8 >> Since we differ from the kernel in other places as well we might use something else, of course.
On 15.07.19 18:12, Christian Borntraeger wrote: > > > On 15.07.19 17:50, Christian Borntraeger wrote: >> >> >> On 15.07.19 17:02, Thomas Huth wrote: >>> On 15/07/2019 16.23, Christian Borntraeger wrote: >>>> David suggested to keep everything in sync as 4.1 is not yet released. >>>> This patch fixes the name "vxbeh" into "vxp". >>>> >>>> To simplify the backports this patch will not change VECTOR_BCD_ENH as >>>> this is just an internal name. That will be done by an extra patch that >>>> does not need to be backported. >>>> >>>> Suggested-by: David Hildenbrand <david@redhat.com> >>>> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") >>>> Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") >>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> >>>> --- >>>> target/s390x/cpu_features_def.inc.h | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h >>>> index 3118a9f89228..99f58a89318a 100644 >>>> --- a/target/s390x/cpu_features_def.inc.h >>>> +++ b/target/s390x/cpu_features_def.inc.h >>>> @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil >>>> DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") >>>> DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") >>>> DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") >>>> -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >>>> +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >>> >>> We already have: >>> >>> DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") >>> >>> ... so I rather expected something like "vxpde" here instead? Or is there a reason >>> >> for just using "vxp"? >> >> Matching what the Linux kernel has. >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/arch/s390/kernel/processor.c?id=a8fd61688dfad6fdce95fa64cacd8a66595697b8 >>> > > Since we differ from the kernel in other places as well we might use something else, of course. > We also have sortl vs. sort vxe vs. vxeh vxe2 vs. vxeh2 So I tend to prefer "vxpde", or rather "vxpdeh". (all other enhancement facilities have "eh", so we should actually use "vxpdeh")
On 16.07.19 09:24, David Hildenbrand wrote: > On 15.07.19 18:12, Christian Borntraeger wrote: >> >> >> On 15.07.19 17:50, Christian Borntraeger wrote: >>> >>> >>> On 15.07.19 17:02, Thomas Huth wrote: >>>> On 15/07/2019 16.23, Christian Borntraeger wrote: >>>>> David suggested to keep everything in sync as 4.1 is not yet released. >>>>> This patch fixes the name "vxbeh" into "vxp". >>>>> >>>>> To simplify the backports this patch will not change VECTOR_BCD_ENH as >>>>> this is just an internal name. That will be done by an extra patch that >>>>> does not need to be backported. >>>>> >>>>> Suggested-by: David Hildenbrand <david@redhat.com> >>>>> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") >>>>> Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") >>>>> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> >>>>> --- >>>>> target/s390x/cpu_features_def.inc.h | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>>> >>>>> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h >>>>> index 3118a9f89228..99f58a89318a 100644 >>>>> --- a/target/s390x/cpu_features_def.inc.h >>>>> +++ b/target/s390x/cpu_features_def.inc.h >>>>> @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil >>>>> DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") >>>>> DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") >>>>> DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") >>>>> -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >>>>> +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") >>>> >>>> We already have: >>>> >>>> DEF_FEAT(VECTOR_PACKED_DECIMAL, "vxpd", STFL, 134, "Vector packed decimal facility") >>>> >>>> ... so I rather expected something like "vxpde" here instead? Or is there a reason >>>> >>> for just using "vxp"? >>> >>> Matching what the Linux kernel has. >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/arch/s390/kernel/processor.c?id=a8fd61688dfad6fdce95fa64cacd8a66595697b8 >>>> >> >> Since we differ from the kernel in other places as well we might use something else, of course. >> > > We also have > > sortl vs. sort > vxe vs. vxeh > vxe2 vs. vxeh2 > > So I tend to prefer "vxpde", or rather "vxpdeh". > > (all other enhancement facilities have "eh", so we should actually use > "vxpdeh") Fine with me. Conny, shall I resend or can you fixup everything?
On Tue, 16 Jul 2019 09:25:42 +0200 Christian Borntraeger <borntraeger@de.ibm.com> wrote: > On 16.07.19 09:24, David Hildenbrand wrote: > > We also have > > > > sortl vs. sort > > vxe vs. vxeh > > vxe2 vs. vxeh2 > > > > So I tend to prefer "vxpde", or rather "vxpdeh". > > > > (all other enhancement facilities have "eh", so we should actually use > > "vxpdeh") > > Fine with me. Conny, shall I resend or can you fixup everything? > I now have the following; can you please double check? commit a02c8264b7219bc30ec258f068c89b93ad244c36 Author: Christian Borntraeger <borntraeger@de.ibm.com> Date: Mon Jul 15 16:23:03 2019 +0200 s390x/cpumodel: also change name of vxbeh David suggested to keep everything in sync as 4.1 is not yet released. This patch fixes the name "vxbeh" into "vxpdeh". To simplify the backports this patch will not change VECTOR_BCD_ENH as this is just an internal name. That will be done by an extra patch that does not need to be backported. Suggested-by: David Hildenbrand <david@redhat.com> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20190715142304.215018-3-borntraeger@de.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h index 3118a9f89228..05b7674affe6 100644 --- a/target/s390x/cpu_features_def.inc.h +++ b/target/s390x/cpu_features_def.inc.h @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") +DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
On 16/07/2019 10.30, Cornelia Huck wrote: > On Tue, 16 Jul 2019 09:25:42 +0200 > Christian Borntraeger <borntraeger@de.ibm.com> wrote: > >> On 16.07.19 09:24, David Hildenbrand wrote: > >>> We also have >>> >>> sortl vs. sort >>> vxe vs. vxeh >>> vxe2 vs. vxeh2 >>> >>> So I tend to prefer "vxpde", or rather "vxpdeh". >>> >>> (all other enhancement facilities have "eh", so we should actually use >>> "vxpdeh") >> >> Fine with me. Conny, shall I resend or can you fixup everything? >> > > I now have the following; can you please double check? > > commit a02c8264b7219bc30ec258f068c89b93ad244c36 > Author: Christian Borntraeger <borntraeger@de.ibm.com> > Date: Mon Jul 15 16:23:03 2019 +0200 > > s390x/cpumodel: also change name of vxbeh > > David suggested to keep everything in sync as 4.1 is not yet released. > This patch fixes the name "vxbeh" into "vxpdeh". > > To simplify the backports this patch will not change VECTOR_BCD_ENH as > this is just an internal name. That will be done by an extra patch that > does not need to be backported. > > Suggested-by: David Hildenbrand <david@redhat.com> > Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") > Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > Message-Id: <20190715142304.215018-3-borntraeger@de.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h > index 3118a9f89228..05b7674affe6 100644 > --- a/target/s390x/cpu_features_def.inc.h > +++ b/target/s390x/cpu_features_def.inc.h > @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil > DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") > DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") > DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") > -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > +DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") > DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") Reviewed-by: Thomas Huth <thuth@redhat.com>
On 16.07.19 10:30, Cornelia Huck wrote: > On Tue, 16 Jul 2019 09:25:42 +0200 > Christian Borntraeger <borntraeger@de.ibm.com> wrote: > >> On 16.07.19 09:24, David Hildenbrand wrote: > >>> We also have >>> >>> sortl vs. sort >>> vxe vs. vxeh >>> vxe2 vs. vxeh2 >>> >>> So I tend to prefer "vxpde", or rather "vxpdeh". >>> >>> (all other enhancement facilities have "eh", so we should actually use >>> "vxpdeh") >> >> Fine with me. Conny, shall I resend or can you fixup everything? >> > > I now have the following; can you please double check? looks good. > > commit a02c8264b7219bc30ec258f068c89b93ad244c36 > Author: Christian Borntraeger <borntraeger@de.ibm.com> > Date: Mon Jul 15 16:23:03 2019 +0200 > > s390x/cpumodel: also change name of vxbeh > > David suggested to keep everything in sync as 4.1 is not yet released. > This patch fixes the name "vxbeh" into "vxpdeh". > > To simplify the backports this patch will not change VECTOR_BCD_ENH as > this is just an internal name. That will be done by an extra patch that > does not need to be backported. > > Suggested-by: David Hildenbrand <david@redhat.com> > Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") > Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > Message-Id: <20190715142304.215018-3-borntraeger@de.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h > index 3118a9f89228..05b7674affe6 100644 > --- a/target/s390x/cpu_features_def.inc.h > +++ b/target/s390x/cpu_features_def.inc.h > @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil > DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") > DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") > DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") > -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > +DEF_FEAT(VECTOR_BCD_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") > DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") > DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") > >
diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h index 3118a9f89228..99f58a89318a 100644 --- a/target/s390x/cpu_features_def.inc.h +++ b/target/s390x/cpu_features_def.inc.h @@ -104,7 +104,7 @@ DEF_FEAT(CMM_NT, "cmmnt", STFL, 147, "CMM: ESSA-enhancement (no translate) facil DEF_FEAT(VECTOR_ENH2, "vxeh2", STFL, 148, "Vector Enhancements facility 2") DEF_FEAT(ESORT_BASE, "esort-base", STFL, 150, "Enhanced-sort facility (excluding subfunctions)") DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility (excluding subfunctions)") -DEF_FEAT(VECTOR_BCD_ENH, "vxbeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") +DEF_FEAT(VECTOR_BCD_ENH, "vxp", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility")
David suggested to keep everything in sync as 4.1 is not yet released. This patch fixes the name "vxbeh" into "vxp". To simplify the backports this patch will not change VECTOR_BCD_ENH as this is just an internal name. That will be done by an extra patch that does not need to be backported. Suggested-by: David Hildenbrand <david@redhat.com> Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector facility") Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements") Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> --- target/s390x/cpu_features_def.inc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)