github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PCI: altera: Fix resource leaks on probe failure

Browse Source 
The chained IRQ handler is set during probe, but is only removed during the
driver remove(). If pci_host_probe() fails, the handler and INTx IRQ
domain remain set even though the devm-managed host bridge storage
containing struct altera_pcie will be released, leaving the handler with
a stale data pointer.

Interrupts are also enabled before pci_host_probe() is called. If probe
fails after that point, the controller interrupt source should be disabled
before the chained handler and INTx domain are removed.

So set the chained handler only after the INTx domain has been created.
Disable controller interrupts during IRQ teardown, and tear the IRQ setup
down if pci_host_probe() fails.

Fixes: c63aed7334 ("PCI: altera: Use pci_host_probe() to register host")
Signed-off-by: Mahesh Vaidya <mahesh.vaidya@altera.com>
[mani: commit log]
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Subhransu S. Prusty <subhransu.sekhar.prusty@altera.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260430204330.3121003-3-mahesh.vaidya@altera.com
This commit is contained in:
Mahesh Vaidya 2026-04-30 13:43:30 -07:00 committed by Manivannan Sadhasivam
parent 5ef4bac021
commit 7a94138cae
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/pci/controller/pcie-altera.c
View File

@ -864,8 +864,23 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
return 0;
}
static void altera_pcie_disable_irq(struct altera_pcie *pcie)
{
if (pcie->pcie_data->version == ALTERA_PCIE_V1 ||
pcie->pcie_data->version == ALTERA_PCIE_V2) {
/* Disable all P2A interrupts */
cra_writel(pcie, 0, P2A_INT_ENABLE);
} else if (pcie->pcie_data->version == ALTERA_PCIE_V3) {
/* Disable port-level interrupts (CFG_AER, etc.) */
writel(0, pcie->hip_base +
pcie->pcie_data->port_conf_offset +
pcie->pcie_data->port_irq_enable_offset);
}
}
static void altera_pcie_irq_teardown(struct altera_pcie *pcie)
{
altera_pcie_disable_irq(pcie);
irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
irq_domain_remove(pcie->irq_domain);
}
@ -890,7 +905,6 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)
if (pcie->irq < 0)
return pcie->irq;
irq_set_chained_handler_and_data(pcie->irq, pcie->pcie_data->ops->rp_isr, pcie);
return 0;
}
@ -1019,6 +1033,14 @@ static int altera_pcie_probe(struct platform_device *pdev)
return ret;
}
/*
* The chained handler uses pcie->irq_domain, so set it only after the
* INTx domain has been created.
*/
irq_set_chained_handler_and_data(pcie->irq,
pcie->pcie_data->ops->rp_isr,
pcie);
if (pcie->pcie_data->version == ALTERA_PCIE_V1 ||
pcie->pcie_data->version == ALTERA_PCIE_V2) {
/* clear all interrupts */
@ -1036,7 +1058,16 @@ static int altera_pcie_probe(struct platform_device *pdev)
bridge->busnr = pcie->root_bus_nr;
bridge->ops = &altera_pcie_ops;
return pci_host_probe(bridge);
ret = pci_host_probe(bridge);
if (ret)
goto err_teardown_irq;
return 0;
err_teardown_irq:
altera_pcie_irq_teardown(pcie);
return ret;
}
static void altera_pcie_remove(struct platform_device *pdev)