Commit deae6e3a authored Jul 13, 2020 by Matthew Gerlach Committed by Greg Kroah-Hartman Jul 29, 2020

fpga: dfl: fix bug in port reset handshake



[ Upstream commit 8614afd689df59d9ce019439389be20bd788a897 ]

When putting the port in reset, driver must wait for the soft reset
acknowledgment bit instead of the soft reset bit.

Fixes: 47c1b19c (fpga: dfl: afu: add port ops support)
Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Acked-by: Wu Hao <hao.wu@intel.com>
Reviewed-by: Tom Rix <trix@redhat.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 060a740b

drivers/fpga/dfl-afu-main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,8 @@ static int port_disable(struct platform_device *pdev)
		* on this port and minimum soft reset pulse width has elapsed.
		* Driver polls port_soft_reset_ack to determine if reset done by HW.
		*/
		if (readq_poll_timeout(base + PORT_HDR_CTRL, v, v & PORT_CTRL_SFTRST,
		if (readq_poll_timeout(base + PORT_HDR_CTRL, v,
		v & PORT_CTRL_SFTRST_ACK,
		RST_POLL_INVL, RST_POLL_TIMEOUT)) {
		dev_err(&pdev->dev, "timeout, fail to reset device\n");
		return -ETIMEDOUT;