From: Minda Chen <minda.chen@starfivetech.com>
To: "Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Conor Dooley" <conor@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh+dt@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Daire McNamara" <daire.mcnamara@microchip.com>,
"Emil Renner Berthing" <emil.renner.berthing@canonical.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-pci@vger.kernel.org,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Philipp Zabel <p.zabel@pengutronix.de>,
Mason Huo <mason.huo@starfivetech.com>,
Leyfoon Tan <leyfoon.tan@starfivetech.com>,
Kevin Xie <kevin.xie@starfivetech.com>,
Minda Chen <minda.chen@starfivetech.com>
Subject: [PATCH v16 06/22] PCI: microchip: Move PCIe host data structures to plda-pcie.h
Date: Thu, 28 Mar 2024 17:18:19 +0800 [thread overview]
Message-ID: <20240328091835.14797-7-minda.chen@starfivetech.com> (raw)
In-Reply-To: <20240328091835.14797-1-minda.chen@starfivetech.com>
Move the common data structures definition to head file becauce these two
data structures can be re-used.
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
---
.../pci/controller/plda/pcie-microchip-host.c | 20 ------------------
drivers/pci/controller/plda/pcie-plda.h | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index df0736f688ce..a554a56cc0e8 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -21,9 +21,6 @@
#include "../../pci.h"
#include "pcie-plda.h"
-/* Number of MSI IRQs */
-#define PLDA_MAX_NUM_MSI_IRQS 32
-
/* PCIe Bridge Phy and Controller Phy offsets */
#define MC_PCIE1_BRIDGE_ADDR 0x00008000u
#define MC_PCIE1_CTRL_ADDR 0x0000a000u
@@ -179,23 +176,6 @@ struct event_map {
u32 event_bit;
};
-struct plda_msi {
- struct mutex lock; /* Protect used bitmap */
- struct irq_domain *msi_domain;
- struct irq_domain *dev_domain;
- u32 num_vectors;
- u64 vector_phy;
- DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
-};
-
-struct plda_pcie_rp {
- struct device *dev;
- struct irq_domain *intx_domain;
- struct irq_domain *event_domain;
- raw_spinlock_t lock;
- struct plda_msi msi;
- void __iomem *bridge_addr;
-};
struct mc_pcie {
struct plda_pcie_rp plda;
diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index 65e0f3b72184..9ca66916c609 100644
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -6,6 +6,9 @@
#ifndef _PCIE_PLDA_H
#define _PCIE_PLDA_H
+/* Number of MSI IRQs */
+#define PLDA_MAX_NUM_MSI_IRQS 32
+
/* PCIe Bridge Phy Regs */
#define PCIE_PCI_IRQ_DW0 0xa8
#define MSIX_CAP_MASK BIT(31)
@@ -105,4 +108,22 @@ enum plda_int_event {
#define PLDA_MAX_EVENT_NUM (PLDA_NUM_DMA_EVENTS + PLDA_INT_EVENT_NUM)
+struct plda_msi {
+ struct mutex lock; /* Protect used bitmap */
+ struct irq_domain *msi_domain;
+ struct irq_domain *dev_domain;
+ u32 num_vectors;
+ u64 vector_phy;
+ DECLARE_BITMAP(used, PLDA_MAX_NUM_MSI_IRQS);
+};
+
+struct plda_pcie_rp {
+ struct device *dev;
+ struct irq_domain *intx_domain;
+ struct irq_domain *event_domain;
+ raw_spinlock_t lock;
+ struct plda_msi msi;
+ void __iomem *bridge_addr;
+};
+
#endif
--
2.17.1
next prev parent reply other threads:[~2024-03-28 9:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 9:18 [PATCH v16 00/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2024-03-28 9:18 ` [PATCH v16 01/22] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen
2024-03-28 9:18 ` [PATCH v16 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen
2024-03-28 9:18 ` [PATCH v16 03/22] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen
2024-03-28 9:18 ` [PATCH v16 04/22] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen
2024-03-28 9:18 ` [PATCH v16 05/22] PCI: microchip: Rename two PCIe data structures Minda Chen
2024-03-28 9:18 ` Minda Chen [this message]
2024-03-28 9:18 ` [PATCH v16 07/22] PCI: microchip: Rename two setup functions Minda Chen
2024-03-28 9:18 ` [PATCH v16 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen
2024-03-28 9:18 ` [PATCH v16 09/22] PCI: microchip: Move setup functions to pcie-plda-host.c Minda Chen
2024-03-28 9:18 ` [PATCH v16 10/22] PCI: microchip: Rename interrupt related functions Minda Chen
2024-03-28 9:18 ` [PATCH v16 11/22] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen
2024-03-28 9:18 ` [PATCH v16 12/22] PCI: microchip: Add request_event_irq() callback function Minda Chen
2024-03-28 9:18 ` [PATCH v16 13/22] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen
2024-03-28 9:18 ` [PATCH v16 14/22] PCI: microchip: Add get_events() callback and add PLDA get_event() Minda Chen
2024-03-28 9:18 ` [PATCH v16 15/22] PCI: microchip: Add event irqchip field to host port and add PLDA irqchip Minda Chen
2024-04-30 0:50 ` Minda Chen
2024-04-30 1:10 ` Minda Chen
2024-03-28 9:18 ` [PATCH v16 16/22] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen
2024-03-28 9:18 ` [PATCH v16 17/22] PCI: plda: Add event bitmap field to struct plda_pcie_rp Minda Chen
2024-03-28 9:18 ` [PATCH v16 18/22] PCI: plda: Add host init/deinit and map bus functions Minda Chen
2024-03-28 9:18 ` [PATCH v16 19/22] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen
2024-03-28 9:18 ` [PATCH v16 20/22] PCI: Add PCIE_RESET_CONFIG_DEVICE_WAIT_MS waiting time value Minda Chen
2024-03-28 9:18 ` [PATCH v16 21/22] PCI: starfive: Add JH7110 PCIe controller Minda Chen
2024-03-28 9:18 ` [PATCH v16 22/22] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen
2024-04-30 0:53 ` 回复: [PATCH v16 00/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
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=20240328091835.14797-7-minda.chen@starfivetech.com \
--to=minda.chen@starfivetech.com \
--cc=aou@eecs.berkeley.edu \
--cc=bhelgaas@google.com \
--cc=conor@kernel.org \
--cc=daire.mcnamara@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=emil.renner.berthing@canonical.com \
--cc=kevin.xie@starfivetech.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kw@linux.com \
--cc=leyfoon.tan@starfivetech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=mason.huo@starfivetech.com \
--cc=p.zabel@pengutronix.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/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).