#include <asm/numaq/wakecpu.h>
#include <asm/numaq.h>
-static int mps_oem_check(struct mp_config_table *mpc, char *oem,
- char *productid)
+static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
numaq_mps_oem_check(mpc, oem, productid);
return found_numaq;
return found_numaq;
}
-/* Hook from generic ACPI tables.c */
-static int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
-{
- return 0;
-}
-
-static void vector_allocation_domain(int cpu, cpumask_t *retmask)
+static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask)
{
/* Careful. Some cpus do not strictly honor the set of cpus
* specified in the interrupt destination when using lowest
*retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };
}
-struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq);
+struct genapic apic_numaq = {
+
+ .name = "NUMAQ",
+ .probe = probe_numaq,
+ .acpi_madt_oem_check = NULL,
+ .apic_id_registered = numaq_apic_id_registered,
+
+ .irq_delivery_mode = dest_LowestPrio,
+ /* physical delivery on LOCAL quad: */
+ .irq_dest_mode = 0,
+
+ .target_cpus = numaq_target_cpus,
+ .disable_esr = 1,
+ .dest_logical = APIC_DEST_LOGICAL,
+ .check_apicid_used = numaq_check_apicid_used,
+ .check_apicid_present = numaq_check_apicid_present,
+
+ .vector_allocation_domain = numaq_vector_allocation_domain,
+ .init_apic_ldr = numaq_init_apic_ldr,
+
+ .ioapic_phys_id_map = numaq_ioapic_phys_id_map,
+ .setup_apic_routing = numaq_setup_apic_routing,
+ .multi_timer_check = numaq_multi_timer_check,
+ .apicid_to_node = numaq_apicid_to_node,
+ .cpu_to_logical_apicid = numaq_cpu_to_logical_apicid,
+ .cpu_present_to_apicid = numaq_cpu_present_to_apicid,
+ .apicid_to_cpu_present = apicid_to_cpu_present,
+ .setup_portio_remap = setup_portio_remap,
+ .check_phys_apicid_present = check_phys_apicid_present,
+ .enable_apic_mode = enable_apic_mode,
+ .phys_pkg_id = phys_pkg_id,
+ .mps_oem_check = mps_oem_check,
+
+ .get_apic_id = get_apic_id,
+ .set_apic_id = NULL,
+ .apic_id_mask = APIC_ID_MASK,
+
+ .cpu_mask_to_apicid = cpu_mask_to_apicid,
+ .cpu_mask_to_apicid_and = cpu_mask_to_apicid_and,
+
+ .send_IPI_mask = send_IPI_mask,
+ .send_IPI_mask_allbutself = NULL,
+ .send_IPI_allbutself = send_IPI_allbutself,
+ .send_IPI_all = send_IPI_all,
+ .send_IPI_self = NULL,
+
+ .wakeup_cpu = NULL,
+ .trampoline_phys_low = TRAMPOLINE_PHYS_LOW,
+ .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH,
+ .wait_for_init_deassert = wait_for_init_deassert,
+ .smp_callin_clear_local_apic = smp_callin_clear_local_apic,
+ .store_NMI_vector = store_NMI_vector,
+ .restore_NMI_vector = restore_NMI_vector,
+ .inquire_remote_apic = inquire_remote_apic,
+};