Received-SPF: pass (google.com: domain of linux-kernel+bounces-42098-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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 11/22] PCI: microchip: Add num_events field to struct plda_pcie_rp
Date: Mon, 29 Jan 2024 08:59:56 +0800
Message-Id: <20240129005958.3613-10-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?QsoC66fd1Y6JRISLmHoOsCJhOYNYs6pteYAnolT/gvDb3+qsownihOAX0bdz?=
 =?us-ascii?Q?3Hm+if+HUZgCC04yg6yPr5Pxyqnv9bL7sNANcYBNgxcj+RU/mlR3geTcLBIx?=
 =?us-ascii?Q?5G6+oLv/aWvp1zDglATY7+tO5KIVZNgsuIBtceujOKxBfal/N5DrvZM5Iyh4?=
 =?us-ascii?Q?KPin/NfcjMs8SXLvgZ5DQOOoFq0a6bwNItXNLec4AmXQUJuMInvmPU8TBVbZ?=
 =?us-ascii?Q?hREQHqbUPG5+OYBX5uInw4e76jOHXUrPqbJNHRjMmQ3msudpcTqtCRTZFdho?=
 =?us-ascii?Q?8Yqp6RGxQIG0fGU7AuuabcyusXOzQDdrev9s8ZCmH0396LoVJwOorToREdw7?=
 =?us-ascii?Q?rYncMBqsG64+sdbxhpNh0rQZyS5NXxz59UzYvu8cXldzbQOJmLDgNFIh+mBO?=
 =?us-ascii?Q?vR3XFljAifJiL043nUFG2FFheuHU45rrQdNEkxWfyMbIBlQyhRdNsWDZGNai?=
 =?us-ascii?Q?T6UMsYdFoUgFV7tMcNcdC+uhQTybdHnahhOk7OyV5vExm0j25Qtl6JGyhTxC?=
 =?us-ascii?Q?Ct2HtClrAMtytvg0zsGaNw4YC15QlXtcC5n/QUai1x/T4iaQjwY5FTm/Kevx?=
 =?us-ascii?Q?8DghFGinJZS/DWhl/32Fb0xNznrzvFxHznupqqYVV6mqjnJVXXNv4QhNb46E?=
 =?us-ascii?Q?0oUF0qf+bqYHvKIdqSkX5NjP39Y6ThyVvTBMRz0BWfSzIIj1hGEC0xFgIw2V?=
 =?us-ascii?Q?rMkK9an/VmuQUxCUNeecaxzyoUV9qh1LY4aLzThPaNxeipL5HD0wU0I4Ckmh?=
 =?us-ascii?Q?ceSqGDyFUxAQZGHQ8MEkYEacB3CKeIKJAw9cPB1A5cf/Tmos0NjthM2Vh1hU?=
 =?us-ascii?Q?LqrAdANTOjTh2Joiq6ghBECyw753pgaVcB4ePDy4BNc5dF5kEjcGXLEa/bR8?=
 =?us-ascii?Q?EXL6xYKfLXjU7gXXlDhFHu/NWnvHHqsdAW35DXgLMHz1IowdIru3tQApmgPl?=
 =?us-ascii?Q?knJtPR9D8BdfpFYU7RAU2r+8lw0MRLZ6tkZoiKV9iDFuC6oudcIc6BfWg8GM?=
 =?us-ascii?Q?hJZ1GdvSWlOj6dOkYrA4WzmajtdBJh4Iy4gb76kInFl/lYXrx+0EXSO6Ecze?=
 =?us-ascii?Q?cvWRuu5q7b0izG63SGdLWR9GGJ9atCzS0P/3lMOVVb+GFJmSWAbuxG+Cyc5l?=
 =?us-ascii?Q?/Clo4opwztsRdlsJckEmzRp4FqaE3aDYVPOWPYN8ULS9W8bbVNT9OmlkngBv?=
 =?us-ascii?Q?xjYTTvCUJcSrYAbQkqanS0Amd3IeNsGvb3KVHRPekmiumTsE/F8D9amSZvrl?=
 =?us-ascii?Q?ObuFERwEA76UAGLw2XcnL7v0pAviGdHGGcVRD96Yk/dOsLNuPnvRqYrp/qM1?=
 =?us-ascii?Q?l69NSBDwtzCGAPEEoBQI2y7IERGIRn9PmAnnBER86MwJ9/tKRB31Hye00TQ8?=
 =?us-ascii?Q?GLvu1Rn0m06/Q4Dm8siDg/suaD2fbjFb12JANXPxapHH3SnLW3f1L0jeg5D3?=
 =?us-ascii?Q?vsTV5biYbrMbrMMzm8b4bbzWiT1EA8EvxEULX5fcHHhEgR8oEVjc5oqmY3XQ?=
 =?us-ascii?Q?+zipKbPPQJO6Lx36S8A/EjmmCpXKWhIOZWFJU8v41ZfuBPmAFJEwH7VhHCUA?=
 =?us-ascii?Q?e+k9pvJifWHF/2/6rul/uWzM5hfvzAcsl/LACoCkYL8dcuBKRYDQVJLKupAT?=
 =?us-ascii?Q?Pw=3D=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4c5de45-dd09-4554-e05b-08dc2065a984
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:18.8556
 (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: aBskbvOvjcgmqP7VmNpV4M1qAE8fElRehYWuECD4bE5YbPsQQUwqB9ioJrosdFxC2gashvX8W6xXBDH1KfliH9+f7bHoeHCU7Dr1QBplZoY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BJXPR01MB0552

The number of events is different across platforms. In order to share
interrupt processing code, add a variable that defines the number of
events so that it can be set per-platform instead of hardcoding it.

Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/pci/controller/plda/pcie-microchip-host.c | 8 +++++---
 drivers/pci/controller/plda/pcie-plda.h           | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index 18bc352db389..0a5cd8b214cd 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -653,7 +653,7 @@ static void plda_handle_event(struct irq_desc *desc)
 
 	events = mc_get_events(port);
 
-	for_each_set_bit(bit, &events, NUM_EVENTS)
+	for_each_set_bit(bit, &events, port->num_events)
 		generic_handle_domain_irq(port->event_domain, bit);
 
 	chained_irq_exit(chip, desc);
@@ -816,7 +816,8 @@ static int plda_pcie_init_irq_domains(struct plda_pcie_rp *port)
 		return -EINVAL;
 	}
 
