Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3994ff90 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Remove dest argument from __default_send_IPI_shortcut() 



The SDM states:

  "The destination shorthand field of the ICR allows the delivery mode to be
   by-passed in favor of broadcasting the IPI to all the processors on the
   system bus and/or back to itself (see Section 10.6.1, Interrupt Command
   Register (ICR)). Three destination shorthands are supported: self, all
   excluding self, and all including self. The destination mode is ignored
   when a destination shorthand is used."

So there is no point to supply the destination mode to the shorthand
delivery function.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190722105220.094613426@linutronix.de
parent 60dcaad5

arch/x86/kernel/apic/apic_flat_64.c

+2 −4
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ static void flat_send_IPI_allbutself(int vector) 
			_flat_send_IPI_mask(mask, vector);

		}

	} else if (num_online_cpus() > 1) {

		__default_send_IPI_shortcut(APIC_DEST_ALLBUT,

					    vector, apic->dest_logical);

		__default_send_IPI_shortcut(APIC_DEST_ALLBUT, vector);

	}

}
@@ -100,8 +99,7 @@ static void flat_send_IPI_all(int vector) 
	if (vector == NMI_VECTOR) {

		flat_send_IPI_mask(cpu_online_mask, vector);

	} else {

		__default_send_IPI_shortcut(APIC_DEST_ALLINC,

					    vector, apic->dest_logical);

		__default_send_IPI_shortcut(APIC_DEST_ALLINC, vector);

	}

}

arch/x86/kernel/apic/ipi.c

+7 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static inline void __xapic_wait_icr_idle(void) 
		cpu_relax();

}



void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)

void __default_send_IPI_shortcut(unsigned int shortcut, int vector)

{

	/*

	 * Subtle. In the case of the 'never do double writes' workaround
@@ -33,9 +33,10 @@ void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int 
	__xapic_wait_icr_idle();



	/*

	 * No need to touch the target chip field

	 * No need to touch the target chip field. Also the destination

	 * mode is ignored when a shorthand is used.

	 */

	cfg = __prepare_ICR(shortcut, vector, dest);

	cfg = __prepare_ICR(shortcut, vector, 0);



	/*

	 * Send the IPI. The write to APIC_ICR fires this off.
@@ -202,8 +203,7 @@ void default_send_IPI_allbutself(int vector) 
	if (no_broadcast || vector == NMI_VECTOR) {

		apic->send_IPI_mask_allbutself(cpu_online_mask, vector);

	} else {

		__default_send_IPI_shortcut(APIC_DEST_ALLBUT, vector,

					    apic->dest_logical);

		__default_send_IPI_shortcut(APIC_DEST_ALLBUT, vector);

	}

}
@@ -212,14 +212,13 @@ void default_send_IPI_all(int vector) 
	if (no_broadcast || vector == NMI_VECTOR) {

		apic->send_IPI_mask(cpu_online_mask, vector);

	} else {

		__default_send_IPI_shortcut(APIC_DEST_ALLINC, vector,

					    apic->dest_logical);

		__default_send_IPI_shortcut(APIC_DEST_ALLINC, vector);

	}

}



void default_send_IPI_self(int vector)

{

	__default_send_IPI_shortcut(APIC_DEST_SELF, vector, apic->dest_logical);

	__default_send_IPI_shortcut(APIC_DEST_SELF, vector);

}



/* must come after the send_IPI functions above for inlining */

arch/x86/kernel/apic/local.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, 
	return icr;

}



void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest);

void __default_send_IPI_shortcut(unsigned int shortcut, int vector);



/*

 * This is used to send an IPI with no shorthand notation (the destination is

arch/x86/kernel/apic/probe_64.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ void __init default_setup_apic_routing(void) 


void apic_send_IPI_self(int vector)

{

	__default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);

	__default_send_IPI_shortcut(APIC_DEST_SELF, vector);

}



int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)