Comment 10 for bug 1836154

Revision history for this message
bugproxy (bugproxy) wrote : Comment bridged from LTC Bugzilla

------- Comment From <email address hidden> 2019-07-16 08:25 EDT-------
> directly picking changes for Disco:
> - at first works fine until f2a7d157 "add z14 GA2 model"
> context misses S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF in
> target/s390x/gen-features.c
> The define of default_GEN14_GA2 is easily added, but I wonder if the change
> before being
> ddf5d18a "mepochptff: warn when no mepoch and re-align group init" might
> also need:
> 84176c79 "s390x/cpumodel: default enable mepoch for z14 and later"
> I'll try to build it without, but let me know what you think about that.

Adding these patches would be ok but not strictly necessary as upstream does not
enable mepoch extension for the 3.1 machine.
If you decide to pick those nevertheless, then you could also pick
commit f2a7d157711 ("s390x/cpumodel: add z14 GA2 model")
But as I said. I think those are not strictly necessary.

>
> - further as we have known already d05be57d needs
> - target/s390x/cpu_features.c -> target/s390x/cpu_features_def.inc.h
> - DEF-FEAT -> FEAT_INIT
> No questions on this one.

Yes.

In addition to that there are 2 (or optional 3) bugfixes on top that would be important to have in bionic,disco (and also eaon).

mandatory:
https://github.com/cohuck/qemu/commit/0d4cb295db7503fbac2f5bb3e878a56630231fed
(s390x/cpumodel: also change name of vxbeh)
https://github.com/cohuck/qemu/commit/de6bb08570065eb318849dfd7f316448e51197b5
( s390x/cpumodel: remove esort from the default model)

optional:
https://github.com/cohuck/qemu/commit/5d8866c89817998a3d9c3055d5dc2b5a8e78658a
( s390x/cpumodel: change internal name of vxpdeh to match description )

I expect Cornelia to send a pull request soon so I hope to have final commit IDs soon.