mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
be381a7ac7
Deleted (upstreamed): generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1] generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2] generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3] generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4] Manually rebased: generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch ramips/patches-5.15/710-at803x.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Refresh patches again] [Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
92 lines
3.2 KiB
Diff
92 lines
3.2 KiB
Diff
From fa73c200f181436eab859374657c53a73778d8ad Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
Date: Fri, 26 Mar 2021 17:35:44 +0100
|
|
Subject: [PATCH] PCI: aardvark: Fix setting MSI address
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -277,7 +277,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;
|
|
@@ -472,6 +471,7 @@ static void advk_pcie_disable_ob_win(str
|
|
|
|
static void advk_pcie_setup_hw(struct advk_pcie *pcie)
|
|
{
|
|
+ phys_addr_t msi_addr;
|
|
u32 reg;
|
|
int i;
|
|
|
|
@@ -560,6 +560,11 @@ static void advk_pcie_setup_hw(struct ad
|
|
reg |= LANE_COUNT_1;
|
|
advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
|
|
|
|
+ /* Set MSI address */
|
|
+ msi_addr = virt_to_phys(pcie);
|
|
+ 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;
|
|
@@ -1179,10 +1184,10 @@ static void advk_msi_irq_compose_msi_msg
|
|
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;
|
|
}
|
|
|
|
@@ -1341,18 +1346,10 @@ static struct msi_domain_info advk_msi_d
|
|
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);
|