Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Allow HDA stream reset to timeout

Browse Source 
This was hanging on some version of qemu :^)
This commit is contained in:
Bananymous
2026-05-15 21:30:41 +03:00
parent b2f795b1e1
commit 5e1b5c329b
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/Audio/HDAudio/AudioFunctionGroup.h
View File

@@ -43,7 +43,7 @@ namespace Kernel
BAN::ErrorOr<void> enable_output_path(uint8_t index); BAN::ErrorOr<void> enable_output_path(uint8_t index);
BAN::ErrorOr<void> disable_output_path(uint8_t index); BAN::ErrorOr<void> disable_output_path(uint8_t index);
void reset_stream(); BAN::ErrorOr<void> reset_stream();
BAN::ErrorOr<void> recurse_output_paths(const HDAudio::AFGWidget& widget, BAN::Vector<const HDAudio::AFGWidget*>& path); BAN::ErrorOr<void> recurse_output_paths(const HDAudio::AFGWidget& widget, BAN::Vector<const HDAudio::AFGWidget*>& path);

23
kernel/kernel/Audio/HDAudio/AudioFunctionGroup.cpp
View File

@@ -1,6 +1,7 @@
#include <kernel/Audio/HDAudio/AudioFunctionGroup.h> #include <kernel/Audio/HDAudio/AudioFunctionGroup.h>
#include <kernel/Audio/HDAudio/Registers.h> #include <kernel/Audio/HDAudio/Registers.h>
#include <kernel/FS/DevFS/FileSystem.h> #include <kernel/FS/DevFS/FileSystem.h>
#include <kernel/Timer/Timer.h>
#include <BAN/Sort.h> #include <BAN/Sort.h>
@@ -202,12 +203,12 @@ namespace Kernel
ASSERT(m_stream_index == 0xFF); ASSERT(m_stream_index == 0xFF);
m_stream_index = TRY(m_controller->allocate_stream(HDAudio::StreamType::Output, this)); m_stream_index = TRY(m_controller->allocate_stream(HDAudio::StreamType::Output, this));
reset_stream(); TRY(reset_stream());
return {}; return {};
} }
void HDAudioFunctionGroup::reset_stream() BAN::ErrorOr<void> HDAudioFunctionGroup::reset_stream()
{ {
using Regs = HDAudio::Regs; using Regs = HDAudio::Regs;
@@ -219,13 +220,23 @@ namespace Kernel
// stop stream // stop stream
bar.write8(base + Regs::SDCTL, bar.read8(base + Regs::SDCTL) & 0xFD); bar.write8(base + Regs::SDCTL, bar.read8(base + Regs::SDCTL) & 0xFD);
const auto timeout_ms = SystemTimer::get().ms_since_boot() + 100;
// reset stream // reset stream
bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE) | 1); bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE) | 1);
while (!(bar.read8(base + Regs::SDCTL) & 1)) while (!(bar.read8(base + Regs::SDCTL) & 1))
{
if (SystemTimer::get().ms_since_boot() > timeout_ms)
return BAN::Error::from_errno(ETIMEDOUT);
Processor::pause(); Processor::pause();
}
bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE)); bar.write8(base + Regs::SDCTL, (bar.read8(base + Regs::SDCTL) & 0xFE));
while ((bar.read8(base + Regs::SDCTL) & 1)) while ((bar.read8(base + Regs::SDCTL) & 1))
{
if (SystemTimer::get().ms_since_boot() > timeout_ms)
return BAN::Error::from_errno(ETIMEDOUT);
Processor::pause(); Processor::pause();
}
// set bdl address, total size and lvi // set bdl address, total size and lvi
const paddr_t bdl_paddr = m_bdl_region->paddr() + bdl_offset(); const paddr_t bdl_paddr = m_bdl_region->paddr() + bdl_offset();
@@ -621,7 +632,13 @@ namespace Kernel
m_bdl_tail = (m_bdl_tail + 1) % m_bdl_entry_count; m_bdl_tail = (m_bdl_tail + 1) % m_bdl_entry_count;
if (m_bdl_tail == m_bdl_head) if (m_bdl_tail == m_bdl_head)
reset_stream(); {
if (auto ret = reset_stream(); ret.is_error())
{
dwarnln("failed to reset HDA stream: {}", ret.error());
return;
}
}
queue_bdl_data(); queue_bdl_data();
} }