From patchwork Fri Jun 30 17:01:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9820113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FC6D603F2 for ; Fri, 30 Jun 2017 17:03:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BE32286B4 for ; Fri, 30 Jun 2017 17:03:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FFC0286BC; Fri, 30 Jun 2017 17:03:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF8D9286B4 for ; Fri, 30 Jun 2017 17:03:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQzIU-0002vl-Ds; Fri, 30 Jun 2017 17:01:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQzIT-0002sx-6c for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 17:01:33 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 2A/8E-22472-CE386595; Fri, 30 Jun 2017 17:01:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOIsWRWlGSWpSXmKPExsXitHSDve6b5rB Ig5aHHBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aRp6dYC5YqVrzZsIalgfGMVBcjJ4eEgL/E /1Xr2EBsNgFliZ+dvWC2iICeRNOB54wgNrNAnsTZ1YtYQWxhAUOJhYe/gtksAqoS/e+mgdXwC phL7OvbwAgxU15iV9tFsBpOAQuJSxumsYDYQkA1i6/uYYKwFSQ6ph9jgugVlDg58wkLxC4JiY MvXjBPYOSdhSQ1C0lqASPTKkaN4tSistQiXUMLvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKR iveT83E2MwOCpZ2Bg3MH4+7TnIUZJDiYlUd6V10IjhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw ZjSFRQoJFqWmp1akZeYAwxgmLcHBoyTC61cLlOYtLkjMLc5Mh0idYjTm2LB6/RcmjlcT/n9jE mLJy89LlRLn1QKZJABSmlGaBzcIFl+XGGWlhHkZGRgYhHgKUotyM0tQ5V8xinMwKgnzCoJM4c nMK4Hb9wroFCagU4RnhICcUpKIkJJqYJxgu3nRjgd3rq8wb6rKW+628fxbRzENF9u0b3Mnfzq z7RKH1eQ12z7uPd4Q0C6rqLFYhfXC+Y8ND4V/JJTxt67/qPtCuOR+w91TZUr3Fn3e8L5j+4RX NWXnXzOWxUVO1jVpbEucI/5iYwP/HNVXkZff7dx+7HnOudaoC5oMyqt2HdCzbPK2vMqlxFKck WioxVxUnAgA2SA3VaoCAAA= X-Env-Sender: prvs=347159f46=wei.liu2@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1498842088!102764747!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62395 invoked from network); 30 Jun 2017 17:01:31 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 30 Jun 2017 17:01:31 -0000 X-IronPort-AV: E=Sophos;i="5.40,287,1496102400"; d="scan'208";a="438494976" From: Wei Liu To: Xen-devel Date: Fri, 30 Jun 2017 18:01:10 +0100 Message-ID: <20170630170126.4148-3-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630170126.4148-1-wei.liu2@citrix.com> References: <20170630170126.4148-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH 02/18] x86/apic.c: use plain bool X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Wei Liu --- xen/arch/x86/apic.c | 30 +++++++++++++++--------------- xen/include/asm-x86/apic.h | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 8c6c2f5819..28a1ef8a58 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -37,8 +37,8 @@ #include #include -static bool_t tdt_enabled __read_mostly; -static bool_t tdt_enable __initdata = 1; +static bool tdt_enabled __read_mostly; +static bool tdt_enable __initdata = true; boolean_param("tdt", tdt_enable); static struct { @@ -70,7 +70,7 @@ static s8 __initdata enable_local_apic; /* -1=force-disable, +1=force-enable */ */ u8 __read_mostly apic_verbosity; -static bool_t __initdata opt_x2apic = 1; +static bool __initdata opt_x2apic = true; boolean_param("x2apic", opt_x2apic); /* @@ -79,8 +79,8 @@ boolean_param("x2apic", opt_x2apic); */ static enum apic_mode apic_boot_mode = APIC_MODE_INVALID; -bool_t __read_mostly x2apic_enabled = 0; -bool_t __read_mostly directed_eoi_enabled = 0; +bool __read_mostly x2apic_enabled = false; +bool __read_mostly directed_eoi_enabled = false; static int modern_apic(void) { @@ -130,9 +130,9 @@ void __init apic_intr_init(void) } /* Using APIC to generate smp_local_timer_interrupt? */ -static bool_t __read_mostly using_apic_timer; +static bool __read_mostly using_apic_timer; -static bool_t __read_mostly enabled_via_apicbase; +static bool __read_mostly enabled_via_apicbase; int get_physical_broadcast(void) { @@ -387,7 +387,7 @@ int __init verify_local_APIC(void) else { ioapic_ack_new = 0; - directed_eoi_enabled = 1; + directed_eoi_enabled = true; printk("Enabled directed EOI with ioapic_ack_old on!\n"); } } @@ -839,7 +839,7 @@ static int __init detect_init_APIC (void) msr_content &= ~MSR_IA32_APICBASE_BASE; msr_content |= MSR_IA32_APICBASE_ENABLE | APIC_DEFAULT_PHYS_BASE; wrmsrl(MSR_IA32_APICBASE, msr_content); - enabled_via_apicbase = 1; + enabled_via_apicbase = true; } } /* @@ -945,7 +945,7 @@ void __init x2apic_bsp_setup(void) if ( !x2apic_enabled ) { - x2apic_enabled = 1; + x2apic_enabled = true; __enable_x2apic(); } @@ -1176,7 +1176,7 @@ void __init setup_boot_APIC_clock(void) { unsigned long flags; apic_printk(APIC_VERBOSE, "Using local APIC timer interrupts.\n"); - using_apic_timer = 1; + using_apic_timer = true; local_irq_save(flags); @@ -1185,7 +1185,7 @@ void __init setup_boot_APIC_clock(void) if ( tdt_enable && boot_cpu_has(X86_FEATURE_TSC_DEADLINE) ) { printk(KERN_DEBUG "TSC deadline timer enabled\n"); - tdt_enabled = 1; + tdt_enabled = true; } setup_APIC_timer(); @@ -1258,12 +1258,12 @@ void apic_timer_interrupt(struct cpu_user_regs * regs) raise_softirq(TIMER_SOFTIRQ); } -static DEFINE_PER_CPU(bool_t, state_dump_pending); +static DEFINE_PER_CPU(bool, state_dump_pending); void smp_send_state_dump(unsigned int cpu) { /* We overload the spurious interrupt handler to handle the dump. */ - per_cpu(state_dump_pending, cpu) = 1; + per_cpu(state_dump_pending, cpu) = true; send_IPI_mask(cpumask_of(cpu), SPURIOUS_APIC_VECTOR); } @@ -1280,7 +1280,7 @@ void spurious_interrupt(struct cpu_user_regs *regs) if (apic_isr_read(SPURIOUS_APIC_VECTOR)) { ack_APIC_irq(); if (this_cpu(state_dump_pending)) { - this_cpu(state_dump_pending) = 0; + this_cpu(state_dump_pending) = false; dump_execstate(regs); goto out; } diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index ea675b7f0a..9d7ec93042 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -29,8 +29,8 @@ enum apic_mode { }; extern u8 apic_verbosity; -extern bool_t x2apic_enabled; -extern bool_t directed_eoi_enabled; +extern bool x2apic_enabled; +extern bool directed_eoi_enabled; void check_x2apic_preenabled(void); void x2apic_bsp_setup(void);