From patchwork Thu Jan 5 16:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9499295 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 182FB606B5 for ; Thu, 5 Jan 2017 16:28:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CBED28409 for ; Thu, 5 Jan 2017 16:28:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 010A82841D; Thu, 5 Jan 2017 16:28:58 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID 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 6094328409 for ; Thu, 5 Jan 2017 16:28:58 +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 1cPAs5-0008EC-4w; Thu, 05 Jan 2017 16:26:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cPAs3-0008E5-VI for xen-devel@lists.xen.org; Thu, 05 Jan 2017 16:26:32 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 58/FD-06501-7B37E685; Thu, 05 Jan 2017 16:26:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42K5GHr/kO624rw Ig2frJSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxrpxawFSyTq5i+vIetgXGCZBcjF4eQwCRG iY673xhBHBaBdmaJtavvADmcHBIC71gk5n+qg7BjJFrOvWOCsCsldr3pZwWxhQQUJH5POMQEM WkFk0TTpRUsIAk2AQ2JJ79msIHYIgKZEi0P57CD2MwCahJ9C96BxYUF7CQOL3nLDGKzCKhK7P z9AWwxr4CZxIsTV9ghlslLLDx/hGkCI98CRoZVjBrFqUVlqUW6RgZ6SUWZ6RkluYmZObqGBqZ 6uanFxYnpqTmJScV6yfm5mxiBoVLPwMC4g7Fxtt8hRkkOJiVR3v3peRFCfEn5KZUZicUZ8UWl OanFhxhlODiUJHhtioBygkWp6akVaZk5wKCFSUtw8CiJ8LqDpHmLCxJzizPTIVKnGI05js1a/ JSJY1fnmqdMQix5+XmpUuK8M0FKBUBKM0rz4AbBoukSo6yUMC8jAwODEE9BalFuZgmq/CtGcQ 5GJWHeRyBTeDLzSuD2vQI6hQnolO0B2SCnlCQipKQaGMuWvNSxXHxomvym404MzKpauWFhfZy nq5Q/77DQKQvzXyH9/+XKbwcLT2h9MRY8dEv4TPeeANZ7yV9THkc/T7hg/s3FVCdcIJD1SpHr K01HjgjdGlO/Nm2H0Esn5dXEyusznSY/cHCNv7W8tu3S5Tk8b7su+Fn2ZU7VWXHd3c7TXMZR0 KFCiaU4I9FQi7moOBEAq8Ria6ECAAA= X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1483633589!39698268!1 X-Originating-IP: [209.85.223.194] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31344 invoked from network); 5 Jan 2017 16:26:29 -0000 Received: from mail-io0-f194.google.com (HELO mail-io0-f194.google.com) (209.85.223.194) by server-14.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 5 Jan 2017 16:26:29 -0000 Received: by mail-io0-f194.google.com with SMTP id f73so63320510ioe.2 for ; Thu, 05 Jan 2017 08:26:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id; bh=o9hwKR5Rzd+ZZcc085CYECNE5e7EY1FQSI9J+FoyyaU=; b=fALFU6tQnjGhlxcMfZKc6V5DcBNiGuYdyG3FULJ7AjXKl3r8bPYW3ZUVbsWIzZ59iy GqXgm+5LSesknX/Gb/vkzfR9dBnwiKSHvKrc9EEh71EYNxT4CmMaLCthEgeFZeNCSiMW f3RHhaFHl/uIvR0r2P4MKkVwkpTqRdbfdvjn0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=o9hwKR5Rzd+ZZcc085CYECNE5e7EY1FQSI9J+FoyyaU=; b=cTlvwGXB8Cr4cJEcKMlm5dbulw8eIZ+BFLdXpGsC6TIyoYtkAgFYUmOQT/Th29qNt8 NK/Thy9HxZQV5tj/mNMAi35djA3e1p+knOY+fnhjUe6liE05GLwwE6DOkNaJee1SJIaL 4r00yW+TKDTQ1oZFN+QfNN2Y/pM0w9StmpY3oAdU3l1YZEwREdeHoBUClDl0FzE8btIx tAMlTZeUclHW/hgRZLrbygTj3dHTsR8BVjJ+CBUcWJptGcQlQYazhHazk3vAs4Pj7YGD FoUC0iwUMzO1SP0bfx6QnLJpkxXt23a2uMsRjFLZGqDnjGB/uYlBnxhw99HBATeIWMGc Gf+g== X-Gm-Message-State: AIkVDXIfOFQWpcdGxaFC7mnL1kr3eV+GbocOpxwioMxHGoYmHmQYx0VGrVka7qcAkWqUxQ== X-Received: by 10.107.183.8 with SMTP id h8mr54545587iof.163.1483633588680; Thu, 05 Jan 2017 08:26:28 -0800 (PST) Received: from swanson.attlocal.net (104-179-196-18.lightspeed.brhmal.sbcglobal.net. [104.179.196.18]) by smtp.gmail.com with ESMTPSA id f4sm37598939ioe.40.2017.01.05.08.26.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jan 2017 08:26:28 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org, Jan Beulich , Andrew Cooper Date: Thu, 5 Jan 2017 10:26:09 -0600 Message-Id: <20170105162609.31453-1-cardoe@cardoe.com> X-Mailer: git-send-email 2.10.2 Cc: Doug Goldstein Subject: [Xen-devel] [PATCH] x86/mtrr: use stdbool instead of int + define 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Instead of using an int and providing a define for TRUE and FALSE, change the code to use stdbool that Xen provides. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper and queued --- xen/arch/x86/cpu/mtrr/generic.c | 21 +++++++++++---------- xen/arch/x86/cpu/mtrr/mtrr.h | 5 ----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c index 012aca4..2d2eadc 100644 --- a/xen/arch/x86/cpu/mtrr/generic.c +++ b/xen/arch/x86/cpu/mtrr/generic.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -237,7 +238,7 @@ static void mtrr_wrmsr(unsigned int msr, uint64_t msr_content) * \param changed pointer which indicates whether the MTRR needed to be changed * \param msrwords pointer to the MSR values which the MSR should have */ -static void set_fixed_range(int msr, int * changed, unsigned int * msrwords) +static void set_fixed_range(int msr, bool * changed, unsigned int * msrwords) { uint64_t msr_content, val; @@ -246,7 +247,7 @@ static void set_fixed_range(int msr, int * changed, unsigned int * msrwords) if (msr_content != val) { mtrr_wrmsr(msr, val); - *changed = TRUE; + *changed = true; } } @@ -302,10 +303,10 @@ void mtrr_generic_get(unsigned int reg, unsigned long *base, * Checks and updates the fixed-range MTRRs if they differ from the saved set * \param frs pointer to fixed-range MTRR values, saved by get_fixed_ranges() */ -static int set_fixed_ranges(mtrr_type * frs) +static bool set_fixed_ranges(mtrr_type * frs) { unsigned long long *saved = (unsigned long long *) frs; - int changed = FALSE; + bool changed = false; int block=-1, range; while (fixed_range_blocks[++block].ranges) @@ -316,13 +317,13 @@ static int set_fixed_ranges(mtrr_type * frs) return changed; } -/* Set the MSR pair relating to a var range. Returns TRUE if +/* Set the MSR pair relating to a var range. Returns true if changes are made */ -static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) +static bool set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) { uint32_t lo, hi, base_lo, base_hi, mask_lo, mask_hi; uint64_t msr_content; - int changed = FALSE; + bool changed = false; rdmsrl(MSR_IA32_MTRR_PHYSBASE(index), msr_content); lo = (uint32_t)msr_content; @@ -337,7 +338,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) if ((base_lo != lo) || (base_hi != hi)) { mtrr_wrmsr(MSR_IA32_MTRR_PHYSBASE(index), vr->base); - changed = TRUE; + changed = true; } rdmsrl(MSR_IA32_MTRR_PHYSMASK(index), msr_content); @@ -353,7 +354,7 @@ static int set_mtrr_var_ranges(unsigned int index, struct mtrr_var_range *vr) if ((mask_lo != lo) || (mask_hi != hi)) { mtrr_wrmsr(MSR_IA32_MTRR_PHYSMASK(index), vr->mask); - changed = TRUE; + changed = true; } return changed; } @@ -478,7 +479,7 @@ void mtrr_generic_set(unsigned int reg, unsigned long base, The base address of the region. The size of the region. If this is 0 the region is disabled. The type of the region. - If TRUE, do the change safely. If FALSE, safety measures should + If true, do the change safely. If false, safety measures should be done externally. [RETURNS] Nothing. */ diff --git a/xen/arch/x86/cpu/mtrr/mtrr.h b/xen/arch/x86/cpu/mtrr/mtrr.h index 1a3b1e5..9d55c68 100644 --- a/xen/arch/x86/cpu/mtrr/mtrr.h +++ b/xen/arch/x86/cpu/mtrr/mtrr.h @@ -2,11 +2,6 @@ * local mtrr defines. */ -#ifndef TRUE -#define TRUE 1 -#define FALSE 0 -#endif - #define MTRR_CHANGE_MASK_FIXED 0x01 #define MTRR_CHANGE_MASK_VARIABLE 0x02 #define MTRR_CHANGE_MASK_DEFTYPE 0x04