Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / cmd / x86 / mtrr.c

diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index f632f495ede35c11cea8bb90ce056588d66524d4..084d7315f43e84378d58636ebad2a7fce2cf18ff 100644 (file)
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <command.h>
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 
@@ -44,7 +44,7 @@ static int do_mtrr_list(void)
        return 0;
 }
 
-static int do_mtrr_set(uint reg, int argc, char * const argv[])
+static int do_mtrr_set(uint reg, int argc, char *const argv[])
 {
        const char *typename = argv[0];
        struct mtrr_state state;
@@ -73,11 +73,10 @@ static int do_mtrr_set(uint reg, int argc, char * const argv[])
        if (valid)
                mask |= MTRR_PHYS_MASK_VALID;
 
-       printf("base=%llx, mask=%llx\n", base, mask);
-       mtrr_open(&state);
+       mtrr_open(&state, true);
        wrmsrl(MTRR_PHYS_BASE_MSR(reg), base);
        wrmsrl(MTRR_PHYS_MASK_MSR(reg), mask);
-       mtrr_close(&state);
+       mtrr_close(&state, true);
 
        return 0;
 }
@@ -87,19 +86,20 @@ static int mtrr_set_valid(int reg, bool valid)
        struct mtrr_state state;
        uint64_t mask;
 
-       mtrr_open(&state);
+       mtrr_open(&state, true);
        mask = native_read_msr(MTRR_PHYS_MASK_MSR(reg));
        if (valid)
                mask |= MTRR_PHYS_MASK_VALID;
        else
                mask &= ~MTRR_PHYS_MASK_VALID;
        wrmsrl(MTRR_PHYS_MASK_MSR(reg), mask);
-       mtrr_close(&state);
+       mtrr_close(&state, true);
 
        return 0;
 }
 
-static int do_mtrr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_mtrr(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        const char *cmd;
        uint reg;