Change in coreboot[master]: cpu/x86/lapic: Add lapic_send_ipi_self,others()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60713 )

Change subject: cpu/x86/lapic: Add lapic_send_ipi_self,others()
......................................................................

cpu/x86/lapic: Add lapic_send_ipi_self,others()

This avoids unnecessary passing of APIC ID parameter and
allows some minor optimisation for X2APIC mode.

Change-Id: I0b0c8c39ecd13858cffc91cc781bea52decf67c5
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60713
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Arthur Heymans 
---
M src/cpu/x86/lapic/lapic_cpu_stop.c
M src/cpu/x86/mp_init.c
M src/include/cpu/x86/lapic.h
3 files changed, 16 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved
  Tim Wawrzynczak: Looks good to me, but someone else must approve

diff --git a/src/cpu/x86/lapic/lapic_cpu_stop.c b/src/cpu/x86/lapic/lapic_cpu_stop.c
index e933ce4..1affe15 100644
--- a/src/cpu/x86/lapic/lapic_cpu_stop.c
+++ b/src/cpu/x86/lapic/lapic_cpu_stop.c
@@ -55,7 +55,7 @@
    printk(BIOS_DEBUG, "CPU %ld going down...\n", id);

/* send an LAPIC INIT to myself */
-	lapic_send_ipi(LAPIC_INT_LEVELTRIG | LAPIC_INT_ASSERT | LAPIC_DM_INIT, id);
+	lapic_send_ipi_self(LAPIC_INT_LEVELTRIG | LAPIC_INT_ASSERT | LAPIC_DM_INIT);
    wait_for_ipi_completion_without_printk(timeout_100ms);

mdelay(10);
@@ -63,7 +63,7 @@
    dprintk(BIOS_SPEW, "Deasserting INIT.\n");

/* Deassert the LAPIC INIT */
-	lapic_send_ipi(LAPIC_INT_LEVELTRIG | LAPIC_DM_INIT, id);
+	lapic_send_ipi_self(LAPIC_INT_LEVELTRIG | LAPIC_DM_INIT);
    wait_for_ipi_completion_without_printk(timeout_100ms);

halt();
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index e1979c8..abe903c 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -423,8 +423,7 @@
    	printk(BIOS_DEBUG, "done.\n");
    }

-	lapic_send_ipi(LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT | LAPIC_DM_STARTUP | sipi_vector,
-		       0);
+	lapic_send_ipi_others(LAPIC_INT_ASSERT | LAPIC_DM_STARTUP | sipi_vector);
    printk(BIOS_DEBUG, "Waiting for SIPI to complete...\n");
    if (apic_wait_timeout(10000 /* 10 ms */, 50 /* us */) != CB_SUCCESS) {
    	printk(BIOS_ERR, "timed out.\n");
@@ -464,7 +463,7 @@
    }

/* Send INIT IPI to all but self. */
-	lapic_send_ipi(LAPIC_DEST_ALLBUT | LAPIC_INT_ASSERT | LAPIC_DM_INIT, 0);
+	lapic_send_ipi_others(LAPIC_INT_ASSERT | LAPIC_DM_INIT);

if (!CONFIG(X86_INIT_NEED_1_SIPI)) {
    	printk(BIOS_DEBUG, "Waiting for 10ms after sending INIT.\n");
@@ -649,7 +648,7 @@
    	printk(BIOS_DEBUG, "done.\n");
    }

-	lapic_send_ipi(LAPIC_INT_ASSERT | LAPIC_DM_SMI, lapicid());
+	lapic_send_ipi_self(LAPIC_INT_ASSERT | LAPIC_DM_SMI);

if (lapic_busy()) {
    	if (apic_wait_timeout(1000 /* 1 ms */, 100 /* us */) != CB_SUCCESS) {
diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 779799e..c1603f2 100644
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -143,6 +143,17 @@
    return lapicid;
 }

+static __always_inline void lapic_send_ipi_self(uint32_t icrlow)
+{
+	/* LAPIC_DEST_SELF does not support all delivery mode -fields. */
+	lapic_send_ipi(icrlow, lapicid());
+}
+
+static __always_inline void lapic_send_ipi_others(uint32_t icrlow)
+{
+	lapic_send_ipi(LAPIC_DEST_ALLBUT | icrlow, 0);
+}
+
 #if !CONFIG(AP_IN_SIPI_WAIT)
 /* If we need to go back to sipi wait, we use the long non-inlined version of
  * this function in lapic_cpu_stop.c