i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio-mmio: add initialization for legacy mode (version 1)

Browse Source 
Change-Id: I4dcfca8cfabafad592b638b28215225b1cca35d2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4657
Reviewed-by: Jérôme Duval <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
David Karoly
2021-12-15 15:55:50 +00:00
committed by Jérôme Duval
parent f0adfe2a54
commit c1e0007eea
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/virtio/virtio_mmio/VirtioDevice.cpp
+12 -4
View File
@@ -91,9 +91,11 @@ VirtioQueue::Init()
phys_addr_t availPhys = (addr_t)fAvail - (addr_t)queueMem + pe.address; phys_addr_t availPhys = (addr_t)fAvail - (addr_t)queueMem + pe.address;
phys_addr_t usedPhys = (addr_t)fUsed - (addr_t)queueMem + pe.address; phys_addr_t usedPhys = (addr_t)fUsed - (addr_t)queueMem + pe.address;
SetLowHi(fDev->fRegs->queueDescLow, fDev->fRegs->queueDescHi, descsPhys); if (fDev->fRegs->version != 1) {
SetLowHi(fDev->fRegs->queueAvailLow, fDev->fRegs->queueAvailHi, availPhys); SetLowHi(fDev->fRegs->queueDescLow, fDev->fRegs->queueDescHi, descsPhys);
SetLowHi(fDev->fRegs->queueUsedLow, fDev->fRegs->queueUsedHi, usedPhys); SetLowHi(fDev->fRegs->queueAvailLow, fDev->fRegs->queueAvailHi, availPhys);
SetLowHi(fDev->fRegs->queueUsedLow, fDev->fRegs->queueUsedHi, usedPhys);
}
fFreeDescs.SetTo(new(std::nothrow) uint32[(fQueueLen + 31) / 32]); fFreeDescs.SetTo(new(std::nothrow) uint32[(fQueueLen + 31) / 32]);
if (!fFreeDescs.IsSet()) if (!fFreeDescs.IsSet())
@@ -104,7 +106,13 @@ VirtioQueue::Init()
if (!fCookies.IsSet()) if (!fCookies.IsSet())
return B_NO_MEMORY; return B_NO_MEMORY;
fDev->fRegs->queueReady = 1; if (fDev->fRegs->version == 1) {
uint32_t pfn = descsPhys / B_PAGE_SIZE;
fDev->fRegs->queueAlign = B_PAGE_SIZE;
fDev->fRegs->queuePfn = pfn;
} else {
fDev->fRegs->queueReady = 1;
}
return B_OK; return B_OK;
} }