Commit 5f5739d5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/irq_cpu_offline into irq/irqchip-next 



* irq/irq_cpu_offline:
  : .
  : Make irq_cpu_{on,off}line() deprecated kernel API, and only
  : enable it for some obscure Cavium platform after having
  : moved all the other users away from it.
  :
  : Next step, drop the platform itself.
  : .
  genirq: Hide irq_cpu_{on,off}line() behind a deprecated option
  irqchip/mips-gic: Get rid of the reliance on irq_cpu_online()
  MIPS: loongson64: Drop call to irq_cpu_offline()

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents c6dca712 8d15a729

arch/mips/loongson64/smp.c

+0 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ static int loongson3_cpu_disable(void) 
	set_cpu_online(cpu, false);

	calculate_cpu_foreign_map();

	local_irq_save(flags);

	irq_cpu_offline();

	clear_c0_status(ST0_IM);

	local_irq_restore(flags);

	local_flush_tlb_all();

drivers/irqchip/irq-mips-gic.c

+26 −11
Original line number Diff line number Diff line
@@ -381,24 +381,35 @@ static void gic_unmask_local_irq_all_vpes(struct irq_data *d) 
	spin_unlock_irqrestore(&gic_lock, flags);

}



static void gic_all_vpes_irq_cpu_online(struct irq_data *d)

static void gic_all_vpes_irq_cpu_online(void)

{

	struct gic_all_vpes_chip_data *cd;

	unsigned int intr;

	static const unsigned int local_intrs[] = {

		GIC_LOCAL_INT_TIMER,

		GIC_LOCAL_INT_PERFCTR,

		GIC_LOCAL_INT_FDC,

	};

	unsigned long flags;

	int i;



	intr = GIC_HWIRQ_TO_LOCAL(d->hwirq);

	cd = irq_data_get_irq_chip_data(d);

	spin_lock_irqsave(&gic_lock, flags);



	for (i = 0; i < ARRAY_SIZE(local_intrs); i++) {

		unsigned int intr = local_intrs[i];

		struct gic_all_vpes_chip_data *cd;



		cd = &gic_all_vpes_chip_data[intr];

		write_gic_vl_map(mips_gic_vx_map_reg(intr), cd->map);

		if (cd->mask)

			write_gic_vl_smask(BIT(intr));

	}



	spin_unlock_irqrestore(&gic_lock, flags);

}



static struct irq_chip gic_all_vpes_local_irq_controller = {

	.name			= "MIPS GIC Local",

	.irq_mask		= gic_mask_local_irq_all_vpes,

	.irq_unmask		= gic_unmask_local_irq_all_vpes,

	.irq_cpu_online		= gic_all_vpes_irq_cpu_online,

};



static void __gic_irq_dispatch(void)
@@ -477,6 +488,10 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq, 
	intr = GIC_HWIRQ_TO_LOCAL(hwirq);

	map = GIC_MAP_PIN_MAP_TO_PIN | gic_cpu_pin;



	/*

	 * If adding support for more per-cpu interrupts, keep the the

	 * array in gic_all_vpes_irq_cpu_online() in sync.

	 */

	switch (intr) {

	case GIC_LOCAL_INT_TIMER:

		/* CONFIG_MIPS_CMP workaround (see __gic_init) */
@@ -663,8 +678,8 @@ static int gic_cpu_startup(unsigned int cpu) 
	/* Clear all local IRQ masks (ie. disable all local interrupts) */

	write_gic_vl_rmask(~0);



	/* Invoke irq_cpu_online callbacks to enable desired interrupts */

	irq_cpu_online();

	/* Enable desired interrupts */

	gic_all_vpes_irq_cpu_online();



	return 0;

}

include/linux/irq.h

+4 −1
Original line number Diff line number Diff line
@@ -524,9 +524,10 @@ struct irq_chip { 
	void		(*irq_bus_lock)(struct irq_data *data);

	void		(*irq_bus_sync_unlock)(struct irq_data *data);



#ifdef CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE

	void		(*irq_cpu_online)(struct irq_data *data);

	void		(*irq_cpu_offline)(struct irq_data *data);



#endif

	void		(*irq_suspend)(struct irq_data *data);

	void		(*irq_resume)(struct irq_data *data);

	void		(*irq_pm_shutdown)(struct irq_data *data);
@@ -606,8 +607,10 @@ struct irqaction; 
extern int setup_percpu_irq(unsigned int irq, struct irqaction *new);

extern void remove_percpu_irq(unsigned int irq, struct irqaction *act);



#ifdef CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE

extern void irq_cpu_online(void);

extern void irq_cpu_offline(void);

#endif

extern int irq_set_affinity_locked(struct irq_data *data,

				   const struct cpumask *cpumask, bool force);

extern int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info);

kernel/irq/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -141,3 +141,10 @@ config GENERIC_IRQ_MULTI_HANDLER 
	bool

	help

	  Allow to specify the low level IRQ handler at run time.



# Cavium Octeon is the last system to use this deprecated option

# Do not even think of enabling this on any new platform

config DEPRECATED_IRQ_CPU_ONOFFLINE

	bool

	depends on CAVIUM_OCTEON_SOC

	default CAVIUM_OCTEON_SOC

kernel/irq/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,7 @@ void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set) 
}

EXPORT_SYMBOL_GPL(irq_modify_status);



#ifdef CONFIG_DEPRECATED_IRQ_CPU_ONOFFLINE

/**

 *	irq_cpu_online - Invoke all irq_cpu_online functions.

 *
@@ -1181,6 +1182,7 @@ void irq_cpu_offline(void) 
		raw_spin_unlock_irqrestore(&desc->lock, flags);

	}

}

#endif



#ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY