mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170714' into staging
s390x/kvm/migration/cpumodel: fixes, enhancements and cleanups - add a network boot rom for s390 (Thomas Huth) - migration of storage attributes like the CMMA used/unused state - PCI related enhancements - full support for aen, ais and zpci - migration support for css with vmstates (Halil Pasic) - cpu model enhancements for cpu features - guarded storage support # gpg: Signature made Fri 14 Jul 2017 11:33:04 BST # gpg: using RSA key 0x117BBC80B5A61C7C # gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>" # Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C * remotes/borntraeger/tags/s390x-20170714: (40 commits) s390x/gdb: add gs registers s390x/arch_dump: also dump guarded storage control block s390x/kvm: enable guarded storage s390x/kvm: Enable KSS facility for nested virtualization s390x/cpumodel: add esop/esop2 to z12 model s390x/cpumodel: we are always in zarchitecture mode s390x/cpumodel: wire up new hardware features s390x/flic: migrate ais states s390x/cpumodel: add zpci, aen and ais facilities s390x: initialize cpu firstly pc-bios/s390: rebuild s390-ccw.img pc-bios/s390: add s390-netboot.img pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load pc-bios/s390-ccw: Add virtio-net driver code pc-bios/s390-ccw: Add core files for the network bootloading program roms/SLOF: Update submodule to latest status pc-bios/s390-ccw: Add code for virtio feature negotiation pc-bios/s390-ccw: Remove unused structs from virtio.h pc-bios/s390-ccw: Move byteswap functions to a separate header pc-bios/s390-ccw: Add a write() function for stdio ... Conflicts: target/s390x/kvm.c Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
@@ -1476,6 +1476,7 @@ typedef struct elf64_shdr {
|
||||
#define NT_TASKSTRUCT 4
|
||||
#define NT_AUXV 6
|
||||
#define NT_PRXFPREG 0x46e62b7f /* copied from gdb5.1/include/elf/common.h */
|
||||
#define NT_S390_GS_CB 0x30b /* s390 guarded storage registers */
|
||||
#define NT_S390_VXRS_HIGH 0x30a /* s390 vector registers 16-31 */
|
||||
#define NT_S390_VXRS_LOW 0x309 /* s390 vector registers 0-15 (lower half) */
|
||||
#define NT_S390_PREFIX 0x305 /* s390 prefix register */
|
||||
|
||||
+18
-5
@@ -12,6 +12,7 @@
|
||||
#ifndef CSS_H
|
||||
#define CSS_H
|
||||
|
||||
#include "cpu.h"
|
||||
#include "hw/s390x/adapter.h"
|
||||
#include "hw/s390x/s390_flic.h"
|
||||
#include "hw/s390x/ioinst.h"
|
||||
@@ -89,10 +90,11 @@ struct SubchDev {
|
||||
bool thinint_active;
|
||||
uint8_t ccw_no_data_cnt;
|
||||
uint16_t migrated_schid; /* used for missmatch detection */
|
||||
ORB orb;
|
||||
/* transport-provided data: */
|
||||
int (*ccw_cb) (SubchDev *, CCW1);
|
||||
void (*disable_cb)(SubchDev *);
|
||||
int (*do_subchannel_work) (SubchDev *, ORB *);
|
||||
int (*do_subchannel_work) (SubchDev *);
|
||||
SenseId id;
|
||||
void *driver_data;
|
||||
};
|
||||
@@ -154,10 +156,9 @@ void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid,
|
||||
void css_generate_chp_crws(uint8_t cssid, uint8_t chpid);
|
||||
void css_generate_css_crws(uint8_t cssid);
|
||||
void css_clear_sei_pending(void);
|
||||
void css_adapter_interrupt(uint8_t isc);
|
||||
int s390_ccw_cmd_request(ORB *orb, SCSW *scsw, void *data);
|
||||
int do_subchannel_work_virtual(SubchDev *sub, ORB *orb);
|
||||
int do_subchannel_work_passthrough(SubchDev *sub, ORB *orb);
|
||||
int do_subchannel_work_virtual(SubchDev *sub);
|
||||
int do_subchannel_work_passthrough(SubchDev *sub);
|
||||
|
||||
typedef enum {
|
||||
CSS_IO_ADAPTER_VIRTIO = 0,
|
||||
@@ -165,9 +166,17 @@ typedef enum {
|
||||
CSS_IO_ADAPTER_TYPE_NUMS,
|
||||
} CssIoAdapterType;
|
||||
|
||||
void css_adapter_interrupt(CssIoAdapterType type, uint8_t isc);
|
||||
int css_do_sic(CPUS390XState *env, uint8_t isc, uint16_t mode);
|
||||
uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc);
|
||||
void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable,
|
||||
Error **errp);
|
||||
uint8_t flags, Error **errp);
|
||||
|
||||
#ifndef CONFIG_KVM
|
||||
#define S390_ADAPTER_SUPPRESSIBLE 0x01
|
||||
#else
|
||||
#define S390_ADAPTER_SUPPRESSIBLE KVM_S390_ADAPTER_SUPPRESSIBLE
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,
|
||||
@@ -225,4 +234,8 @@ extern const PropertyInfo css_devid_ro_propinfo;
|
||||
*/
|
||||
SubchDev *css_create_sch(CssDevId bus_id, bool is_virtual, bool squash_mcss,
|
||||
Error **errp);
|
||||
|
||||
/** Turn on css migration */
|
||||
void css_register_vmstate(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -39,11 +39,21 @@ typedef struct S390CcwMachineClass {
|
||||
/*< public >*/
|
||||
bool ri_allowed;
|
||||
bool cpu_model_allowed;
|
||||
bool css_migration_enabled;
|
||||
bool gs_allowed;
|
||||
} S390CcwMachineClass;
|
||||
|
||||
/* runtime-instrumentation allowed by the machine */
|
||||
bool ri_allowed(void);
|
||||
/* cpu model allowed by the machine */
|
||||
bool cpu_model_allowed(void);
|
||||
/* guarded-storage allowed by the machine */
|
||||
bool gs_allowed(void);
|
||||
|
||||
/**
|
||||
* Returns true if (vmstate based) migration of the channel subsystem
|
||||
* is enabled, false if it is disabled.
|
||||
*/
|
||||
bool css_migration_enabled(void);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -44,7 +44,7 @@ typedef struct S390FLICState {
|
||||
SysBusDevice parent_obj;
|
||||
/* to limit AdapterRoutes.num_routes for compat */
|
||||
uint32_t adapter_routes_max_batch;
|
||||
|
||||
bool ais_supported;
|
||||
} S390FLICState;
|
||||
|
||||
#define S390_FLIC_COMMON_CLASS(klass) \
|
||||
@@ -56,13 +56,16 @@ typedef struct S390FLICStateClass {
|
||||
DeviceClass parent_class;
|
||||
|
||||
int (*register_io_adapter)(S390FLICState *fs, uint32_t id, uint8_t isc,
|
||||
bool swap, bool maskable);
|
||||
bool swap, bool maskable, uint8_t flags);
|
||||
int (*io_adapter_map)(S390FLICState *fs, uint32_t id, uint64_t map_addr,
|
||||
bool do_map);
|
||||
int (*add_adapter_routes)(S390FLICState *fs, AdapterRoutes *routes);
|
||||
void (*release_adapter_routes)(S390FLICState *fs, AdapterRoutes *routes);
|
||||
int (*clear_io_irq)(S390FLICState *fs, uint16_t subchannel_id,
|
||||
uint16_t subchannel_nr);
|
||||
int (*modify_ais_mode)(S390FLICState *fs, uint8_t isc, uint16_t mode);
|
||||
int (*inject_airq)(S390FLICState *fs, uint8_t type, uint8_t isc,
|
||||
uint8_t flags);
|
||||
} S390FLICStateClass;
|
||||
|
||||
#define TYPE_KVM_S390_FLIC "s390-flic-kvm"
|
||||
@@ -73,13 +76,20 @@ typedef struct S390FLICStateClass {
|
||||
#define QEMU_S390_FLIC(obj) \
|
||||
OBJECT_CHECK(QEMUS390FLICState, (obj), TYPE_QEMU_S390_FLIC)
|
||||
|
||||
#define SIC_IRQ_MODE_ALL 0
|
||||
#define SIC_IRQ_MODE_SINGLE 1
|
||||
#define AIS_MODE_MASK(isc) (0x80 >> isc)
|
||||
|
||||
typedef struct QEMUS390FLICState {
|
||||
S390FLICState parent_obj;
|
||||
uint8_t simm;
|
||||
uint8_t nimm;
|
||||
} QEMUS390FLICState;
|
||||
|
||||
void s390_flic_init(void);
|
||||
|
||||
S390FLICState *s390_get_flic(void);
|
||||
bool ais_needed(void *opaque);
|
||||
|
||||
#ifdef CONFIG_KVM
|
||||
DeviceState *s390_flic_kvm_create(void);
|
||||
|
||||
@@ -123,8 +123,7 @@ typedef struct ReadInfo {
|
||||
uint64_t facilities; /* 48-55 */
|
||||
uint8_t _reserved0[76 - 56]; /* 56-75 */
|
||||
uint32_t ibc_val;
|
||||
uint8_t conf_char[96 - 80]; /* 80-95 */
|
||||
uint8_t _reserved4[99 - 96]; /* 96-98 */
|
||||
uint8_t conf_char[99 - 80]; /* 80-98 */
|
||||
uint8_t mha_pow;
|
||||
uint32_t rnsize2;
|
||||
uint64_t rnmax2;
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* s390 storage attributes device
|
||||
*
|
||||
* Copyright 2016 IBM Corp.
|
||||
* Author(s): Claudio Imbrenda <imbrenda@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 S390_STORAGE_ATTRIBUTES_H
|
||||
#define S390_STORAGE_ATTRIBUTES_H
|
||||
|
||||
#include <hw/qdev.h>
|
||||
#include "monitor/monitor.h"
|
||||
|
||||
#define TYPE_S390_STATTRIB "s390-storage_attributes"
|
||||
#define TYPE_QEMU_S390_STATTRIB "s390-storage_attributes-qemu"
|
||||
#define TYPE_KVM_S390_STATTRIB "s390-storage_attributes-kvm"
|
||||
|
||||
#define S390_STATTRIB(obj) \
|
||||
OBJECT_CHECK(S390StAttribState, (obj), TYPE_S390_STATTRIB)
|
||||
|
||||
typedef struct S390StAttribState {
|
||||
DeviceState parent_obj;
|
||||
uint64_t migration_cur_gfn;
|
||||
bool migration_enabled;
|
||||
} S390StAttribState;
|
||||
|
||||
#define S390_STATTRIB_CLASS(klass) \
|
||||
OBJECT_CLASS_CHECK(S390StAttribClass, (klass), TYPE_S390_STATTRIB)
|
||||
#define S390_STATTRIB_GET_CLASS(obj) \
|
||||
OBJECT_GET_CLASS(S390StAttribClass, (obj), TYPE_S390_STATTRIB)
|
||||
|
||||
typedef struct S390StAttribClass {
|
||||
DeviceClass parent_class;
|
||||
/* Return value: < 0 on error, or new count */
|
||||
int (*get_stattr)(S390StAttribState *sa, uint64_t *start_gfn,
|
||||
uint32_t count, uint8_t *values);
|
||||
int (*peek_stattr)(S390StAttribState *sa, uint64_t start_gfn,
|
||||
uint32_t count, uint8_t *values);
|
||||
int (*set_stattr)(S390StAttribState *sa, uint64_t start_gfn,
|
||||
uint32_t count, uint8_t *values);
|
||||
void (*synchronize)(S390StAttribState *sa);
|
||||
int (*set_migrationmode)(S390StAttribState *sa, bool value);
|
||||
int (*get_active)(S390StAttribState *sa);
|
||||
long long (*get_dirtycount)(S390StAttribState *sa);
|
||||
} S390StAttribClass;
|
||||
|
||||
#define QEMU_S390_STATTRIB(obj) \
|
||||
OBJECT_CHECK(QEMUS390StAttribState, (obj), TYPE_QEMU_S390_STATTRIB)
|
||||
|
||||
typedef struct QEMUS390StAttribState {
|
||||
S390StAttribState parent_obj;
|
||||
} QEMUS390StAttribState;
|
||||
|
||||
#define KVM_S390_STATTRIB(obj) \
|
||||
OBJECT_CHECK(KVMS390StAttribState, (obj), TYPE_KVM_S390_STATTRIB)
|
||||
|
||||
typedef struct KVMS390StAttribState {
|
||||
S390StAttribState parent_obj;
|
||||
uint64_t still_dirty;
|
||||
uint8_t *incoming_buffer;
|
||||
} KVMS390StAttribState;
|
||||
|
||||
void s390_stattrib_init(void);
|
||||
|
||||
#ifdef CONFIG_KVM
|
||||
Object *kvm_s390_stattrib_create(void);
|
||||
#else
|
||||
static inline Object *kvm_s390_stattrib_create(void)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void hmp_info_cmma(Monitor *mon, const QDict *qdict);
|
||||
void hmp_migrationmode(Monitor *mon, const QDict *qdict);
|
||||
|
||||
#endif /* S390_STORAGE_ATTRIBUTES_H */
|
||||
@@ -34,16 +34,10 @@
|
||||
#define HV_X64_MSR_REFERENCE_TSC 0x40000021
|
||||
|
||||
/*
|
||||
* There is a single feature flag that signifies the presence of the MSR
|
||||
* that can be used to retrieve both the local APIC Timer frequency as
|
||||
* well as the TSC frequency.
|
||||
* There is a single feature flag that signifies if the partition has access
|
||||
* to MSRs with local APIC and TSC frequencies.
|
||||
*/
|
||||
|
||||
/* Local APIC timer frequency MSR (HV_X64_MSR_APIC_FREQUENCY) is available */
|
||||
#define HV_X64_MSR_APIC_FREQUENCY_AVAILABLE (1 << 11)
|
||||
|
||||
/* TSC frequency MSR (HV_X64_MSR_TSC_FREQUENCY) is available */
|
||||
#define HV_X64_MSR_TSC_FREQUENCY_AVAILABLE (1 << 11)
|
||||
#define HV_X64_ACCESS_FREQUENCY_MSRS (1 << 11)
|
||||
|
||||
/*
|
||||
* Basic SynIC MSRs (HV_X64_MSR_SCONTROL through HV_X64_MSR_EOM
|
||||
@@ -73,6 +67,9 @@
|
||||
*/
|
||||
#define HV_X64_MSR_STAT_PAGES_AVAILABLE (1 << 8)
|
||||
|
||||
/* Frequency MSRs available */
|
||||
#define HV_FEATURE_FREQUENCY_MSRS_AVAILABLE (1 << 8)
|
||||
|
||||
/* Crash MSR available */
|
||||
#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE (1 << 10)
|
||||
|
||||
@@ -152,6 +149,12 @@
|
||||
*/
|
||||
#define HV_X64_DEPRECATING_AEOI_RECOMMENDED (1 << 9)
|
||||
|
||||
/*
|
||||
* HV_VP_SET available
|
||||
*/
|
||||
#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED (1 << 11)
|
||||
|
||||
|
||||
/*
|
||||
* Crash notification flag.
|
||||
*/
|
||||
|
||||
@@ -600,6 +600,7 @@
|
||||
#define KEY_APPSELECT 0x244 /* AL Select Task/Application */
|
||||
#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */
|
||||
#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
|
||||
#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
|
||||
|
||||
#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
|
||||
#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
|
||||
|
||||
@@ -517,6 +517,7 @@
|
||||
#define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */
|
||||
#define PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */
|
||||
#define PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */
|
||||
#define PCI_EXP_LNKCAP_SLS_8_0GB 0x00000003 /* LNKCAP2 SLS Vector bit 2 */
|
||||
#define PCI_EXP_LNKCAP_MLW 0x000003f0 /* Maximum Link Width */
|
||||
#define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */
|
||||
#define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */
|
||||
|
||||
Reference in New Issue
Block a user