From 523de826a22e4abbf1f3cbbd026939503b2ac307 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Mon, 19 Mar 2018 17:02:23 -0500 Subject: configure Cumulus MC inband logic to pass host/occ bit under BAR 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 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Thi N. Tran Reviewed-by: Adam S. Hale Reviewed-by: Daniel M. Crowell Reviewed-by: Joseph J. McGill Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56046 Tested-by: Daniel M. Crowell --- src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C | 2 ++ src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/import/chips') diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C index 77019842a..24d504147 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9c_mi_scom.C @@ -205,6 +205,8 @@ fapi2::ReturnCode p9c_mi_scom(const fapi2::Target& 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)) { diff --git a/src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C b/src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C index 8dbb825f5..6d13baedb 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9c_set_inband_addr.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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>(); -- cgit v1.2.1