Commit 9e9a6151 authored by Mike Looijmans's avatar Mike Looijmans Committed by Greg Kroah-Hartman
Browse files

zynq-fpga: Only route PR via PCAP when required 



The Xilinx Zynq FPGA driver takes ownership of the PR interface, making
it impossible to use the ICAP interface for partial reconfiguration.

This patch changes the driver to only activate PR over PCAP while the
device is actively being accessed by the driver for programming.

This allows both PCAP and ICAP interfaces to be used for PR.

Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: default avatarMoritz Fischer <mdf@kernel.org>
Acked-by: default avatarAlan Tull <atull@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68f60538

drivers/fpga/zynq-fpga.c

+4 −0
Original line number Diff line number Diff line
@@ -501,6 +501,10 @@ static int zynq_fpga_ops_write_complete(struct fpga_manager *mgr, 
	if (err)

		return err;



	/* Release 'PR' control back to the ICAP */

	zynq_fpga_write(priv, CTRL_OFFSET,

		zynq_fpga_read(priv, CTRL_OFFSET) & ~CTRL_PCAP_PR_MASK);



	err = zynq_fpga_poll_timeout(priv, INT_STS_OFFSET, intr_status,

				     intr_status & IXR_PCFG_DONE_MASK,

				     INIT_POLL_DELAY,