commit 292c917e4d4635640923d3c95885650d8f30c05f
author Thang Tran <thuutran@amperecomputing.com> Mon Jun 26 10:03:04 2023 +0700
committer Thang Tran <thuutran@amperecomputing.com> Mon Aug 07 02:26:23 2023 +0000
tree ed3900dc5057d2f4f3d36a64d4b66f63b6d74995
parent 3e3cc35bd2d2efeee76bafc406d76bdef87c20b6

Support to build storage commands in libipmi20

Currently, the storage commands only is built in the libdynamicsensor
library. To build those commands, we have to enable dynamic-sensor
option which makes sensor commands are built too.

To allow compiling storage commands w/o sensor commands, this commit
adds 'dynamic-storages-only' option to request to build storage commands
in libipmi20 library.

Tested:
  1. Disable dynamic-sensor option and enable dynamic-storages-only
     option.
  2. Built the openBmc image and flash to the board.
  3. Request to read/write FRU device via ipmitool.
     All of request work well.
  4. Request to read SEL list.
     Display list of SEL logs.

Signed-off-by: Thang Tran <thuutran@amperecomputing.com>
Change-Id: I330919e7eebbb80bf568f36ead69ade670b2f8d1

meson.build

diff --git a/meson.build b/meson.build
index 1fd2b6b..0cd2f44 100644
--- a/meson.build
+++ b/meson.build
@@ -79,6 +79,7 @@
   'hybrid-sensors'             : '-DFEATURE_HYBRID_SENSORS',
   'sensors-cache'              : '-DFEATURE_SENSORS_CACHE',
   'sel-logger-clears-sel'      : '-DFEATURE_SEL_LOGGER_CLEARS_SEL',
+  'dynamic-storages-only'      : '-DFEATURE_DYNAMIC_STORAGES_ONLY',
 }
 
 foreach option_key, option_value : feature_map
@@ -204,6 +205,11 @@
   transportoem_src = ['transporthandler_oem.cpp']
 endif
 
+storage_cmds_src = []
+if get_option('dynamic-sensors').disabled() and not get_option('dynamic-storages-only').disabled()
+  storage_cmds_src = ['dbus-sdr/storagecommands.cpp', 'dbus-sdr/sdrutils.cpp']
+endif
+
 libipmi20_src = [
   'app/channel.cpp',
   'app/watchdog.cpp',
@@ -226,6 +232,7 @@
   'user_channel/channelcommands.cpp',
   generated_src,
   transportoem_src,
+  storage_cmds_src,
   conf_h,
 ]
 

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 59c597f..fb0c5f2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -72,3 +72,6 @@
 option('get-dbus-active-software', type: 'feature', description: 'Use the  getActiveSoftwareVersionInfo for the BMC version and dev_id.json as backup')
 option('fw-ver-regex', type : 'string', value : '(\\\\d+)\\\\.(\\\\d+)', description : 'Regular expressions for parsing firmware revision')
 option('matches-map', type : 'array', value : ['1', '2', '0', '0', '0', '0'], description : 'An array of integers')
+
+# libipmi20.so library
+option('dynamic-storages-only', type: 'feature', value: 'disabled', description: 'Request to compile storage commands in the libipmi20 library')
\ No newline at end of file

storagehandler.cpp

diff --git a/storagehandler.cpp b/storagehandler.cpp
index 0a7ac1c..d12fb3b 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -861,6 +861,8 @@
     // Do not register the hander if it dynamic sensors stack is used.
 
 #ifndef FEATURE_DYNAMIC_SENSORS
+
+#ifndef FEATURE_DYNAMIC_STORAGES_ONLY
     // <Get SEL Info>
     ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnStorage,
                           ipmi::storage::cmdGetSelInfo, ipmi::Privilege::User,
@@ -905,6 +907,8 @@
                           ipmi::storage::cmdReadFruData,
                           ipmi::Privilege::Operator, ipmiStorageReadFruData);
 
+#endif // FEATURE_DYNAMIC_STORAGES_ONLY
+
     // <Get Repository Info>
     ipmi::registerHandler(ipmi::prioOpenBmcBase, ipmi::netFnStorage,
                           ipmi::storage::cmdGetSdrRepositoryInfo,