[PATCH 1/4] irqchip: riscv: Using CPUHP_AP_ONLINE_DYN

[Palmer Dabbelt]

On Mon, 01 Mar 2021 06:28:19 PST (-0800), guoren at kernel.org wrote:
> From: Guo Ren <guoren at linux.alibaba.com>
>
> Remove RISC-V irqchip custom definitions in hotplug.h:
>  - CPUHP_AP_IRQ_RISCV_STARTING
>  - CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING
>
> For coding convention.
>
> Cc: Peter Zijlstra <peterz at infradead.org>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Linus Torvalds <torvalds at linux-foundation.org>
> Cc: Palmer Dabbelt <palmerdabbelt at google.com>
> Cc: Anup Patel <anup.patel at wdc.com>
> Cc: Atish Patra <atish.patra at wdc.com>
> Cc: Christoph Hellwig <hch at lst.de>
> Tested-by: Guo Ren <guoren at linux.alibaba.com>
> Signed-off-by: Guo Ren <guoren at linux.alibaba.com>
> Link: https://lore.kernel.org/lkml/CAHk-=wjM+kCsKqNdb=c0hKsv=J7-3Q1zmM15vp6_=8S5XfGMtA@mail.gmail.com/
> ---
>  drivers/irqchip/irq-riscv-intc.c  | 2 +-
>  drivers/irqchip/irq-sifive-plic.c | 2 +-
>  include/linux/cpuhotplug.h        | 2 --
>  3 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c
> index 8017f6d..2c37f3a 100644
> --- a/drivers/irqchip/irq-riscv-intc.c
> +++ b/drivers/irqchip/irq-riscv-intc.c
> @@ -125,7 +125,7 @@ static int __init riscv_intc_init(struct device_node *node,
>  		return rc;
>  	}
>
> -	cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_STARTING,
> +	cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
>  			  "irqchip/riscv/intc:starting",
>  			  riscv_intc_cpu_starting,
>  			  riscv_intc_cpu_dying);
> diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
> index 6f432d2..f499f1b 100644
> --- a/drivers/irqchip/irq-sifive-plic.c
> +++ b/drivers/irqchip/irq-sifive-plic.c
> @@ -375,7 +375,7 @@ static int __init plic_init(struct device_node *node,
>  	 */
>  	handler = this_cpu_ptr(&plic_handlers);
>  	if (handler->present && !plic_cpuhp_setup_done) {
> -		cpuhp_setup_state(CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
> +		cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
>  				  "irqchip/sifive/plic:starting",
>  				  plic_starting_cpu, plic_dying_cpu);
>  		plic_cpuhp_setup_done = true;
> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
> index f14adb8..14f49fd 100644
> --- a/include/linux/cpuhotplug.h
> +++ b/include/linux/cpuhotplug.h
> @@ -103,8 +103,6 @@ enum cpuhp_state {
>  	CPUHP_AP_IRQ_ARMADA_XP_STARTING,
>  	CPUHP_AP_IRQ_BCM2836_STARTING,
>  	CPUHP_AP_IRQ_MIPS_GIC_STARTING,
> -	CPUHP_AP_IRQ_RISCV_STARTING,
> -	CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING,
>  	CPUHP_AP_ARM_MVEBU_COHERENCY,
>  	CPUHP_AP_MICROCODE_LOADER,
>  	CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,

Acked-by: Palmer Dabbelt <palmerdabbelt at google.com>

I'm going to assume this is going in through an irqchip tree, but LMK if you
want me to take it via mine.  This isn't really my sort of thing, so I'd prefer
at least an Ack.

Thanks!