Commit c127d130 authored by Haren Myneni's avatar Haren Myneni Committed by Michael Ellerman
Browse files

powerpc/powernv/vas: Assign real address to rx_fifo in vas_rx_win_attr 



In init_winctx_regs(), __pa() is called on winctx->rx_fifo and this
function is called to initialize registers for receive and fault
windows. But the real address is passed in winctx->rx_fifo for
receive windows and the virtual address for fault windows which
causes errors with DEBUG_VIRTUAL enabled. Fixes this issue by
assigning only real address to rx_fifo in vas_rx_win_attr struct
for both receive and fault windows.

Reported-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarHaren Myneni <haren@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/338e958c7ab8f3b266fa794a1f80f99b9671829e.camel@linux.ibm.com
parent 6bdc81ec

arch/powerpc/include/asm/vas.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static inline void vas_user_win_add_mm_context(struct vas_user_win_ref *ref) 
 * Receive window attributes specified by the (in-kernel) owner of window.

 */

struct vas_rx_win_attr {

	void *rx_fifo;

	u64 rx_fifo;

	int rx_fifo_size;

	int wcreds_max;

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

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int vas_setup_fault_window(struct vas_instance *vinst) 
	vas_init_rx_win_attr(&attr, VAS_COP_TYPE_FAULT);



	attr.rx_fifo_size = vinst->fault_fifo_size;

	attr.rx_fifo = vinst->fault_fifo;

	attr.rx_fifo = __pa(vinst->fault_fifo);



	/*

	 * Max creds is based on number of CRBs can fit in the FIFO.

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

+2 −2
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void init_winctx_regs(struct pnv_vas_window *window, 
	 *

	 * See also: Design note in function header.

	 */

	val = __pa(winctx->rx_fifo);

	val = winctx->rx_fifo;

	val = SET_FIELD(VAS_PAGE_MIGRATION_SELECT, val, 0);

	write_hvwc_reg(window, VREG(LFIFO_BAR), val);
@@ -739,7 +739,7 @@ static void init_winctx_for_rxwin(struct pnv_vas_window *rxwin, 
		 */

		winctx->fifo_disable = true;

		winctx->intr_disable = true;

		winctx->rx_fifo = NULL;

		winctx->rx_fifo = 0;

	}



	winctx->lnotify_lpid = rxattr->lnotify_lpid;

arch/powerpc/platforms/powernv/vas.h

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ struct pnv_vas_window { 
 * is a container for the register fields in the window context.

 */

struct vas_winctx {

	void *rx_fifo;

	u64 rx_fifo;

	int rx_fifo_size;

	int wcreds_max;

	int rsvd_txbuf_count;

drivers/crypto/nx/nx-common-powernv.c

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ static int __init vas_cfg_coproc_info(struct device_node *dn, int chip_id, 
		goto err_out;



	vas_init_rx_win_attr(&rxattr, coproc->ct);

	rxattr.rx_fifo = (void *)rx_fifo;

	rxattr.rx_fifo = rx_fifo;

	rxattr.rx_fifo_size = fifo_size;

	rxattr.lnotify_lpid = lpid;

	rxattr.lnotify_pid = pid;