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

Commit 36a288fe authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Michael Ellerman
Browse files

powerpc/vas: Use helper to unpin/close window 



Use a helper to have the hardware unpin and mark a window closed.

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 4963ac36

arch/powerpc/platforms/powernv/vas-window.c

+15 −7
Original line number Diff line number Diff line
@@ -1100,6 +1100,20 @@ static void poll_window_castout(struct vas_window *window) 
	/* stub for now */

}



/*

 * Unpin and close a window so no new requests are accepted and the

 * hardware can evict this window from cache if necessary.

 */

static void unpin_close_window(struct vas_window *window)

{

	u64 val;



	val = read_hvwc_reg(window, VREG(WINCTL));

	val = SET_FIELD(VAS_WINCTL_PIN, val, 0);

	val = SET_FIELD(VAS_WINCTL_OPEN, val, 0);

	write_hvwc_reg(window, VREG(WINCTL), val);

}



/*

 * Close a window.

 *
@@ -1114,8 +1128,6 @@ static void poll_window_castout(struct vas_window *window) 
 */

int vas_win_close(struct vas_window *window)

{

	u64 val;



	if (!window)

		return 0;
@@ -1131,11 +1143,7 @@ int vas_win_close(struct vas_window *window) 


	poll_window_busy_state(window);



	/* Unpin window from cache and close it */

	val = read_hvwc_reg(window, VREG(WINCTL));

	val = SET_FIELD(VAS_WINCTL_PIN, val, 0);

	val = SET_FIELD(VAS_WINCTL_OPEN, val, 0);

	write_hvwc_reg(window, VREG(WINCTL), val);

	unpin_close_window(window);



	poll_window_castout(window);