From 28eaa4a340fb4614ea42a456b7aba631c4dd744b Mon Sep 17 00:00:00 2001 From: Sergii Dmytruk Date: Tue, 18 Jan 2022 00:11:25 +0200 Subject: src/cpu/power9: move part of scom.h to scom.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reset function, constants and include are not used outside of scom.c and not going to be. Change-Id: Iff4e98ae52c7099954f0c20fcb639eb87af15534 Signed-off-by: Sergii Dmytruk Reviewed-on: https://review.coreboot.org/c/coreboot/+/67055 Tested-by: build bot (Jenkins) Reviewed-by: Michał Kopeć --- src/cpu/power9/scom.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/cpu/power9') diff --git a/src/cpu/power9/scom.c b/src/cpu/power9/scom.c index e55d149bff..3e973e52e3 100644 --- a/src/cpu/power9/scom.c +++ b/src/cpu/power9/scom.c @@ -4,6 +4,9 @@ #include // HMER #include +#define XSCOM_ADDR_IND_ADDR PPC_BITMASK(11, 31) +#define XSCOM_ADDR_IND_DATA PPC_BITMASK(48, 63) + #define XSCOM_DATA_IND_READ PPC_BIT(0) #define XSCOM_DATA_IND_COMPLETE PPC_BIT(32) #define XSCOM_DATA_IND_ERR PPC_BITMASK(33, 35) @@ -15,6 +18,21 @@ #define XSCOM_LOG_REG 0x00090012 #define XSCOM_ERR_REG 0x00090013 +static void reset_scom_engine(void) +{ + /* + * With cross-CPU SCOM accesses, first register should be cleared on the + * executing CPU, the other two on target CPU. In that case it may be + * necessary to do the remote writes in assembly directly to skip checking + * HMER and possibly end in a loop. + */ + write_scom_direct(XSCOM_RCVED_STAT_REG, 0); + write_scom_direct(XSCOM_LOG_REG, 0); + write_scom_direct(XSCOM_ERR_REG, 0); + clear_hmer(); + eieio(); +} + uint64_t read_scom_direct(uint64_t reg_address) { uint64_t val; @@ -117,19 +135,3 @@ uint64_t read_scom_indirect(uint64_t reg_address) return data & XSCOM_DATA_IND_DATA; } - -/* This function should be rarely called, don't make it inlined */ -void reset_scom_engine(void) -{ - /* - * With cross-CPU SCOM accesses, first register should be cleared on the - * executing CPU, the other two on target CPU. In that case it may be - * necessary to do the remote writes in assembly directly to skip checking - * HMER and possibly end in a loop. - */ - write_scom_direct(XSCOM_RCVED_STAT_REG, 0); - write_scom_direct(XSCOM_LOG_REG, 0); - write_scom_direct(XSCOM_ERR_REG, 0); - clear_hmer(); - eieio(); -} -- cgit v1.2.3