|
533 | 533 | #define MSR_HWP_CAPABILITIES 0x00000771
|
534 | 534 | #define MSR_HWP_REQUEST_PKG 0x00000772
|
535 | 535 | #define MSR_HWP_INTERRUPT 0x00000773
|
536 |
| -#define MSR_HWP_REQUEST 0x00000774 |
| 536 | +#define MSR_HWP_REQUEST 0x00000774 |
537 | 537 | #define MSR_HWP_STATUS 0x00000777
|
538 | 538 |
|
539 | 539 | /* CPUID.6.EAX */
|
|
550 | 550 | #define HWP_LOWEST_PERF(x) (((x) >> 24) & 0xff)
|
551 | 551 |
|
552 | 552 | /* IA32_HWP_REQUEST */
|
553 |
| -#define HWP_MIN_PERF(x) (x & 0xff) |
554 |
| -#define HWP_MAX_PERF(x) ((x & 0xff) << 8) |
| 553 | +#define HWP_MIN_PERF(x) (x & 0xff) |
| 554 | +#define HWP_MAX_PERF(x) ((x & 0xff) << 8) |
555 | 555 | #define HWP_DESIRED_PERF(x) ((x & 0xff) << 16)
|
556 |
| -#define HWP_ENERGY_PERF_PREFERENCE(x) (((unsigned long long) x & 0xff) << 24) |
| 556 | +#define HWP_ENERGY_PERF_PREFERENCE(x) (((u64)x & 0xff) << 24) |
557 | 557 | #define HWP_EPP_PERFORMANCE 0x00
|
558 | 558 | #define HWP_EPP_BALANCE_PERFORMANCE 0x80
|
559 | 559 | #define HWP_EPP_BALANCE_POWERSAVE 0xC0
|
560 | 560 | #define HWP_EPP_POWERSAVE 0xFF
|
561 |
| -#define HWP_ACTIVITY_WINDOW(x) ((unsigned long long)(x & 0xff3) << 32) |
562 |
| -#define HWP_PACKAGE_CONTROL(x) ((unsigned long long)(x & 0x1) << 42) |
| 561 | +#define HWP_ACTIVITY_WINDOW(x) ((u64)(x & 0xff3) << 32) |
| 562 | +#define HWP_PACKAGE_CONTROL(x) ((u64)(x & 0x1) << 42) |
563 | 563 |
|
564 | 564 | /* IA32_HWP_STATUS */
|
565 | 565 | #define HWP_GUARANTEED_CHANGE(x) (x & 0x1)
|
|
602 | 602 | /* V6 PMON MSR range */
|
603 | 603 | #define MSR_IA32_PMC_V6_GP0_CTR 0x1900
|
604 | 604 | #define MSR_IA32_PMC_V6_GP0_CFG_A 0x1901
|
| 605 | +#define MSR_IA32_PMC_V6_GP0_CFG_B 0x1902 |
| 606 | +#define MSR_IA32_PMC_V6_GP0_CFG_C 0x1903 |
605 | 607 | #define MSR_IA32_PMC_V6_FX0_CTR 0x1980
|
| 608 | +#define MSR_IA32_PMC_V6_FX0_CFG_B 0x1982 |
| 609 | +#define MSR_IA32_PMC_V6_FX0_CFG_C 0x1983 |
606 | 610 | #define MSR_IA32_PMC_V6_STEP 4
|
607 | 611 |
|
608 | 612 | /* KeyID partitioning between MKTME and TDX */
|
|
0 commit comments