From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 176BCC433EF for ; Thu, 17 Feb 2022 17:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=PDoouOkgWSdZMtB/40vnarrHEpyACU4u5Or0UqHQTc4=; b=EY9hB8VPCdZeef ERo5UPna2hC83c81nIuDCgbjwJgD5rhgAeveQcpE2uhAKGCtWJmTn51wPhjnMeTQpubn1BZr4/phq MczMkq/JY/fBMSU0ujA5tfaaIKYImxAeR8b6vqEb3MKbEysHdXg3232y6ZbID568uIyJan9fFCpeq koVs5UbqmDfl/W5tCEFPTZY0LRxDRAME1y1lupT2MNW5ugVwxPCSrxLNXrgS+ARc26OiO19Fb/qCk gw/PpkEei3tmPdS+zITAK6rSWlxkE8re0v+wgcykc7zUhIfZov8up6oqPxdRQ5UI6pKuUMLwCUAdM QspnmVyeG7TOHjuuglTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nKkMt-00BYxj-NP; Thu, 17 Feb 2022 17:14:59 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nKkMp-00BYxP-VL for linux-arm-kernel@lists.infradead.org; Thu, 17 Feb 2022 17:14:57 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E7D5A61820; Thu, 17 Feb 2022 17:14:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 329FFC340E8; Thu, 17 Feb 2022 17:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645118094; bh=V8FuLE6Vxn5siPMWjHbj01sVGcq0wCo+yDT7Qdj4S+I=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=prPz3oAb28oHgqc4mcWzSNRx5FXQu0mAbL9h5AQ+Xq6nRY8BFpfyBA8Sad5O1Moqo LAcMm18rIZDMGP7TgaPxPRxVWQil48c0fLKusHLKyk3K6h/v7liYYQiLoiUhPy330p /OMfUc9rD0FlTJQlzP1Vdh08IYFH8k7uXANvQro8EkJgdmsxm8X0APAUp/dfPnMwtd Ais7+AVvGPNl+Lsil9g4AuTVf9GFMIpfkbpkUgVA1x7PQGyfAFnasYv+yaHHHnqVVA w9Tta0/nCa9kqA+0henKt3+KyBUdQmydMulacsb3AoUBXhJNLcCaTkpzi9yCSB97UL JHjcB+yD85tLw== Date: Thu, 17 Feb 2022 11:14:52 -0600 From: Bjorn Helgaas To: Marek =?iso-8859-1?Q?Beh=FAn?= Cc: Marc Zyngier , Lorenzo Pieralisi , pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org Subject: Re: [PATCH v2 11/23] PCI: aardvark: Fix setting MSI address Message-ID: <20220217171452.GA286231@bhelgaas> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220110015018.26359-12-kabel@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220217_091456_131178_B5861B2F X-CRM114-Status: GOOD ( 24.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jan 10, 2022 at 02:50:06AM +0100, Marek Beh=FAn wrote: > From: Pali Roh=E1r > = > 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_pc= ie. > = > Fixes: 8c39d710363c ("PCI: aardvark: Add Aardvark PCI host controller dri= ver") > Signed-off-by: Pali Roh=E1r > Acked-by: Marc Zyngier > Signed-off-by: Marek Beh=FAn > Cc: stable@vger.kernel.org # f21a8b1b6837 ("PCI: aardvark: Move to MSI ha= ndling 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/controll= er/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 *pci= e) > reg |=3D LANE_COUNT_1; > advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG); > = > + /* Set MSI address */ > + msi_addr =3D 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 =3D advk_readl(pcie, PCIE_CORE_CTRL2_REG); > reg |=3D PCIE_CORE_CTRL2_MSI_ENABLE; > @@ -1184,10 +1189,10 @@ static void advk_msi_irq_compose_msi_msg(struct i= rq_data *data, > struct msi_msg *msg) > { > struct advk_pcie *pcie =3D irq_data_get_irq_chip_data(data); > - phys_addr_t msi_msg =3D virt_to_phys(&pcie->msi_msg); > + phys_addr_t msi_addr =3D virt_to_phys(pcie); > = > - msg->address_lo =3D lower_32_bits(msi_msg); > - msg->address_hi =3D upper_32_bits(msi_msg); > + msg->address_lo =3D lower_32_bits(msi_addr); > + msg->address_hi =3D upper_32_bits(msi_addr); > msg->data =3D data->hwirq; > } > = > @@ -1346,18 +1351,10 @@ static struct msi_domain_info advk_msi_domain_inf= o =3D { > static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie) > { > struct device *dev =3D &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 =3D 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 =3D > 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel