Commit 43af9872 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 apic updates from Thomas Gleixner:
 "This udpate contains:

   - rework the irq vector array to store a pointer to the irq
     descriptor instead of the irq number to avoid a lookup of the irq
     descriptor in the irq entry path

   - lguest interrupt handling cleanups

   - conversion of the local apic timer to the new clockevent callbacks

   - preparatory changes for the irq argument removal of interrupt flow
     handlers"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/irq: Do not dereference irq descriptor before checking it
  tools/lguest: Clean up include dir
  tools/lguest: Fix redefinition of struct virtio_pci_cfg_cap
  x86/irq: Store irq descriptor in vector array
  genirq: Provide irq_desc_has_action
  x86/irq: Get rid of an indentation level
  x86/irq: Rename VECTOR_UNDEFINED to VECTOR_UNUSED
  x86/irq: Replace numeric constant
  x86/irq: Protect smp_cleanup_move
  x86/lguest: Do not setup unused irq vectors
  x86/lguest: Clean up lguest_setup_irq
  x86/apic: Drop local_irq_save/restore in timer callbacks
  x86/apic: Migrate apic timer to new set_state interface
  x86/irq: Use access helper irq_data_get_affinity_mask()
  x86/irq: Use accessor irq_data_get_irq_handler_data()
  x86/irq: Use accessor irq_data_get_node()
parents 17e6b00a a47d4576

arch/x86/include/asm/hw_irq.h

+3 −3
Original line number Diff line number Diff line
@@ -182,10 +182,10 @@ extern char irq_entries_start[]; 
#define trace_irq_entries_start irq_entries_start

#endif



#define VECTOR_UNDEFINED	(-1)

#define VECTOR_RETRIGGERED	(-2)

#define VECTOR_UNUSED		NULL

#define VECTOR_RETRIGGERED	((void *)~0UL)



typedef int vector_irq_t[NR_VECTORS];

typedef struct irq_desc* vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);



#endif /* !ASSEMBLY_ */

arch/x86/include/asm/irq.h

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ extern void kvm_set_posted_intr_wakeup_handler(void (*handler)(void)); 


extern void (*x86_platform_ipi_callback)(void);

extern void native_init_IRQ(void);

extern bool handle_irq(unsigned irq, struct pt_regs *regs);



struct irq_desc;

extern bool handle_irq(struct irq_desc *desc, struct pt_regs *regs);



extern __visible unsigned int do_IRQ(struct pt_regs *regs);

arch/x86/kernel/apic/apic.c

+44 −40
Original line number Diff line number Diff line
@@ -462,40 +462,40 @@ static int lapic_next_deadline(unsigned long delta, 
	return 0;

}



/*

 * Setup the lapic timer in periodic or oneshot mode

 */

static void lapic_timer_setup(enum clock_event_mode mode,

			      struct clock_event_device *evt)

static int lapic_timer_shutdown(struct clock_event_device *evt)

{

	unsigned long flags;

	unsigned int v;



	/* Lapic used as dummy for broadcast ? */

	if (evt->features & CLOCK_EVT_FEAT_DUMMY)

		return;



	local_irq_save(flags);

		return 0;



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

	case CLOCK_EVT_MODE_ONESHOT:

		__setup_APIC_LVTT(lapic_timer_frequency,

				  mode != CLOCK_EVT_MODE_PERIODIC, 1);

		break;

	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

	v = apic_read(APIC_LVTT);

	v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);

	apic_write(APIC_LVTT, v);

	apic_write(APIC_TMICT, 0);

		break;

	case CLOCK_EVT_MODE_RESUME:

		/* Nothing to do here */

		break;

	return 0;

}



	local_irq_restore(flags);

static inline int

lapic_timer_set_periodic_oneshot(struct clock_event_device *evt, bool oneshot)

{

	/* Lapic used as dummy for broadcast ? */

	if (evt->features & CLOCK_EVT_FEAT_DUMMY)

		return 0;



	__setup_APIC_LVTT(lapic_timer_frequency, oneshot, 1);

	return 0;

}



static int lapic_timer_set_periodic(struct clock_event_device *evt)

{

	return lapic_timer_set_periodic_oneshot(evt, false);

}



static int lapic_timer_set_oneshot(struct clock_event_device *evt)

{

	return lapic_timer_set_periodic_oneshot(evt, true);

}



/*
@@ -514,10 +514,13 @@ static void lapic_timer_broadcast(const struct cpumask *mask) 
 */

static struct clock_event_device lapic_clockevent = {

	.name			= "lapic",

	.features	= CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT

			| CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,

	.features		= CLOCK_EVT_FEAT_PERIODIC |

				  CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP

				  | CLOCK_EVT_FEAT_DUMMY,

	.shift			= 32,

	.set_mode	= lapic_timer_setup,

	.set_state_shutdown	= lapic_timer_shutdown,

	.set_state_periodic	= lapic_timer_set_periodic,

	.set_state_oneshot	= lapic_timer_set_oneshot,

	.set_next_event		= lapic_next_event,

	.broadcast		= lapic_timer_broadcast,

	.rating			= 100,
@@ -778,7 +781,7 @@ static int __init calibrate_APIC_clock(void) 
		 * Setup the apic timer manually

		 */

		levt->event_handler = lapic_cal_handler;

		lapic_timer_setup(CLOCK_EVT_MODE_PERIODIC, levt);

		lapic_timer_set_periodic(levt);

		lapic_cal_loops = -1;



		/* Let the interrupts run */
@@ -788,7 +791,8 @@ static int __init calibrate_APIC_clock(void) 
			cpu_relax();



		/* Stop the lapic timer */

		lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, levt);

		local_irq_disable();

		lapic_timer_shutdown(levt);



		/* Jiffies delta */

		deltaj = lapic_cal_j2 - lapic_cal_j1;
@@ -799,7 +803,7 @@ static int __init calibrate_APIC_clock(void) 
			apic_printk(APIC_VERBOSE, "... jiffies result ok\n");

		else

			levt->features |= CLOCK_EVT_FEAT_DUMMY;

	} else

	}

	local_irq_enable();



	if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
@@ -878,7 +882,7 @@ static void local_apic_timer_interrupt(void) 
	if (!evt->event_handler) {

		pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);

		/* Switch it off */

		lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, evt);

		lapic_timer_shutdown(evt);

		return;

	}

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void) 
		 * Honour affinities which have been set in early boot

		 */

		if (!irqd_can_balance(idata) || irqd_affinity_was_set(idata))

			mask = idata->affinity;

			mask = irq_data_get_affinity_mask(idata);

		else

			mask = apic->target_cpus();

arch/x86/kernel/apic/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static inline int hpet_dev_id(struct irq_domain *domain) 


static void hpet_msi_write_msg(struct irq_data *data, struct msi_msg *msg)

{

	hpet_msi_write(data->handler_data, msg);

	hpet_msi_write(irq_data_get_irq_handler_data(data), msg);

}



static struct irq_chip hpet_msi_controller = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE