Skip to contentSkip to conversation

PCI: tegra: Use the DMA-API to get the MSI address

PATCH Superseded Vidya Sagar 4 participants 8 messages Mar 19, 2019 – Apr 16, 2019 1 message not in the archive

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 PCI: tegra: Use the DMA-API to get the MSI address

Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

---
v2:
* changed 'phys' type to 'dma_addr_t' from 'u64'
* added a comment on why DMA mask is set to 32-bit
* replaced 'dma' with 'DMA'

 drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-tegra.c +26 -9
index f4f53d092e00..f8173a5e352d 100644
@@ -231,9 +231,9 @@ struct tegra_msi {
 	struct msi_controller chip;
 	DECLARE_BITMAP(used, INT_PCI_MSI_NR);
 	struct irq_domain *domain;
-	unsigned long pages;
 	struct mutex lock;
-	u64 phys;
+	void *virt;
+	dma_addr_t phys;
 	int irq;
 };
 
@@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
 	err = platform_get_irq_byname(pdev, "msi");
 	if (err < 0) {
 		dev_err(dev, "failed to get IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
 	}
 
 	msi->irq = err;
@@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
 			  tegra_msi_irq_chip.name, pcie);
 	if (err < 0) {
 		dev_err(dev, "failed to request IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
+	}
+
+	/* Though the PCIe controller can address >32-bit address space, to
+	 * facilitate endpoints that support only 32-bit MSI target address,
+	 * the mask is set to 32-bit to make sure that MSI target address is
+	 * always a 32-bit address
+	 */
+	err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+	if (err < 0) {
+		dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
+		goto free_irq;
+	}
+
+	msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
+	if (!msi->virt) {
+		dev_err(dev, "failed to allocate DMA memory for MSI\n");
+		err = -ENOMEM;
+		goto free_irq;
 	}
 
-	/* setup AFI/FPCI range */
-	msi->pages = __get_free_pages(GFP_KERNEL, 0);
-	msi->phys = virt_to_phys((void *)msi->pages);
 	host->msi = &msi->chip;
 
 	return 0;
 
-err:
+free_irq:
+	free_irq(msi->irq, pcie);
+free_irq_domain:
 	irq_domain_remove(msi->domain);
 	return err;
 }
@@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
 	struct tegra_msi *msi = &pcie->msi;
 	unsigned int i, irq;
 
-	free_pages(msi->pages, 0);
+	dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);
 
 	if (msi->irq > 0)
 		free_irq(msi->irq, pcie);
Signature · 1 line
2.7.4
#1 lore raw

Hi Bjorn/Lorenzo,
Can you please review this patch?
Thierry has reviewed it and I already took care of his comments.

Thanks,
Vidya Sagar

Quoted 99 lines · Vidya Sagar

Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

---
v2:
* changed 'phys' type to 'dma_addr_t' from 'u64'
* added a comment on why DMA mask is set to 32-bit
* replaced 'dma' with 'DMA'

 drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-tegra.c +26 -10
index f4f53d092e00..f8173a5e352d 100644
@@ -231,9 +231,9 @@ struct tegra_msi {
        struct msi_controller chip;
        DECLARE_BITMAP(used, INT_PCI_MSI_NR);
        struct irq_domain *domain;
-       unsigned long pages;
        struct mutex lock;
-       u64 phys;
+       void *virt;
+       dma_addr_t phys;
        int irq;
 };
 
@@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
        err = platform_get_irq_byname(pdev, "msi");
        if (err < 0) {
                dev_err(dev, "failed to get IRQ: %d\n", err);
-               goto err;
+               goto free_irq_domain;
        }
 
        msi->irq = err;
@@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
                          tegra_msi_irq_chip.name, pcie);
        if (err < 0) {
                dev_err(dev, "failed to request IRQ: %d\n", err);
-               goto err;
+               goto free_irq_domain;
+       }
+
+       /* Though the PCIe controller can address >32-bit address space, to
+        * facilitate endpoints that support only 32-bit MSI target address,
+        * the mask is set to 32-bit to make sure that MSI target address is
+        * always a 32-bit address
+        */
+       err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+       if (err < 0) {
+               dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
+               goto free_irq;
+       }
+
+       msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
+       if (!msi->virt) {
+               dev_err(dev, "failed to allocate DMA memory for MSI\n");
+               err = -ENOMEM;
+               goto free_irq;
        }
 
-       /* setup AFI/FPCI range */
-       msi->pages = __get_free_pages(GFP_KERNEL, 0);
-       msi->phys = virt_to_phys((void *)msi->pages);
        host->msi = &msi->chip;
 
        return 0;
 
