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

Commit c1c88e2f authored by Alexander Graf's avatar Alexander Graf Committed by Avi Kivity
Browse files

KVM: PPC: Move BAT handling code into spr handler 



The current approach duplicates the spr->bat finding logic and makes it harder
to reuse the actually used variables. So let's move everything down to the spr
handler.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 7508e16c

arch/powerpc/kvm/book3s_emulate.c

+16 −32
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat, bool upper, 
	}

}



static u32 kvmppc_read_bat(struct kvm_vcpu *vcpu, int sprn)

static struct kvmppc_bat *kvmppc_find_bat(struct kvm_vcpu *vcpu, int sprn)

{

	struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);

	struct kvmppc_bat *bat;
@@ -286,35 +286,7 @@ static u32 kvmppc_read_bat(struct kvm_vcpu *vcpu, int sprn) 
		BUG();

	}



	if (sprn % 2)

		return bat->raw >> 32;

	else

		return bat->raw;

}



static void kvmppc_write_bat(struct kvm_vcpu *vcpu, int sprn, u32 val)

{

	struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);

	struct kvmppc_bat *bat;



	switch (sprn) {

	case SPRN_IBAT0U ... SPRN_IBAT3L:

		bat = &vcpu_book3s->ibat[(sprn - SPRN_IBAT0U) / 2];

		break;

	case SPRN_IBAT4U ... SPRN_IBAT7L:

		bat = &vcpu_book3s->ibat[4 + ((sprn - SPRN_IBAT4U) / 2)];

		break;

	case SPRN_DBAT0U ... SPRN_DBAT3L:

		bat = &vcpu_book3s->dbat[(sprn - SPRN_DBAT0U) / 2];

		break;

	case SPRN_DBAT4U ... SPRN_DBAT7L:

		bat = &vcpu_book3s->dbat[4 + ((sprn - SPRN_DBAT4U) / 2)];

		break;

	default:

		BUG();

	}



	kvmppc_set_bat(vcpu, bat, !(sprn % 2), val);

	return bat;

}



int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
@@ -339,12 +311,16 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs) 
	case SPRN_IBAT4U ... SPRN_IBAT7L:

	case SPRN_DBAT0U ... SPRN_DBAT3L:

	case SPRN_DBAT4U ... SPRN_DBAT7L:

		kvmppc_write_bat(vcpu, sprn, (u32)spr_val);

	{

		struct kvmppc_bat *bat = kvmppc_find_bat(vcpu, sprn);



		kvmppc_set_bat(vcpu, bat, !(sprn % 2), (u32)spr_val);

		/* BAT writes happen so rarely that we're ok to flush

		 * everything here */

		kvmppc_mmu_pte_flush(vcpu, 0, 0);

		kvmppc_mmu_flush_segments(vcpu);

		break;

	}

	case SPRN_HID0:

		to_book3s(vcpu)->hid[0] = spr_val;

		break;
@@ -434,8 +410,16 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
	case SPRN_IBAT4U ... SPRN_IBAT7L:

	case SPRN_DBAT0U ... SPRN_DBAT3L:

	case SPRN_DBAT4U ... SPRN_DBAT7L:

		kvmppc_set_gpr(vcpu, rt, kvmppc_read_bat(vcpu, sprn));

	{

		struct kvmppc_bat *bat = kvmppc_find_bat(vcpu, sprn);



		if (sprn % 2)

			kvmppc_set_gpr(vcpu, rt, bat->raw >> 32);

		else

			kvmppc_set_gpr(vcpu, rt, bat->raw);



		break;

	}

	case SPRN_SDR1:

		kvmppc_set_gpr(vcpu, rt, to_book3s(vcpu)->sdr1);

		break;