* Re: [PATCH v2 11/23] PCI: aardvark: Fix setting MSI address
2022-01-10 1:50 ` [PATCH v2 11/23] PCI: aardvark: Fix setting MSI address Marek Behún
@ 2022-02-17 17:14 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2022-02-17 17:14 UTC (permalink / raw)
To: Marek Behún
Cc: Marc Zyngier, Lorenzo Pieralisi, pali, linux-pci,
linux-arm-kernel, stable
On Mon, Jan 10, 2022 at 02:50:06AM +0100, Marek Behún wrote:
> From: Pali Rohár <pali@kernel.org>
>
> MSI address for receiving MSI interrupts needs to be correctly set before
> enabling processing of MSI interrupts.
>
> Move code for setting PCIE_MSI_ADDR_LOW_REG and PCIE_MSI_ADDR_HIGH_REG
> from advk_pcie_init_msi_irq_domain() to advk_pcie_setup_hw(), before
> enabling PCIE_CORE_CTRL2_MSI_ENABLE.
>
> After this we can remove the now unused member msi_msg, which was used
> only for MSI doorbell address. MSI address can be any address which cannot
> be used to DMA to. So change it to the address of the main struct advk_pcie.
>
> Fixes: 8c39d710363c ("PCI: aardvark: Add Aardvark PCI host controller driver")
> Signed-off-by: Pali Rohár <pali@kernel.org>
> Acked-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Marek Behún <kabel@kernel.org>
> Cc: stable@vger.kernel.org # f21a8b1b6837 ("PCI: aardvark: Move to MSI handling using generic MSI support")
> ---
> drivers/pci/controller/pci-aardvark.c | 21 +++++++++------------
> 1 file changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
> index 51fedbcb41fb..79102704d82f 100644
> --- a/drivers/pci/controller/pci-aardvark.c
> +++ b/drivers/pci/controller/pci-aardvark.c
> @@ -278,7 +278,6 @@ struct advk_pcie {
> raw_spinlock_t msi_irq_lock;
> DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
> struct mutex msi_used_lock;
> - u16 msi_msg;
> int link_gen;
> struct pci_bridge_emul bridge;
> struct gpio_desc *reset_gpio;
> @@ -473,6 +472,7 @@ static void advk_pcie_disable_ob_win(struct advk_pcie *pcie, u8 win_num)
>
> static void advk_pcie_setup_hw(struct advk_pcie *pcie)
> {
> + phys_addr_t msi_addr;
> u32 reg;
> int i;
>
> @@ -561,6 +561,11 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
> reg |= LANE_COUNT_1;
> advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
>
> + /* Set MSI address */
> + msi_addr = virt_to_phys(pcie);
Strictly speaking, msi_addr should be a pci_bus_addr_t, not a
phys_addr_t, and virt_to_phys() doesn't return a bus address.
> + advk_writel(pcie, lower_32_bits(msi_addr), PCIE_MSI_ADDR_LOW_REG);
> + advk_writel(pcie, upper_32_bits(msi_addr), PCIE_MSI_ADDR_HIGH_REG);
> +
> /* Enable MSI */
> reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
> reg |= PCIE_CORE_CTRL2_MSI_ENABLE;
> @@ -1184,10 +1189,10 @@ static void advk_msi_irq_compose_msi_msg(struct irq_data *data,
> struct msi_msg *msg)
> {
> struct advk_pcie *pcie = irq_data_get_irq_chip_data(data);
> - phys_addr_t msi_msg = virt_to_phys(&pcie->msi_msg);
> + phys_addr_t msi_addr = virt_to_phys(pcie);
>
> - msg->address_lo = lower_32_bits(msi_msg);
> - msg->address_hi = upper_32_bits(msi_msg);
> + msg->address_lo = lower_32_bits(msi_addr);
> + msg->address_hi = upper_32_bits(msi_addr);
> msg->data = data->hwirq;
> }
>
> @@ -1346,18 +1351,10 @@ static struct msi_domain_info advk_msi_domain_info = {
> static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
> {
> struct device *dev = &pcie->pdev->dev;
> - phys_addr_t msi_msg_phys;
>
> raw_spin_lock_init(&pcie->msi_irq_lock);
> mutex_init(&pcie->msi_used_lock);
>
> - msi_msg_phys = virt_to_phys(&pcie->msi_msg);
> -
> - advk_writel(pcie, lower_32_bits(msi_msg_phys),
> - PCIE_MSI_ADDR_LOW_REG);
> - advk_writel(pcie, upper_32_bits(msi_msg_phys),
> - PCIE_MSI_ADDR_HIGH_REG);
> -
> pcie->msi_inner_domain =
> irq_domain_add_linear(NULL, MSI_IRQ_NUM,
> &advk_msi_domain_ops, pcie);
> --
> 2.34.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread