* [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64
@ 2018-10-29 16:08 Anatolij Gustschin
2018-11-01 20:00 ` Alan Tull
2018-11-02 21:02 ` Moritz Fischer
0 siblings, 2 replies; 3+ messages in thread
From: Anatolij Gustschin @ 2018-10-29 16:08 UTC (permalink / raw)
To: linux-fpga; +Cc: atull, mdf
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>
---
drivers/fpga/altera-cvp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index 610a1558e0ed..144fa2a4d4cc 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -477,7 +477,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,
return 0;
err_unmap:
- pci_iounmap(pdev, conf->map);
+ if (conf->map)
+ pci_iounmap(pdev, conf->map);
pci_release_region(pdev, CVP_BAR);
err_disable:
cmd &= ~PCI_COMMAND_MEMORY;
@@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)
driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
fpga_mgr_unregister(mgr);
- pci_iounmap(pdev, conf->map);
+ if (conf->map)
+ pci_iounmap(pdev, conf->map);
pci_release_region(pdev, CVP_BAR);
pci_read_config_word(pdev, PCI_COMMAND, &cmd);
cmd &= ~PCI_COMMAND_MEMORY;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64
2018-10-29 16:08 [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64 Anatolij Gustschin
@ 2018-11-01 20:00 ` Alan Tull
2018-11-02 21:02 ` Moritz Fischer
1 sibling, 0 replies; 3+ messages in thread
From: Alan Tull @ 2018-11-01 20:00 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fpga, Moritz Fischer
On Mon, Oct 29, 2018 at 11:08 AM Anatolij Gustschin <agust@denx.de> wrote:
Hi Anatolij,
>
> 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>
Thanks for fixing this!
Alan
> ---
> drivers/fpga/altera-cvp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> index 610a1558e0ed..144fa2a4d4cc 100644
> --- a/drivers/fpga/altera-cvp.c
> +++ b/drivers/fpga/altera-cvp.c
> @@ -477,7 +477,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> return 0;
>
> err_unmap:
> - pci_iounmap(pdev, conf->map);
> + if (conf->map)
> + pci_iounmap(pdev, conf->map);
> pci_release_region(pdev, CVP_BAR);
> err_disable:
> cmd &= ~PCI_COMMAND_MEMORY;
> @@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)
>
> driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
> fpga_mgr_unregister(mgr);
> - pci_iounmap(pdev, conf->map);
> + if (conf->map)
> + pci_iounmap(pdev, conf->map);
> pci_release_region(pdev, CVP_BAR);
> pci_read_config_word(pdev, PCI_COMMAND, &cmd);
> cmd &= ~PCI_COMMAND_MEMORY;
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64
2018-10-29 16:08 [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64 Anatolij Gustschin
2018-11-01 20:00 ` Alan Tull
@ 2018-11-02 21:02 ` Moritz Fischer
1 sibling, 0 replies; 3+ messages in thread
From: Moritz Fischer @ 2018-11-02 21:02 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fpga, atull, mdf
Hi Anatolij,
On Mon, Oct 29, 2018 at 05:08:14PM +0100, Anatolij Gustschin wrote:
> 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: Moritz Fischer <mdf@kernel.org>
> ---
> drivers/fpga/altera-cvp.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> index 610a1558e0ed..144fa2a4d4cc 100644
> --- a/drivers/fpga/altera-cvp.c
> +++ b/drivers/fpga/altera-cvp.c
> @@ -477,7 +477,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> return 0;
>
> err_unmap:
> - pci_iounmap(pdev, conf->map);
> + if (conf->map)
> + pci_iounmap(pdev, conf->map);
> pci_release_region(pdev, CVP_BAR);
> err_disable:
> cmd &= ~PCI_COMMAND_MEMORY;
> @@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)
>
> driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
> fpga_mgr_unregister(mgr);
> - pci_iounmap(pdev, conf->map);
> + if (conf->map)
> + pci_iounmap(pdev, conf->map);
> pci_release_region(pdev, CVP_BAR);
> pci_read_config_word(pdev, PCI_COMMAND, &cmd);
> cmd &= ~PCI_COMMAND_MEMORY;
> --
> 2.17.1
>
Thanks for the patch,
Moritz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-02 21:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-29 16:08 [PATCH] fpga: altera-cvp: fix 'bad IO access' on x86_64 Anatolij Gustschin
2018-11-01 20:00 ` Alan Tull
2018-11-02 21:02 ` Moritz Fischer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.