sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kvm: Use the address finalization code in the TLB

Browse source 
Reuse the address finalization code in the TLB instead of replicating
it when handling MMIO. This patch also adds support for injecting
memory mapped IPR requests into the memory system.
This commit is contained in:
Andreas Sandberg 2013-06-18 16:10:22 +02:00
parent 46a8cbbb7f
commit 6151c0f7f4
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cpu/kvm/base.cc
View file

@ -46,6 +46,7 @@
#include <csignal>
#include <ostream>
#include "arch/mmapped_ipr.hh"
#include "arch/utility.hh"
#include "cpu/kvm/base.hh"
#include "debug/Checkpoint.hh"
@ -949,12 +950,32 @@ BaseKvmCPU::handleKvmExitFailEntry()
Tick
BaseKvmCPU::doMMIOAccess(Addr paddr, void *data, int size, bool write)
{
ThreadContext *tc(thread->getTC());
syncThreadContext();
mmio_req.setPhys(paddr, size, Request::UNCACHEABLE, dataMasterId());
// Some architectures do need to massage physical addresses a bit
// before they are inserted into the memory system. This enables
// APIC accesses on x86 and m5ops where supported through a MMIO
// interface.
BaseTLB::Mode tlb_mode(write ? BaseTLB::Write : BaseTLB::Read);
Fault fault(tc->getDTBPtr()->finalizePhysical(&mmio_req, tc, tlb_mode));
if (fault != NoFault)
warn("Finalization of MMIO address failed: %s\n", fault->name());
const MemCmd cmd(write ? MemCmd::WriteReq : MemCmd::ReadReq);
Packet pkt(&mmio_req, cmd);
pkt.dataStatic(data);
if (mmio_req.isMmappedIpr()) {
if (write)
return TheISA::handleIprWrite(tc, &pkt);
else
return TheISA::handleIprRead(tc, &pkt);
} else {
return dataPort.sendAtomic(&pkt);
}
}
void

10
src/mem/request.hh
View file

@ -321,15 +321,15 @@ class Request
}
/**
* Set just the physical address. This should only be used to
* record the result of a translation, and thus the vaddr must be
* valid before this method is called. Otherwise, use setPhys()
* to guarantee that the size and flags are also set.
* Set just the physical address. This usually used to record the
* result of a translation. However, when using virtualized CPUs
* setPhys() is sometimes called to finalize a physical address
* without a virtual address, so we can't check if the virtual
* address is valid.
*/
void
setPaddr(Addr paddr)
{
assert(privateFlags.isSet(VALID_VADDR));
_paddr = paddr;
privateFlags.set(VALID_PADDR);
}