summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2014-04-15 17:45:53 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-05-09 07:19:10 -0500
commit868e98cac34aed64ffb5f983a3662ae31af0c8a1 (patch)
tree51eb73b4c371ec4e1347f6ff7423d4b32c576436 /src/usr
parentf1207a134bea63fc08342effe5e806aa38cc26e6 (diff)
downloadblackbird-hostboot-868e98cac34aed64ffb5f983a3662ae31af0c8a1.tar.gz
blackbird-hostboot-868e98cac34aed64ffb5f983a3662ae31af0c8a1.zip
Move mailbox area to leave more room for Sapphire.
Change-Id: If39241fbbc110400177b3ef3a5e895f5ed14f2a4 RTC: 81670 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10588 Tested-by: Jenkins Server Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/mbox/mbox_dma_buffer.C5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr/mbox/mbox_dma_buffer.C b/src/usr/mbox/mbox_dma_buffer.C
index f04c54aee..43c93c681 100644
--- a/src/usr/mbox/mbox_dma_buffer.C
+++ b/src/usr/mbox/mbox_dma_buffer.C
@@ -179,7 +179,8 @@ void DmaBuffer::initPhysicalArea(void*& io_addr, uint64_t& o_phys)
// Move the physical address to the start of the node (unsecure) and
// add on the DMA buffer offset inside the node.
o_phys &= ~(hrmor_base-1);
- o_phys += VmmManager::MBOX_DMA_ADDR;
+ o_phys += reinterpret_cast<uint64_t>(io_addr) +
+ VMM_UNSECURE_RESERVED_MEMORY_BASEADDR;
// Allocate a new VMM block for the buffer.
io_addr = mm_block_map(reinterpret_cast<void*>(o_phys),
@@ -195,5 +196,7 @@ void DmaBuffer::initPhysicalArea(void*& io_addr, uint64_t& o_phys)
reinterpret_cast<uint64_t*>(VmmManager::MBOX_DMA_SIZE +
reinterpret_cast<uint64_t>(io_addr)));
+ memset(io_addr, '\0', VmmManager::MBOX_DMA_SIZE);
+
}
OpenPOWER on IntegriCloud