lkml.org 
[lkml]   [2019]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 046/118] PCI: dwc: Free MSI IRQ page in dw_pcie_free_msi()
    Date
    [ Upstream commit dc69a3d567941784c3d00e1d0834582b42b0b3e7 ]

    To avoid a memory leak, free the page allocated for MSI IRQ in
    dw_pcie_free_msi().

    Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/dwc/pcie-designware-host.c | 12 ++++++++----
    drivers/pci/controller/dwc/pcie-designware.h | 1 +
    2 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
    index 4eedb2c54ab3..acd50920c2ff 100644
    --- a/drivers/pci/controller/dwc/pcie-designware-host.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
    @@ -303,20 +303,24 @@ void dw_pcie_free_msi(struct pcie_port *pp)

    irq_domain_remove(pp->msi_domain);
    irq_domain_remove(pp->irq_domain);
    +
    + if (pp->msi_page)
    + __free_page(pp->msi_page);
    }

    void dw_pcie_msi_init(struct pcie_port *pp)
    {
    struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
    struct device *dev = pci->dev;
    - struct page *page;
    u64 msi_target;

    - page = alloc_page(GFP_KERNEL);
    - pp->msi_data = dma_map_page(dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);
    + pp->msi_page = alloc_page(GFP_KERNEL);
    + pp->msi_data = dma_map_page(dev, pp->msi_page, 0, PAGE_SIZE,
    + DMA_FROM_DEVICE);
    if (dma_mapping_error(dev, pp->msi_data)) {
    dev_err(dev, "Failed to map MSI data\n");
    - __free_page(page);
    + __free_page(pp->msi_page);
    + pp->msi_page = NULL;
    return;
    }
    msi_target = (u64)pp->msi_data;
    diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
    index 9f1a5e399b70..14dcf6646699 100644
    --- a/drivers/pci/controller/dwc/pcie-designware.h
    +++ b/drivers/pci/controller/dwc/pcie-designware.h
    @@ -164,6 +164,7 @@ struct pcie_port {
    struct irq_domain *irq_domain;
    struct irq_domain *msi_domain;
    dma_addr_t msi_data;
    + struct page *msi_page;
    u32 num_vectors;
    u32 irq_status[MAX_MSI_CTRLS];
    raw_spinlock_t lock;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-06-13 18:19    [W:4.158 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site