score: Optimize Workspace Handler initialization

The BSPs provide memory for the workspace initialization via
_Memory_Get().  Most BSPs provide exactly one memory area.  Only two
BSPs provide more than one memory area (arm/altera-cyclone-v and
bsps/powerpc/mpc55xxevb).  Only if more than one memory area is
provided, there is a need to use _Heap_Extend().  Provide two
implementations to initialize the workspace handler and let the BSP
select one of the implementations based on the number of provided memory
areas.  This gets rid of a dependency on _Heap_Extend().  It also avoids
dead code sections for most BSPs.

1 files changed, 4 insertions, 81 deletions

diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 7930a1fdc1..5b8c980384 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -5,14 +5,12 @@
  *
  * @ingroup RTEMSScoreWorkspace
  *
- * @brief This source file contains the definition of ::_Workspace_Area, the
- *   implementation of _Workspace_Handler_initialization(),
- *   _Workspace_Allocate(), and _Workspace_Free(), and the Workspace Handler
- *   system initialization.
+ * @brief This source file contains the definition of ::_Workspace_Area and the
+ *   Workspace Handler system initialization.
  */
 
 /*
- * Copyright (C) 2012, 2020 embedded brains GmbH (http://www.embedded-brains.de)
+ * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,87 +39,12 @@
 #endif
 
 #include <rtems/score/wkspace.h>
-#include <rtems/score/assert.h>
-#include <rtems/score/heapimpl.h>
-#include <rtems/score/interr.h>
-#include <rtems/config.h>
 #include <rtems/sysinit.h>
 
 Heap_Control _Workspace_Area;
 
-static void _Workspace_Initialize( void )
-{
-  _Workspace_Handler_initialization( _Memory_Get(), _Heap_Extend );
-}
-
 RTEMS_SYSINIT_ITEM(
-  _Workspace_Initialize,
+  _Workspace_Handler_initialization,
   RTEMS_SYSINIT_WORKSPACE,
   RTEMS_SYSINIT_ORDER_MIDDLE
 );
-
-void _Workspace_Handler_initialization(
-  const Memory_Information              *mem,
-  Heap_Initialization_or_extend_handler  extend
-)
-{
-  Heap_Initialization_or_extend_handler init_or_extend;
-  uintptr_t                             remaining;
-  bool                                  unified;
-  uintptr_t                             page_size;
-  uintptr_t                             overhead;
-  size_t                                i;
-
-  page_size = CPU_HEAP_ALIGNMENT;
-  remaining = rtems_configuration_get_work_space_size();
-  init_or_extend = _Heap_Initialize;
-  unified = rtems_configuration_get_unified_work_area();
-  overhead = _Heap_Area_overhead( page_size );
-
-  for ( i = 0; i < _Memory_Get_count( mem ); ++i ) {
-    Memory_Area *area;
-    uintptr_t    free_size;
-
-    area = _Memory_Get_area( mem, i );
-    free_size = _Memory_Get_free_size( area );
-
-    if ( free_size > overhead ) {
-      uintptr_t space_available;
-      uintptr_t size;
-
-      if ( unified ) {
-        size = free_size;
-      } else {
-        if ( remaining > 0 ) {
-          size = remaining < free_size - overhead ?
-            remaining + overhead : free_size;
-        } else {
-          size = 0;
-        }
-      }
-
-      space_available = ( *init_or_extend )(
-        &_Workspace_Area,
-        _Memory_Get_free_begin( area ),
-        size,
-        page_size
-      );
-
-      _Memory_Consume( area, size );
-
-      if ( space_available < remaining ) {
-        remaining -= space_available;
-      } else {
-        remaining = 0;
-      }
-
-      init_or_extend = extend;
-    }
-  }
-
-  if ( remaining > 0 ) {
-    _Internal_error( INTERNAL_ERROR_TOO_LITTLE_WORKSPACE );
-  }
-
-  _Heap_Protection_set_delayed_free_fraction( &_Workspace_Area, 1 );
-}