Patch "irqchip/jcore-aic, clocksource/drivers/jcore: Fix jcore-pit interrupt request" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    irqchip/jcore-aic, clocksource/drivers/jcore: Fix jcore-pit interrupt request

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     irqchip-jcore-aic-clocksource-drivers-jcore-fix-jcor.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5e56c13da760b93659910cb9d015a5bbe48a5294
Author: Artur Rojek <contact@xxxxxxxxxxxxxx>
Date:   Sun Feb 16 18:55:45 2025 +0100

    irqchip/jcore-aic, clocksource/drivers/jcore: Fix jcore-pit interrupt request
    
    [ Upstream commit d7e3fd658248f257006227285095d190e70ee73a ]
    
    The jcore-aic irqchip does not have separate interrupt numbers reserved for
    cpu-local vs global interrupts. Therefore the device drivers need to
    request the given interrupt as per CPU interrupt.
    
    69a9dcbd2d65 ("clocksource/drivers/jcore: Use request_percpu_irq()")
    converted the clocksource driver over to request_percpu_irq(), but failed
    to do add all the required changes, resulting in a failure to register PIT
    interrupts.
    
    Fix this by:
    
     1) Explicitly mark the interrupt via irq_set_percpu_devid() in
        jcore_pit_init().
    
     2) Enable and disable the per CPU interrupt in the CPU hotplug callbacks.
    
     3) Pass the correct per-cpu cookie to the irq handler by using
        handle_percpu_devid_irq() instead of handle_percpu_irq() in
        handle_jcore_irq().
    
    [ tglx: Massage change log ]
    
    Fixes: 69a9dcbd2d65 ("clocksource/drivers/jcore: Use request_percpu_irq()")
    Signed-off-by: Artur Rojek <contact@xxxxxxxxxxxxxx>
    Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
    Acked-by: Uros Bizjak <ubizjak@xxxxxxxxx>
    Link: https://lore.kernel.org/all/20250216175545.35079-3-contact@xxxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/clocksource/jcore-pit.c b/drivers/clocksource/jcore-pit.c
index a3fe98cd38382..82815428f8f92 100644
--- a/drivers/clocksource/jcore-pit.c
+++ b/drivers/clocksource/jcore-pit.c
@@ -114,6 +114,18 @@ static int jcore_pit_local_init(unsigned cpu)
 	pit->periodic_delta = DIV_ROUND_CLOSEST(NSEC_PER_SEC, HZ * buspd);
 
 	clockevents_config_and_register(&pit->ced, freq, 1, ULONG_MAX);
+	enable_percpu_irq(pit->ced.irq, IRQ_TYPE_NONE);
+
+	return 0;
+}
+
+static int jcore_pit_local_teardown(unsigned cpu)
+{
+	struct jcore_pit *pit = this_cpu_ptr(jcore_pit_percpu);
+
+	pr_info("Local J-Core PIT teardown on cpu %u\n", cpu);
+
+	disable_percpu_irq(pit->ced.irq);
 
 	return 0;
 }
@@ -168,6 +180,7 @@ static int __init jcore_pit_init(struct device_node *node)
 		return -ENOMEM;
 	}
 
+	irq_set_percpu_devid(pit_irq);
 	err = request_percpu_irq(pit_irq, jcore_timer_interrupt,
 				 "jcore_pit", jcore_pit_percpu);
 	if (err) {
@@ -237,7 +250,7 @@ static int __init jcore_pit_init(struct device_node *node)
 
 	cpuhp_setup_state(CPUHP_AP_JCORE_TIMER_STARTING,
 			  "clockevents/jcore:starting",
-			  jcore_pit_local_init, NULL);
+			  jcore_pit_local_init, jcore_pit_local_teardown);
 
 	return 0;
 }
diff --git a/drivers/irqchip/irq-jcore-aic.c b/drivers/irqchip/irq-jcore-aic.c
index b9dcc8e78c750..1f613eb7b7f03 100644
--- a/drivers/irqchip/irq-jcore-aic.c
+++ b/drivers/irqchip/irq-jcore-aic.c
@@ -38,7 +38,7 @@ static struct irq_chip jcore_aic;
 static void handle_jcore_irq(struct irq_desc *desc)
 {
 	if (irqd_is_per_cpu(irq_desc_get_irq_data(desc)))
-		handle_percpu_irq(desc);
+		handle_percpu_devid_irq(desc);
 	else
 		handle_simple_irq(desc);
 }