Commit f060c825 authored Nov 07, 2018 by Anatolij Gustschin Committed by Greg Kroah-Hartman Feb 12, 2019

fpga: altera-cvp: fix 'bad IO access' on x86_64



[ Upstream commit 187fade88ca0ff2df9d360ca751d948d73db7095 ]

If mapping the CvP BAR fails, we still can configure the FPGA via
PCI config space access. In this case the iomap pointer is NULL.
On x86_64, passing NULL address to pci_iounmap() generates
"Bad IO access at port 0x0" output with stack call trace. Fix it.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Acked-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 42e19f56

drivers/fpga/altera-cvp.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -480,6 +480,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
		return 0;

		err_unmap:
		if (conf->map)
		pci_iounmap(pdev, conf->map);
		pci_release_region(pdev, CVP_BAR);
		err_disable:
		@@ -495,6 +496,7 @@ static void altera_cvp_remove(struct pci_dev *pdev)
		u16 cmd;

		fpga_mgr_unregister(mgr);
		if (conf->map)
		pci_iounmap(pdev, conf->map);
		pci_release_region(pdev, CVP_BAR);
		pci_read_config_word(pdev, PCI_COMMAND, &cmd);