Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolved duplicate MSR errors in allowlists and updated table references to be correct. #150

Merged
merged 1 commit into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 57 additions & 57 deletions allowlists/al_06_2D
Original file line number Diff line number Diff line change
Expand Up @@ -166,57 +166,57 @@
# 0x0000041A 0x0000000000000000 # "IA32_MC6_ADDR (Table: 2-23)"
# 0x0000041B 0x0000000000000000 # "IA32_MC6_MISC (Table: 2-23)"
# 0x0000041C 0x0000000000000000 # "IA32_MC7_CTL (Table: 2-23)"
# 0x0000041D 0x0000000000000000 # "IA32_MC7_STATUS (Table: 2-23)"
# 0x0000041E 0x0000000000000000 # "IA32_MC7_ADDR (Table: 2-23)"
# 0x0000041F 0x0000000000000000 # "IA32_MC7_MISC (Table: 2-23)"
# 0x00000420 0x0000000000000000 # "IA32_MC8_CTL (Table: 2-23)"
# 0x00000421 0x0000000000000000 # "IA32_MC8_STATUS (Table: 2-23)"
# 0x00000422 0x0000000000000000 # "IA32_MC8_ADDR (Table: 2-23)"
# 0x00000423 0x0000000000000000 # "IA32_MC8_MISC (Table: 2-23)"
# 0x00000424 0x0000000000000000 # "IA32_MC9_CTL (Table: 2-23)"
# 0x00000425 0x0000000000000000 # "IA32_MC9_STATUS (Table: 2-23)"
# 0x00000426 0x0000000000000000 # "IA32_MC9_ADDR (Table: 2-23)"
# 0x00000427 0x0000000000000000 # "IA32_MC9_MISC (Table: 2-23)"
# 0x00000428 0x0000000000000000 # "IA32_MC10_CTL (Table: 2-23)"
# 0x00000429 0x0000000000000000 # "IA32_MC10_STATUS (Table: 2-23)"
# 0x0000042A 0x0000000000000000 # "IA32_MC10_ADDR (Table: 2-23)"
# 0x0000042B 0x0000000000000000 # "IA32_MC10_MISC (Table: 2-23)"
# 0x0000042C 0x0000000000000000 # "IA32_MC11_CTL (Table: 2-23)"
# 0x0000042D 0x0000000000000000 # "IA32_MC11_STATUS (Table: 2-23)"
# 0x0000042E 0x0000000000000000 # "IA32_MC11_ADDR (Table: 2-23)"
# 0x0000042F 0x0000000000000000 # "IA32_MC11_MISC (Table: 2-23)"
# 0x00000430 0x0000000000000000 # "IA32_MC12_CTL (Table: 2-23)"
# 0x00000431 0x0000000000000000 # "IA32_MC12_STATUS (Table: 2-23)"
# 0x00000432 0x0000000000000000 # "IA32_MC12_ADDR (Table: 2-23)"
# 0x00000433 0x0000000000000000 # "IA32_MC12_MISC (Table: 2-23)"
# 0x00000434 0x0000000000000000 # "IA32_MC13_CTL (Table: 2-23)"
# 0x00000435 0x0000000000000000 # "IA32_MC13_STATUS (Table: 2-23)"
# 0x00000436 0x0000000000000000 # "IA32_MC13_ADDR (Table: 2-23)"
# 0x00000437 0x0000000000000000 # "IA32_MC13_MISC (Table: 2-23)"
# 0x00000438 0x0000000000000000 # "IA32_MC14_CTL (Table: 2-23)"
# 0x00000439 0x0000000000000000 # "IA32_MC14_STATUS (Table: 2-23)"
# 0x0000043A 0x0000000000000000 # "IA32_MC14_ADDR (Table: 2-23)"
# 0x0000043B 0x0000000000000000 # "IA32_MC14_MISC (Table: 2-23)"
# 0x0000043C 0x0000000000000000 # "IA32_MC15_CTL (Table: 2-23)"
# 0x0000043D 0x0000000000000000 # "IA32_MC15_STATUS (Table: 2-23)"
# 0x0000043E 0x0000000000000000 # "IA32_MC15_ADDR (Table: 2-23)"
# 0x0000043F 0x0000000000000000 # "IA32_MC15_MISC (Table: 2-23)"
# 0x00000440 0x0000000000000000 # "IA32_MC16_CTL (Table: 2-23)"
# 0x00000441 0x0000000000000000 # "IA32_MC16_STATUS (Table: 2-23)"
# 0x00000442 0x0000000000000000 # "IA32_MC16_ADDR (Table: 2-23)"
# 0x00000443 0x0000000000000000 # "IA32_MC16_MISC (Table: 2-23)"
# 0x00000444 0x0000000000000000 # "IA32_MC17_CTL (Table: 2-23)"
# 0x00000445 0x0000000000000000 # "IA32_MC17_STATUS (Table: 2-23)"
# 0x00000446 0x0000000000000000 # "IA32_MC17_ADDR (Table: 2-23)"
# 0x00000447 0x0000000000000000 # "IA32_MC17_MISC (Table: 2-23)"
# 0x00000448 0x0000000000000000 # "IA32_MC18_CTL (Table: 2-23)"
# 0x00000449 0x0000000000000000 # "IA32_MC18_STATUS (Table: 2-23)"
# 0x0000044A 0x0000000000000000 # "IA32_MC18_ADDR (Table: 2-23)"
# 0x0000044B 0x0000000000000000 # "IA32_MC18_MISC (Table: 2-23)"
# 0x0000044C 0x0000000000000000 # "IA32_MC19_CTL (Table: 2-23)"
# 0x0000044D 0x0000000000000000 # "IA32_MC19_STATUS (Table: 2-23)"
# 0x0000044E 0x0000000000000000 # "IA32_MC19_ADDR (Table: 2-23)"
# 0x0000044F 0x0000000000000000 # "IA32_MC19_MISC (Table: 2-23)"
# 0x0000041D 0x0000000000000000 # "IA32_MC7_STATUS (Table: 2-24)"
# 0x0000041E 0x0000000000000000 # "IA32_MC7_ADDR (Table: 2-24)"
# 0x0000041F 0x0000000000000000 # "IA32_MC7_MISC (Table: 2-24)"
# 0x00000420 0x0000000000000000 # "IA32_MC8_CTL (Table: 2-24)"
# 0x00000421 0x0000000000000000 # "IA32_MC8_STATUS (Table: 2-24)"
# 0x00000422 0x0000000000000000 # "IA32_MC8_ADDR (Table: 2-24)"
# 0x00000423 0x0000000000000000 # "IA32_MC8_MISC (Table: 2-24)"
# 0x00000424 0x0000000000000000 # "IA32_MC9_CTL (Table: 2-24)"
# 0x00000425 0x0000000000000000 # "IA32_MC9_STATUS (Table: 2-24)"
# 0x00000426 0x0000000000000000 # "IA32_MC9_ADDR (Table: 2-24)"
# 0x00000427 0x0000000000000000 # "IA32_MC9_MISC (Table: 2-24)"
# 0x00000428 0x0000000000000000 # "IA32_MC10_CTL (Table: 2-24)"
# 0x00000429 0x0000000000000000 # "IA32_MC10_STATUS (Table: 2-24)"
# 0x0000042A 0x0000000000000000 # "IA32_MC10_ADDR (Table: 2-24)"
# 0x0000042B 0x0000000000000000 # "IA32_MC10_MISC (Table: 2-24)"
# 0x0000042C 0x0000000000000000 # "IA32_MC11_CTL (Table: 2-24)"
# 0x0000042D 0x0000000000000000 # "IA32_MC11_STATUS (Table: 2-24)"
# 0x0000042E 0x0000000000000000 # "IA32_MC11_ADDR (Table: 2-24)"
# 0x0000042F 0x0000000000000000 # "IA32_MC11_MISC (Table: 2-24)"
# 0x00000430 0x0000000000000000 # "IA32_MC12_CTL (Table: 2-24)"
# 0x00000431 0x0000000000000000 # "IA32_MC12_STATUS (Table: 2-24)"
# 0x00000432 0x0000000000000000 # "IA32_MC12_ADDR (Table: 2-24)"
# 0x00000433 0x0000000000000000 # "IA32_MC12_MISC (Table: 2-24)"
# 0x00000434 0x0000000000000000 # "IA32_MC13_CTL (Table: 2-24)"
# 0x00000435 0x0000000000000000 # "IA32_MC13_STATUS (Table: 2-24)"
# 0x00000436 0x0000000000000000 # "IA32_MC13_ADDR (Table: 2-24)"
# 0x00000437 0x0000000000000000 # "IA32_MC13_MISC (Table: 2-24)"
# 0x00000438 0x0000000000000000 # "IA32_MC14_CTL (Table: 2-24)"
# 0x00000439 0x0000000000000000 # "IA32_MC14_STATUS (Table: 2-24)"
# 0x0000043A 0x0000000000000000 # "IA32_MC14_ADDR (Table: 2-24)"
# 0x0000043B 0x0000000000000000 # "IA32_MC14_MISC (Table: 2-24)"
# 0x0000043C 0x0000000000000000 # "IA32_MC15_CTL (Table: 2-24)"
# 0x0000043D 0x0000000000000000 # "IA32_MC15_STATUS (Table: 2-24)"
# 0x0000043E 0x0000000000000000 # "IA32_MC15_ADDR (Table: 2-24)"
# 0x0000043F 0x0000000000000000 # "IA32_MC15_MISC (Table: 2-24)"
# 0x00000440 0x0000000000000000 # "IA32_MC16_CTL (Table: 2-24)"
# 0x00000441 0x0000000000000000 # "IA32_MC16_STATUS (Table: 2-24)"
# 0x00000442 0x0000000000000000 # "IA32_MC16_ADDR (Table: 2-24)"
# 0x00000443 0x0000000000000000 # "IA32_MC16_MISC (Table: 2-24)"
# 0x00000444 0x0000000000000000 # "IA32_MC17_CTL (Table: 2-24)"
# 0x00000445 0x0000000000000000 # "IA32_MC17_STATUS (Table: 2-24)"
# 0x00000446 0x0000000000000000 # "IA32_MC17_ADDR (Table: 2-24)"
# 0x00000447 0x0000000000000000 # "IA32_MC17_MISC (Table: 2-24)"
# 0x00000448 0x0000000000000000 # "IA32_MC18_CTL (Table: 2-24)"
# 0x00000449 0x0000000000000000 # "IA32_MC18_STATUS (Table: 2-24)"
# 0x0000044A 0x0000000000000000 # "IA32_MC18_ADDR (Table: 2-24)"
# 0x0000044B 0x0000000000000000 # "IA32_MC18_MISC (Table: 2-24)"
# 0x0000044C 0x0000000000000000 # "IA32_MC19_CTL (Table: 2-24)"
# 0x0000044D 0x0000000000000000 # "IA32_MC19_STATUS (Table: 2-24)"
# 0x0000044E 0x0000000000000000 # "IA32_MC19_ADDR (Table: 2-24)"
# 0x0000044F 0x0000000000000000 # "IA32_MC19_MISC (Table: 2-24)"
# 0x00000480 0x0000000000000000 # "IA32_VMX_BASIC (Table: 2-20)"
# 0x00000481 0x0000000000000000 # "IA32_VMX_PINBASED_CTLS (Table: 2-20)"
# 0x00000482 0x0000000000000000 # "IA32_VMX_PROCBASED_CTLS (Table: 2-20)"
Expand Down Expand Up @@ -249,14 +249,14 @@
# 0x0000060D 0x0000000000000000 # "MSR_PKG_C2_RESIDENCY (Table: 2-20)"
# 0x00000610 0x0000000000000000 # "MSR_PKG_POWER_LIMIT (Table: 2-20)"
# 0x00000611 0x0000000000000000 # "MSR_PKG_ENERGY_STATUS (Table: 2-20)"
# 0x00000613 0x0000000000000000 # "MSR_PKG_PERF_STATUS (Table: 2-23)"
# 0x00000613 0x0000000000000000 # "MSR_PKG_PERF_STATUS (Table: 2-24)"
# 0x00000614 0x0000000000000000 # "MSR_PKG_POWER_INFO (Table: 2-20)"
# 0x00000618 0x0000000000000000 # "MSR_DRAM_POWER_LIMIT (Table: 2-23)"
# 0x00000619 0x0000000000000000 # "MSR_DRAM_ENERGY_STATUS (Table: 2-23)"
# 0x0000061B 0x0000000000000000 # "MSR_DRAM_PERF_STATUS (Table: 2-23)"
# 0x0000061C 0x0000000000000000 # "MSR_DRAM_POWER_INFO (Table: 2-23)"
# 0x00000618 0x0000000000000000 # "MSR_DRAM_POWER_LIMIT (Table: 2-24)"
# 0x00000619 0x0000000000000000 # "MSR_DRAM_ENERGY_STATUS (Table: 2-24)"
# 0x0000061B 0x0000000000000000 # "MSR_DRAM_PERF_STATUS (Table: 2-24)"
# 0x0000061C 0x0000000000000000 # "MSR_DRAM_POWER_INFO (Table: 2-24)"
# 0x00000638 0x0000000000000000 # "MSR_PP0_POWER_LIMIT (Table: 2-20)"
# 0x00000639 0x0000000000000000 # "MSR_PP0_ENERGY_STATUS (Table: 2-23)"
# 0x00000639 0x0000000000000000 # "MSR_PP0_ENERGY_STATUS (Table: 2-24)"
# 0x00000680 0x0000000000000000 # "MSR_LASTBRANCH_0_FROM_IP (Table: 2-20)"
# 0x00000681 0x0000000000000000 # "MSR_LASTBRANCH_1_FROM_IP (Table: 2-20)"
# 0x00000682 0x0000000000000000 # "MSR_LASTBRANCH_2_FROM_IP (Table: 2-20)"
Expand Down
6 changes: 3 additions & 3 deletions allowlists/al_06_3A
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
# 0x000000C6 0x0000000000000000 # "IA32_PMC5 (Table: 2-20)"
# 0x000000C7 0x0000000000000000 # "IA32_PMC6 (Table: 2-20)"
# 0x000000C8 0x0000000000000000 # "IA32_PMC7 (Table: 2-20)"
# 0x000000CE 0x0000000000000000 # "MSR_PLATFORM_INFO (Table: 2-20)"
# 0x000000E2 0x0000000000000000 # "MSR_PKG_CST_CONFIG_CONTROL (Table: 2-20)"
# 0x000000CE 0x0000000000000000 # "MSR_PLATFORM_INFO (Table: 2-25)"
# 0x000000E2 0x0000000000000000 # "MSR_PKG_CST_CONFIG_CONTROL (Table: 2-25)"
# 0x000000E4 0x0000000000000000 # "MSR_PMG_IO_CAPTURE_BASE (Table: 2-20)"
# 0x000000E7 0x0000000000000000 # "IA32_MPERF (Table: 2-20)"
# 0x000000E8 0x0000000000000000 # "IA32_APERF (Table: 2-20)"
Expand Down Expand Up @@ -184,7 +184,7 @@
# 0x00000611 0x0000000000000000 # "MSR_PKG_ENERGY_STATUS (Table: 2-20)"
# 0x00000614 0x0000000000000000 # "MSR_PKG_POWER_INFO (Table: 2-20)"
# 0x00000638 0x0000000000000000 # "MSR_PP0_POWER_LIMIT (Table: 2-20)"
# 0x00000639 0x0000000000000000 # "MSR_PP0_ENERGY_STATUS (Table: 2-21)"
# 0x00000639 0x0000000000000000 # "MSR_PP0_ENERGY_STATUS (Table: 2-25)"
# 0x0000063A 0x0000000000000000 # "MSR_PP0_POLICY (Table: 2-21)"
# 0x00000640 0x0000000000000000 # "MSR_PP1_POWER_LIMIT (Table: 2-21)"
# 0x00000641 0x0000000000000000 # "MSR_PP1_ENERGY_STATUS (Table: 2-21)"
Expand Down
Loading