-	port->event_domain = irq_domain_add_linear(pcie_intc_node, NUM_EVENTS,
+	port->event_domain = irq_domain_add_linear(pcie_intc_node,
+						   port->num_events,
 						   &plda_event_domain_ops,
 						   port);
 	if (!port->event_domain) {
@@ -920,7 +921,7 @@ static int plda_init_interrupts(struct platform_device *pdev, struct plda_pcie_r
 	if (irq < 0)
 		return -ENODEV;
 
-	for (i = 0; i < NUM_EVENTS; i++) {
+	for (i = 0; i < port->num_events; i++) {
 		event_irq = irq_create_mapping(port->event_domain, i);
 		if (!event_irq) {
 			dev_err(dev, "failed to map hwirq %d\n", i);
@@ -1012,6 +1013,7 @@ static int mc_host_probe(struct platform_device *pdev)
 
 	bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
 	plda->bridge_addr = bridge_base_addr;
+	plda->num_events = NUM_EVENTS;
 
 	/* Allow enabling MSI by disabling MSI-X */
 	val = readl(bridge_base_addr + PCIE_PCI_IRQ_DW0);
diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index e277a5452b5d..f7e900b395f8 100644
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -124,6 +124,7 @@ struct plda_pcie_rp {
 	raw_spinlock_t lock;
 	struct plda_msi msi;
 	void __iomem *bridge_addr;
+	int num_events;
 };
 
 void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
-- 
2.17.1