sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inteltool: Allow to set cores range for MSRs dump

Browse Source 
Adds the ability to output MSRs dump for the specified range of CPU
cores. This makes it easier to reverse engineer server multicore
processors using the inteltool utility.

The range is set using --cpu-range <start>[-<end>] command line option:

  $ sudo ./inteltool -M --cpu-range 0-7
  $ sudo ./inteltool -M --cpu-range 7-15
  $ sudo ./inteltool -M --cpu-range 32

  $ sudo ./inteltool -M will print a register dump for all cores, just
as before.

Change-Id: I3a037cf7ac270d2b51d6e453334c358ff47b4105
Signed-off-by: Maxim Polyakov <max.senia.poliak@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35919
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Maxim Polyakov
2019-10-09 18:35:23 +03:00
committed by Nico Huber
parent b11f7e2b6b
commit d8163ede51
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
util/inteltool/inteltool.c
View File

@@ -10,6 +10,7 @@
#include <sys/mman.h>
#include <unistd.h>
#include <errno.h>
#include <limits.h>
#include "inteltool.h"
#include "pcr.h"
@@ -21,6 +22,7 @@
enum long_only_opts {
LONG_OPT_PCR = 0x100,
LONG_OPT_RANGE = 0x101,
};
/*
@@ -516,6 +518,7 @@ static void print_usage(const char *name)
" -d | --dmibar: dump northbridge DMIBAR registers\n"
" -P | --pciexpress: dump northbridge PCIEXBAR registers\n\n"
" -M | --msrs: dump CPU MSRs\n"
" --cpu-range <start>[-<end>]: (optional) set CPU cores range for -M (--msrs) option\n"
" -A | --ambs: dump AMB registers\n"
" -x | --sgx: dump SGX status\n"
" -t | --tme: dump TME status\n"
@@ -585,6 +588,8 @@ int main(int argc, char *argv[])
size_t pcr_count = 0;
uint8_t dump_pcr[MAX_PCR_PORTS];
unsigned int cores_range_start = 0, cores_range_end = UINT_MAX;
static struct option long_options[] = {
{"version", 0, 0, 'v'},
{"help", 0, 0, 'h'},
@@ -598,6 +603,7 @@ int main(int argc, char *argv[])
{"dmibar", 0, 0, 'd'},
{"pciexpress", 0, 0, 'P'},
{"msrs", 0, 0, 'M'},
{"cpu-range", required_argument, 0, LONG_OPT_RANGE},
{"ambs", 0, 0, 'A'},
{"spi", 0, 0, 's'},
{"spd", 0, 0, 'S'},
@@ -657,6 +663,24 @@ int main(int argc, char *argv[])
case 'M':
dump_coremsrs = 1;
break;
case LONG_OPT_RANGE:
if (strlen(optarg) == 0) {
print_usage(argv[0]);
exit(1);
}
const int sscanf_ret = sscanf(optarg, "%u-%u", &cores_range_start, &cores_range_end);
if (sscanf_ret == 1) {
/* the end of the range is not specified - only for one core */
cores_range_end = cores_range_start;
} else if (sscanf_ret != 2) {
print_usage(argv[0]);
exit(1);
} else if (cores_range_end < cores_range_start) {
printf("Error: invalid cores range <%u-%u>!\n",
cores_range_start, cores_range_end);
exit(1);
}
break;
case 'a':
dump_gpios = 1;
show_gpio_diffs = 1;
@@ -859,7 +883,7 @@ int main(int argc, char *argv[])
}
if (dump_coremsrs) {
print_intel_core_msrs();
print_intel_msrs(cores_range_start, cores_range_end);
printf("\n\n");
}