commit 3c48bd34726ababcb8cb06d048098a66286fcc64
author Todd Eisenberger <teisenbe@google.com> Mon Apr 16 11:27:17 2018 -0700
committer Todd Eisenberger <teisenbe@google.com> Mon Apr 16 11:28:54 2018 -0700
tree 2edff63170f499728a77f7ac38162528d77ebbaa
parent d90658f42ca72673d2838beec627037dba69fa5b

[kernel][iommu] Relax const-ness of some accessors

This allows more flexibility in the implementations.

Change-Id: Ie59c4ede6fcc3130e10455a7c38dc0177663188c

kernel/dev/iommu/dummy/dummy_iommu.cpp

diff --git a/kernel/dev/iommu/dummy/dummy_iommu.cpp b/kernel/dev/iommu/dummy/dummy_iommu.cpp
index fce0edb..9a52979 100644
--- a/kernel/dev/iommu/dummy/dummy_iommu.cpp
+++ b/kernel/dev/iommu/dummy/dummy_iommu.cpp
@@ -135,10 +135,10 @@
     return ZX_OK;
 }
 
-uint64_t DummyIommu::minimum_contiguity(uint64_t bus_txn_id) const {
+uint64_t DummyIommu::minimum_contiguity(uint64_t bus_txn_id) {
     return PAGE_SIZE;
 }
 
-uint64_t DummyIommu::aspace_size(uint64_t bus_txn_id) const {
+uint64_t DummyIommu::aspace_size(uint64_t bus_txn_id) {
     return UINT64_MAX;
 }

kernel/dev/iommu/dummy/include/dev/iommu/dummy.h

diff --git a/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h b/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
index d9ddc39..385c389 100644
--- a/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
+++ b/kernel/dev/iommu/dummy/include/dev/iommu/dummy.h
@@ -28,8 +28,8 @@
 
     zx_status_t ClearMappingsForBusTxnId(uint64_t bus_txn_id) final;
 
-    uint64_t minimum_contiguity(uint64_t bus_txn_id) const final;
-    uint64_t aspace_size(uint64_t bus_txn_id) const final;
+    uint64_t minimum_contiguity(uint64_t bus_txn_id) final;
+    uint64_t aspace_size(uint64_t bus_txn_id) final;
 
     ~DummyIommu() final;
 

kernel/dev/iommu/intel/iommu_impl.cpp

diff --git a/kernel/dev/iommu/intel/iommu_impl.cpp b/kernel/dev/iommu/intel/iommu_impl.cpp
index 68e0d92..aedbaa4 100644
--- a/kernel/dev/iommu/intel/iommu_impl.cpp
+++ b/kernel/dev/iommu/intel/iommu_impl.cpp
@@ -772,12 +772,12 @@
     return ctx_table_state->CreateDeviceContext(bdf, domain_id, context);
 }
 
-uint64_t IommuImpl::minimum_contiguity(uint64_t bus_txn_id) const {
+uint64_t IommuImpl::minimum_contiguity(uint64_t bus_txn_id) {
     // TODO(teisenbe): Discover this from the device context
     return PAGE_SIZE;
 }
 
-uint64_t IommuImpl::aspace_size(uint64_t bus_txn_id) const {
+uint64_t IommuImpl::aspace_size(uint64_t bus_txn_id) {
     // TODO(teisenbe): Discover this from the device context
     // 2^48 is the size of an address space using 4-levevel translation.
     return 1ull << 48;

kernel/dev/iommu/intel/iommu_impl.h

diff --git a/kernel/dev/iommu/intel/iommu_impl.h b/kernel/dev/iommu/intel/iommu_impl.h
index 33449b2..b4044ca 100644
--- a/kernel/dev/iommu/intel/iommu_impl.h
+++ b/kernel/dev/iommu/intel/iommu_impl.h
@@ -43,8 +43,8 @@
 
     zx_status_t ClearMappingsForBusTxnId(uint64_t bus_txn_id) final;
 
-    uint64_t minimum_contiguity(uint64_t bus_txn_id) const final;
-    uint64_t aspace_size(uint64_t bus_txn_id) const final;
+    uint64_t minimum_contiguity(uint64_t bus_txn_id) final;
+    uint64_t aspace_size(uint64_t bus_txn_id) final;
 
     ~IommuImpl() final;
 

kernel/include/dev/iommu.h

diff --git a/kernel/include/dev/iommu.h b/kernel/include/dev/iommu.h
index e498f05..7c78d4e 100644
--- a/kernel/include/dev/iommu.h
+++ b/kernel/include/dev/iommu.h
@@ -83,11 +83,11 @@
     // Returns the number of bytes that Map() can guarantee, upon success, to find
     // a contiguous address range for.  This function is only returns meaningful
     // values if |IsValidBusTxnId(bus_txn_id)|.
-    virtual uint64_t minimum_contiguity(uint64_t bus_txn_id) const = 0;
+    virtual uint64_t minimum_contiguity(uint64_t bus_txn_id) = 0;
 
     // Returns the total size of the space the addresses are mapped into.  This
     // function is only returns meaningful values if |IsValidBusTxnId(bus_txn_id)|.
-    virtual uint64_t aspace_size(uint64_t bus_txn_id) const = 0;
+    virtual uint64_t aspace_size(uint64_t bus_txn_id) = 0;
 
     virtual ~Iommu() { }
 };