Commit 6eb1acd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.7a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen updates from Juergen Gross:

 - A fix in the Xen events driver avoiding the use of RCU after
   the call to rcu_report_dead() when taking a cpu down

 - A fix for running as Xen dom0 to line up ACPI's idea of power
   management capabilities with the one of Xen

 - A cleanup eliminating several kernel-doc warnings in Xen related
   code

 - A cleanup series of the Xen events driver

* tag 'for-linus-6.7a-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/events: remove some info_for_irq() calls in pirq handling
  xen/events: modify internal [un]bind interfaces
  xen/events: drop xen_allocate_irqs_dynamic()
  xen/events: remove some simple helpers from events_base.c
  xen/events: reduce externally visible helper functions
  xen/events: remove unused functions
  xen/events: fix delayed eoi list handling
  xen/shbuf: eliminate 17 kernel-doc warnings
  acpi/processor: sanitize _OSC/_PDC capabilities for Xen dom0
  xen/events: avoid using info_for_irq() in xen_send_IPI_one()
parents 372bed5f cee96422

arch/x86/include/asm/acpi.h

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include <asm/x86_init.h>

#include <asm/cpufeature.h>

#include <asm/irq_vectors.h>

#include <asm/xen/hypervisor.h>



#include <xen/xen.h>



#ifdef CONFIG_ACPI_APEI

# include <asm/pgtable_types.h>
@@ -127,6 +130,17 @@ static inline void arch_acpi_set_proc_cap_bits(u32 *cap) 
	if (!cpu_has(c, X86_FEATURE_MWAIT) ||

	    boot_option_idle_override == IDLE_NOMWAIT)

		*cap &= ~(ACPI_PROC_CAP_C_C1_FFH | ACPI_PROC_CAP_C_C2C3_FFH);



	if (xen_initial_domain()) {

		/*

		 * When Linux is running as Xen dom0, the hypervisor is the

		 * entity in charge of the processor power management, and so

		 * Xen needs to check the OS capabilities reported in the

		 * processor capabilities buffer matches what the hypervisor

		 * driver supports.

		 */

		xen_sanitize_proc_cap_bits(cap);

	}

}



static inline bool acpi_has_cpu_in_madt(void)

arch/x86/include/asm/xen/hypervisor.h

+9 −0
Original line number Diff line number Diff line
@@ -100,4 +100,13 @@ static inline void leave_lazy(enum xen_lazy_mode mode) 


enum xen_lazy_mode xen_get_lazy_mode(void);



#if defined(CONFIG_XEN_DOM0) && defined(CONFIG_ACPI)

void xen_sanitize_proc_cap_bits(uint32_t *buf);

#else

static inline void xen_sanitize_proc_cap_bits(uint32_t *buf)

{

	BUG();

}

#endif



#endif /* _ASM_X86_XEN_HYPERVISOR_H */

drivers/xen/events/events_2l.c

+4 −4
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ static void evtchn_2l_handle_events(unsigned cpu, struct evtchn_loop_ctrl *ctrl) 
	int i;

	struct shared_info *s = HYPERVISOR_shared_info;

	struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);

	evtchn_port_t evtchn;



	/* Timer interrupt has highest priority. */

	irq = irq_from_virq(cpu, VIRQ_TIMER);

	irq = irq_evtchn_from_virq(cpu, VIRQ_TIMER, &evtchn);

	if (irq != -1) {

		evtchn_port_t evtchn = evtchn_from_irq(irq);

		word_idx = evtchn / BITS_PER_LONG;

		bit_idx = evtchn % BITS_PER_LONG;

		if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx))
@@ -328,9 +328,9 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id) 
	for (i = 0; i < EVTCHN_2L_NR_CHANNELS; i++) {

		if (sync_test_bit(i, BM(sh->evtchn_pending))) {

			int word_idx = i / BITS_PER_EVTCHN_WORD;

			printk("  %d: event %d -> irq %d%s%s%s\n",

			printk("  %d: event %d -> irq %u%s%s%s\n",

			       cpu_from_evtchn(i), i,

			       get_evtchn_to_irq(i),

			       irq_from_evtchn(i),

			       sync_test_bit(word_idx, BM(&v->evtchn_pending_sel))

			       ? "" : " l2-clear",

			       !sync_test_bit(i, BM(sh->evtchn_mask))

drivers/xen/events/events_base.c

+279 −297

File changed.

Preview size limit exceeded, changes collapsed.

drivers/xen/events/events_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct evtchn_ops { 


extern const struct evtchn_ops *evtchn_ops;



int get_evtchn_to_irq(evtchn_port_t evtchn);

void handle_irq_for_port(evtchn_port_t port, struct evtchn_loop_ctrl *ctrl);



unsigned int cpu_from_evtchn(evtchn_port_t evtchn);