Skip to content

Commit

Permalink
configure Cumulus MC inband logic to pass host/occ bit under BAR
Browse files Browse the repository at this point in the history
In p9 mode, MCMODE0 bit 25 controls the extent of the inband BAR match:
- bit 25 = 0b0 -- BAR match down to RA bit 38
- bit 25 = 0b1 -- BAR match down to RA bit 37, bit 38 passed to Centaur
indicating host or OCC access

In p8, we used the host/OCC bit to indicate the requestor.  Current
OCC code is continuing this behavior, so we need to set MCMODE0 bit 25
to allow this.

Change-Id: I740549d61b9485e66d8a201ce9b80c241c9f2a85
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56044
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
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: Adam S. Hale <adam.samuel.hale@ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56046
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
jjmcgill authored and dcrowell77 committed Apr 3, 2018
1 parent c6150ef commit 523de82
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ fapi2::ReturnCode p9c_mi_scom(const fapi2::Target<fapi2::TARGET_TYPE_MI>& TGT0,
l_scom_buffer.insert<22, 1, 63, uint64_t>(l_MC01_PBI01_SCOMFIR_MCMODE0_ENABLE_CENTAUR_CHECKSTOP_COMMAND_ON );
constexpr auto l_MC01_PBI01_SCOMFIR_MCMODE0_ENABLE_CENTAUR_TRACESTOP_COMMAND_ON = 0x1;
l_scom_buffer.insert<23, 1, 63, uint64_t>(l_MC01_PBI01_SCOMFIR_MCMODE0_ENABLE_CENTAUR_TRACESTOP_COMMAND_ON );
constexpr auto l_MC01_PBI01_SCOMFIR_MCMODE0_ENABLE_SELECT_ERROR_LOG_SOURCE_ON = 0x1;
l_scom_buffer.insert<25, 1, 63, uint64_t>(l_MC01_PBI01_SCOMFIR_MCMODE0_ENABLE_SELECT_ERROR_LOG_SOURCE_ON );

if ((l_def_ENABLE_DYNAMIC_64_128B_READS == literal_1))
{
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2017 */
/* Contributors Listed Below - COPYRIGHT 2017,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -90,9 +90,9 @@ fapi2::ReturnCode p9c_set_inband_addr(

// form SCOM register format
l_scom_data.flush<0>();
// BAR address 8:38 into bits 4:34
// BAR address 8:37 into bits 4:33
l_dmi_inband_addr = l_base_addr_mmio + l_bar_offset;
l_scom_data.insert<4, 31, 8>(l_dmi_inband_addr);
l_scom_data.insert<4, 30, 8>(l_dmi_inband_addr);
// Set valid(bit0 = 1), P9 mode(bit3 = 0)
l_scom_data.setBit<0>();

Expand Down

0 comments on commit 523de82

Please sign in to comment.