mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [tip: irq/core] irqchip/armada-370-xp: Don't read number of supported interrupts multiple times
       [not found] <20240711115748.30268-8-kabel@kernel.org>
@ 2024-07-29  9:49 ` tip-bot2 for Marek Behún
  2024-07-30 11:40 ` tip-bot2 for Marek Behún
  1 sibling, 0 replies; 2+ messages in thread
From: tip-bot2 for Marek Behún @ 2024-07-29  9:49 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: kabel, Thomas Gleixner, Andrew Lunn, ilpo.jarvinen, x86,
	linux-kernel, maz

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     ec47b16b24fa25f9ddc3ac9652f1746107312156
Gitweb:        https://git.kernel.org/tip/ec47b16b24fa25f9ddc3ac9652f1746107312156
Author:        Marek Behún <kabel@kernel.org>
AuthorDate:    Thu, 11 Jul 2024 13:57:45 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Mon, 29 Jul 2024 10:57:23 +02:00

irqchip/armada-370-xp: Don't read number of supported interrupts multiple times

Use mpic_domain::hwirq_max at runtime instead of reading the same value
over and over from the MPIC_INT_CONTROL register.

Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/all/20240711115748.30268-8-kabel@kernel.org

---
 drivers/irqchip/irq-armada-370-xp.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 2758834..e43eb26 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -494,13 +494,7 @@ static int mpic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
 
 static void mpic_smp_cpu_init(void)
 {
-	u32 control;
-	int nr_irqs;
-
-	control = readl(main_int_base + MPIC_INT_CONTROL);
-	nr_irqs = (control >> 2) & 0x3ff;
-
-	for (int i = 0; i < nr_irqs; i++)
+	for (int i = 0; i < mpic_domain->hwirq_max; i++)
 		writel(i, per_cpu_int_base + MPIC_INT_SET_MASK);
 
 	if (!mpic_is_ipi_available())
@@ -706,10 +700,9 @@ static int mpic_suspend(void)
 static void mpic_resume(void)
 {
 	bool src0, src1;
-	int nirqs;
+
 	/* Re-enable interrupts */
-	nirqs = (readl(main_int_base + MPIC_INT_CONTROL) >> 2) & 0x3ff;
-	for (irq_hw_number_t irq = 0; irq < nirqs; irq++) {
+	for (irq_hw_number_t irq = 0; irq < mpic_domain->hwirq_max; irq++) {
 		struct irq_data *data;
 		unsigned int virq;
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [tip: irq/core] irqchip/armada-370-xp: Don't read number of supported interrupts multiple times
       [not found] <20240711115748.30268-8-kabel@kernel.org>
  2024-07-29  9:49 ` [tip: irq/core] irqchip/armada-370-xp: Don't read number of supported interrupts multiple times tip-bot2 for Marek Behún
@ 2024-07-30 11:40 ` tip-bot2 for Marek Behún
  1 sibling, 0 replies; 2+ messages in thread
From: tip-bot2 for Marek Behún @ 2024-07-30 11:40 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: kabel, Thomas Gleixner, Andrew Lunn, ilpo.jarvinen, x86,
	linux-kernel, maz

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     5ecafc9a640f7c1e5690375cf3a82848d669abb9
Gitweb:        https://git.kernel.org/tip/5ecafc9a640f7c1e5690375cf3a82848d669abb9
Author:        Marek Behún <kabel@kernel.org>
AuthorDate:    Thu, 11 Jul 2024 13:57:45 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 30 Jul 2024 13:35:47 +02:00

irqchip/armada-370-xp: Don't read number of supported interrupts multiple times

Use mpic_domain::hwirq_max at runtime instead of reading the same value
over and over from the MPIC_INT_CONTROL register.

Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/all/20240711115748.30268-8-kabel@kernel.org


---
 drivers/irqchip/irq-armada-370-xp.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 2758834..e43eb26 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -494,13 +494,7 @@ static int mpic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
 
 static void mpic_smp_cpu_init(void)
 {
-	u32 control;
-	int nr_irqs;
-
-	control = readl(main_int_base + MPIC_INT_CONTROL);
-	nr_irqs = (control >> 2) & 0x3ff;
-
-	for (int i = 0; i < nr_irqs; i++)
+	for (int i = 0; i < mpic_domain->hwirq_max; i++)
 		writel(i, per_cpu_int_base + MPIC_INT_SET_MASK);
 
 	if (!mpic_is_ipi_available())
@@ -706,10 +700,9 @@ static int mpic_suspend(void)
 static void mpic_resume(void)
 {
 	bool src0, src1;
-	int nirqs;
+
 	/* Re-enable interrupts */
-	nirqs = (readl(main_int_base + MPIC_INT_CONTROL) >> 2) & 0x3ff;
-	for (irq_hw_number_t irq = 0; irq < nirqs; irq++) {
+	for (irq_hw_number_t irq = 0; irq < mpic_domain->hwirq_max; irq++) {
 		struct irq_data *data;
 		unsigned int virq;
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-07-30 11:40 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20240711115748.30268-8-kabel@kernel.org>
2024-07-29  9:49 ` [tip: irq/core] irqchip/armada-370-xp: Don't read number of supported interrupts multiple times tip-bot2 for Marek Behún
2024-07-30 11:40 ` tip-bot2 for Marek Behún

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®