Skip to content

Commit

Permalink
x86: clean up apic->acpi_madt_oem_check methods
Browse files Browse the repository at this point in the history 
Impact: refactor code

x86 subarchitectures each defined a "acpi_madt_oem_check()" method,
which could be an inline function, or an extern, or a static function,
and which was also the name of a genapic field.

Untangle this namespace spaghetti by setting ->acpi_madt_oem_check()
to NULL on those subarchitectures that have no detection quirks,
and rename the other ones (summit, es7000) that do.

Also change default_acpi_madt_oem_check() to handle NULL entries,
and clean its control flow up as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jan 28, 2009
1 parent 9a6801d commit 306db03
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion arch/x86/include/asm/es7000/mpparse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);
extern void setup_unisys(void);

#ifndef CONFIG_X86_GENERICARCH
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid);
#endif

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/include/asm/genapic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ extern struct genapic apic_flat;
extern struct genapic apic_physflat;
extern struct genapic apic_x2apic_cluster;
extern struct genapic apic_x2apic_phys;
extern int acpi_madt_oem_check(char *, char *);
extern int default_acpi_madt_oem_check(char *, char *);

extern void apic_send_IPI_self(int vector);

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/include/asm/mach-default/mach_mpparse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
}

/* Hook from generic ACPI tables.c */
static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
static inline int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/include/asm/mach-generic/mach_mpparse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

extern int mps_oem_check(struct mpc_table *, char *, char *);

extern int acpi_madt_oem_check(char *, char *);
extern int default_acpi_madt_oem_check(char *, char *);

#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */
2 changes: 1 addition & 1 deletion arch/x86/include/asm/summit/mpparse.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static inline int mps_oem_check(struct mpc_table *mpc, char *oem,
}

/* Hook from generic ACPI tables.c */
static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)
static inline int summit_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
if (!strncmp(oem_id, "IBM", 3) &&
(!strncmp(oem_table_id, "SERVIGIL", 8)
Expand Down
3 changes: 2 additions & 1 deletion arch/x86/kernel/acpi/boot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
madt->address);
}

acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
default_acpi_madt_oem_check(madt->header.oem_id,
madt->header.oem_table_id);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/genapic_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void apic_send_IPI_self(int vector)
__send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
}

int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mach-generic/bigsmp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct genapic apic_bigsmp = {

.name = "bigsmp",
.probe = probe_bigsmp,
.acpi_madt_oem_check = acpi_madt_oem_check,
.acpi_madt_oem_check = NULL,
.apic_id_registered = apic_id_registered,

.int_delivery_mode = INT_DELIVERY_MODE,
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mach-generic/default.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct genapic apic_default = {

.name = "default",
.probe = probe_default,
.acpi_madt_oem_check = acpi_madt_oem_check,
.acpi_madt_oem_check = NULL,
.apic_id_registered = apic_id_registered,

.int_delivery_mode = INT_DELIVERY_MODE,
Expand Down
6 changes: 3 additions & 3 deletions arch/x86/mach-generic/es7000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)

#ifdef CONFIG_ACPI
/* Hook from generic ACPI tables.c */
static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
unsigned long oem_addr = 0;
int check_dsdt;
Expand All @@ -81,7 +81,7 @@ static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return ret;
}
#else
static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
return 0;
}
Expand All @@ -104,7 +104,7 @@ struct genapic apic_es7000 = {

.name = "es7000",
.probe = probe_es7000,
.acpi_madt_oem_check = acpi_madt_oem_check,
.acpi_madt_oem_check = es7000_acpi_madt_oem_check,
.apic_id_registered = apic_id_registered,

.int_delivery_mode = INT_DELIVERY_MODE,
Expand Down
8 changes: 1 addition & 7 deletions arch/x86/mach-generic/numaq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ static int probe_numaq(void)
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)
{
/* Careful. Some cpus do not strictly honor the set of cpus
Expand All @@ -54,7 +48,7 @@ struct genapic apic_numaq = {

.name = "NUMAQ",
.probe = probe_numaq,
.acpi_madt_oem_check = acpi_madt_oem_check,
.acpi_madt_oem_check = NULL,
.apic_id_registered = apic_id_registered,

.int_delivery_mode = INT_DELIVERY_MODE,
Expand Down
24 changes: 14 additions & 10 deletions arch/x86/mach-generic/probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,20 +128,24 @@ int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
return 0;
}

int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
{
int i;

for (i = 0; apic_probe[i]; ++i) {
if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
if (!cmdline_apic) {
apic = apic_probe[i];
if (x86_quirks->update_genapic)
x86_quirks->update_genapic();
printk(KERN_INFO "Switched to APIC driver `%s'.\n",
apic->name);
}
return 1;
if (!apic_probe[i]->acpi_madt_oem_check)
continue;
if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id))
continue;

if (!cmdline_apic) {
apic = apic_probe[i];
if (x86_quirks->update_genapic)
x86_quirks->update_genapic();
printk(KERN_INFO "Switched to APIC driver `%s'.\n",
apic->name);
}
return 1;
}
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mach-generic/summit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct genapic apic_summit = {

.name = "summit",
.probe = probe_summit,
.acpi_madt_oem_check = acpi_madt_oem_check,
.acpi_madt_oem_check = summit_acpi_madt_oem_check,
.apic_id_registered = apic_id_registered,

.int_delivery_mode = INT_DELIVERY_MODE,
Expand Down

0 comments on commit 306db03

Please sign in to comment.