| Message ID | 20210330151145.997953-3-maz@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | PCI/MSI: Getting rid of msi_controller, and other cleanups | expand |
On Tue, Mar 30, 2021 at 04:11:33PM +0100, Marc Zyngier wrote: > A long cargo-culted behaviour of PCI drivers is to allocate memory > to obtain an address that is fed to the controller as the MSI > capture address (i.e. the MSI doorbell). > > But there is no actual requirement for this address to be RAM. > All it needs to be is a suitable aligned address that will > *not* be DMA'd to. > > Since the rcar platform already has a requirement that this > address should be in the first 4GB of the physical address space, > use the controller's own base address as the capture address. > > Signed-off-by: Marc Zyngier <maz@kernel.org> > --- > drivers/pci/controller/pcie-rcar-host.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) Marek, Yoshihiro, can you test this patch please and report back ? It is not fundamental for the rest of the series (ie the rest of the series does not depend on it) and we can still merge the series without it but it would be good if you can review and test anyway. I'd like to merge this series into -next shortly. Thanks, Lorenzo > diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c > index a728e8f9ad3c..ce952403e22c 100644 > --- a/drivers/pci/controller/pcie-rcar-host.c > +++ b/drivers/pci/controller/pcie-rcar-host.c > @@ -36,7 +36,6 @@ struct rcar_msi { > DECLARE_BITMAP(used, INT_PCI_MSI_NR); > struct irq_domain *domain; > struct msi_controller chip; > - unsigned long pages; > struct mutex lock; > int irq1; > int irq2; > @@ -680,14 +679,15 @@ static void rcar_pcie_unmap_msi(struct rcar_pcie_host *host) > static void rcar_pcie_hw_enable_msi(struct rcar_pcie_host *host) > { > struct rcar_pcie *pcie = &host->pcie; > - struct rcar_msi *msi = &host->msi; > - unsigned long base; > + struct device *dev = pcie->dev; > + struct resource res; > > - /* setup MSI data target */ > - base = virt_to_phys((void *)msi->pages); > + if (WARN_ON(of_address_to_resource(dev->of_node, 0, &res))) > + return; > > - rcar_pci_write_reg(pcie, lower_32_bits(base) | MSIFE, PCIEMSIALR); > - rcar_pci_write_reg(pcie, upper_32_bits(base), PCIEMSIAUR); > + /* setup MSI data target */ > + rcar_pci_write_reg(pcie, lower_32_bits(res.start) | MSIFE, PCIEMSIALR); > + rcar_pci_write_reg(pcie, upper_32_bits(res.start), PCIEMSIAUR); > > /* enable all MSI interrupts */ > rcar_pci_write_reg(pcie, 0xffffffff, PCIEMSIIER); > @@ -735,7 +735,6 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host) > } > > /* setup MSI data target */ > - msi->pages = __get_free_pages(GFP_KERNEL | GFP_DMA32, 0); > rcar_pcie_hw_enable_msi(host); > > return 0; > @@ -748,7 +747,6 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host) > static void rcar_pcie_teardown_msi(struct rcar_pcie_host *host) > { > struct rcar_pcie *pcie = &host->pcie; > - struct rcar_msi *msi = &host->msi; > > /* Disable all MSI interrupts */ > rcar_pci_write_reg(pcie, 0, PCIEMSIIER); > @@ -756,8 +754,6 @@ static void rcar_pcie_teardown_msi(struct rcar_pcie_host *host) > /* Disable address decoding of the MSI interrupt, MSIFE */ > rcar_pci_write_reg(pcie, 0, PCIEMSIALR); > > - free_pages(msi->pages, 0); > - > rcar_pcie_unmap_msi(host); > } > > -- > 2.29.2 >
Hi Lorenzo, Marc, > From: Lorenzo Pieralisi, Sent: Wednesday, March 31, 2021 12:29 AM > > On Tue, Mar 30, 2021 at 04:11:33PM +0100, Marc Zyngier wrote: > > A long cargo-culted behaviour of PCI drivers is to allocate memory > > to obtain an address that is fed to the controller as the MSI > > capture address (i.e. the MSI doorbell). > > > > But there is no actual requirement for this address to be RAM. > > All it needs to be is a suitable aligned address that will > > *not* be DMA'd to. > > > > Since the rcar platform already has a requirement that this > > address should be in the first 4GB of the physical address space, > > use the controller's own base address as the capture address. > > > > Signed-off-by: Marc Zyngier <maz@kernel.org> > > --- > > drivers/pci/controller/pcie-rcar-host.c | 18 +++++++----------- > > 1 file changed, 7 insertions(+), 11 deletions(-) > > Marek, Yoshihiro, > > can you test this patch please and report back ? It is not fundamental > for the rest of the series (ie the rest of the series does not depend on > it) and we can still merge the series without it but it would be good if > you can review and test anyway. I reviewed and tested this patch and it worked correctly. So, Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Best regards, Yoshihiro Shimoda
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index a728e8f9ad3c..ce952403e22c 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -36,7 +36,6 @@ struct rcar_msi { DECLARE_BITMAP(used, INT_PCI_MSI_NR); struct irq_domain *domain; struct msi_controller chip; - unsigned long pages; struct mutex lock; int irq1; int irq2; @@ -680,14 +679,15 @@ static void rcar_pcie_unmap_msi(struct rcar_pcie_host *host) static void rcar_pcie_hw_enable_msi(struct rcar_pcie_host *host) { struct rcar_pcie *pcie = &host->pcie; - struct rcar_msi *msi = &host->msi; - unsigned long base; + struct device *dev = pcie->dev; + struct resource res; - /* setup MSI data target */ - base = virt_to_phys((void *)msi->pages); + if (WARN_ON(of_address_to_resource(dev->of_node, 0, &res))) + return; - rcar_pci_write_reg(pcie, lower_32_bits(base) | MSIFE, PCIEMSIALR); - rcar_pci_write_reg(pcie, upper_32_bits(base), PCIEMSIAUR); + /* setup MSI data target */ + rcar_pci_write_reg(pcie, lower_32_bits(res.start) | MSIFE, PCIEMSIALR); + rcar_pci_write_reg(pcie, upper_32_bits(res.start), PCIEMSIAUR); /* enable all MSI interrupts */ rcar_pci_write_reg(pcie, 0xffffffff, PCIEMSIIER); @@ -735,7 +735,6 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host) } /* setup MSI data target */ - msi->pages = __get_free_pages(GFP_KERNEL | GFP_DMA32, 0); rcar_pcie_hw_enable_msi(host); return 0; @@ -748,7 +747,6 @@ static int rcar_pcie_enable_msi(struct rcar_pcie_host *host) static void rcar_pcie_teardown_msi(struct rcar_pcie_host *host) { struct rcar_pcie *pcie = &host->pcie; - struct rcar_msi *msi = &host->msi; /* Disable all MSI interrupts */ rcar_pci_write_reg(pcie, 0, PCIEMSIIER); @@ -756,8 +754,6 @@ static void rcar_pcie_teardown_msi(struct rcar_pcie_host *host) /* Disable address decoding of the MSI interrupt, MSIFE */ rcar_pci_write_reg(pcie, 0, PCIEMSIALR); - free_pages(msi->pages, 0); - rcar_pcie_unmap_msi(host); }
A long cargo-culted behaviour of PCI drivers is to allocate memory to obtain an address that is fed to the controller as the MSI capture address (i.e. the MSI doorbell). But there is no actual requirement for this address to be RAM. All it needs to be is a suitable aligned address that will *not* be DMA'd to. Since the rcar platform already has a requirement that this address should be in the first 4GB of the physical address space, use the controller's own base address as the capture address. Signed-off-by: Marc Zyngier <maz@kernel.org> --- drivers/pci/controller/pcie-rcar-host.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)