* [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency [not found] <20240711160907.31012-8-kabel@kernel.org> @ 2024-07-29 9:49 ` tip-bot2 for Marek Behún 2024-07-30 11:39 ` tip-bot2 for Marek Behún 1 sibling, 0 replies; 4+ 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, x86, linux-kernel, maz The following commit has been merged into the irq/core branch of tip: Commit-ID: e827b6cb64b412a6b52e5fc0f453013ac98032f6 Gitweb: https://git.kernel.org/tip/e827b6cb64b412a6b52e5fc0f453013ac98032f6 Author: Marek Behún <kabel@kernel.org> AuthorDate: Thu, 11 Jul 2024 18:09:04 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 29 Jul 2024 10:57:24 +02:00 irqchip/armada-370-xp: Rename variable for consistency Rename the variable holding the cause register to "cause" in mpic_handle_cascade_irq(). Signed-off-by: Marek Behún <kabel@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20240711160907.31012-8-kabel@kernel.org --- drivers/irqchip/irq-armada-370-xp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index c1085c7..29ce6fe 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -633,15 +633,15 @@ static inline void mpic_handle_ipi_irq(void) {} static void mpic_handle_cascade_irq(struct irq_desc *desc) { struct irq_chip *chip = irq_desc_get_chip(desc); - unsigned long irqmap, irqsrc, cpuid; + unsigned long cause, irqsrc, cpuid; irq_hw_number_t i; chained_irq_enter(chip, desc); - irqmap = readl_relaxed(per_cpu_int_base + MPIC_PPI_CAUSE); + cause = readl_relaxed(per_cpu_int_base + MPIC_PPI_CAUSE); cpuid = cpu_logical_map(smp_processor_id()); - for_each_set_bit(i, &irqmap, BITS_PER_LONG) { + for_each_set_bit(i, &cause, BITS_PER_LONG) { irqsrc = readl_relaxed(main_int_base + MPIC_INT_SOURCE_CTL(i)); /* Check if the interrupt is not masked on current CPU. ^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency [not found] <20240711160907.31012-8-kabel@kernel.org> 2024-07-29 9:49 ` [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency tip-bot2 for Marek Behún @ 2024-07-30 11:39 ` tip-bot2 for Marek Behún 1 sibling, 0 replies; 4+ messages in thread From: tip-bot2 for Marek Behún @ 2024-07-30 11:39 UTC (permalink / raw) To: linux-tip-commits; +Cc: kabel, Thomas Gleixner, x86, linux-kernel, maz The following commit has been merged into the irq/core branch of tip: Commit-ID: ac0ae59db6f521223b477677d2ff51e26815b114 Gitweb: https://git.kernel.org/tip/ac0ae59db6f521223b477677d2ff51e26815b114 Author: Marek Behún <kabel@kernel.org> AuthorDate: Thu, 11 Jul 2024 18:09:04 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Tue, 30 Jul 2024 13:35:48 +02:00 irqchip/armada-370-xp: Rename variable for consistency Rename the variable holding the cause register to "cause" in mpic_handle_cascade_irq(). Signed-off-by: Marek Behún <kabel@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/all/20240711160907.31012-8-kabel@kernel.org --- drivers/irqchip/irq-armada-370-xp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 4abe0ea..5cde229 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -633,15 +633,15 @@ static inline void mpic_handle_ipi_irq(void) {} static void mpic_handle_cascade_irq(struct irq_desc *desc) { struct irq_chip *chip = irq_desc_get_chip(desc); - unsigned long irqmap, irqsrc, cpuid; + unsigned long cause, irqsrc, cpuid; irq_hw_number_t i; chained_irq_enter(chip, desc); - irqmap = readl_relaxed(per_cpu_int_base + MPIC_PPI_CAUSE); + cause = readl_relaxed(per_cpu_int_base + MPIC_PPI_CAUSE); cpuid = cpu_logical_map(smp_processor_id()); - for_each_set_bit(i, &irqmap, BITS_PER_LONG) { + for_each_set_bit(i, &cause, BITS_PER_LONG) { irqsrc = readl_relaxed(main_int_base + MPIC_INT_SOURCE_CTL(i)); /* Check if the interrupt is not masked on current CPU. ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20240711115748.30268-2-kabel@kernel.org>]
* [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency [not found] <20240711115748.30268-2-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; 4+ 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: d258a2da44fe9986e787da056585da0765e78437 Gitweb: https://git.kernel.org/tip/d258a2da44fe9986e787da056585da0765e78437 Author: Marek Behún <kabel@kernel.org> AuthorDate: Thu, 11 Jul 2024 13:57:39 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Mon, 29 Jul 2024 10:57:22 +02:00 irqchip/armada-370-xp: Rename variable for consistency Rename the irq variable to virq in the ipi_resume() function for consistency with the rest of the code. 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-2-kabel@kernel.org --- drivers/irqchip/irq-armada-370-xp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 22e1a49..7016b20 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -462,14 +462,14 @@ static const struct irq_domain_ops ipi_domain_ops = { static void ipi_resume(void) { for (int i = 0; i < IPI_DOORBELL_END; i++) { - int irq; + int virq; - irq = irq_find_mapping(ipi_domain, i); - if (irq <= 0) + virq = irq_find_mapping(ipi_domain, i); + if (virq <= 0) continue; - if (irq_percpu_is_enabled(irq)) { + if (irq_percpu_is_enabled(virq)) { struct irq_data *d; - d = irq_domain_get_irq_data(ipi_domain, irq); + d = irq_domain_get_irq_data(ipi_domain, virq); armada_370_xp_ipi_unmask(d); } } ^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency [not found] <20240711115748.30268-2-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; 4+ 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: 55689986d7eaed09b6569b1e06b29044cd3cb590 Gitweb: https://git.kernel.org/tip/55689986d7eaed09b6569b1e06b29044cd3cb590 Author: Marek Behún <kabel@kernel.org> AuthorDate: Thu, 11 Jul 2024 13:57:39 +02:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Tue, 30 Jul 2024 13:35:46 +02:00 irqchip/armada-370-xp: Rename variable for consistency Rename the irq variable to virq in the ipi_resume() function for consistency with the rest of the code. 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-2-kabel@kernel.org --- drivers/irqchip/irq-armada-370-xp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 22e1a49..7016b20 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -462,14 +462,14 @@ static const struct irq_domain_ops ipi_domain_ops = { static void ipi_resume(void) { for (int i = 0; i < IPI_DOORBELL_END; i++) { - int irq; + int virq; - irq = irq_find_mapping(ipi_domain, i); - if (irq <= 0) + virq = irq_find_mapping(ipi_domain, i); + if (virq <= 0) continue; - if (irq_percpu_is_enabled(irq)) { + if (irq_percpu_is_enabled(virq)) { struct irq_data *d; - d = irq_domain_get_irq_data(ipi_domain, irq); + d = irq_domain_get_irq_data(ipi_domain, virq); armada_370_xp_ipi_unmask(d); } } ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-30 11:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20240711160907.31012-8-kabel@kernel.org>
2024-07-29 9:49 ` [tip: irq/core] irqchip/armada-370-xp: Rename variable for consistency tip-bot2 for Marek Behún
2024-07-30 11:39 ` tip-bot2 for Marek Behún
[not found] <20240711115748.30268-2-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
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®