Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a8bea3 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-4.18-1' of... 

Merge tag 'kvm-s390-next-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Cleanups for 4.18

- cleanups for nested, clock handling, crypto, storage keys and
control register bits
parents 5eec43a1 2c8180e8

arch/s390/include/asm/ctl_reg.h

+12 −0
Original line number Diff line number Diff line
@@ -10,8 +10,20 @@ 


#include <linux/const.h>



#define CR0_CLOCK_COMPARATOR_SIGN	_BITUL(63 - 10)

#define CR0_EMERGENCY_SIGNAL_SUBMASK	_BITUL(63 - 49)

#define CR0_EXTERNAL_CALL_SUBMASK	_BITUL(63 - 50)

#define CR0_CLOCK_COMPARATOR_SUBMASK	_BITUL(63 - 52)

#define CR0_CPU_TIMER_SUBMASK		_BITUL(63 - 53)

#define CR0_SERVICE_SIGNAL_SUBMASK	_BITUL(63 - 54)

#define CR0_UNUSED_56			_BITUL(63 - 56)

#define CR0_INTERRUPT_KEY_SUBMASK	_BITUL(63 - 57)

#define CR0_MEASUREMENT_ALERT_SUBMASK	_BITUL(63 - 58)



#define CR2_GUARDED_STORAGE		_BITUL(63 - 59)



#define CR14_UNUSED_32			_BITUL(63 - 32)

#define CR14_UNUSED_33			_BITUL(63 - 33)

#define CR14_CHANNEL_REPORT_SUBMASK	_BITUL(63 - 35)

#define CR14_RECOVERY_SUBMASK		_BITUL(63 - 36)

#define CR14_DEGRADATION_SUBMASK	_BITUL(63 - 37)

arch/s390/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ struct kvm_arch{ 
	int use_irqchip;

	int use_cmma;

	int use_pfmfi;

	int use_skf;

	int user_cpu_state_ctrl;

	int user_sigp;

	int user_stsi;

arch/s390/include/asm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ typedef struct { 
	/* The mmu context uses extended page tables. */

	unsigned int has_pgste:1;

	/* The mmu context uses storage keys. */

	unsigned int use_skey:1;

	unsigned int uses_skeys:1;

	/* The mmu context uses CMM. */

	unsigned int uses_cmm:1;

} mm_context_t;

arch/s390/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline int init_new_context(struct task_struct *tsk, 
		test_thread_flag(TIF_PGSTE) ||

		(current->mm && current->mm->context.alloc_pgste);

	mm->context.has_pgste = 0;

	mm->context.use_skey = 0;

	mm->context.uses_skeys = 0;

	mm->context.uses_cmm = 0;

#endif

	switch (mm->context.asce_limit) {

arch/s390/include/asm/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -507,10 +507,10 @@ static inline int mm_alloc_pgste(struct mm_struct *mm) 
 * faults should no longer be backed by zero pages

 */

#define mm_forbids_zeropage mm_has_pgste

static inline int mm_use_skey(struct mm_struct *mm)

static inline int mm_uses_skeys(struct mm_struct *mm)

{

#ifdef CONFIG_PGSTE

	if (mm->context.use_skey)

	if (mm->context.uses_skeys)

		return 1;

#endif

	return 0;