Merge branch 'master' of git://git.denx.de/u-boot-usb

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

diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c
index f632f495ede35c11cea8bb90ce056588d66524d4..d3fd959235f3e9e891b35f4b041021a28df0b3bf 100644 (file)
--- a/cmd/x86/mtrr.c
+++ b/cmd/x86/mtrr.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -74,10 +73,10 @@ static int do_mtrr_set(uint reg, int argc, char * const argv[])
                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,14 +86,14 @@ 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;
 }