mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-05-29 22:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Kernel: Rename OSPKU CPUID feature flag to OSPKE

Browse source 
Unlike "XSAVE enabled by OS" being indicated by the OSXSAVE flag, in
this case it's "PKU enabled by OS" being indicated by the OSPKE flag.
This commit is contained in:
Linus Groh 2022-04-08 18:18:51 +01:00
parent 280e99073b
commit 87aabb5ef7
Notes: sideshowbarker 2024-07-18 02:13:10 +09:00
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Arch/x86/CPUID.h
View file

@ -142,7 +142,7 @@ AK_MAKE_ARBITRARY_SIZED_ENUM(CPUFeature, u256,
AVX512_VBMI = CPUFeature(1u) << 97u, // AVX-512 Vector Bit Manipulation Instructions AVX512_VBMI = CPUFeature(1u) << 97u, // AVX-512 Vector Bit Manipulation Instructions
UMIP = CPUFeature(1u) << 98u, // UMIP UMIP = CPUFeature(1u) << 98u, // UMIP
PKU = CPUFeature(1u) << 99u, // Memory Protection Keys for User-mode pages PKU = CPUFeature(1u) << 99u, // Memory Protection Keys for User-mode pages
OSPKU = CPUFeature(1u) << 100u, // PKU enabled by OS OSPKE = CPUFeature(1u) << 100u, // PKU enabled by OS
WAITPKG = CPUFeature(1u) << 101u, // Timed pause and user-level monitor/wait WAITPKG = CPUFeature(1u) << 101u, // Timed pause and user-level monitor/wait
AVX512_VBMI2 = CPUFeature(1u) << 102u, // AVX-512 Vector Bit Manipulation Instructions 2 AVX512_VBMI2 = CPUFeature(1u) << 102u, // AVX-512 Vector Bit Manipulation Instructions 2
CET_SS = CPUFeature(1u) << 103u, // Control Flow Enforcement (CET) Shadow Stack CET_SS = CPUFeature(1u) << 103u, // Control Flow Enforcement (CET) Shadow Stack

4
Kernel/Arch/x86/common/CPUID.cpp
View file

@ -206,8 +206,8 @@ StringView cpu_feature_to_string_view(CPUFeature::Type const& feature)
return "umip"sv; return "umip"sv;
if (feature == CPUFeature::PKU) if (feature == CPUFeature::PKU)
return "pku"sv; return "pku"sv;
if (feature == CPUFeature::OSPKU) if (feature == CPUFeature::OSPKE)
return "ospku"sv; return "ospke"sv;
if (feature == CPUFeature::WAITPKG) if (feature == CPUFeature::WAITPKG)
return "waitpkg"sv; return "waitpkg"sv;
if (feature == CPUFeature::AVX512_VBMI2) if (feature == CPUFeature::AVX512_VBMI2)

2
Kernel/Arch/x86/common/Processor.cpp
View file

@ -287,7 +287,7 @@ UNMAP_AFTER_INIT void Processor::cpu_detect()
if (extended_features.ecx() & (1 << 3)) if (extended_features.ecx() & (1 << 3))
m_features |= CPUFeature::PKU; m_features |= CPUFeature::PKU;
if (extended_features.ecx() & (1 << 4)) if (extended_features.ecx() & (1 << 4))
m_features |= CPUFeature::OSPKU; m_features |= CPUFeature::OSPKE;
if (extended_features.ecx() & (1 << 5)) if (extended_features.ecx() & (1 << 5))
m_features |= CPUFeature::WAITPKG; m_features |= CPUFeature::WAITPKG;
if (extended_features.ecx() & (1 << 6)) if (extended_features.ecx() & (1 << 6))