-err:
+free_irq:
+       free_irq(msi->irq, pcie);
+free_irq_domain:
        irq_domain_remove(msi->domain);
        return err;
 }
@@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
        struct tegra_msi *msi = &pcie->msi;
        unsigned int i, irq;
 
-       free_pages(msi->pages, 0);
+       dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);
 
        if (msi->irq > 0)
                free_irq(msi->irq, pcie);
--

2.7.4

A message that is not in the archive (sent off-list or not yet received): CAN7O0+LG8vbB+hApe2tz2LLE_a9XF1iPfD7tKY6=MmhqgoJm8w@mail.gmail.com

#3 lore raw

Hi Bjorn / Lorenzo,
Can you please review this patch?

Thanks,
Vidya Sagar

Quoted 107 lines · vidya sagar

Hi Bjorn/Lorenzo,
Can you please review this patch?
Thierry has reviewed it and I already took care of his comments.

Thanks,
Vidya Sagar

On Tue, Mar 19, 2019 at 7:33 PM Vidya Sagar <[email protected] <mailto:[email protected]>> wrote:

    Since the upstream MSI memory writes are generated by downstream devices,
    it is logically correct to have MSI target memory coming from the DMA pool
    reserved for PCIe than from the general memory pool reserved for CPU
    access. This avoids PCIe DMA addresses coinciding with MSI target address
    thereby raising unwanted MSI interrupts. This patch also enforces to limit
    the MSI target address to 32-bits to make it work for PCIe endponits that
    support only 32-bit MSI target address and those endpoints that support
    64-bit MSI target address anyway work with 32-bit MSI target address.

    Signed-off-by: Vidya Sagar <[email protected] <mailto:[email protected]>>
    Reviewed-by: Thierry Reding <[email protected] <mailto:[email protected]>>
    Acked-by: Thierry Reding <[email protected] <mailto:[email protected]>>
    ---
    v2:
    * changed 'phys' type to 'dma_addr_t' from 'u64'
    * added a comment on why DMA mask is set to 32-bit
    * replaced 'dma' with 'DMA'

      drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------
      1 file changed, 26 insertions(+), 9 deletions(-)

    diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
    index f4f53d092e00..f8173a5e352d 100644
    --- a/drivers/pci/controller/pci-tegra.c
    +++ b/drivers/pci/controller/pci-tegra.c
    @@ -231,9 +231,9 @@ struct tegra_msi {
             struct msi_controller chip;
             DECLARE_BITMAP(used, INT_PCI_MSI_NR);
             struct irq_domain *domain;
    -       unsigned long pages;
             struct mutex lock;
    -       u64 phys;
    +       void *virt;
    +       dma_addr_t phys;
             int irq;
      };

    @@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
             err = platform_get_irq_byname(pdev, "msi");
             if (err < 0) {
                     dev_err(dev, "failed to get IRQ: %d\n", err);
    -               goto err;
    +               goto free_irq_domain;
             }

             msi->irq = err;
    @@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
    tegra_msi_irq_chip.name <http://tegra_msi_irq_chip.name>, pcie);
             if (err < 0) {
                     dev_err(dev, "failed to request IRQ: %d\n", err);
    -               goto err;
    +               goto free_irq_domain;
    +       }
    +
    +       /* Though the PCIe controller can address >32-bit address space, to
    +        * facilitate endpoints that support only 32-bit MSI target address,
    +        * the mask is set to 32-bit to make sure that MSI target address is
    +        * always a 32-bit address
    +        */
    +       err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
    +       if (err < 0) {
    +               dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
    +               goto free_irq;
    +       }
    +
    +       msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
    +       if (!msi->virt) {
    +               dev_err(dev, "failed to allocate DMA memory for MSI\n");
    +               err = -ENOMEM;
    +               goto free_irq;
             }

    -       /* setup AFI/FPCI range */
    -       msi->pages = __get_free_pages(GFP_KERNEL, 0);
    -       msi->phys = virt_to_phys((void *)msi->pages);
             host->msi = &msi->chip;

             return 0;

    -err:
    +free_irq:
    +       free_irq(msi->irq, pcie);
    +free_irq_domain:
             irq_domain_remove(msi->domain);
             return err;
      }
    @@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
             struct tegra_msi *msi = &pcie->msi;
             unsigned int i, irq;

    -       free_pages(msi->pages, 0);
    +       dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);

             if (msi->irq > 0)
                     free_irq(msi->irq, pcie);
    -- 
    2.7.4
