hw/cxl: Fix missing write mask for HDM decoder target list registers
PATCH v4 1/1 hw/cxl: Fix missing write mask for HDM decoder target list registers
Without being able to write these registers, no interleaving is possible. More refined checks of HDM register state on commit to follow.
Signed-off-by Jonathan Cameron <[email protected]>
Reviewed-by Ben Widawsky <[email protected]>
---
v4: (Ben Widawsky review responses - thanks!)
- Expand list of matched types for 'skip' usages (with more restrictive write mask) to include all CXL device types (type 3, type 1/2 and LD). We only emulate type 3 so far but good for the function implementation to be correct for the other types.
- Added Ben's RB.
hw/cxl/cxl-component-utils.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
hw/cxl/cxl-component-utils.c +11 -2
@@ -154,7 +154,8 @@ static void ras_init_common(uint32_t *reg_state, uint32_t *write_msk) reg_state[R_CXL_RAS_ERR_CAP_CTRL ] =0x00 ; } -static void hdm_init_common (uint32_t *reg_state,uint32_t *write_msk) +static void hdm_init_common (uint32_t *reg_state,uint32_t *write_msk, +enum reg_type type) {int decoder_count =1 ;int i;
@@ -174,6 +175,14 @@ static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk) write_msk[R_CXL_HDM_DECODER0_SIZE_LO + i *0x20 ] =0xf0000000 ; write_msk[R_CXL_HDM_DECODER0_SIZE_HI + i *0x20 ] =0xffffffff ; write_msk[R_CXL_HDM_DECODER0_CTRL + i *0x20 ] =0x13ff ; +if (type ==CXL2_DEVICE || + type ==CXL2_TYPE3_DEVICE || + type ==CXL2_LOGICAL_DEVICE ) { + write_msk[R_CXL_HDM_DECODER0_TARGET_LIST_LO + i *0x20 ] =0xf0000000 ; + }else { + write_msk[R_CXL_HDM_DECODER0_TARGET_LIST_LO + i *0x20 ] =0xffffffff ; + } + write_msk[R_CXL_HDM_DECODER0_TARGET_LIST_HI + i *0x20 ] =0xffffffff ; } }
@@ -239,7 +248,7 @@ void cxl_component_register_init_common(uint32_t *reg_state, uint32_t *write_msk }init_cap_reg (HDM ,5 ,1 ); -hdm_init_common (reg_state, write_msk); +hdm_init_common (reg_state, write_msk, type);if (caps <5 ) {return ;
Signature · 1 line
2.32.0