diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/initservice/mboxRegs.H | 33 | ||||
| -rw-r--r-- | src/include/usr/util/utilmbox_scratch.H | 12 |
2 files changed, 29 insertions, 16 deletions
diff --git a/src/include/usr/initservice/mboxRegs.H b/src/include/usr/initservice/mboxRegs.H index 69b942757..737ab7bb4 100644 --- a/src/include/usr/initservice/mboxRegs.H +++ b/src/include/usr/initservice/mboxRegs.H @@ -29,14 +29,31 @@ namespace INITSERVICE { namespace SPLESS { - const uint32_t MBOX_SCRATCH_REG1 = 0x00050038; - const uint32_t MBOX_SCRATCH_REG2 = 0x00050039; - const uint32_t MBOX_SCRATCH_REG3 = 0x0005003a; - const uint32_t MBOX_SCRATCH_REG4 = 0x0005003b; - const uint32_t MBOX_SCRATCH_REG5 = 0x0005003c; - const uint32_t MBOX_SCRATCH_REG6 = 0x0005003d; - const uint32_t MBOX_SCRATCH_REG7 = 0x0005003e; - const uint32_t MBOX_SCRATCH_REG8 = 0x0005003f; + const uint32_t MBOX_SCRATCH_REG1 = 0x00050038; //CFAM 2838 + const uint32_t MBOX_SCRATCH_REG2 = 0x00050039; //CFAM 2839 + const uint32_t MBOX_SCRATCH_REG3 = 0x0005003a; //CFAM 283A + const uint32_t MBOX_SCRATCH_REG4 = 0x0005003b; //CFAM 283B + const uint32_t MBOX_SCRATCH_REG5 = 0x0005003c; //CFAM 283C + const uint32_t MBOX_SCRATCH_REG6 = 0x0005003d; //CFAM 283D + const uint32_t MBOX_SCRATCH_REG7 = 0x0005003e; //CFAM 283E + const uint32_t MBOX_SCRATCH_REG8 = 0x0005003f; //CFAM 283F + + + // Mailbox Scratch Register 3 + union MboxScratch3_t + { + uint32_t data32; + struct + { + uint32_t istepMode:1; //0 + uint32_t goToRuntime:1; //1 + uint32_t isMpipl:1; //2 + uint32_t fspAttached:1; //3 + uint32_t sbeFFDC:1; //4 + uint32_t sbeInternalFFDC:1; //5 + uint32_t reserved:26; //6:31 + } PACKED; + }; }; }; #endif diff --git a/src/include/usr/util/utilmbox_scratch.H b/src/include/usr/util/utilmbox_scratch.H index b995da557..dd9584c18 100644 --- a/src/include/usr/util/utilmbox_scratch.H +++ b/src/include/usr/util/utilmbox_scratch.H @@ -61,10 +61,6 @@ namespace Util MSG_TYPE_TRACE = 0x00, MSG_TYPE_ATTRDUMP = 0x01, - - ISTEP_CONFIG_BIT = 0x8000000000000000, - MPIPL_CONFIG_BIT = 0x2000000000000000, - }; /** @@ -85,11 +81,11 @@ namespace Util * These scom addresses are always accessible and any errors are commited * internally * @param[in] i_addr Scom address of mailbox reg to write - * @param[in] i_data Data to write to mailbox (only 0:31 are valid) + * @param[in] i_data Data to write to mailbox * * @return none */ - void writeScratchReg(uint64_t i_addr, uint64_t i_data); + void writeScratchReg(uint64_t i_addr, uint32_t i_data); /** * @brief This function reads data to mailbox scratch reg @@ -97,9 +93,9 @@ namespace Util * internally * @param[in] i_addr Scom address of mailbox reg to read * - * @return Data in mailbox scratch reg (only 0:31 are valid) + * @return Data in mailbox scratch reg */ - uint64_t readScratchReg(uint64_t i_addr); + uint32_t readScratchReg(uint64_t i_addr); }; #endif //UTILMEM_H |
