justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-12 09:24:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add some AHCI debugging dumps

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-20 02:02:06 -07:00
parent 81fc559802
commit 193d9939f0
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/kernel/ahci/hba.cpp
View File

@@ -62,6 +62,8 @@ hba::hba(pci_device *device)
device_manager &dm = device_manager::get();
uint32_t bar5 = device->get_bar(5);
log::debug(logs::driver, "HBA raw BAR5 is %08lx", bar5);
m_data = reinterpret_cast<hba_data *>(bar5 & ~0xfffull);
pm->map_offset_pointer(reinterpret_cast<void **>(&m_data), 0x2000);
@@ -93,6 +95,7 @@ hba::hba(pci_device *device)
m_data->host_control |= 0x02; // enable interrupts
}
dump();
for (auto &p : m_ports) {
if (!p.active()) continue;

8
src/kernel/ahci/port.cpp
View File

@@ -301,11 +301,17 @@ port::read_async(uint64_t offset, size_t length, void *dest)
size_t
port::read(uint64_t offset, size_t length, void *dest)
{
dump();
int slot = read_async(offset, length, dest);
dump();
int timeout = 0;
while (m_pending[slot].type == command_type::read) {
if (timeout++ > 10) return 0;
if (timeout++ > 5) {
m_hba->dump();
dump();
return 0;
}
asm("hlt");
}
kassert(m_pending[slot].type == command_type::finished,