| From 3d5f473dff3b1e3718dc015c3d83f7231d011463 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 16 Aug 2025 17:45:28 +0800 |
| Subject: genirq/test: Fix depth tests on architectures with NOREQUEST by |
| default. |
| |
| From: David Gow <davidgow@google.com> |
| |
| [ Upstream commit c9163915a93d40e32c4e4aeb942c0adcb190d72e ] |
| |
| The new irq KUnit tests fail on some architectures (notably PowerPC and |
| 32-bit ARM), as the request_irq() call fails due to the ARCH_IRQ_INIT_FLAGS |
| containing IRQ_NOREQUEST, yielding the following errors: |
| |
| [10:17:45] # irq_free_disabled_test: EXPECTATION FAILED at kernel/irq/irq_test.c:88 |
| [10:17:45] Expected ret == 0, but |
| [10:17:45] ret == -22 (0xffffffffffffffea) |
| [10:17:45] # irq_free_disabled_test: EXPECTATION FAILED at kernel/irq/irq_test.c:90 |
| [10:17:45] Expected desc->depth == 0, but |
| [10:17:45] desc->depth == 1 (0x1) |
| [10:17:45] # irq_free_disabled_test: EXPECTATION FAILED at kernel/irq/irq_test.c:93 |
| [10:17:45] Expected desc->depth == 1, but |
| [10:17:45] desc->depth == 2 (0x2) |
| |
| By clearing IRQ_NOREQUEST from the interrupt descriptor, these tests now |
| pass on ARM and PowerPC. |
| |
| Fixes: 66067c3c8a1e ("genirq: Add kunit tests for depth counts") |
| Signed-off-by: David Gow <davidgow@google.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Tested-by: Guenter Roeck <linux@roeck-us.net> |
| Tested-by: Brian Norris <briannorris@chromium.org> |
| Reviewed-by: Brian Norris <briannorris@chromium.org> |
| Link: https://lore.kernel.org/all/20250816094528.3560222-2-davidgow@google.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/irq/irq_test.c | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| diff --git a/kernel/irq/irq_test.c b/kernel/irq/irq_test.c |
| index a75abebed7f24..e220e7b2fc187 100644 |
| --- a/kernel/irq/irq_test.c |
| +++ b/kernel/irq/irq_test.c |
| @@ -54,6 +54,9 @@ static void irq_disable_depth_test(struct kunit *test) |
| desc = irq_to_desc(virq); |
| KUNIT_ASSERT_PTR_NE(test, desc, NULL); |
| |
| + /* On some architectures, IRQs are NOREQUEST | NOPROBE by default. */ |
| + irq_settings_clr_norequest(desc); |
| + |
| ret = request_irq(virq, noop_handler, 0, "test_irq", NULL); |
| KUNIT_EXPECT_EQ(test, ret, 0); |
| |
| @@ -81,6 +84,9 @@ static void irq_free_disabled_test(struct kunit *test) |
| desc = irq_to_desc(virq); |
| KUNIT_ASSERT_PTR_NE(test, desc, NULL); |
| |
| + /* On some architectures, IRQs are NOREQUEST | NOPROBE by default. */ |
| + irq_settings_clr_norequest(desc); |
| + |
| ret = request_irq(virq, noop_handler, 0, "test_irq", NULL); |
| KUNIT_EXPECT_EQ(test, ret, 0); |
| |
| @@ -120,6 +126,9 @@ static void irq_shutdown_depth_test(struct kunit *test) |
| desc = irq_to_desc(virq); |
| KUNIT_ASSERT_PTR_NE(test, desc, NULL); |
| |
| + /* On some architectures, IRQs are NOREQUEST | NOPROBE by default. */ |
| + irq_settings_clr_norequest(desc); |
| + |
| data = irq_desc_get_irq_data(desc); |
| KUNIT_ASSERT_PTR_NE(test, data, NULL); |
| |
| @@ -180,6 +189,9 @@ static void irq_cpuhotplug_test(struct kunit *test) |
| desc = irq_to_desc(virq); |
| KUNIT_ASSERT_PTR_NE(test, desc, NULL); |
| |
| + /* On some architectures, IRQs are NOREQUEST | NOPROBE by default. */ |
| + irq_settings_clr_norequest(desc); |
| + |
| data = irq_desc_get_irq_data(desc); |
| KUNIT_ASSERT_PTR_NE(test, data, NULL); |
| |
| -- |
| 2.51.0 |
| |