#4 lore raw

On 4/1/2019 11:13 AM, Vidya Sagar wrote:

Hi Bjorn / Lorenzo,
Apologies for reminding you again. Could you please review this patch?

Thanks,
Vidya Sagar

Quoted 114 lines

Hi Bjorn / Lorenzo,
Can you please review this patch?

Thanks,
Vidya Sagar

Quoted 106 lines · vidya sagar

Hi Bjorn/Lorenzo,
Can you please review this patch?
Thierry has reviewed it and I already took care of his comments.

Thanks,
Vidya Sagar

On Tue, Mar 19, 2019 at 7:33 PM Vidya Sagar <[email protected] <mailto:[email protected]>> wrote:

    Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

Signed-off-by Vidya Sagar <[email protected] <mailto:[email protected]>>
Reviewed-by Thierry Reding <[email protected] <mailto:[email protected]>>
Acked-by Thierry Reding <[email protected] <mailto:[email protected]>>

    ---
    v2:
    * changed 'phys' type to 'dma_addr_t' from 'u64'
    * added a comment on why DMA mask is set to 32-bit
    * replaced 'dma' with 'DMA'

      drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------

      1 file changed, 26 insertions(+), 9 deletions(-)

    diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c index f4f53d092e00..f8173a5e352d 100644
    --- a/drivers/pci/controller/pci-tegra.c
    +++ b/drivers/pci/controller/pci-tegra.c
    @@ -231,9 +231,9 @@ struct tegra_msi {
             struct msi_controller chip;
             DECLARE_BITMAP(used, INT_PCI_MSI_NR);
             struct irq_domain *domain;
    -       unsigned long pages;
             struct mutex lock;
    -       u64 phys;
    +       void *virt;
    +       dma_addr_t phys;
             int irq;
      };

    @@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie) err = platform_get_irq_byname(pdev, "msi");
             if (err < 0) {
                     dev_err(dev, "failed to get IRQ: %d\n", err);
    -               goto err;
    +               goto free_irq_domain;
             }

             msi->irq = err;
    @@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie) tegra_msi_irq_chip.name <http://tegra_msi_irq_chip.name>, pcie); if (err < 0) {
                     dev_err(dev, "failed to request IRQ: %d\n", err); -               goto err;
    +               goto free_irq_domain;
    +       }
    +
    +       /* Though the PCIe controller can address >32-bit address space, to +        * facilitate endpoints that support only 32-bit MSI target address, +        * the mask is set to 32-bit to make sure that MSI target address is +        * always a 32-bit address
    +        */
    +       err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
    +       if (err < 0) {
    +               dev_err(dev, "failed to set DMA coherent mask: %d\n", err); +               goto free_irq;
    +       }
    +
    +       msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL); +       if (!msi->virt) {
    +               dev_err(dev, "failed to allocate DMA memory for MSI\n"); +               err = -ENOMEM;
    +               goto free_irq;
             }

    -       /* setup AFI/FPCI range */
    -       msi->pages = __get_free_pages(GFP_KERNEL, 0); -       msi->phys = virt_to_phys((void *)msi->pages); host->msi = &msi->chip;

             return 0;

    -err:
    +free_irq:
    +       free_irq(msi->irq, pcie);
    +free_irq_domain:
             irq_domain_remove(msi->domain);
             return err;
      }
    @@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie) struct tegra_msi *msi = &pcie->msi;
             unsigned int i, irq;

    -       free_pages(msi->pages, 0);
    +       dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);

             if (msi->irq > 0)
                     free_irq(msi->irq, pcie);
    --     2.7.4

#5 lore raw
Quoted 4 lines · Vidya Sagar

On 4/1/2019 11:13 AM, Vidya Sagar wrote:

Hi Bjorn / Lorenzo,
Apologies for reminding you again. Could you please review this patch?

It is in the patchwork queue - I will get to it, thank you for your patience.

Lorenzo

Quoted 118 lines

Thanks,
Vidya Sagar

Quoted 114 lines

Hi Bjorn / Lorenzo,
Can you please review this patch?

Thanks,
Vidya Sagar

Quoted 106 lines · vidya sagar

Hi Bjorn/Lorenzo,
Can you please review this patch?
Thierry has reviewed it and I already took care of his comments.

Thanks,
Vidya Sagar

On Tue, Mar 19, 2019 at 7:33 PM Vidya Sagar <[email protected] <mailto:[email protected]>> wrote:

    Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

