hw/cxl: Fix missing write mask for HDM decoder target list registers
PATCH v2 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.
---
v2: (Ben Widawsky)
- Correctly set a tighter write mask for the endpoint devices where this register has a different use.
hw/cxl/cxl-component-utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
hw/cxl/cxl-component-utils.c +8 -1
@@ -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,12 @@ 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 ) { + 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 ; } }
Signature · 1 line
2.32.0
Quoted 4 lines · On Tue, 7 Jun 2022 11:56:17 +0100 Jonathan Cameron…
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]>
+Cc Ben on current address.
Which reminds me - Ben, when you have time please send an update to MAINTAINERS to switch to your preferred email address going forwards.
Thanks,
Jonathan
Quoted 35 lines
---
v2: (Ben Widawsky)
- Correctly set a tighter write mask for the endpoint devices where this register has a different use.hw/cxl/cxl-component-utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)hw/cxl/cxl-component-utils.c +8
-1@@ -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,12 @@ 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 ) { + 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 ; } }
Quoted 6 lines · On Tue, 7 Jun 2022 12:06:12 +0100 Jonathan Cameron…
Quoted 3 lines · On Tue, 7 Jun 2022 11:56:17 +0100 Jonathan Cameron…
Without being able to write these registers, no interleaving is possible. More refined checks of HDM register state on commit to follow.
Quoted 6 lines
Quoted 1 line
Signed-off-by Jonathan Cameron <[email protected]>+Cc Ben on current address.
Which reminds me - Ben, when you have time please send an update to
MAINTAINERSto switch to your preferred email address going forwards.
Ignore this version as clearly broken due to some git command line fumbling. v3 shortly.
Quoted 41 lines
Thanks,
Jonathan
Quoted 35 lines
---
v2: (Ben Widawsky)
- Correctly set a tighter write mask for the endpoint devices where this register has a different use.hw/cxl/cxl-component-utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)hw/cxl/cxl-component-utils.c +8
-1@@ -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,12 @@ 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 ) { + 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 ; } }