1 files changed, 40 insertions, 21 deletions

diff --git a/cpukit/libcsupport/src/cachecoherentalloc.c b/cpukit/libcsupport/src/cachecoherentalloc.c
index ced6b6951b..ed17ebffcb 100644
--- a/cpukit/libcsupport/src/cachecoherentalloc.c
+++ b/cpukit/libcsupport/src/cachecoherentalloc.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  * @file
  *
@@ -5,17 +7,28 @@
  */
 
 /*
- * Copyright (c) 2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2014 embedded brains GmbH & Co. KG
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -84,7 +97,7 @@ void rtems_cache_coherent_free( void *ptr )
   _RTEMS_Unlock_allocator();
 }
 
-static void add_area(
+static rtems_status_code add_area(
   void *area_begin,
   uintptr_t area_size
 )
@@ -92,31 +105,37 @@ static void add_area(
   Heap_Control *heap = cache_coherent_heap;
 
   if ( heap == NULL ) {
-    bool ok;
-
     heap = &cache_coherent_heap_instance;
 
-    ok = _Heap_Initialize( heap, area_begin, area_size, 0 );
-    if ( ok ) {
-      cache_coherent_heap = heap;
+    if ( _Heap_Initialize( heap, area_begin, area_size, 0 ) == 0 ) {
+      return RTEMS_UNSATISFIED;
     }
+    cache_coherent_heap = heap;
   } else {
-    _Heap_Extend( heap, area_begin, area_size, 0 );
+    if (_Heap_Extend( heap, area_begin, area_size, 0 ) == 0) {
+      return RTEMS_UNSATISFIED;
+    }
   }
+  return RTEMS_SUCCESSFUL;
 }
 
-void rtems_cache_coherent_add_area(
+rtems_status_code rtems_cache_coherent_add_area(
   void *area_begin,
   uintptr_t area_size
 )
 {
-  if ( _System_state_Is_up( _System_state_Get()) ) {
+  rtems_status_code sc;
+  bool needs_locking = _System_state_Is_up( _System_state_Get());
+
+  if ( needs_locking ) {
     _RTEMS_Lock_allocator();
+  }
 
-    add_area( area_begin, area_size );
+  sc = add_area( area_begin, area_size );
 
+  if ( needs_locking ) {
     _RTEMS_Unlock_allocator();
-  } else {
-    add_area( area_begin, area_size );
   }
+
+  return sc;
 }