Signed-off-by Vidya Sagar <[email protected] <mailto:[email protected]>>
Reviewed-by Thierry Reding <[email protected] <mailto:[email protected]>>
Acked-by Thierry Reding <[email protected] <mailto:[email protected]>>

    ---
    v2:
    * changed 'phys' type to 'dma_addr_t' from 'u64'
    * added a comment on why DMA mask is set to 32-bit
    * replaced 'dma' with 'DMA'

      drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------

      1 file changed, 26 insertions(+), 9 deletions(-)

    diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c index f4f53d092e00..f8173a5e352d 100644
    --- a/drivers/pci/controller/pci-tegra.c
    +++ b/drivers/pci/controller/pci-tegra.c
    @@ -231,9 +231,9 @@ struct tegra_msi {
             struct msi_controller chip;
             DECLARE_BITMAP(used, INT_PCI_MSI_NR);
             struct irq_domain *domain;
    -       unsigned long pages;
             struct mutex lock;
    -       u64 phys;
    +       void *virt;
    +       dma_addr_t phys;
             int irq;
      };

    @@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie) err = platform_get_irq_byname(pdev, "msi");
             if (err < 0) {
                     dev_err(dev, "failed to get IRQ: %d\n", err);
    -               goto err;
    +               goto free_irq_domain;
             }

             msi->irq = err;
    @@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie) tegra_msi_irq_chip.name <http://tegra_msi_irq_chip.name>, pcie); if (err < 0) {
                     dev_err(dev, "failed to request IRQ: %d\n", err); -               goto err;
    +               goto free_irq_domain;
    +       }
    +
    +       /* Though the PCIe controller can address >32-bit address space, to +        * facilitate endpoints that support only 32-bit MSI target address, +        * the mask is set to 32-bit to make sure that MSI target address is +        * always a 32-bit address
    +        */
    +       err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
    +       if (err < 0) {
    +               dev_err(dev, "failed to set DMA coherent mask: %d\n", err); +               goto free_irq;
    +       }
    +
    +       msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL); +       if (!msi->virt) {
    +               dev_err(dev, "failed to allocate DMA memory for MSI\n"); +               err = -ENOMEM;
    +               goto free_irq;
             }

    -       /* setup AFI/FPCI range */
    -       msi->pages = __get_free_pages(GFP_KERNEL, 0); -       msi->phys = virt_to_phys((void *)msi->pages); host->msi = &msi->chip;

             return 0;

    -err:
    +free_irq:
    +       free_irq(msi->irq, pcie);
    +free_irq_domain:
             irq_domain_remove(msi->domain);
             return err;
      }
    @@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie) struct tegra_msi *msi = &pcie->msi;
             unsigned int i, irq;

    -       free_pages(msi->pages, 0);
    +       dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);

             if (msi->irq > 0)
                     free_irq(msi->irq, pcie);
    --     2.7.4

#6 lore raw
In reply to Vidya Sagar

[+Robin]

I would like Robin to have a look before merging this patch so that we agree that's the expected approach.

Lorenzo

Quoted 98 lines · Vidya Sagar

Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

---
v2:
* changed 'phys' type to 'dma_addr_t' from 'u64'
* added a comment on why DMA mask is set to 32-bit
* replaced 'dma' with 'DMA'

 drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-tegra.c +26 -9
index f4f53d092e00..f8173a5e352d 100644
@@ -231,9 +231,9 @@ struct tegra_msi {
 	struct msi_controller chip;
 	DECLARE_BITMAP(used, INT_PCI_MSI_NR);
 	struct irq_domain *domain;
-	unsigned long pages;
 	struct mutex lock;
-	u64 phys;
+	void *virt;
+	dma_addr_t phys;
 	int irq;
 };
 
@@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
 	err = platform_get_irq_byname(pdev, "msi");
 	if (err < 0) {
 		dev_err(dev, "failed to get IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
 	}
 
 	msi->irq = err;
@@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
 			  tegra_msi_irq_chip.name, pcie);
 	if (err < 0) {
 		dev_err(dev, "failed to request IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
+	}
+
+	/* Though the PCIe controller can address >32-bit address space, to
+	 * facilitate endpoints that support only 32-bit MSI target address,
+	 * the mask is set to 32-bit to make sure that MSI target address is
+	 * always a 32-bit address
+	 */
+	err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+	if (err < 0) {
+		dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
+		goto free_irq;
+	}
+
+	msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
+	if (!msi->virt) {
+		dev_err(dev, "failed to allocate DMA memory for MSI\n");
+		err = -ENOMEM;
+		goto free_irq;
 	}
 
-	/* setup AFI/FPCI range */
-	msi->pages = __get_free_pages(GFP_KERNEL, 0);
-	msi->phys = virt_to_phys((void *)msi->pages);
 	host->msi = &msi->chip;
 
 	return 0;
 
-err:
+free_irq:
+	free_irq(msi->irq, pcie);
+free_irq_domain:
 	irq_domain_remove(msi->domain);
 	return err;
 }
