mirror of
https://github.com/torvalds/linux
synced 2024-09-27 23:10:58 +00:00
5fecc9d8f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQDRDNAAoJEI7yEDeUysxlkl8P/3C2AHx2webOU8sVzhfU6ONZ
ZoGevwBjyZIeJEmiWVpFTTEew1l0PXtpyOocXGNUXIddVnhXTQOKr/Scj4uFbmx8
ROqgK8NSX9+xOGrBPCoN7SlJkmp+m6uYtwYkl2SGnsEVLWMKkc7J7oqmszCcTQvN
UXMf7G47/Ul2NUSBdv4Yvizhl4kpvWxluiweDw3E/hIQKN0uyP7CY58qcAztw8nG
csZBAnnuPFwIAWxHXW3eBBv4UP138HbNDqJ/dujjocM6GnOxmXJmcZ6b57gh+Y64
3+w9IR4qrRWnsErb/I8inKLJ1Jdcf7yV2FmxYqR4pIXay2Yzo1BsvFd6EB+JavUv
pJpixrFiDDFoQyXlh4tGpsjpqdXNMLqyG4YpqzSZ46C8naVv9gKE7SXqlXnjyDlb
Llx3hb9Fop8O5ykYEGHi+gIISAK5eETiQl4yw9RUBDpxydH4qJtqGIbLiDy8y9wi
Xyi8PBlNl+biJFsK805lxURqTp/SJTC3+Zb7A7CzYEQm5xZw3W/CKZx1ZYBfpaa/
pWaP6tB7JwgLIVXi4HQayLWqMVwH0soZIn9yazpOEFv6qO8d5QH5RAxAW2VXE3n5
JDlrajar/lGIdiBVWfwTJLb86gv3QDZtIWoR9mZuLKeKWE/6PRLe7HQpG1pJovsm
2AsN5bS0BWq+aqPpZHa5
=pECD
-----END PGP SIGNATURE-----
Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM updates from Avi Kivity:
"Highlights include
- full big real mode emulation on pre-Westmere Intel hosts (can be
disabled with emulate_invalid_guest_state=0)
- relatively small ppc and s390 updates
- PCID/INVPCID support in guests
- EOI avoidance; 3.6 guests should perform better on 3.6 hosts on
interrupt intensive workloads)
- Lockless write faults during live migration
- EPT accessed/dirty bits support for new Intel processors"
Fix up conflicts in:
- Documentation/virtual/kvm/api.txt:
Stupid subchapter numbering, added next to each other.
- arch/powerpc/kvm/booke_interrupts.S:
PPC asm changes clashing with the KVM fixes
- arch/s390/include/asm/sigp.h, arch/s390/kvm/sigp.c:
Duplicated commits through the kvm tree and the s390 tree, with
subsequent edits in the KVM tree.
* tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (93 commits)
KVM: fix race with level interrupts
x86, hyper: fix build with !CONFIG_KVM_GUEST
Revert "apic: fix kvm build on UP without IOAPIC"
KVM guest: switch to apic_set_eoi_write, apic_write
apic: add apic_set_eoi_write for PV use
KVM: VMX: Implement PCID/INVPCID for guests with EPT
KVM: Add x86_hyper_kvm to complete detect_hypervisor_platform check
KVM: PPC: Critical interrupt emulation support
KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests
KVM: PPC64: booke: Set interrupt computation mode for 64-bit host
KVM: PPC: bookehv: Add ESR flag to Data Storage Interrupt
KVM: PPC: bookehv64: Add support for std/ld emulation.
booke: Added crit/mc exception handler for e500v2
booke/bookehv: Add host crit-watchdog exception support
KVM: MMU: document mmu-lock and fast page fault
KVM: MMU: fix kvm_mmu_pagetable_walk tracepoint
KVM: MMU: trace fast page fault
KVM: MMU: fast path of handling guest page fault
KVM: MMU: introduce SPTE_MMU_WRITEABLE bit
KVM: MMU: fold tlb flush judgement into mmu_spte_update
...
60 lines
1.4 KiB
C
60 lines
1.4 KiB
C
/*
|
|
* Copyright IBM Corp. 2007
|
|
* Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
|
|
*/
|
|
|
|
#ifndef _ASM_S390_SCLP_H
|
|
#define _ASM_S390_SCLP_H
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/chpid.h>
|
|
|
|
#define SCLP_CHP_INFO_MASK_SIZE 32
|
|
|
|
struct sclp_chp_info {
|
|
u8 recognized[SCLP_CHP_INFO_MASK_SIZE];
|
|
u8 standby[SCLP_CHP_INFO_MASK_SIZE];
|
|
u8 configured[SCLP_CHP_INFO_MASK_SIZE];
|
|
};
|
|
|
|
#define LOADPARM_LEN 8
|
|
|
|
struct sclp_ipl_info {
|
|
int is_valid;
|
|
int has_dump;
|
|
char loadparm[LOADPARM_LEN];
|
|
};
|
|
|
|
struct sclp_cpu_entry {
|
|
u8 address;
|
|
u8 reserved0[13];
|
|
u8 type;
|
|
u8 reserved1;
|
|
} __attribute__((packed));
|
|
|
|
struct sclp_cpu_info {
|
|
unsigned int configured;
|
|
unsigned int standby;
|
|
unsigned int combined;
|
|
int has_cpu_type;
|
|
struct sclp_cpu_entry cpu[255];
|
|
};
|
|
|
|
int sclp_get_cpu_info(struct sclp_cpu_info *info);
|
|
int sclp_cpu_configure(u8 cpu);
|
|
int sclp_cpu_deconfigure(u8 cpu);
|
|
void sclp_facilities_detect(void);
|
|
unsigned long long sclp_get_rnmax(void);
|
|
unsigned long long sclp_get_rzm(void);
|
|
u8 sclp_get_fac85(void);
|
|
int sclp_sdias_blk_count(void);
|
|
int sclp_sdias_copy(void *dest, int blk_num, int nr_blks);
|
|
int sclp_chp_configure(struct chp_id chpid);
|
|
int sclp_chp_deconfigure(struct chp_id chpid);
|
|
int sclp_chp_read_info(struct sclp_chp_info *info);
|
|
void sclp_get_ipl_info(struct sclp_ipl_info *info);
|
|
bool sclp_has_linemode(void);
|
|
bool sclp_has_vt220(void);
|
|
|
|
#endif /* _ASM_S390_SCLP_H */
|