64bc98f4b9
Let's also properly forward that bit. It should always be set. I verified it under z/VM, it seems to be always set there. For now, zKVM guests never get that bit set when the CPU model is active. The PoP mentiones, that z800 + z900 (HW generation 7) always set this bit to 0, so let's take care of that. Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20170531193434.6918-2-david@redhat.com> Acked-by: Jason J. Herne <jjherne@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
124 lines
4.1 KiB
C
124 lines
4.1 KiB
C
/*
|
|
* CPU models for s390x
|
|
*
|
|
* Copyright 2016 IBM Corp.
|
|
*
|
|
* Author(s): David Hildenbrand <dahi@linux.vnet.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
* directory.
|
|
*/
|
|
|
|
#ifndef TARGET_S390X_CPU_MODELS_H
|
|
#define TARGET_S390X_CPU_MODELS_H
|
|
|
|
#include "cpu_features.h"
|
|
#include "qom/cpu.h"
|
|
|
|
/* static CPU definition */
|
|
typedef struct S390CPUDef {
|
|
const char *name; /* name exposed to the user */
|
|
const char *desc; /* description exposed to the user */
|
|
uint8_t gen; /* hw generation identification */
|
|
uint16_t type; /* cpu type identification */
|
|
uint8_t ec_ga; /* EC GA version (on which also the BC is based) */
|
|
uint8_t mha_pow; /* Maximum Host Adress Power, mha = 2^pow-1 */
|
|
uint32_t hmfai; /* hypervisor-managed facilities */
|
|
/* base/min features, must never be changed between QEMU versions */
|
|
S390FeatBitmap base_feat;
|
|
/* used to init base_feat from generated data */
|
|
S390FeatInit base_init;
|
|
/* deafault features, QEMU version specific */
|
|
S390FeatBitmap default_feat;
|
|
/* used to init default_feat from generated data */
|
|
S390FeatInit default_init;
|
|
/* max allowed features, QEMU version specific */
|
|
S390FeatBitmap full_feat;
|
|
/* used to init full_feat from generated data */
|
|
S390FeatInit full_init;
|
|
} S390CPUDef;
|
|
|
|
/* CPU model based on a CPU definition */
|
|
typedef struct S390CPUModel {
|
|
const S390CPUDef *def;
|
|
S390FeatBitmap features;
|
|
/* values copied from the "host" model, can change during migration */
|
|
uint16_t lowest_ibc; /* lowest IBC that the hardware supports */
|
|
uint32_t cpu_id; /* CPU id */
|
|
uint8_t cpu_id_format; /* CPU id format bit */
|
|
uint8_t cpu_ver; /* CPU version, usually "ff" for kvm */
|
|
} S390CPUModel;
|
|
|
|
/*
|
|
* CPU ID
|
|
*
|
|
* bits 0-7: Zeroes (ff for kvm)
|
|
* bits 8-31: CPU ID (serial number)
|
|
* bits 32-47: Machine type
|
|
* bit 48: CPU ID format
|
|
* bits 49-63: Zeroes
|
|
*/
|
|
#define cpuid_type(x) (((x) >> 16) & 0xffff)
|
|
#define cpuid_id(x) (((x) >> 32) & 0xffffff)
|
|
#define cpuid_ver(x) (((x) >> 56) & 0xff)
|
|
#define cpuid_format(x) (((x) >> 15) & 0x1)
|
|
|
|
#define lowest_ibc(x) (((uint32_t)(x) >> 16) & 0xfff)
|
|
#define unblocked_ibc(x) ((uint32_t)(x) & 0xfff)
|
|
#define has_ibc(x) (lowest_ibc(x) != 0)
|
|
|
|
#define S390_GEN_Z10 0xa
|
|
#define ibc_gen(x) (x == 0 ? 0 : ((x >> 4) + S390_GEN_Z10))
|
|
#define ibc_ec_ga(x) (x & 0xf)
|
|
|
|
uint32_t s390_get_hmfai(void);
|
|
uint8_t s390_get_mha_pow(void);
|
|
uint32_t s390_get_ibc_val(void);
|
|
static inline uint16_t s390_ibc_from_cpu_model(const S390CPUModel *model)
|
|
{
|
|
uint16_t ibc = 0;
|
|
|
|
if (model->def->gen >= S390_GEN_Z10) {
|
|
ibc = ((model->def->gen - S390_GEN_Z10) << 4) + model->def->ec_ga;
|
|
}
|
|
return ibc;
|
|
}
|
|
void s390_get_feat_block(S390FeatType type, uint8_t *data);
|
|
bool s390_has_feat(S390Feat feat);
|
|
uint8_t s390_get_gen_for_cpu_type(uint16_t type);
|
|
static inline bool s390_known_cpu_type(uint16_t type)
|
|
{
|
|
return s390_get_gen_for_cpu_type(type) != 0;
|
|
}
|
|
static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model)
|
|
{
|
|
return ((uint64_t)model->cpu_ver << 56) |
|
|
((uint64_t)model->cpu_id << 32) |
|
|
((uint64_t)model->def->type << 16) |
|
|
(model->def->gen == 7 ? 0 : (uint64_t)model->cpu_id_format << 15);
|
|
}
|
|
S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
|
|
S390FeatBitmap features);
|
|
|
|
#ifdef CONFIG_KVM
|
|
bool kvm_s390_cpu_models_supported(void);
|
|
void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp);
|
|
void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp);
|
|
#else
|
|
static inline void kvm_s390_get_host_cpu_model(S390CPUModel *model,
|
|
Error **errp)
|
|
{
|
|
}
|
|
static inline void kvm_s390_apply_cpu_model(const S390CPUModel *model,
|
|
Error **errp)
|
|
{
|
|
}
|
|
static inline bool kvm_s390_cpu_models_supported(void)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#endif /* TARGET_S390X_CPU_MODELS_H */
|