Received-SPF: pass (google.com: domain of linux-kernel+bounces-83044-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>,
	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 v15,RESEND 11/23] PCI: microchip: Add num_events field to struct plda_pcie_rp
Date: Tue, 27 Feb 2024 18:35:10 +0800
Message-Id: <20240227103522.80915-12-minda.chen@starfivetech.com>
In-Reply-To: <20240227103522.80915-1-minda.chen@starfivetech.com>
References: <20240227103522.80915-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?9+MV+W9guow5xFEmYx+2p7niOa6bvBespThw0bd53uJXch5BcZ+oZIv8NBYc?=
 =?us-ascii?Q?q8T+rO2gRnDI4y+naI1ZGtWkWUeVNkei9z6Oe2dIS00f4Uv4MZkCqtdDUeQi?=
 =?us-ascii?Q?RvgrydvL0WbX2oR0Xkl5RBHSw2kjGb1EyA5/fqg/EJCHmNGehUZHnBb6ym3q?=
 =?us-ascii?Q?HTDVaRozrrfkSWAHotkGNRlR5kBAyTsgCFSUokixu+MqS6tW4JtIfUTh1g16?=
 =?us-ascii?Q?F+mQ8nToglFtEC+z9vhSvnLwpBhco/7wyhVgHlLz++m1cpen5vCq6wJOu1jA?=
 =?us-ascii?Q?kubZA8FQB7QSVyPVbAA5as3+KrSMX+FX026UuBRVJZDEwWOkPMH1Trl4B0+q?=
 =?us-ascii?Q?yD/iz2/Kp0DSB5AaXT2MH1Aiupdx2YnW6f5CVEvH1TNwUKECc9URwJQuWdIQ?=
 =?us-ascii?Q?u/Os1ZqIu9ol+hs09ruRJ0QVfSfDs/Zn3s+DQcs//vkSfpy1KMqfSLzLADJS?=
 =?us-ascii?Q?64z94dhYlBygUJcBPNjJqrDexV81N3/c38Lzr31c2Te0mhUM8I//59pA5zcC?=
 =?us-ascii?Q?UDDUmpQrjxhtF8b3LkRG1RABzDQ/qU5c41zPVZcFc8z164Z3kRKfOXKM/zfY?=
 =?us-ascii?Q?TpdgY6ou4F/hZC1a5/R8x0O7kRS4WPt0Wl9YIyFTdUwzzXXy/3vHLAe48fV9?=
 =?us-ascii?Q?nnxnkCjesY6zmeckMs0YDvFD3VQ8TrqkZWEe6qY2JrDmf7FED86R/hcYvZO5?=
 =?us-ascii?Q?ksjPolrDe+oNU4Aa3zA+HRRmX3wYzgOD1NKpyVc86PZFrjCQ1oCVBhOebj+U?=
 =?us-ascii?Q?4dNjrMyhUAtoo5BSuZTZ3N7MDd7ig/fSEgBPsZmvfb9FRQ9ZFdmUIr14EvZc?=
 =?us-ascii?Q?TKyIMj6yesz/ovHpQM/W6PDs5W9qmr+Vgk6PJiAsV9iM4mZfse1f1uxRHv6F?=
 =?us-ascii?Q?pCcQaaBT/h2CdgrwFT5GzqRtOGVLoqosg7lfyhkUGLt1iOaw7CA07gBxjgSY?=
 =?us-ascii?Q?paGZBonOGNOmxl/HsB+FnD0asLfnldYTIu63yevohCQyiGIeaDNsuvid61qY?=
 =?us-ascii?Q?UW413L2zaTWBDv0G7lJP01o+JLydLqlXme4Y9fjkE2ZTcgv1wQmBCee2Fu0e?=
 =?us-ascii?Q?huLU7RKBiNENaGZFTKiT6krl0DZsc4zXktx4YQk8p8C9VNqUJ/RRGNr46PX8?=
 =?us-ascii?Q?EGmdZQCnCk/ZztADz+sJ4FHV3tTcwyHHStuS33IvyiL0cSpiRt7x6CENc7Wt?=
 =?us-ascii?Q?S8uTL9UU33UBWIu8Vk5LZx3pq5cV0I9urpGrIjSIWZGLXt3/Z5ThVH1yFU6Y?=
 =?us-ascii?Q?RRSWhhQ9+TpNYVwvfaNAMPHvwYJDhlLpWuZnKlJlnP5Bq600T8J9M19eVPR6?=
 =?us-ascii?Q?O8+7viuQuzJehswyklKLs8XjZlko9/TVbLyqKRI3E4HIvBHuX04Kt7m82Xur?=
 =?us-ascii?Q?PyFe3vEZ78c/h5k9TtAdR8gaq00cdJwwnlcd1pUFTn2zTMaCiiwazuHhqSWJ?=
 =?us-ascii?Q?PRKwNCxtLoq/HTZxDFxTLV/W7iAiYWJaqv8oCM8HmhjGhtcFs/yXIe1Fjzn0?=
 =?us-ascii?Q?nV3VmK6cF8JuVZKJULr3MjL7kurjY9DFhggVuE5PP4W6zfHaFV2yaUe4qjFh?=
 =?us-ascii?Q?E4zEOA7CgS29RVbsTuX1DVCpkHVIJ/WpuLGUttqDrtI2u8PF1L8tLvVm1FaS?=
 =?us-ascii?Q?Vg=3D=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd69a0ee-ec2d-4bed-1fca-08dc377fd879
X-MS-Exchange-CrossTenant-AuthSource: SHXPR01MB0863.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 10:35:41.3115
 (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: dHQdOu4A37mrbZ96jNLz/IBVpaUCcZEBlxj4078EuRpoUjcXWkUsu9nbGYeZPT1WK+g8362rqkVTsQnsiTvgcv3dwns+o56+Ylo1th02KBs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0496

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