diff options
| author | Nick Bofferding <bofferdn@us.ibm.com> | 2015-03-02 18:04:05 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-04-09 21:59:24 -0500 |
| commit | 343014b3095462dbec20efe456cbb945d4844b4e (patch) | |
| tree | e7a4f1b0b522e63ba0c0baea82a6add01b09772c /src/build/debug | |
| parent | 77f3ab96fd87a9bbecb19aba9f3b48cfb09983bd (diff) | |
| download | talos-hostboot-343014b3095462dbec20efe456cbb945d4844b4e.tar.gz talos-hostboot-343014b3095462dbec20efe456cbb945d4844b4e.zip | |
Prevent out-of-order data access to FSP mailbox memory area
- Added system call to map FSP mailbox memory with guard permission
- Call new mapping in DMA area init
- Propagate guard permission down to MMIO map
- Apply guard permission in page fault handler
- Updated debug tools to support extra bit in MMIO struct
Change-Id: I8335ac7d3ef57e46d4c8b6c2b2a42b8a0bf7c4b0
Backport: release-fips830
Backport: release-fips820
CQ: SW295345
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16307
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.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/build/debug')
| -rwxr-xr-x | src/build/debug/Hostboot/_DebugFrameworkVMM.pm | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/src/build/debug/Hostboot/_DebugFrameworkVMM.pm b/src/build/debug/Hostboot/_DebugFrameworkVMM.pm index ef8e71dc4..1f0d3fdc9 100755 --- a/src/build/debug/Hostboot/_DebugFrameworkVMM.pm +++ b/src/build/debug/Hostboot/_DebugFrameworkVMM.pm @@ -6,7 +6,9 @@ # # OpenPOWER HostBoot Project # -# COPYRIGHT International Business Machines Corp. 2011,2014 +# Contributors Listed Below - COPYRIGHT 2012,2015 +# [+] International Business Machines Corp. +# # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -74,8 +76,12 @@ use constant STACK_PREV_STACK_OFFEST => 8; use constant STACK_KEY_OFFSET => 16; use constant STACK_BLOCKPTR_OFFSET => 24; +use constant MMIO_STRUCT_SIZE => 16; use constant MMIO_STRUCT_SEGADDR_OFFSET => 0; use constant MMIO_STRUCT_SEGSIZE_OFFSET => 8; +use constant MMIO_STRUCT_GUARDED_MASK => 0x4000000000000000; +use constant MMIO_STRUCT_NO_CI_MASK => 0x8000000000000000; +use constant MMIO_STRUCT_SIZE_MASK => 0x3FFFFFFFFFFFFFFF; use constant BLOCK_BASE_ADDR => 0; use constant BLOCK_SIZE_OFFSET => 8; @@ -890,14 +896,26 @@ sub printDeviceSegments # loop through all mmio devices max of 32 per device segment. while($curmmiodevice < $maxmmiodevices) { - my $segmentPhyAddr =::read64($mmiostructptr + - $curmmiodevice*16 + - MMIO_STRUCT_SEGADDR_OFFSET, 8); + my $segmentPhyAddr =::read64($mmiostructptr + + $curmmiodevice*MMIO_STRUCT_SIZE + + MMIO_STRUCT_SEGADDR_OFFSET, 8); + + my $segmentSize =::read64($mmiostructptr + + $curmmiodevice*MMIO_STRUCT_SIZE + + MMIO_STRUCT_SEGSIZE_OFFSET, 8); + use bigint; + + # DeviceSegment::devSegData.no_ci + my $no_ci = ( ($segmentSize & MMIO_STRUCT_NO_CI_MASK) + == MMIO_STRUCT_NO_CI_MASK); + + # DeviceSegment::devSegData.guarded + my $guarded = ( ($segmentSize & MMIO_STRUCT_GUARDED_MASK) + == MMIO_STRUCT_GUARDED_MASK); - my $segmentSize =::read64($mmiostructptr + $curmmiodevice*16 - + MMIO_STRUCT_SEGSIZE_OFFSET, 8); - # Segment size is a 63 bit quantity. - $segmentSize = $segmentSize & 0x7FFFFFFFFFFFFFFF; + # Segment size is a 62 bit quantity. + # DeviceSegment::devSegData.size + $segmentSize = ($segmentSize & MMIO_STRUCT_SIZE_MASK); if ($segmentPhyAddr != 0) { @@ -911,7 +929,12 @@ sub printDeviceSegments ::userDisplay (sprintf " MMio Device Size: %X\n" , $segmentSize); - + ::userDisplay (sprintf + " MMio no_ci flag: %u\n" , + $no_ci); + ::userDisplay (sprintf + " MMio guarded flag: %u\n" , + $guarded); } $curmmiodevice = $curmmiodevice + 1; |

