[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <b5910989a46777b9857061db2cd59b6150c6fade.1234826723.git.jeremy.fitzhardinge@citrix.com>
Date: Mon, 16 Feb 2009 15:46:12 -0800
From: Jeremy Fitzhardinge <jeremy@...p.org>
To: Ingo Molnar <mingo@...e.hu>
Cc: the arch/x86 maintainers <x86@...nel.org>,
Xen-devel <xen-devel@...ts.xensource.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Yinghai Lu <yinghai@...nel.org>,
Ian Campbell <Ian.Campbell@...rix.com>,
Mark McLoughlin <markmc@...hat.com>
Subject: [PATCH 18/19] xen mtrr: Implement xen_get_free_region()
From: Mark McLoughlin <markmc@...hat.com>
When an already set MTRR is being changed, we need to
first unset, since Xen also maintains a usage count.
Signed-off-by: Mark McLoughlin <markmc@...hat.com>
---
arch/x86/kernel/cpu/mtrr/xen.c | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/xen.c b/arch/x86/kernel/cpu/mtrr/xen.c
index f226044..d715843 100644
--- a/arch/x86/kernel/cpu/mtrr/xen.c
+++ b/arch/x86/kernel/cpu/mtrr/xen.c
@@ -9,13 +9,38 @@
static int __init xen_num_var_ranges(void);
+static int xen_get_free_region(unsigned long base, unsigned long size, int replace_reg)
+{
+ struct xen_platform_op op;
+ int error;
+
+ if (replace_reg < 0)
+ return generic_get_free_region(base, size, -1);
+
+ /* If we're replacing the contents of a register,
+ * we need to first unset it since Xen also keeps
+ * a usage count.
+ */
+ op.cmd = XENPF_del_memtype;
+ op.u.del_memtype.handle = 0;
+ op.u.del_memtype.reg = replace_reg;
+
+ error = HYPERVISOR_dom0_op(&op);
+ if (error) {
+ BUG_ON(error > 0);
+ return error;
+ }
+
+ return replace_reg;
+}
+
/* DOM0 TODO: Need to fill in the remaining mtrr methods to have full
* working userland mtrr support. */
static struct mtrr_ops xen_mtrr_ops = {
.vendor = X86_VENDOR_UNKNOWN,
// .set = xen_set_mtrr,
// .get = xen_get_mtrr,
- .get_free_region = generic_get_free_region,
+ .get_free_region = xen_get_free_region,
.validate_add_page = generic_validate_add_page,
.have_wrcomb = positive_have_wrcomb,
.use_intel_if = 0,
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists