x86/apic: Get rid of apic:: Dest_logical

struct apic has two members which store information about the destination
mode: dest_logical and irq_dest_mode.

dest_logical contains a mask which was historically used to set the
destination mode in IPI messages. Over time the usage was reduced and the
logical/physical functions were seperated.

There are only a few places which still use 'dest_logical' but they can
use 'irq_dest_mode' instead.

irq_dest_mode is actually a boolean where 0 means physical destination mode
and 1 means logical destination mode. Of course the name does not reflect
the functionality. This will be cleaned up in a subsequent change.

Remove apic::dest_logical and fixup the remaining users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-8-dwmw2@infradead.org

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 37a08f3..e230ed2 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -306,8 +306,6 @@ struct apic {
        void    (*send_IPI_all)(int vector);
        void    (*send_IPI_self)(int vector);
 
-       /* dest_logical is used by the IPI functions */
-       u32     dest_logical;
        u32     disable_esr;
 
        enum apic_delivery_modes delivery_mode;

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 113f6ca..29d28b3 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1591,7 +1591,7 @@ static void setup_local_APIC(void)
        apic->init_apic_ldr();
 
 #ifdef CONFIG_X86_32
-       if (apic->dest_logical) {
+       if (apic->irq_dest_mode == 1) {
                int logical_apicid, ldr_apicid;
 
                /*

diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 6df837f..bbb1b89 100644 (file)
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -117,11 +117,9 @@ static struct apic apic_flat __ro_after_init = {
        .irq_dest_mode                  = 1, /* logical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = flat_init_apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
@@ -210,11 +208,9 @@ static struct apic apic_physflat __ro_after_init = {
        .irq_dest_mode                  = 0, /* physical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = 0,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = physflat_init_apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 4fc934b..38f167c 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -100,11 +100,9 @@ struct apic apic_noop __ro_after_init = {
        .irq_dest_mode                  = 1,
 
        .disable_esr                    = 0,
-       .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = default_check_apicid_used,
 
+       .check_apicid_used              = default_check_apicid_used,
        .init_apic_ldr                  = noop_init_apic_ldr,
-
        .ioapic_phys_id_map             = default_ioapic_phys_id_map,
        .setup_apic_routing             = NULL,
 

diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index db715d0..4ebf9fe 100644 (file)
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -250,11 +250,9 @@ static const struct apic apic_numachip1 __refconst = {
        .irq_dest_mode                  = 0, /* physical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = 0,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = flat_init_apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,
@@ -299,11 +297,9 @@ static const struct apic apic_numachip2 __refconst = {
        .irq_dest_mode                  = 0, /* physical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = 0,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = flat_init_apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 7f6461f..64c375b 100644 (file)
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -132,11 +132,9 @@ static struct apic apic_bigsmp __ro_after_init = {
        .irq_dest_mode                  = 0,
 
        .disable_esr                    = 1,
-       .dest_logical                   = 0,
-       .check_apicid_used              = bigsmp_check_apicid_used,
 
+       .check_apicid_used              = bigsmp_check_apicid_used,
        .init_apic_ldr                  = bigsmp_init_apic_ldr,
-
        .ioapic_phys_id_map             = bigsmp_ioapic_phys_id_map,
        .setup_apic_routing             = bigsmp_setup_apic_routing,
        .cpu_present_to_apicid          = bigsmp_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 77c6e2e..97652aa 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -74,11 +74,9 @@ static struct apic apic_default __ro_after_init = {
        .irq_dest_mode                  = 1,
 
        .disable_esr                    = 0,
-       .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = default_check_apicid_used,
 
+       .check_apicid_used              = default_check_apicid_used,
        .init_apic_ldr                  = default_init_apic_ldr,
-
        .ioapic_phys_id_map             = default_ioapic_phys_id_map,
        .setup_apic_routing             = setup_apic_flat_routing,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index f77e9fb..53390fc 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -188,11 +188,9 @@ static struct apic apic_x2apic_cluster __ro_after_init = {
        .irq_dest_mode                  = 1, /* logical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = APIC_DEST_LOGICAL,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = init_x2apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 437e843..ee0c4d0 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -161,11 +161,9 @@ static struct apic apic_x2apic_phys __ro_after_init = {
        .irq_dest_mode                  = 0, /* physical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = 0,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = init_x2apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 49deefd..d21a685 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -811,11 +811,9 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
        .irq_dest_mode                  = 0, /* Physical */
 
        .disable_esr                    = 0,
-       .dest_logical                   = APIC_DEST_PHYSICAL,
-       .check_apicid_used              = NULL,
 
+       .check_apicid_used              = NULL,
        .init_apic_ldr                  = uv_init_apic_ldr,
-
        .ioapic_phys_id_map             = NULL,
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = default_cpu_present_to_apicid,

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index de776b2..6c14f10 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -747,13 +747,14 @@ static void __init smp_quirk_init_udelay(void)
 int
 wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)
 {
+       u32 dm = apic->irq_dest_mode ? APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL;
        unsigned long send_status, accept_status = 0;
        int maxlvt;
 
        /* Target chip */
        /* Boot on the stack */
        /* Kick the second */
-       apic_icr_write(APIC_DM_NMI | apic->dest_logical, apicid);
+       apic_icr_write(APIC_DM_NMI | dm, apicid);
 
        pr_debug("Waiting for send to finish...\n");
        send_status = safe_apic_wait_icr_idle();
@@ -980,7 +981,7 @@ wakeup_cpu_via_init_nmi(int cpu, unsigned long start_ip, int apicid,
        if (!boot_error) {
                enable_start_cpu0 = 1;
                *cpu0_nmi_registered = 1;
-               if (apic->dest_logical == APIC_DEST_LOGICAL)
+               if (apic->irq_dest_mode)
                        id = cpu0_logical_apicid;
                else
                        id = apicid;

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index e82fd19..c35c24b 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -152,11 +152,9 @@ static struct apic xen_pv_apic = {
        /* .irq_dest_mode     - used in native_compose_msi_msg only */
 
        .disable_esr                    = 0,
-       /* .dest_logical      -  default_send_IPI_ use it but we use our own. */
-       .check_apicid_used              = default_check_apicid_used, /* Used on 32-bit */
 
+       .check_apicid_used              = default_check_apicid_used, /* Used on 32-bit */
        .init_apic_ldr                  = xen_noop, /* setup_local_APIC calls it */
-
        .ioapic_phys_id_map             = default_ioapic_phys_id_map, /* Used on 32-bit */
        .setup_apic_routing             = NULL,
        .cpu_present_to_apicid          = xen_cpu_present_to_apicid,