Skip to content

Commit

Permalink
ipmi: Split into ipmibase and ipmiext modules
Browse files Browse the repository at this point in the history 
Split the IPMI module into base and ext portions, with the BT interface,
device driver and resource provider in the base portion, and all
remaining IPMI functionality in the ext portion. The split is in
preparation for moving the base functionality in the hostboot base
image.

Change-Id: Iec864f96240d79f4fadd5519d2ef46437d07c1fd
Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66792
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
Andrew Jeffery authored and dcrowell77 committed Oct 10, 2018
1 parent 1b48118 commit 5fc4573
Show file tree
Hide file tree
Showing 35 changed files with 99 additions and 64 deletions.
3 changes: 2 additions & 1 deletion src/build/tools/listdeps.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@
"liblpc.so" => '1',
"libconsole.so" => '1',
"liberrldisplay.so" => '1',
"libipmi.so" => '1',
"libipmibase.so" => '1',
"libipmiext.so" => '1',
"libsbeio.so" => '1',
"libvpd.so" => '1',
"libsecureboot_trusted.so" => '1',
Expand Down
3 changes: 2 additions & 1 deletion src/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ EXTENDED_MODULES += $(if $(CONFIG_HTMGT),htmgt)
EXTENDED_MODULES += $(if $(CONFIG_GPIODD),gpio,)
EXTENDED_MODULES += $(if $(CONFIG_CONSOLE),console)
EXTENDED_MODULES += $(if $(CONFIG_CONSOLE_OUTPUT_ERRORDISPLAY),errldisplay)
EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmi)
EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmibase)
EXTENDED_MODULES += $(if $(CONFIG_BMC_IPMI),ipmiext)
EXTENDED_MODULES += xz
EXTENDED_MODULES += p9_stop_util
EXTENDED_MODULES += isteps_mss
Expand Down
13 changes: 11 additions & 2 deletions src/usr/initservice/extinitsvc/extinitsvctasks.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,27 @@ const TaskInfo g_exttaskinfolist[] = {
},

/**
* @brief IPMI resource provider
* @brief IPMI
*/
#ifdef CONFIG_BMC_IPMI
{
"libipmi.so", // taskname
"libipmibase.so", // taskname
NULL, // no ptr to fnct
{

START_TASK, // task type
EXT_IMAGE, // Extended Module
}
},
{
"libipmiext.so", // taskname
NULL, // no ptr to fnct
{

INIT_TASK, // task type
EXT_IMAGE, // Extended Module
}
},
#endif

