drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Working AHCI DMA IPC from yellowstone to denali.

Browse source 
We have a weird bug in context switching where a process's rsp0 ends up
pointing at the wrong value sometimes which crashes the OS.
This commit is contained in:
Drew Galbraith 2023-06-16 01:31:23 -07:00
parent ccfe1b15ab
commit e5da93757a
11 changed files with 171 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sys/denali/ahci/ahci_driver.cpp
View file

@ -33,16 +33,16 @@ z_err_t AhciDriver::Init() {
return Z_OK;
}
z_err_t AhciDriver::GetDevice(uint64_t id, AhciDevice& device) {
z_err_t AhciDriver::GetDevice(uint64_t id, AhciDevice** device) {
if (id >= 32) {
return Z_ERR_INVALID;
}
if (!devices_[id].IsInit()) {
if (devices_[id] != nullptr && !devices_[id]->IsInit()) {
return Z_ERR_NOT_FOUND;
}
device = devices_[id];
*device = devices_[id];
return Z_OK;
}
@ -126,24 +126,27 @@ void AhciDriver::DumpCapabilities() {
void AhciDriver::DumpPorts() {
for (uint64_t i = 0; i < 6; i++) {
AhciDevice& dev = devices_[i];
if (!dev.IsInit()) {
AhciDevice* dev = devices_[i];
if (dev == nullptr || !dev->IsInit()) {
continue;
}
dbgln("");
dbgln("Port %u:", i);
dev.DumpInfo();
dev->DumpInfo();
}
}
void AhciDriver::InterruptLoop() {
dbgln("Starting interrupt loop");
while (true) {
uint64_t type, bytes, caps;
check(ZPortRecv(irq_port_cap_, 0, 0, 0, 0, &type, &bytes, &caps));
for (uint64_t i = 0; i < 32; i++) {
if (devices_[i].IsInit() && (ahci_hba_->interrupt_status & (1 << i))) {
devices_[i].HandleIrq();
if (devices_[i] != nullptr && devices_[i]->IsInit() &&
(ahci_hba_->interrupt_status & (1 << i))) {
dbgln("Interrupt for %u", i);
devices_[i]->HandleIrq();
ahci_hba_->interrupt_status &= ~(1 << i);
}
}
@ -212,7 +215,7 @@ z_err_t AhciDriver::LoadDevices() {
}
uint64_t port_addr =
reinterpret_cast<uint64_t>(ahci_hba_) + 0x100 + (0x80 * i);
devices_[i] = AhciDevice(reinterpret_cast<AhciPort*>(port_addr));
devices_[i] = new AhciDevice(reinterpret_cast<AhciPort*>(port_addr));
}
return Z_OK;
}