bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: 9298/1: Drop custom mdesc->handle_irq()

Browse source 
ARM exclusively uses GENERIC_IRQ_MULTI_HANDLER, so at some point
set_handle_irq() needs to be called to handle system-wide
interrupts.

For all DT-enabled boards, this call happens down in the
drivers/irqchip subsystem, after locating the target irqchip
driver from the device tree.

We still have a few instances of the boardfiles with machine
descriptors passing a machine-specific .handle_irq() to the
ARM kernel core.

Get rid of this by letting the few remaining machines consistently
call set_handle_irq() from the end of the .init_irq() callback
instead and diet down one member from the machine descriptor.

Cc: Marc Zyngier <maz@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Linus Walleij 2023-05-09 13:57:28 +01:00 • committed by Russell King (Oracle)
parent ac9a78681b
commit 5bb578a0c1
15 changed files with 6 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/include/asm/mach/arch.h
View file

@ -56,7 +56,6 @@ struct machine_desc {
void (*init_time)(void); void (*init_time)(void);
void (*init_machine)(void); void (*init_machine)(void);
void (*init_late)(void); void (*init_late)(void);
void (*handle_irq)(struct pt_regs *);
void (*restart)(enum reboot_mode, const char *); void (*restart)(enum reboot_mode, const char *);
}; };

4
arch/arm/kernel/setup.c
View file

@ -1198,10 +1198,6 @@ void __init setup_arch(char **cmdline_p)
reserve_crashkernel(); reserve_crashkernel();
#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
handle_arch_irq = mdesc->handle_irq;
#endif
#ifdef CONFIG_VT #ifdef CONFIG_VT
#if defined(CONFIG_VGA_CONSOLE) #if defined(CONFIG_VGA_CONSOLE)
conswitchp = &vga_con; conswitchp = &vga_con;

2
arch/arm/mach-mxs/mach-mxs.c
View file

@ -11,7 +11,6 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqchip/mxs.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/micrel_phy.h> #include <linux/micrel_phy.h>
#include <linux/of_address.h> #include <linux/of_address.h>
@ -472,7 +471,6 @@ static const char *const mxs_dt_compat[] __initconst = {
}; };
DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
.handle_irq = icoll_handle_irq,
.init_machine = mxs_machine_init, .init_machine = mxs_machine_init,
.init_late = mxs_pm_init, .init_late = mxs_pm_init,
.dt_compat = mxs_dt_compat, .dt_compat = mxs_dt_compat,

1
arch/arm/mach-omap1/board-ams-delta.c
View file

@ -877,7 +877,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
.map_io = ams_delta_map_io, .map_io = ams_delta_map_io,
.init_early = omap1_init_early, .init_early = omap1_init_early,
.init_irq = omap1_init_irq, .init_irq = omap1_init_irq,
.handle_irq = omap1_handle_irq,
.init_machine = ams_delta_init, .init_machine = ams_delta_init,
.init_late = ams_delta_init_late, .init_late = ams_delta_init_late,
.init_time = omap1_timer_init, .init_time = omap1_timer_init,

1
arch/arm/mach-omap1/board-nokia770.c
View file

@ -291,7 +291,6 @@ MACHINE_START(NOKIA770, "Nokia 770")
.map_io = omap1_map_io, .map_io = omap1_map_io,
.init_early = omap1_init_early, .init_early = omap1_init_early,
.init_irq = omap1_init_irq, .init_irq = omap1_init_irq,
.handle_irq = omap1_handle_irq,
.init_machine = omap_nokia770_init, .init_machine = omap_nokia770_init,
.init_late = omap1_init_late, .init_late = omap1_init_late,
.init_time = omap1_timer_init, .init_time = omap1_timer_init,

1
arch/arm/mach-omap1/board-osk.c
View file

@ -389,7 +389,6 @@ MACHINE_START(OMAP_OSK, "TI-OSK")
.map_io = omap1_map_io, .map_io = omap1_map_io,
.init_early = omap1_init_early, .init_early = omap1_init_early,
.init_irq = omap1_init_irq, .init_irq = omap1_init_irq,
.handle_irq = omap1_handle_irq,
.init_machine = osk_init, .init_machine = osk_init,
.init_late = omap1_init_late, .init_late = omap1_init_late,
.init_time = omap1_timer_init, .init_time = omap1_timer_init,

1
arch/arm/mach-omap1/board-palmte.c
View file

@ -259,7 +259,6 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
.map_io = omap1_map_io, .map_io = omap1_map_io,
.init_early = omap1_init_early, .init_early = omap1_init_early,
.init_irq = omap1_init_irq, .init_irq = omap1_init_irq,
.handle_irq = omap1_handle_irq,
.init_machine = omap_palmte_init, .init_machine = omap_palmte_init,
.init_late = omap1_init_late, .init_late = omap1_init_late,
.init_time = omap1_timer_init, .init_time = omap1_timer_init,