@@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
 	struct tegra_msi *msi = &pcie->msi;
 	unsigned int i, irq;
 
-	free_pages(msi->pages, 0);
+	dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);
 
 	if (msi->irq > 0)
 		free_irq(msi->irq, pcie);
Signature · 1 line
2.7.4
#7 lore raw
Quoted 4 lines · Lorenzo Pieralisi

[+Robin]

I would like Robin to have a look before merging this patch so that we agree that's the expected approach.

It's a bit crazy, but I guess it's not really any worse than the existing implementation. As long the comments and commit message clearly document that this is just trickery to reserve a 32-bit DMA address (which AFAICS they more or less do) I don't think I have a significant objection.

One suggestion I would make is using dma_alloc_attrs() with DMA_ATTR_NO_KERNEL_MAPPING, to make it clear that this is being set aside for 'special' device purposes and is not intended to be accessed as a regular buffer (plus I believe this is non-coherent, so that should also skip the small overhead of creating a non-cacheable remap).

Ultimately, it might make sense to have an API in the PCI core which can look at memblock/bridge windows/etc. to find a suitable non-overlapping address for this kind of root-complex-integrated doorbell without having to subvert the page allocator, as it seems to be a fairly common setup in 'embedded' IPs.

Robin.

Quoted 102 lines

Lorenzo

Quoted 98 lines · Vidya Sagar

Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

---
v2:
* changed 'phys' type to 'dma_addr_t' from 'u64'
* added a comment on why DMA mask is set to 32-bit
* replaced 'dma' with 'DMA'

  drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------
  1 file changed, 26 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-tegra.c +26 -9
index f4f53d092e00..f8173a5e352d 100644
@@ -231,9 +231,9 @@ struct tegra_msi {
  	struct msi_controller chip;
  	DECLARE_BITMAP(used, INT_PCI_MSI_NR);
  	struct irq_domain *domain;
-	unsigned long pages;
  	struct mutex lock;
-	u64 phys;
+	void *virt;
+	dma_addr_t phys;
  	int irq;
  };
 
@@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
  	err = platform_get_irq_byname(pdev, "msi");
  	if (err < 0) {
  		dev_err(dev, "failed to get IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
  	}
 
  	msi->irq = err;
@@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
  			  tegra_msi_irq_chip.name, pcie);
  	if (err < 0) {
  		dev_err(dev, "failed to request IRQ: %d\n", err);
-		goto err;
+		goto free_irq_domain;
+	}
+
+	/* Though the PCIe controller can address >32-bit address space, to
+	 * facilitate endpoints that support only 32-bit MSI target address,
+	 * the mask is set to 32-bit to make sure that MSI target address is
+	 * always a 32-bit address
+	 */
+	err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+	if (err < 0) {
+		dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
+		goto free_irq;
+	}
+
+	msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
+	if (!msi->virt) {
+		dev_err(dev, "failed to allocate DMA memory for MSI\n");
+		err = -ENOMEM;
+		goto free_irq;
  	}
 
-	/* setup AFI/FPCI range */
-	msi->pages = __get_free_pages(GFP_KERNEL, 0);
-	msi->phys = virt_to_phys((void *)msi->pages);
  	host->msi = &msi->chip;
 
  	return 0;
 
-err:
+free_irq:
+	free_irq(msi->irq, pcie);
+free_irq_domain:
  	irq_domain_remove(msi->domain);
  	return err;
  }
@@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
  	struct tegra_msi *msi = &pcie->msi;
  	unsigned int i, irq;
 
-	free_pages(msi->pages, 0);
+	dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);
 
  	if (msi->irq > 0)
  		free_irq(msi->irq, pcie);
Signature · 1 line
2.7.4
#8 lore raw
Quoted 9 lines · Robin Murphy
Quoted 4 lines · Lorenzo Pieralisi

[+Robin]

I would like Robin to have a look before merging this patch so that we agree that's the expected approach.

