x86/apic: Make some APIC init functions bool
Quite some APIC init functions are pure boolean, but use the success = 0, fail < 0 model. That's confusing as hell when reading through the code. Convert them to boolean. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Michael Kelley <mikelley@microsoft.com> Tested-by: Sohil Mehta <sohil.mehta@intel.com> Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)
This commit is contained in:
parent
2906a67ac8
commit
1751adedbd
@ -135,12 +135,12 @@ extern void setup_secondary_APIC_clock(void);
|
||||
extern void lapic_update_tsc_freq(void);
|
||||
|
||||
#ifdef CONFIG_X86_64
|
||||
static inline int apic_force_enable(unsigned long addr)
|
||||
static inline bool apic_force_enable(unsigned long addr)
|
||||
{
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
extern int apic_force_enable(unsigned long addr);
|
||||
extern bool apic_force_enable(unsigned long addr);
|
||||
#endif
|
||||
|
||||
extern void apic_ap_setup(void);
|
||||
|
@ -2000,19 +2000,19 @@ void __init enable_IR_x2apic(void)
|
||||
* On AMD64 we trust the BIOS - if it says no APIC it is likely
|
||||
* not correctly set up (usually the APIC timer won't work etc.)
|
||||
*/
|
||||
static int __init detect_init_APIC(void)
|
||||
static bool __init detect_init_APIC(void)
|
||||
{
|
||||
if (!boot_cpu_has(X86_FEATURE_APIC)) {
|
||||
pr_info("No local APIC present\n");
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
|
||||
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
|
||||
static int __init apic_verify(void)
|
||||
static bool __init apic_verify(void)
|
||||
{
|
||||
u32 features, h, l;
|
||||
|
||||
@ -2023,7 +2023,7 @@ static int __init apic_verify(void)
|
||||
features = cpuid_edx(1);
|
||||
if (!(features & (1 << X86_FEATURE_APIC))) {
|
||||
pr_warn("Could not enable APIC!\n");
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
|
||||
mp_lapic_addr = APIC_DEFAULT_PHYS_BASE;
|
||||
@ -2036,15 +2036,15 @@ static int __init apic_verify(void)
|
||||
}
|
||||
|
||||
pr_info("Found and enabled local APIC!\n");
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
int __init apic_force_enable(unsigned long addr)
|
||||
bool __init apic_force_enable(unsigned long addr)
|
||||
{
|
||||
u32 h, l;
|
||||
|
||||
if (apic_is_disabled)
|
||||
return -1;
|
||||
return false;
|
||||
|
||||
/*
|
||||
* Some BIOSes disable the local APIC in the APIC_BASE
|
||||
@ -2067,11 +2067,11 @@ int __init apic_force_enable(unsigned long addr)
|
||||
/*
|
||||
* Detect and initialize APIC
|
||||
*/
|
||||
static int __init detect_init_APIC(void)
|
||||
static bool __init detect_init_APIC(void)
|
||||
{
|
||||
/* Disabled by kernel option? */
|
||||
if (apic_is_disabled)
|
||||
return -1;
|
||||
return false;
|
||||
|
||||
switch (boot_cpu_data.x86_vendor) {
|
||||
case X86_VENDOR_AMD:
|
||||
@ -2098,22 +2098,22 @@ static int __init detect_init_APIC(void)
|
||||
if (!force_enable_local_apic) {
|
||||
pr_info("Local APIC disabled by BIOS -- "
|
||||
"you can enable it with \"lapic\"\n");
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
if (apic_force_enable(APIC_DEFAULT_PHYS_BASE))
|
||||
return -1;
|
||||
if (!apic_force_enable(APIC_DEFAULT_PHYS_BASE))
|
||||
return false;
|
||||
} else {
|
||||
if (apic_verify())
|
||||
return -1;
|
||||
if (!apic_verify())
|
||||
return false;
|
||||
}
|
||||
|
||||
apic_pm_activate();
|
||||
|
||||
return 0;
|
||||
return true;
|
||||
|
||||
no_apic:
|
||||
pr_info("No local APIC present or hardware disabled\n");
|
||||
return -1;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -2129,7 +2129,7 @@ void __init init_apic_mappings(void)
|
||||
return;
|
||||
|
||||
/* If no local APIC can be found return early */
|
||||
if (!smp_found_config && detect_init_APIC()) {
|
||||
if (!smp_found_config && !detect_init_APIC()) {
|
||||
/* lets NOP'ify apic operations */
|
||||
pr_info("APIC: disable apic facility\n");
|
||||
apic_disable();
|
||||
|
@ -158,7 +158,7 @@ static void __init dtb_lapic_setup(void)
|
||||
/* Did the boot loader setup the local APIC ? */
|
||||
if (!boot_cpu_has(X86_FEATURE_APIC)) {
|
||||
/* Try force enabling, which registers the APIC address */
|
||||
if (apic_force_enable(lapic_addr))
|
||||
if (!apic_force_enable(lapic_addr))
|
||||
return;
|
||||
} else {
|
||||
register_lapic_address(lapic_addr);
|
||||
|
Loading…
x
Reference in New Issue
Block a user