tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i386/msr: Merge rdmsr.h and wrmsr.h into msr.h

Browse Source 
It does not make sense to have separate headers for individual static
functions. So, make one common place to store them.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Daniel Kiper 2024-10-06 17:14:42 +03:00
parent 86ec48882b
commit d96cfd7bf8
4 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub-core/commands/i386/rdmsr.c
View File

@ -26,7 +26,7 @@
#include <grub/extcmd.h>
#include <grub/i18n.h>
#include <grub/i386/cpuid.h>
#include <grub/i386/rdmsr.h>
#include <grub/i386/msr.h>
GRUB_MOD_LICENSE("GPLv3+");

2
grub-core/commands/i386/wrmsr.c
View File

@ -27,7 +27,7 @@
#include <grub/lockdown.h>
#include <grub/i18n.h>
#include <grub/i386/cpuid.h>
#include <grub/i386/wrmsr.h>
#include <grub/i386/msr.h>
GRUB_MOD_LICENSE("GPLv3+");

16
include/grub/i386/wrmsr.h → include/grub/i386/msr.h
View File

@ -16,14 +16,24 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GRUB_WRMSR_H
#define GRUB_WRMSR_H 1
#ifndef GRUB_I386_MSR_H
#define GRUB_I386_MSR_H 1
/*
* TODO: Add a general protection exception handler.
* Accessing a reserved or unimplemented MSR address results in a GP#.
*/
static inline grub_uint64_t
grub_msr_read (grub_uint32_t msr_id)
{
grub_uint32_t low, high;
asm volatile ("rdmsr" : "=a" (low), "=d" (high) : "c" (msr_id));
return ((grub_uint64_t) high << 32) | low;
}
static inline void
grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value)
{
@ -32,4 +42,4 @@ grub_msr_write(grub_uint32_t msr_id, grub_uint64_t msr_value)
asm volatile ("wrmsr" : : "c" (msr_id), "a" (low), "d" (high));
}
#endif /* GRUB_WRMSR_H */
#endif /* GRUB_I386_MSR_H */

37
include/grub/i386/rdmsr.h
View File

@ -1,37 +0,0 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2019 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GRUB_RDMSR_H
#define GRUB_RDMSR_H 1
/*
* TODO: Add a general protection exception handler.
* Accessing a reserved or unimplemented MSR address results in a GP#.
*/
static inline grub_uint64_t
grub_msr_read (grub_uint32_t msr_id)
{
grub_uint32_t low, high;
asm volatile ("rdmsr" : "=a" (low), "=d" (high) : "c" (msr_id));
return ((grub_uint64_t)high << 32) | low;
}
#endif /* GRUB_RDMSR_H */