mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
080691d7b1
Backport Aardvark PCIe controller driver changes that fix MSI support, that were recently sent to the linux-pci mailing list [1]. These changes fix MSI and MSI-X support for this PCIe controller, which, among other things, make it possible to use NVMe drives with this PCIe controllers. [1] https://lore.kernel.org/linux-pci/20220110015018.26359-1-kabel@kernel.org/ Signed-off-by: Marek Behún <kabel@kernel.org>
99 lines
3.2 KiB
Diff
99 lines
3.2 KiB
Diff
From 5eb36a6b9508da442aac80f4df23e3951bbfa7aa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Mon, 10 Jan 2022 00:03:41 +0100
|
|
Subject: [PATCH] PCI: aardvark: Make MSI irq_chip structures static driver
|
|
structures
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Marc Zyngier says [1] that we should use struct irq_chip as a global
|
|
static struct in the driver. Even though the structure currently
|
|
contains a dynamic member (parent_device), Marc says [2] that he plans
|
|
to kill it and make the structure completely static.
|
|
|
|
Convert Aardvark's priv->msi_bottom_irq_chip and priv->msi_irq_chip to
|
|
static driver structure.
|
|
|
|
[1] https://lore.kernel.org/linux-pci/877dbcvngf.wl-maz@kernel.org/
|
|
[2] https://lore.kernel.org/linux-pci/874k6gvkhz.wl-maz@kernel.org/
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 26 ++++++++++++--------------
|
|
1 file changed, 12 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
|
|
index 4be05b52d835..c7bd6b123857 100644
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -281,8 +281,6 @@ struct advk_pcie {
|
|
raw_spinlock_t irq_lock;
|
|
struct irq_domain *msi_domain;
|
|
struct irq_domain *msi_inner_domain;
|
|
- struct irq_chip msi_bottom_irq_chip;
|
|
- struct irq_chip msi_irq_chip;
|
|
struct msi_domain_info msi_domain_info;
|
|
DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
|
|
struct mutex msi_used_lock;
|
|
@@ -1197,6 +1195,12 @@ static int advk_msi_set_affinity(struct irq_data *irq_data,
|
|
return -EINVAL;
|
|
}
|
|
|
|
+static struct irq_chip advk_msi_bottom_irq_chip = {
|
|
+ .name = "MSI",
|
|
+ .irq_compose_msi_msg = advk_msi_irq_compose_msi_msg,
|
|
+ .irq_set_affinity = advk_msi_set_affinity,
|
|
+};
|
|
+
|
|
static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
|
|
unsigned int virq,
|
|
unsigned int nr_irqs, void *args)
|
|
@@ -1213,7 +1217,7 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
|
|
|
|
for (i = 0; i < nr_irqs; i++)
|
|
irq_domain_set_info(domain, virq + i, hwirq + i,
|
|
- &pcie->msi_bottom_irq_chip,
|
|
+ &advk_msi_bottom_irq_chip,
|
|
domain->host_data, handle_simple_irq,
|
|
NULL, NULL);
|
|
|
|
@@ -1283,29 +1287,23 @@ static const struct irq_domain_ops advk_pcie_irq_domain_ops = {
|
|
.xlate = irq_domain_xlate_onecell,
|
|
};
|
|
|
|
+static struct irq_chip advk_msi_irq_chip = {
|
|
+ .name = "advk-MSI",
|
|
+};
|
|
+
|
|
static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
|
|
{
|
|
struct device *dev = &pcie->pdev->dev;
|
|
struct device_node *node = dev->of_node;
|
|
- struct irq_chip *bottom_ic, *msi_ic;
|
|
struct msi_domain_info *msi_di;
|
|
phys_addr_t msi_msg_phys;
|
|
|
|
mutex_init(&pcie->msi_used_lock);
|
|
|
|
- bottom_ic = &pcie->msi_bottom_irq_chip;
|
|
-
|
|
- bottom_ic->name = "MSI";
|
|
- bottom_ic->irq_compose_msi_msg = advk_msi_irq_compose_msi_msg;
|
|
- bottom_ic->irq_set_affinity = advk_msi_set_affinity;
|
|
-
|
|
- msi_ic = &pcie->msi_irq_chip;
|
|
- msi_ic->name = "advk-MSI";
|
|
-
|
|
msi_di = &pcie->msi_domain_info;
|
|
msi_di->flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
|
|
MSI_FLAG_MULTI_PCI_MSI;
|
|
- msi_di->chip = msi_ic;
|
|
+ msi_di->chip = &advk_msi_irq_chip;
|
|
|
|
msi_msg_phys = virt_to_phys(&pcie->msi_msg);
|
|
|
|
--
|
|
2.34.1
|
|
|