Merge tag 'fpga-late-fixes-for-5.8' of... (120c8a49) · Commits · 戴 / test

Merge tag 'fpga-late-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga into char-misc-linus Moritz writes: FPGA manager fixes for 5.8 Here are two (late) dfl fixes for the the 5.8 release. Matthew's fix addresses an issue in the reset of a port. Xu'x fix addresses a linter warning. All patches have been reviewed on the mailing list, and have been in the last few linux-next releases (as part of my fixes branch) without issues. Signed-off-by:

Moritz Fischer <mdf@kernel.org> * tag 'fpga-late-fixes-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga: fpga: dfl: fix bug in port reset handshake fpga: dfl: pci: reduce the scope of variable 'ret'

drivers/fpga/dfl-afu-main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,8 @@ int __afu_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;

drivers/fpga/dfl-pci.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,6 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)
		{
		struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
		struct dfl_fpga_cdev *cdev = drvdata->cdev;
		int ret = 0;

		if (!num_vfs) {
		/*
		@@ -239,6 +238,8 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)
		dfl_fpga_cdev_config_ports_pf(cdev);

		} else {
		int ret;

		/*
		* before enable SRIOV, put released ports into VF access mode
		* first of all.

Admin message