Commit 05c155c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up apic_x2apic_phys



- reorder fields so that they appear in struct genapic field ordering

- add zero-initialized fields too so that it's apparent which functionality
  is default / missing.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c7967329
Loading
Loading
Loading
Loading
+55 −19
Original line number Diff line number Diff line
@@ -172,23 +172,59 @@ static void init_x2apic_ldr(void)
}

struct genapic apic_x2apic_phys = {

	.name				= "physical x2apic",
	.probe				= NULL,
	.acpi_madt_oem_check		= x2apic_acpi_madt_oem_check,
	.apic_id_registered		= x2apic_apic_id_registered,

	.int_delivery_mode		= dest_Fixed,
	.int_dest_mode			= (APIC_DEST_PHYSICAL != 0),

	.target_cpus			= x2apic_target_cpus,
	.ESR_DISABLE			= 0,
	.apic_destination_logical	= 0,
	.check_apicid_used		= NULL,
	.check_apicid_present		= NULL,

	.no_balance_irq			= 0,
	.no_ioapic_check		= 0,

	.vector_allocation_domain	= x2apic_vector_allocation_domain,
	.apic_id_registered = x2apic_apic_id_registered,
	.init_apic_ldr			= init_x2apic_ldr,
	.send_IPI_all = x2apic_send_IPI_all,
	.send_IPI_allbutself = x2apic_send_IPI_allbutself,
	.send_IPI_mask = x2apic_send_IPI_mask,
	.send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself,
	.send_IPI_self = x2apic_send_IPI_self,
	.cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid,
	.cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and,

	.ioapic_phys_id_map		= NULL,
	.setup_apic_routing		= NULL,
	.multi_timer_check		= NULL,
	.apicid_to_node			= NULL,
	.cpu_to_logical_apicid		= NULL,
	.cpu_present_to_apicid		= NULL,
	.apicid_to_cpu_present		= NULL,
	.setup_portio_remap		= NULL,
	.check_phys_apicid_present	= NULL,
	.enable_apic_mode		= NULL,
	.phys_pkg_id			= phys_pkg_id,
	.mps_oem_check			= NULL,

	.get_apic_id			= get_apic_id,
	.set_apic_id			= set_apic_id,
	.apic_id_mask = (0xFFFFFFFFu),
	.apic_id_mask			= 0xFFFFFFFFu,

	.cpu_mask_to_apicid		= x2apic_cpu_mask_to_apicid,
	.cpu_mask_to_apicid_and		= x2apic_cpu_mask_to_apicid_and,

	.send_IPI_mask			= x2apic_send_IPI_mask,
	.send_IPI_mask_allbutself	= x2apic_send_IPI_mask_allbutself,
	.send_IPI_allbutself		= x2apic_send_IPI_allbutself,
	.send_IPI_all			= x2apic_send_IPI_all,
	.send_IPI_self			= x2apic_send_IPI_self,

	.wakeup_cpu			= NULL,
	.trampoline_phys_low		= 0,
	.trampoline_phys_high		= 0,
	.wait_for_init_deassert		= NULL,
	.smp_callin_clear_local_apic	= NULL,
	.store_NMI_vector		= NULL,
	.restore_NMI_vector		= NULL,
	.inquire_remote_apic		= NULL,
};