1
arch/arm/mach-omap1/board-sx1.c
View file

@ -338,7 +338,6 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
.map_io = omap1_map_io, .map_io = omap1_map_io,
.init_early = omap1_init_early, .init_early = omap1_init_early,
.init_irq = omap1_init_irq, .init_irq = omap1_init_irq,
.handle_irq = omap1_handle_irq,
.init_machine = omap_sx1_init, .init_machine = omap_sx1_init,
.init_late = omap1_init_late, .init_late = omap1_init_late,
.init_time = omap1_timer_init, .init_time = omap1_timer_init,

3
arch/arm/mach-omap1/irq.c
View file

@ -37,6 +37,7 @@
*/ */
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -254,4 +255,6 @@ void __init omap1_init_irq(void)
ct = irq_data_get_chip_type(d); ct = irq_data_get_chip_type(d);
ct->chip.irq_unmask(d); ct->chip.irq_unmask(d);
} }
set_handle_irq(omap1_handle_irq);
} }

1
arch/arm/mach-pxa/gumstix.c
View file

@ -233,7 +233,6 @@ MACHINE_START(GUMSTIX, "Gumstix")
.map_io = pxa25x_map_io, .map_io = pxa25x_map_io,
.nr_irqs = PXA_NR_IRQS, .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa25x_init_irq, .init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
.init_time = pxa_timer_init, .init_time = pxa_timer_init,
.init_machine = gumstix_init, .init_machine = gumstix_init,
.restart = pxa_restart, .restart = pxa_restart,

1
arch/arm/mach-pxa/pxa25x.c
View file

@ -143,6 +143,7 @@ set_pwer:
void __init pxa25x_init_irq(void) void __init pxa25x_init_irq(void)
{ {
pxa_init_irq(32, pxa25x_set_wake); pxa_init_irq(32, pxa25x_set_wake);
set_handle_irq(pxa25x_handle_irq);
} }
static int __init __init static int __init __init

1
arch/arm/mach-pxa/pxa27x.c
View file

@ -228,6 +228,7 @@ static int pxa27x_set_wake(struct irq_data *d, unsigned int on)
void __init pxa27x_init_irq(void) void __init pxa27x_init_irq(void)
{ {
pxa_init_irq(34, pxa27x_set_wake); pxa_init_irq(34, pxa27x_set_wake);
set_handle_irq(pxa27x_handle_irq);
} }
static int __init static int __init

3
arch/arm/mach-pxa/spitz.c
View file

@ -1043,7 +1043,6 @@ MACHINE_START(SPITZ, "SHARP Spitz")
.map_io = pxa27x_map_io, .map_io = pxa27x_map_io,
.nr_irqs = PXA_NR_IRQS, .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa27x_init_irq, .init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.init_machine = spitz_init, .init_machine = spitz_init,
.init_time = pxa_timer_init, .init_time = pxa_timer_init,
.restart = spitz_restart, .restart = spitz_restart,
@ -1056,7 +1055,6 @@ MACHINE_START(BORZOI, "SHARP Borzoi")
.map_io = pxa27x_map_io, .map_io = pxa27x_map_io,
.nr_irqs = PXA_NR_IRQS, .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa27x_init_irq, .init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.init_machine = spitz_init, .init_machine = spitz_init,
.init_time = pxa_timer_init, .init_time = pxa_timer_init,
.restart = spitz_restart, .restart = spitz_restart,
@ -1069,7 +1067,6 @@ MACHINE_START(AKITA, "SHARP Akita")
.map_io = pxa27x_map_io, .map_io = pxa27x_map_io,
.nr_irqs = PXA_NR_IRQS, .nr_irqs = PXA_NR_IRQS,
.init_irq = pxa27x_init_irq, .init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
.init_machine = spitz_init, .init_machine = spitz_init,
.init_time = pxa_timer_init, .init_time = pxa_timer_init,
.restart = spitz_restart, .restart = spitz_restart,

1
drivers/irqchip/irq-mxs.c
View file

@ -201,6 +201,7 @@ static int __init icoll_of_init(struct device_node *np,
stmp_reset_block(icoll_priv.ctrl); stmp_reset_block(icoll_priv.ctrl);
icoll_add_domain(np, ICOLL_NUM_IRQS); icoll_add_domain(np, ICOLL_NUM_IRQS);
set_handle_irq(icoll_handle_irq);
return 0; return 0;
} }

11
include/linux/irqchip/mxs.h
View file

@ -1,11 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2013 Freescale Semiconductor, Inc.
*/
#ifndef __LINUX_IRQCHIP_MXS_H
#define __LINUX_IRQCHIP_MXS_H
extern void icoll_handle_irq(struct pt_regs *);
#endif