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

Commit 8a2ef71b authored by Jens Freimann's avatar Jens Freimann Committed by Christian Borntraeger
Browse files

KVM: s390: factor out get_ilc() function 



Let's make this a reusable function.

Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 44c6ca3d

arch/s390/kvm/interrupt.c

+21 −20
Original line number Original line Diff line number Diff line
@@ -206,11 +206,30 @@ static void __set_intercept_indicator(struct kvm_vcpu *vcpu, 
	}

	}

}

}





static u16 get_ilc(struct kvm_vcpu *vcpu)

{

	const unsigned short table[] = { 2, 4, 4, 6 };



	switch (vcpu->arch.sie_block->icptcode) {

	case ICPT_INST:

	case ICPT_INSTPROGI:

	case ICPT_OPEREXC:

	case ICPT_PARTEXEC:

	case ICPT_IOINST:

		/* last instruction only stored for these icptcodes */

		return table[vcpu->arch.sie_block->ipa >> 14];

	case ICPT_PROGI:

		return vcpu->arch.sie_block->pgmilc;

	default:

		return 0;

	}

}



static int __deliver_prog_irq(struct kvm_vcpu *vcpu,

static int __deliver_prog_irq(struct kvm_vcpu *vcpu,

			      struct kvm_s390_pgm_info *pgm_info)

			      struct kvm_s390_pgm_info *pgm_info)

{

{

	const unsigned short table[] = { 2, 4, 4, 6 };

	int rc = 0;

	int rc = 0;

	u16 ilc = get_ilc(vcpu);





	switch (pgm_info->code & ~PGM_PER) {

	switch (pgm_info->code & ~PGM_PER) {

	case PGM_AFX_TRANSLATION:

	case PGM_AFX_TRANSLATION:
@@ -277,25 +296,7 @@ static int __deliver_prog_irq(struct kvm_vcpu *vcpu, 
				   (u8 *) __LC_PER_ACCESS_ID);

				   (u8 *) __LC_PER_ACCESS_ID);

	}

	}





	switch (vcpu->arch.sie_block->icptcode) {

	rc |= put_guest_lc(vcpu, ilc, (u16 *) __LC_PGM_ILC);

	case ICPT_INST:

	case ICPT_INSTPROGI:

	case ICPT_OPEREXC:

	case ICPT_PARTEXEC:

	case ICPT_IOINST:

		/* last instruction only stored for these icptcodes */

		rc |= put_guest_lc(vcpu, table[vcpu->arch.sie_block->ipa >> 14],

				   (u16 *) __LC_PGM_ILC);

		break;

	case ICPT_PROGI:

		rc |= put_guest_lc(vcpu, vcpu->arch.sie_block->pgmilc,

				   (u16 *) __LC_PGM_ILC);

		break;

	default:

		rc |= put_guest_lc(vcpu, 0,

				   (u16 *) __LC_PGM_ILC);

	}



	rc |= put_guest_lc(vcpu, pgm_info->code,

	rc |= put_guest_lc(vcpu, pgm_info->code,

			   (u16 *)__LC_PGM_INT_CODE);

			   (u16 *)__LC_PGM_INT_CODE);

	rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,

	rc |= write_guest_lc(vcpu, __LC_PGM_OLD_PSW,