[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] hvmloader: use memory type constants
commit 671f50ffab3329c5497208da89620322b9721a77 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Thu Jan 5 16:21:13 2023 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Thu Jan 5 16:21:13 2023 +0100 hvmloader: use memory type constants Now that we have them available in a header which is okay to use from hvmloader sources, do away with respective literal numbers and silent assumptions. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper@xxxxxxxxxx> --- tools/firmware/hvmloader/cacheattr.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/firmware/hvmloader/cacheattr.c b/tools/firmware/hvmloader/cacheattr.c index 1c67819748..b7215fba2e 100644 --- a/tools/firmware/hvmloader/cacheattr.c +++ b/tools/firmware/hvmloader/cacheattr.c @@ -22,6 +22,8 @@ #include "util.h" #include "config.h" +#include <xen/asm/x86-defns.h> + #define MSR_MTRRphysBase(reg) (0x200 + 2 * (reg)) #define MSR_MTRRphysMask(reg) (0x200 + 2 * (reg) + 1) #define MSR_MTRRcap 0x00fe @@ -71,23 +73,28 @@ void cacheattr_init(void) addr_mask = ((1ull << phys_bits) - 1) & ~((1ull << 12) - 1); mtrr_cap = rdmsr(MSR_MTRRcap); - mtrr_def = (1u << 11) | 6; /* E, default type WB */ + mtrr_def = (1u << 11) | X86_MT_WB; /* E, default type WB */ /* Fixed-range MTRRs supported? */ if ( mtrr_cap & (1u << 8) ) { +#define BCST(mt) ((mt) * 0x0101010101010101ULL) /* 0x00000-0x9ffff: Write Back (WB) */ - content = 0x0606060606060606ull; + content = BCST(X86_MT_WB); wrmsr(MSR_MTRRfix64K_00000, content); wrmsr(MSR_MTRRfix16K_80000, content); + /* 0xa0000-0xbffff: Write Combining (WC) */ if ( mtrr_cap & (1u << 10) ) /* WC supported? */ - content = 0x0101010101010101ull; + content = BCST(X86_MT_WC); wrmsr(MSR_MTRRfix16K_A0000, content); + /* 0xc0000-0xfffff: Write Back (WB) */ - content = 0x0606060606060606ull; + content = BCST(X86_MT_WB); for ( i = 0; i < 8; i++ ) wrmsr(MSR_MTRRfix4K_C0000 + i, content); +#undef BCST + mtrr_def |= 1u << 10; /* FE */ printf("fixed MTRRs ... "); } @@ -106,7 +113,7 @@ void cacheattr_init(void) while ( ((base + size) < base) || ((base + size) > pci_mem_end) ) size >>= 1; - wrmsr(MSR_MTRRphysBase(i), base); + wrmsr(MSR_MTRRphysBase(i), base | X86_MT_UC); wrmsr(MSR_MTRRphysMask(i), (~(size - 1) & addr_mask) | (1u << 11)); base += size; @@ -121,7 +128,7 @@ void cacheattr_init(void) while ( (base + size < base) || (base + size > pci_hi_mem_end) ) size >>= 1; - wrmsr(MSR_MTRRphysBase(i), base); + wrmsr(MSR_MTRRphysBase(i), base | X86_MT_UC); wrmsr(MSR_MTRRphysMask(i), (~(size - 1) & addr_mask) | (1u << 11)); base += size; -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |