Skip to content

Commit 78f670a

Browse files
jjmcgilldcrowell77
authored andcommitted
L3 updates -- shell HWPs
p9_abus_scominit p9_attr_update p9_exit_cache_contained p9_pcie_hotplug_control All HWPs are currently empty, and planned to be so to my knowledge Change-Id: If1210fd4fdbbaee6965beb70d2f6fac031d7c9d3 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41051 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Thi N. Tran <thi@us.ibm.com> Reviewed-by: Benjamin Gass <bgass@us.ibm.com> Reviewed-by: Peng Fei Gou <shgoupf@cn.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41055 Reviewed-by: Hostboot Team <hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
1 parent 3e6b198 commit 78f670a

File tree

6 files changed

+91
-94
lines changed

6 files changed

+91
-94
lines changed

src/import/chips/p9/procedures/hwp/nest/p9_attr_update.C

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -24,22 +24,23 @@
2424
/* IBM_PROLOG_END_TAG */
2525
///
2626
/// @file p9_attr_update.C
27+
/// @brief Stub HWP for FW to override attributes programmatically (FAPI2)
2728
///
28-
/// @brief Stub HWP for FW to override attributes programmatically
29+
/// @author Joe McGill <jmcgill@us.ibm.com>
2930
///
3031

3132
//
32-
// *HWP HW Owner : Michael Dye <dyem@us.ibm.com>
33+
// *HWP HW Owner : Joe McGill <jmcgill@us.ibm.com>
3334
// *HWP FW Owner : Thi N. Tran <thi@us.ibm.com>
3435
// *HWP Team : Nest
35-
// *HWP Level : 2
36+
// *HWP Level : 3
3637
// *HWP Consumed by : HB
3738
//
3839

3940
//------------------------------------------------------------------------------
4041
// Includes
4142
//------------------------------------------------------------------------------
42-
#include "p9_attr_update.H"
43+
#include <p9_attr_update.H>
4344

4445
//------------------------------------------------------------------------------
4546
// Function definitions
@@ -48,11 +49,7 @@
4849
fapi2::ReturnCode
4950
p9_attr_update(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
5051
{
51-
FAPI_DBG("Entering ...");
52-
53-
FAPI_DBG("Exiting ...");
54-
55-
//fapi_try_exit:
56-
return fapi2::current_err;
57-
52+
FAPI_DBG("Start");
53+
FAPI_DBG("End");
54+
return fapi2::FAPI2_RC_SUCCESS;
5855
}

src/import/chips/p9/procedures/hwp/nest/p9_attr_update.H

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -24,19 +24,19 @@
2424
/* IBM_PROLOG_END_TAG */
2525
///
2626
/// @file p9_attr_update.H
27+
/// @brief Stub HWP for FW to override attributes programmatically (FAPI2)
2728
///
28-
/// @brief Stub HWP for FW to override attributes programmatically
29+
/// @author Joe McGill <jmcgill@us.ibm.com>
2930
///
3031

3132
//
32-
// *HWP HW Owner : Michael Dye <dyem@us.ibm.com>
33+
// *HWP HW Owner : Joe McGill <jmcgill@us.ibm.com>
3334
// *HWP FW Owner : Thi N. Tran <thi@us.ibm.com>
3435
// *HWP Team : Nest
35-
// *HWP Level : 1
36+
// *HWP Level : 3
3637
// *HWP Consumed by : HB
3738
//
3839

39-
4040
#ifndef _P9_ATTR_UPDATE_H_
4141
#define _P9_ATTR_UPDATE_H_
4242

@@ -48,8 +48,8 @@
4848
//------------------------------------------------------------------------------
4949
// Structure definitions
5050
//------------------------------------------------------------------------------
51-
52-
typedef fapi2::ReturnCode (*p9_attr_update_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
51+
typedef fapi2::ReturnCode (*p9_attr_update_FP_t)(
52+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
5353

5454
//------------------------------------------------------------------------------
5555
// Function prototypes
@@ -58,11 +58,13 @@ typedef fapi2::ReturnCode (*p9_attr_update_FP_t)(const fapi2::Target<fapi2::TARG
5858
extern "C"
5959
{
6060

61+
///
6162
/// @brief Placeholder for attribute overrides
6263
///
6364
/// @param[in] i_target Reference to processor chip target
6465
/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
65-
fapi2::ReturnCode p9_attr_update(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
66+
fapi2::ReturnCode p9_attr_update(
67+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
6668

6769
} // extern "C"
6870

src/import/chips/p9/procedures/hwp/nest/p9_exit_cache_contained.C

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -22,50 +22,43 @@
2222
/* permissions and limitations under the License. */
2323
/* */
2424
/* IBM_PROLOG_END_TAG */
25-
26-
///----------------------------------------------------------------------------
25+
///
2726
/// @file p9_exit_cache_contained.C
27+
/// @brief Placeholder to apply inits needed prior to HB expansion from L3
28+
/// cache to main memory (FAPI2)
29+
///
30+
/// @author Joe McGill <jmcgill@us.ibm.com>
2831
///
29-
/// @brief Contains inits to be performed before Hostboot expanded from
30-
/// running inside the confines of the L3 cache out to main memory.
31-
///----------------------------------------------------------------------------
3232

33+
//
3334
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
3435
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
3536
// *HWP Team: Nest
36-
// *HWP Level: 2
37+
// *HWP Level: 3
3738
// *HWP Consumed by: HB
38-
39+
//
3940

4041
//------------------------------------------------------------------------------
4142
// Includes
4243
//------------------------------------------------------------------------------
4344
#include <p9_exit_cache_contained.H>
4445

45-
extern "C"
46-
{
47-
///
48-
/// p9_exit_cache_contained HWP entry point (Defined in .H file)
49-
///
50-
fapi2::ReturnCode p9_exit_cache_contained(const
51-
fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
52-
& i_target)
53-
{
54-
fapi2::ReturnCode rc;
55-
56-
// Mark Entry
57-
FAPI_INF("Entering ...");
5846

59-
// This procedure is a placeholder to add inits that might need to be
60-
// performed before Hostboot expanded from running inside the confines
61-
// of the L3 cache out to main memory.
62-
// There is nothing specific to be added for P9 at this point.
47+
//------------------------------------------------------------------------------
48+
// Function definitions
49+
//------------------------------------------------------------------------------
6350

51+
fapi2::ReturnCode
52+
p9_exit_cache_contained(
53+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target)
54+
{
55+
// This procedure is a placeholder to add inits that might need to be
56+
// performed before Hostboot expanded from running inside the confines
57+
// of the L3 cache out to main memory.
58+
// There is nothing specific to be added for P9 at this point.
6459

65-
// Mark Exit
66-
FAPI_INF("Exiting ...");
60+
FAPI_INF("Start");
61+
FAPI_INF("End");
6762

68-
return rc;
69-
}
70-
} // extern "C"
71-
/* End: */
63+
return fapi2::FAPI2_RC_SUCCESS;
64+
}

src/import/chips/p9/procedures/hwp/nest/p9_exit_cache_contained.H

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -23,50 +23,53 @@
2323
/* */
2424
/* IBM_PROLOG_END_TAG */
2525
///
26-
27-
///----------------------------------------------------------------------------
2826
/// @file p9_exit_cache_contained.H
27+
/// @brief Placeholder to apply inits needed prior to HB expansion from L3
28+
/// cache to main memory (FAPI2)
29+
///
30+
/// @author Joe McGill <jmcgill@us.ibm.com>
2931
///
30-
/// @brief Contains inits to be performed before Hostboot expanded from
31-
/// running inside the confines of the L3 cache out to main memory.
32-
///----------------------------------------------------------------------------
3332

33+
//
3434
// *HWP HWP Owner: Joe McGill <jmcgill@us.ibm.com>
3535
// *HWP FW Owner: Thi Tran <thi@us.ibm.com>
3636
// *HWP Team: Nest
37-
// *HWP Level: 2
37+
// *HWP Level: 3
3838
// *HWP Consumed by: HB
39+
//
40+
///
3941

4042
#ifndef _PROC_EXIT_CACHE_CONTAINED_H_
4143
#define _PROC_EXIT_CACHE_CONTAINED_H_
44+
4245
//------------------------------------------------------------------------------
4346
// Includes
4447
//------------------------------------------------------------------------------
45-
4648
#include <fapi2.H>
4749

50+
//------------------------------------------------------------------------------
51+
// Structure definitions
52+
//------------------------------------------------------------------------------
53+
4854
// Function pointer typedef definition for HWP call support
49-
typedef fapi2::ReturnCode (*p9_exit_cache_contained_FP_t)(fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
55+
typedef fapi2::ReturnCode (*p9_exit_cache_contained_FP_t)(
56+
fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&);
5057

5158
//------------------------------------------------------------------------------
5259
// Function prototypes
5360
//------------------------------------------------------------------------------
5461
extern "C"
5562
{
5663

57-
//------------------------------------------------------------------------------
58-
// Hardware Procedure
59-
//------------------------------------------------------------------------------
6064
///
6165
/// @brief Placeholder for overrides needed to step the core from
6266
/// cache-contained execution to expand to memory
6367
///
6468
/// @param[in] i_target Reference to processor chip target
65-
///
6669
/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code.
6770
///
68-
fapi2::ReturnCode p9_exit_cache_contained(const
69-
fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
71+
fapi2::ReturnCode p9_exit_cache_contained(
72+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target);
7073

7174
} // extern "C"
7275

src/import/chips/p9/procedures/hwp/nest/p9_pcie_hotplug_control.C

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -26,25 +26,26 @@
2626
/// @file p9_pcie_hotplug_control.C
2727
/// @brief Manage slot power on hot-plug controlled slots (FAPI2)
2828
///
29-
// *HWP HWP Owner: Christina Graves clgraves@us.ibm.com
29+
// *HWP HWP Owner: Joe McGill jmcgill@us.ibm.com
3030
// *HWP FW Owner: Thi Tran thi@us.ibm.com
3131
// *HWP Team: Nest
32-
// *HWP Level: 1
32+
// *HWP Level: 3
3333
// *HWP Consumed by: HB
3434

35-
//-----------------------------------------------------------------------------------
35+
//------------------------------------------------------------------------------
3636
// Includes
37-
//-----------------------------------------------------------------------------------
37+
//------------------------------------------------------------------------------
3838
#include <p9_pcie_hotplug_control.H>
3939

40-
41-
//-----------------------------------------------------------------------------------
40+
//------------------------------------------------------------------------------
4241
// Function definitions
43-
//-----------------------------------------------------------------------------------
44-
fapi2::ReturnCode p9_pcie_hotplug_control(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
45-
const bool i_enable_slot_power)
42+
//------------------------------------------------------------------------------
43+
44+
fapi2::ReturnCode p9_pcie_hotplug_control(
45+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
46+
const bool i_enable_slot_power)
4647
{
47-
FAPI_INF("Start");
48-
FAPI_INF("End");
48+
FAPI_DBG("Start");
49+
FAPI_DBG("End");
4950
return fapi2::current_err;
5051
}

src/import/chips/p9/procedures/hwp/nest/p9_pcie_hotplug_control.H

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/* */
66
/* OpenPOWER HostBoot Project */
77
/* */
8-
/* Contributors Listed Below - COPYRIGHT 2015,2016 */
8+
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
99
/* [+] International Business Machines Corp. */
1010
/* */
1111
/* */
@@ -26,10 +26,11 @@
2626
/// @file p9_pcie_hotplug_control.H
2727
/// @brief Manage slot power on hot-plug controlled slots (FAPI2)
2828
///
29-
// *HWP HWP Owner: Christina Graves clgraves@us.ibm.com
29+
30+
// *HWP HWP Owner: Joe McGill jmcgill@us.ibm.com
3031
// *HWP FW Owner: Thi Tran thi@us.ibm.com
3132
// *HWP Team: Nest
32-
// *HWP Level: 1
33+
// *HWP Level: 3
3334
// *HWP Consumed by: HB
3435

3536
#ifndef _P9_PCIE_HOTPLUG_CONTROL_H_
@@ -44,27 +45,27 @@
4445
// Structure definitions
4546
//-----------------------------------------------------------------------------------
4647

47-
//function pointer typedef definition for HWP call support
48-
typedef fapi2::ReturnCode (*p9_pcie_hotplug_control_FP_t) (const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
49-
const bool);
48+
// function pointer typedef definition for HWP call support
49+
typedef fapi2::ReturnCode (*p9_pcie_hotplug_control_FP_t) (
50+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
51+
const bool);
5052

5153
//-----------------------------------------------------------------------------------
52-
// Constant definitions
54+
// Function prototype
5355
//-----------------------------------------------------------------------------------
5456

5557
extern "C" {
5658

57-
//-----------------------------------------------------------------------------------
58-
// Function prototype
59-
//-----------------------------------------------------------------------------------
60-
6159
/// @brief Enable/disable PCIE slot power
62-
/// @param[in] i_target => P9 chip target
63-
/// @param[in] i_enable_slot_power => boolean to control power state (true=enable, false=disable)
64-
/// @return FAPI_RC_SUCCESS if the setup completes successfully,
60+
/// @param[in] i_target P9 chip target
61+
/// @param[in] i_enable_slot_power boolean to control power state (true=enable,
62+
/// false=disable)
63+
/// @return FAPI_RC_SUCCESS if the setup completes successfully, else error
6564
//
66-
fapi2::ReturnCode p9_pcie_hotplug_control(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
67-
const bool i_enable_slot_power);
65+
fapi2::ReturnCode p9_pcie_hotplug_control(
66+
const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
67+
const bool i_enable_slot_power);
68+
6869
} //extern"C"
6970

7071
#endif //_P9_PCIE_HOTPLUG_CONTROL_H_

0 commit comments

Comments
 (0)