From: "Marek Behún" <kabel@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>
Cc: stable@vger.kernel.org, pali@kernel.org,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH 5.15 16/30] PCI: aardvark: Make msi_domain_info structure a static driver structure
Date: Wed, 4 May 2022 18:57:41 +0200 [thread overview]
Message-ID: <20220504165755.30002-17-kabel@kernel.org> (raw)
In-Reply-To: <20220504165755.30002-1-kabel@kernel.org>
commit 26bcd54e4a5cd51ec12d06fdc30e22863ed4c422 upstream.
Make Aardvark's msi_domain_info structure into a private driver structure.
Domain info is same for every potential instatination of a controller.
Link: https://lore.kernel.org/r/20220110015018.26359-8-kabel@kernel.org
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/pci/controller/pci-aardvark.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 7011a4a36165..51cb49a9d3f5 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -274,7 +274,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;
@@ -1288,20 +1287,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),
@@ -1317,7 +1316,8 @@ static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
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;
--
2.35.1
next prev parent reply other threads:[~2022-05-04 17:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 16:57 [PATCH 5.15 00/30] PCIe Aardvark controller backports for 5.15 Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 01/30] PCI: pci-bridge-emul: Add description for class_revision field Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 02/30] PCI: pci-bridge-emul: Add definitions for missing capabilities registers Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 03/30] PCI: aardvark: Add support for DEVCAP2, DEVCTL2, LNKCAP2 and LNKCTL2 registers on emulated bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 04/30] PCI: aardvark: Clear all MSIs at setup Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 05/30] PCI: aardvark: Comment actions in driver remove method Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 06/30] PCI: aardvark: Disable bus mastering when unbinding driver Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 07/30] PCI: aardvark: Mask all interrupts " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 08/30] PCI: aardvark: Fix memory leak in driver unbind Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 09/30] PCI: aardvark: Assert PERST# when unbinding driver Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 10/30] PCI: aardvark: Disable link training " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 11/30] PCI: aardvark: Disable common PHY " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 12/30] PCI: aardvark: Replace custom PCIE_CORE_INT_* macros with PCI_INTERRUPT_* Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 13/30] PCI: aardvark: Rewrite IRQ code to chained IRQ handler Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 14/30] PCI: aardvark: Check return value of generic_handle_domain_irq() when processing INTx IRQ Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 15/30] PCI: aardvark: Make MSI irq_chip structures static driver structures Marek Behún
2022-05-04 16:57 ` Marek Behún [this message]
2022-05-04 16:57 ` [PATCH 5.15 17/30] PCI: aardvark: Use dev_fwnode() instead of of_node_to_fwnode(dev->of_node) Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 18/30] PCI: aardvark: Refactor unmasking summary MSI interrupt Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 19/30] PCI: aardvark: Add support for masking MSI interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 20/30] PCI: aardvark: Fix setting MSI address Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 21/30] PCI: aardvark: Enable MSI-X support Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 22/30] PCI: aardvark: Add support for ERR interrupt on emulated bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 23/30] PCI: aardvark: Optimize writing PCI_EXP_RTCTL_PMEIE and PCI_EXP_RTSTA_PME " Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 24/30] PCI: aardvark: Add support for PME interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 25/30] PCI: aardvark: Fix support for PME requester on emulated bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 26/30] PCI: aardvark: Use separate INTA interrupt for emulated root bridge Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 27/30] PCI: aardvark: Remove irq_mask_ack() callback for INTx interrupts Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 28/30] PCI: aardvark: Don't mask irq when mapping Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 29/30] PCI: aardvark: Drop __maybe_unused from advk_pcie_disable_phy() Marek Behún
2022-05-04 16:57 ` [PATCH 5.15 30/30] PCI: aardvark: Update comment about link going down after link-up Marek Behún
2022-05-10 12:06 ` [PATCH 5.15 00/30] PCIe Aardvark controller backports for 5.15 Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220504165755.30002-17-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=pali@kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).