Skip to content

Commit

Permalink
x86/apic: Factor out default target_cpus() operation
Browse files Browse the repository at this point in the history 
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/20120605112324.GA11449@dhcp-26-207.brq.redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Alexander Gordeev authored and Ingo Molnar committed Jun 6, 2012
1 parent 49d0c7a commit bf721d3
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 45 deletions.
5 changes: 5 additions & 0 deletions arch/x86/include/asm/apic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,11 @@ static inline const struct cpumask *default_target_cpus(void)
#endif
}

static inline const struct cpumask *online_target_cpus(void)
{
return cpu_online_mask;
}

DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);


Expand Down
9 changes: 0 additions & 9 deletions arch/x86/include/asm/x2apic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
#include <asm/ipi.h>
#include <linux/cpumask.h>

/*
* Need to use more than cpu 0, because we need more vectors
* when MSI-X are used.
*/
static const struct cpumask *x2apic_target_cpus(void)
{
return cpu_online_mask;
}

static int x2apic_apic_id_valid(int apicid)
{
return 1;
Expand Down
14 changes: 2 additions & 12 deletions arch/x86/kernel/apic/apic_flat_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return 1;
}

static const struct cpumask *flat_target_cpus(void)
{
return cpu_online_mask;
}

static void flat_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
/* Careful. Some cpus do not strictly honor the set of cpus
Expand Down Expand Up @@ -186,7 +181,7 @@ static struct apic apic_flat = {
.irq_delivery_mode = dest_LowestPrio,
.irq_dest_mode = 1, /* logical */

.target_cpus = flat_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL,
Expand Down Expand Up @@ -262,11 +257,6 @@ static int physflat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return 0;
}

static const struct cpumask *physflat_target_cpus(void)
{
return cpu_online_mask;
}

static void physflat_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
cpumask_clear(retmask);
Expand Down Expand Up @@ -345,7 +335,7 @@ static struct apic apic_physflat = {
.irq_delivery_mode = dest_Fixed,
.irq_dest_mode = 0, /* physical */

.target_cpus = physflat_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = 0,
.check_apicid_used = NULL,
Expand Down
7 changes: 1 addition & 6 deletions arch/x86/kernel/apic/apic_numachip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
return initial_apic_id >> index_msb;
}

static const struct cpumask *numachip_target_cpus(void)
{
return cpu_online_mask;
}

static void numachip_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
cpumask_clear(retmask);
Expand Down Expand Up @@ -253,7 +248,7 @@ static struct apic apic_numachip __refconst = {
.irq_delivery_mode = dest_Fixed,
.irq_dest_mode = 0, /* physical */

.target_cpus = numachip_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = 0,
.check_apicid_used = NULL,
Expand Down
11 changes: 1 addition & 10 deletions arch/x86/kernel/apic/bigsmp_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@ static int bigsmp_apic_id_registered(void)
return 1;
}

static const struct cpumask *bigsmp_target_cpus(void)
{
#ifdef CONFIG_SMP
return cpu_online_mask;
#else
return cpumask_of(0);
#endif
}

static unsigned long bigsmp_check_apicid_used(physid_mask_t *map, int apicid)
{
return 0;
Expand Down Expand Up @@ -205,7 +196,7 @@ static struct apic apic_bigsmp = {
/* phys delivery to target CPU: */
.irq_dest_mode = 0,

.target_cpus = bigsmp_target_cpus,
.target_cpus = default_target_cpus,
.disable_esr = 1,
.dest_logical = 0,
.check_apicid_used = bigsmp_check_apicid_used,
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/apic/x2apic_cluster.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static struct apic apic_x2apic_cluster = {
.irq_delivery_mode = dest_LowestPrio,
.irq_dest_mode = 1, /* logical */

.target_cpus = x2apic_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL,
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/apic/x2apic_phys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static struct apic apic_x2apic_phys = {
.irq_delivery_mode = dest_Fixed,
.irq_dest_mode = 0, /* physical */

.target_cpus = x2apic_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = 0,
.check_apicid_used = NULL,
Expand Down
7 changes: 1 addition & 6 deletions arch/x86/kernel/apic/x2apic_uv_x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ EXPORT_SYMBOL_GPL(uv_possible_blades);
unsigned long sn_rtc_cycles_per_second;
EXPORT_SYMBOL(sn_rtc_cycles_per_second);

static const struct cpumask *uv_target_cpus(void)
{
return cpu_online_mask;
}

static void uv_vector_allocation_domain(int cpu, struct cpumask *retmask)
{
cpumask_clear(retmask);
Expand Down Expand Up @@ -362,7 +357,7 @@ static struct apic __refdata apic_x2apic_uv_x = {
.irq_delivery_mode = dest_Fixed,
.irq_dest_mode = 0, /* physical */

.target_cpus = uv_target_cpus,
.target_cpus = online_target_cpus,
.disable_esr = 0,
.dest_logical = APIC_DEST_LOGICAL,
.check_apicid_used = NULL,
Expand Down

0 comments on commit bf721d3

Please sign in to comment.