/**
Expand Down
6 changes: 0 additions & 6 deletions src/usr/ipmi/HBconfig → src/usr/ipmibase/HBconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,3 @@ config BMC_BT_LPC_IPMI
depends on BMC_IPMI
help
Determines if the BMC uses the LPC bus for block-transfer IPMI traffic

config BMC_IPMI_LONG_WATCHDOG
default y if CONSOLE_OUTPUT_TRACE || CONSOLE_TRACE_LITE
depends on BMC_IPMI
help
Sets watchdog default timer to several times normal for debugging
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmibt.C → src/usr/ipmibase/ipmibt.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmibt.C $ */
/* $Source: src/usr/ipmibase/ipmibt.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmibt.H → src/usr/ipmibase/ipmibt.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmibt.H $ */
/* $Source: src/usr/ipmibase/ipmibt.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmiconfig.C → src/usr/ipmibase/ipmiconfig.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmiconfig.C $ */
/* $Source: src/usr/ipmibase/ipmiconfig.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2015 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmiconfig.H → src/usr/ipmibase/ipmiconfig.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmiconfig.H $ */
/* $Source: src/usr/ipmibase/ipmiconfig.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmidd.C → src/usr/ipmibase/ipmidd.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmidd.C $ */
/* $Source: src/usr/ipmibase/ipmidd.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmidd.H → src/usr/ipmibase/ipmidd.H
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmidd.H $ */
/* $Source: src/usr/ipmibase/ipmidd.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmimsg.C → src/usr/ipmibase/ipmimsg.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmimsg.C $ */
/* $Source: src/usr/ipmibase/ipmimsg.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmimsg.H → src/usr/ipmibase/ipmimsg.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmimsg.H $ */
/* $Source: src/usr/ipmibase/ipmimsg.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmirp.C → src/usr/ipmibase/ipmirp.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmirp.C $ */
/* $Source: src/usr/ipmibase/ipmirp.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmirp.H → src/usr/ipmibase/ipmirp.H
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmirp.H $ */
/* $Source: src/usr/ipmibase/ipmirp.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmiselrecord.C → src/usr/ipmibase/ipmiselrecord.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmiselrecord.C $ */
/* $Source: src/usr/ipmibase/ipmiselrecord.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
34 changes: 34 additions & 0 deletions src/usr/ipmibase/makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/usr/ipmibase/makefile $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2011,2018
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied. See the License for the specific language governing
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
ROOTPATH = ../../..
MODULE = ipmibase

OBJS += ipmimsg.o
OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmibt.o)
OBJS += ipmirp.o
OBJS += $(if $(CONFIG_BMC_BT_LPC_IPMI),ipmidd.o)
OBJS += ipmiconfig.o
OBJS += ipmiselrecord.o

include ${ROOTPATH}/config.mk
5 changes: 5 additions & 0 deletions src/usr/ipmiext/HBconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config BMC_IPMI_LONG_WATCHDOG
default y if CONSOLE_OUTPUT_TRACE || CONSOLE_TRACE_LITE
depends on BMC_IPMI
help
Sets watchdog default timer to several times normal for debugging
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmi.mk → src/usr/ipmiext/ipmi.mk
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/usr/ipmi/ipmi.mk $
# $Source: src/usr/ipmiext/ipmi.mk $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2015,2017
# Contributors Listed Below - COPYRIGHT 2015,2018
# [+] International Business Machines Corp.
#
#
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmichassiscontrol.C → src/usr/ipmiext/ipmichassiscontrol.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmichassiscontrol.C $ */
/* $Source: src/usr/ipmiext/ipmichassiscontrol.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2016 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmiconfiglookup.C → src/usr/ipmiext/ipmiconfiglookup.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmiconfiglookup.C $ */
/* $Source: src/usr/ipmiext/ipmiconfiglookup.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* Contributors Listed Below - COPYRIGHT 2017,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmidcmi.C → src/usr/ipmiext/ipmidcmi.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmidcmi.C $ */
/* $Source: src/usr/ipmiext/ipmidcmi.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015 */
/* Contributors Listed Below - COPYRIGHT 2015,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmifru.C → src/usr/ipmiext/ipmifru.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmifru.C $ */
/* $Source: src/usr/ipmiext/ipmifru.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmifru.H → src/usr/ipmiext/ipmifru.H
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmifru.H $ */
/* $Source: src/usr/ipmiext/ipmifru.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmifruinv.C → src/usr/ipmiext/ipmifruinv.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmifruinv.C $ */
/* $Source: src/usr/ipmiext/ipmifruinv.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmifruinvprvt.H → src/usr/ipmiext/ipmifruinvprvt.H
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmifruinvprvt.H $ */
/* $Source: src/usr/ipmiext/ipmifruinvprvt.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down
4 changes: 2 additions & 2 deletions src/usr/ipmi/ipmipowerstate.C → src/usr/ipmiext/ipmipowerstate.C
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmipowerstate.C $ */
/* $Source: src/usr/ipmiext/ipmipowerstate.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2015 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down
2 changes: 1 addition & 1 deletion src/usr/ipmi/ipmisel.C → src/usr/ipmiext/ipmisel.C
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/ipmi/ipmisel.C $ */
/* $Source: src/usr/ipmiext/ipmisel.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
Expand Down

0 comments on commit 5fc4573

Please sign in to comment.