mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 10:39:04 +00:00
662d1f9f8d
Removed upstreamed:
generic/backport-5.10/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch
generic/pending-5.10/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch
ipq40xx/patches-5.10/105-ipq40xx-fix-sleep-clock.patch
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Compile-/run-tested: ath79/generic (Archer C7 v2).
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[rebased in 22.03 tree]
Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit b92ec82235)
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From c092ab8994f1f777054c0179a9deb40b87ee606f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Mon, 10 Jan 2022 00:10:46 +0100
|
|
Subject: [PATCH] PCI: aardvark: Make msi_domain_info structure a static driver
|
|
structure
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Make Aardvark's msi_domain_info structure into a private driver structure.
|
|
Domain info is same for every potential instatination of a controller.
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
---
|
|
drivers/pci/controller/pci-aardvark.c | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/pci/controller/pci-aardvark.c
|
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
@@ -281,7 +281,6 @@ struct advk_pcie {
|
|
raw_spinlock_t irq_lock;
|
|
struct irq_domain *msi_domain;
|
|
struct irq_domain *msi_inner_domain;
|
|
- struct msi_domain_info msi_domain_info;
|
|
DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
|
|
struct mutex msi_used_lock;
|
|
u16 msi_msg;
|
|
@@ -1295,20 +1294,20 @@ static struct irq_chip advk_msi_irq_chip
|
|
.name = "advk-MSI",
|
|
};
|
|
|
|
+static struct msi_domain_info advk_msi_domain_info = {
|
|
+ .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
|
|
+ MSI_FLAG_MULTI_PCI_MSI,
|
|
+ .chip = &advk_msi_irq_chip,
|
|
+};
|
|
+
|
|
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 msi_domain_info *msi_di;
|
|
phys_addr_t msi_msg_phys;
|
|
|
|
mutex_init(&pcie->msi_used_lock);
|
|
|
|
- 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 = &advk_msi_irq_chip;
|
|
-
|
|
msi_msg_phys = virt_to_phys(&pcie->msi_msg);
|
|
|
|
advk_writel(pcie, lower_32_bits(msi_msg_phys),
|
|
@@ -1324,7 +1323,8 @@ static int advk_pcie_init_msi_irq_domain
|
|
|
|
pcie->msi_domain =
|
|
pci_msi_create_irq_domain(of_node_to_fwnode(node),
|
|
- msi_di, pcie->msi_inner_domain);
|
|
+ &advk_msi_domain_info,
|
|
+ pcie->msi_inner_domain);
|
|
if (!pcie->msi_domain) {
|
|
irq_domain_remove(pcie->msi_inner_domain);
|
|
return -ENOMEM;
|