RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:37:35 +00:00
Code Issues Activity Actions

Kernel: Align read operation in HPET registers' block

Browse source
This commit is contained in:
Liav A 2020-04-01 15:06:48 +03:00 • committed by Andreas Kling
parent 175ec99814
commit b1365d94f4
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/Time/HPET.cpp
View file

@ -74,9 +74,7 @@ struct [[gnu::packed]] TimerStructure
struct [[gnu::packed]] HPETCapabilityRegister struct [[gnu::packed]] HPETCapabilityRegister
{ {
u8 revision_id; u32 attributes; // Note: We must do a 32 bit access to offsets 0x0, or 0x4 only, according to HPET spec.
u8 attributes;
u16 vendor_id;
u32 main_counter_tick_period; u32 main_counter_tick_period;
u64 reserved; u64 reserved;
}; };
@ -90,7 +88,7 @@ struct [[gnu::packed]] HPETRegister
struct [[gnu::packed]] HPETRegistersBlock struct [[gnu::packed]] HPETRegistersBlock
{ {
union { union {
volatile HPETCapabilityRegister capabilities; // Note: We must do a 32 bit access to offsets 0x0, or 0x4 only, according to HPET spec. volatile HPETCapabilityRegister capabilities;
volatile HPETRegister raw_capabilites; volatile HPETRegister raw_capabilites;
}; };
HPETRegister configuration; HPETRegister configuration;
@ -155,8 +153,7 @@ bool HPET::check_for_exisiting_periodic_timers()
auto block_region = MM.allocate_kernel_region(p_block, (PAGE_SIZE * 2), "HPET Initialization", Region::Access::Read); auto block_region = MM.allocate_kernel_region(p_block, (PAGE_SIZE * 2), "HPET Initialization", Region::Access::Read);
auto* registers = (volatile HPETRegistersBlock*)block_region->vaddr().offset(p_block.offset_in_page()).as_ptr(); auto* registers = (volatile HPETRegistersBlock*)block_region->vaddr().offset(p_block.offset_in_page()).as_ptr();
auto* capabilities_register = (volatile HPETCapabilityRegister*)&registers->capabilities; size_t timers_count = ((registers->raw_capabilites.reg >> 8) & 0x1f) + 1;
size_t timers_count = (capabilities_register->attributes & 0x1f) + 1;
for (size_t index = 0; index < timers_count; index++) { for (size_t index = 0; index < timers_count; index++) {
if (registers->timers[index].configuration_and_capability & (u32)HPETFlags::TimerConfiguration::PeriodicInterruptCapable) if (registers->timers[index].configuration_and_capability & (u32)HPETFlags::TimerConfiguration::PeriodicInterruptCapable)
return true; return true;