Received-SPF: pass (google.com: domain of linux-kernel+bounces-42130-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Minda Chen <minda.chen@starfivetech.com>
To: Conor Dooley <conor@kernel.org>,
	=?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
	Rob Herring <robh+dt@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	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 v14,RESEND 06/22] PCI: microchip: Move PCIe host data structures to plda-pcie.h
Date: Mon, 29 Jan 2024 08:59:51 +0800
Message-Id: <20240129005958.3613-5-minda.chen@starfivetech.com>
In-Reply-To: <20240129005958.3613-1-minda.chen@starfivetech.com>
References: <20240129005958.3613-1-minda.chen@starfivetech.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?5RRHy8WLR3qxOlVn5Kfa60DJqFaPMsQt9nfbPPNE0cLnhoRXmo/IR6lOD91X?=
 =?us-ascii?Q?SLPqVVSL3sKfaGQ5BMKb4HuPMCRLE6JHI1aT58Kat0SL5IyJiAHyIq06bs8q?=
 =?us-ascii?Q?zNSENrlFeLfc1G9+2t659W/7Wy9bsc7Oc0GDPlA8R9bUEQTJQYQl1WVZUlpu?=
 =?us-ascii?Q?LHMZzeQLR6b9q5l3PchdfD6TV67BgFkds4S/KujsP6SSBoc36+QbOTp3QDdP?=
 =?us-ascii?Q?lkE4LULlYNpgaEk1An5WivZQ64fyNuJ2053zn0EtFYprpFUMP8WtQPqZOAQl?=
 =?us-ascii?Q?2NFmuz7wmAkpzVn5H52FJLkP5YcdFA1r7FcRIygXcGn+embujv3+kP7eGZD0?=
 =?us-ascii?Q?YH1NUkj+BTGpPeOBsEwHNHA14jlb/6UCGvA3MT0mgC6MbSZcZYhksquIBRlh?=
 =?us-ascii?Q?Jk4BRLUPhDh70S77gCEPeE6Eqysn1YMfbhba9oFwkG3pLXvRe72hNkiEaQ3I?=
 =?us-ascii?Q?PxLcGPWx0Zk6nqq2/Bl8W/m8SHKzguYwekXg2RBJ7LzlMHcbtRT996jGnJmj?=
 =?us-ascii?Q?uUmxuQDKpJWlo9Ns92tFeksGpB0DKoBJDX2diOJlPgIo30kRuReGv/03TmoS?=
 =?us-ascii?Q?YnKmc1xDoFn/ZB11UZ0rYHZljpY2Inqlh3jhcGEkyAv8qQQANXQCEY/7TeSY?=
 =?us-ascii?Q?5jUz/HMtpPihX9aLtcPF1wZ0BDYdi6IHEBeexX8f3d6z0GDvEeSH1sGp0ZEn?=
 =?us-ascii?Q?+9dh3A+O5uwT0YbGvg+nsSw0NPqaJdZDNBbaVlAI4Dmvco+iXtlWxtVSqC3n?=
 =?us-ascii?Q?8alL0na5pbqCnGUgxBg9pASnJ0LXHyUw79RSV4+8wJpiGvdttE3RA1LS9wRU?=
 =?us-ascii?Q?B96uiFCtvrY2skNcezIgdDyeH+NNdN9HDSrboY7Bzy5D2jmdRp3RWeBNrMuW?=
 =?us-ascii?Q?pCGCEZ1WuIQqaXu7ZCQ2CcFnNX1YGlej9qoqyL5RSd+9WbAMufXN6DA0xIz1?=
 =?us-ascii?Q?wvDaju4sLdHHF39+6LAGlwWfHTH9rNqPc9WuDoSEs/KVxwO6LVB4AVJj2AZD?=
 =?us-ascii?Q?t4E1zQRE2IksnNqkElRtpvOu1jjEeTicII3qnJU2yny9EpcseXljtADk1bvp?=
 =?us-ascii?Q?ur/gAYdNFTQBTh7vkyEwnEQvS0UgAPI9cBhN2dCPlcjtF8dMmSscQlpRIYAK?=
 =?us-ascii?Q?buPWwRh6dw4XY7bxQYPmX0FH1MlGkPuxILoDk8FOluQEchfeOY0AnHrkDxr1?=
 =?us-ascii?Q?a/24tGl8+xTao3Fj+dQuTUaY/s51qBXqwkSc5pC/kOXWIMzUt55svNC9Irsb?=
 =?us-ascii?Q?0iuUEr4TF74qOOEqopLgwsc1F1ILHCYaxaHSn7C+qCTr8OVD0HknmHdc5Pfo?=
 =?us-ascii?Q?4vh3LSY7OperURGzI+FGfXihT2ZzE7txoOvDdUifUW9CsZCbK/i8qYDHiMpw?=
 =?us-ascii?Q?6AV2lRrhSNLh76+CH8M9X8KNcAGgDFAYCCdfBOWmp9pEOhv3utRYuVCPYEHk?=
 =?us-ascii?Q?b0Goc4Udreqiwf0aVd9ZYkpJY6Vz3b8DJ8bwg8Ju6V6MHwJCGO4yIXobcK8h?=
 =?us-ascii?Q?bzVuAYXo1sRb1qZ+cvCEW6cODywzP7LAi2yXhahzqnhbM67pbdaf7+NtFFA3?=
 =?us-ascii?Q?IanOxRYaQFMoaVemSSsRSc12oTfrtWIQ9Kxykv1Is9gZvsiTK0OfjCsBCaj3?=
 =?us-ascii?Q?CA=3D=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa597cfc-697e-4027-d3ce-08dc2065a577
X-MS-Exchange-CrossTenant-AuthSource: BJXPR01MB0855.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 01:00:12.0778
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DHAseEhrXm1zWUWC0jQKK1HLsE0WmO//avrYL4fB160hbJJGyL47Er8JohJocl9AN/wBTH3EOMVM7CBrk209hCvTbP5nIJ4OYHF+yeTr63c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BJXPR01MB0630

Move the common data structures definition to head file for 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