It's a bit crazy, but I guess it's not really any worse than the existing implementation. As long the comments and commit message clearly document that this is just trickery to reserve a 32-bit DMA address (which AFAICS they more or less do) I don't think I have a significant objection.

One suggestion I would make is using dma_alloc_attrs() with DMA_ATTR_NO_KERNEL_MAPPING, to make it clear that this is being set aside for 'special' device purposes and is not intended to be accessed as a regular buffer (plus I believe this is non-coherent, so that should also skip the small overhead of creating a non-cacheable remap).

Thanks Robin for your inputs. I'll take care of changing API from dma_alloc_coherent()/dma_free_coherent() to dma_alloc_attrs()/dma_free_attrs() in V3 patch.

Quoted 100 lines

Ultimately, it might make sense to have an API in the PCI core which can look at memblock/bridge windows/etc. to find a suitable non-overlapping address for this kind of root-complex-integrated doorbell without having to subvert the page allocator, as it seems to be a fairly common setup in 'embedded' IPs.

Robin.

Quoted 95 lines

Lorenzo

Quoted 91 lines · Vidya Sagar

Since the upstream MSI memory writes are generated by downstream devices, it is logically correct to have MSI target memory coming from the DMA pool reserved for PCIe than from the general memory pool reserved for CPU access. This avoids PCIe DMA addresses coinciding with MSI target address thereby raising unwanted MSI interrupts. This patch also enforces to limit the MSI target address to 32-bits to make it work for PCIe endponits that support only 32-bit MSI target address and those endpoints that support 64-bit MSI target address anyway work with 32-bit MSI target address.

---
v2:
* changed 'phys' type to 'dma_addr_t' from 'u64'
* added a comment on why DMA mask is set to 32-bit
* replaced 'dma' with 'DMA'

  drivers/pci/controller/pci-tegra.c | 35 ++++++++++++++++++++++++++---------

  1 file changed, 26 insertions(+), 9 deletions(-)
drivers/pci/controller/pci-tegra.c +26 -9
index f4f53d092e00..f8173a5e352d 100644
@@ -231,9 +231,9 @@ struct tegra_msi {
       struct msi_controller chip;
       DECLARE_BITMAP(used, INT_PCI_MSI_NR);
       struct irq_domain *domain;
-    unsigned long pages;
       struct mutex lock;
-    u64 phys;
+    void *virt;
+    dma_addr_t phys;
       int irq;
   };
@@ -1536,7 +1536,7 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
       err = platform_get_irq_byname(pdev, "msi");
       if (err < 0) {
           dev_err(dev, "failed to get IRQ: %d\n", err);
-        goto err;
+        goto free_irq_domain;
       }
       msi->irq = err;
@@ -1545,17 +1545,34 @@ static int tegra_pcie_msi_setup(struct tegra_pcie *pcie)
                 tegra_msi_irq_chip.name, pcie);
       if (err < 0) {
           dev_err(dev, "failed to request IRQ: %d\n", err);
-        goto err;
+        goto free_irq_domain;
+    }
+
+    /* Though the PCIe controller can address >32-bit address space, to
+     * facilitate endpoints that support only 32-bit MSI target address,
+     * the mask is set to 32-bit to make sure that MSI target address is
+     * always a 32-bit address
+     */
+    err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));
+    if (err < 0) {
+        dev_err(dev, "failed to set DMA coherent mask: %d\n", err);
+        goto free_irq;
+    }
+
+    msi->virt = dma_alloc_coherent(dev, PAGE_SIZE, &msi->phys, GFP_KERNEL);
+    if (!msi->virt) {
+        dev_err(dev, "failed to allocate DMA memory for MSI\n");
+        err = -ENOMEM;
+        goto free_irq;
       }
-    /* setup AFI/FPCI range */
-    msi->pages = __get_free_pages(GFP_KERNEL, 0);
-    msi->phys = virt_to_phys((void *)msi->pages);
       host->msi = &msi->chip;
       return 0;
-err:
+free_irq:
+    free_irq(msi->irq, pcie);
+free_irq_domain:
       irq_domain_remove(msi->domain);
       return err;
   }
@@ -1592,7 +1609,7 @@ static void tegra_pcie_msi_teardown(struct tegra_pcie *pcie)
       struct tegra_msi *msi = &pcie->msi;
       unsigned int i, irq;
-    free_pages(msi->pages, 0);
+    dma_free_coherent(pcie->dev, PAGE_SIZE, msi->virt, msi->phys);
       if (msi->irq > 0)
           free_irq(msi->irq, pcie);
Signature · 1 line
2.7.4