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

Commit 4f053d06 authored by Balbir Singh's avatar Balbir Singh Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S: Remove duplicate setting of the B field in tlbie 



Remove duplicate setting of the the "B" field when doing a tlbie(l).
In compute_tlbie_rb(), the "B" field is set again just before
returning the rb value to be used for tlbie(l).

Signed-off-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent ac0e89bb

arch/powerpc/include/asm/kvm_book3s_64.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -125,7 +125,6 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
	/* This covers 14..54 bits of va*/

	/* This covers 14..54 bits of va*/

	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	rb = (v & ~0x7fUL) << 16;		/* AVA field */





	rb |= (v >> HPTE_V_SSIZE_SHIFT) << 8;	/*  B field */

	/*

	/*

	 * AVA in v had cleared lower 23 bits. We need to derive

	 * AVA in v had cleared lower 23 bits. We need to derive

	 * that from pteg index

	 * that from pteg index
@@ -177,7 +176,7 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
		break;

		break;

	}

	}

	}

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	rb |= (v >> HPTE_V_SSIZE_SHIFT) << 8;	/* B field */

	return rb;

	return rb;

}

}