MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-19 07:39:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: endpoint: Fix error handling in epf_ntb_epc_cleanup()

Browse Source 
[ Upstream commit 6bba3c0ac5 ]

There are two issues related to epf_ntb_epc_cleanup():

  1) It should call epf_ntb_config_sspad_bar_clear()
  2) The epf_ntb_bind() function should call epf_ntb_epc_cleanup()
     to cleanup.

I also changed the ordering a bit.  Unwinding should be done in the
mirror order from how they are allocated.

Fixes: e35f56bb03 ("PCI: endpoint: Support NTB transfer between RC and EP")
Link: https://lore.kernel.org/linux-pci/aaffbe8d-7094-4083-8146-185f4a84e8a1@moroto.mountain
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter 2024-06-10 12:33:49 +03:00 committed by Greg Kroah-Hartman
parent 0e27e2e869
commit 3750e92ccc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/endpoint/functions/pci-epf-vntb.c
View File

@ -810,8 +810,9 @@ err_config_interrupt:
*/ */
static void epf_ntb_epc_cleanup(struct epf_ntb *ntb) static void epf_ntb_epc_cleanup(struct epf_ntb *ntb)
{ {
epf_ntb_db_bar_clear(ntb);
epf_ntb_mw_bar_clear(ntb, ntb->num_mws); epf_ntb_mw_bar_clear(ntb, ntb->num_mws);
epf_ntb_db_bar_clear(ntb);
epf_ntb_config_sspad_bar_clear(ntb);
} }
#define EPF_NTB_R(_name) \ #define EPF_NTB_R(_name) \
@ -1351,7 +1352,7 @@ static int epf_ntb_bind(struct pci_epf *epf)
ret = pci_register_driver(&vntb_pci_driver); ret = pci_register_driver(&vntb_pci_driver);
if (ret) { if (ret) {
dev_err(dev, "failure register vntb pci driver\n"); dev_err(dev, "failure register vntb pci driver\n");
goto err_bar_alloc; goto err_epc_cleanup;
} }
ret = vpci_scan_bus(ntb); ret = vpci_scan_bus(ntb);
@ -1362,6 +1363,8 @@ static int epf_ntb_bind(struct pci_epf *epf)
err_unregister: err_unregister:
pci_unregister_driver(&vntb_pci_driver); pci_unregister_driver(&vntb_pci_driver);
err_epc_cleanup:
epf_ntb_epc_cleanup(ntb);
err_bar_alloc: err_bar_alloc:
epf_ntb_config_spad_bar_free(ntb); epf_ntb_config_spad_bar_free(ntb);