Skip to contentSkip to conversation

hw/cxl: Fix missing write mask for HDM decoder target list registers

PATCH Superseded Jonathan Cameron 2 participants 4 messages Jun 7, 2022

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 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.

---
v3: Actually pass the parameter to the call...
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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
hw/cxl/cxl-component-utils.c +9 -2
index 7985c9bfca..2208284ee6 100644
@@ -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;
     }
 }
 
@@ -239,7 +246,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
Reviewed-by on v3 1/1
#1 lore raw
Quoted 28 lines · Jonathan Cameron

Without being able to write these registers, no interleaving is possible. More refined checks of HDM register state on commit to follow.

---
v3: Actually pass the parameter to the call...
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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
hw/cxl/cxl-component-utils.c +2 -1
index 7985c9bfca..2208284ee6 100644
@@ -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;

hw/cxl/cxl-component-utils.c static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk) · line 183

Quoted 9 lines
hw/cxl/cxl-component-utils.c +6 -0
@@ -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;

Should it be (type == CXL2_DEVICE || type == CXL2_TYPE3_DEVICE) ?

Otherwise,

Quoted 15 lines
hw/cxl/cxl-component-utils.c +1 -1
     }
 }
 
@@ -239,7 +246,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
#2 lore raw
Quoted 32 lines · On Tue, 7 Jun 2022 09:19:28 -0700 Ben Widawsky <[email protected]> wrote:
Quoted 31 lines · Jonathan Cameron

Without being able to write these registers, no interleaving is possible. More refined checks of HDM register state on commit to follow.

---
v3: Actually pass the parameter to the call...
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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
hw/cxl/cxl-component-utils.c +2 -1
index 7985c9bfca..2208284ee6 100644
@@ -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;
Quoted 8 lines

hw/cxl/cxl-component-utils.c static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk) · line 183

Quoted 6 lines
hw/cxl/cxl-component-utils.c +6 -0
+        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;  

Should it be (type == CXL2_DEVICE || type == CXL2_TYPE3_DEVICE) ?

Good point, but also for consistency I think we need type == CXL2_LOGICAL_DEVICE as well.

We will only exercise the match to CXL2_TYPE3_DEVICE currently as we don't have any emulation for MLDs (and hence LD) or type 1/2 devices (CXL2_DEVICE).

I'll send a v4 out tomorrow.

Quoted 19 lines

Otherwise,

Quoted 15 lines
hw/cxl/cxl-component-utils.c +1 -1
     }
 }
 
@@ -239,7 +246,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
#3 lore raw
Quoted 44 lines · Jonathan Cameron
Quoted 32 lines · On Tue, 7 Jun 2022 09:19:28 -0700 Ben Widawsky <[email protected]> wrote:
Quoted 31 lines · Jonathan Cameron

Without being able to write these registers, no interleaving is possible. More refined checks of HDM register state on commit to follow.

---
v3: Actually pass the parameter to the call...
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 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
hw/cxl/cxl-component-utils.c +2 -1
index 7985c9bfca..2208284ee6 100644
@@ -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;
Quoted 8 lines

hw/cxl/cxl-component-utils.c static void hdm_init_common(uint32_t *reg_state, uint32_t *write_msk) · line 183

Quoted 6 lines
hw/cxl/cxl-component-utils.c +6 -0
+        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;  

Should it be (type == CXL2_DEVICE || type == CXL2_TYPE3_DEVICE) ?

Quoted 2 lines

Good point, but also for consistency I think we need type == CXL2_LOGICAL_DEVICE as well.

I was looking at this and I am not sure, but I defer to you.

Quoted 7 lines

We will only exercise the match to CXL2_TYPE3_DEVICE currently as we don't have any emulation for MLDs (and hence LD) or type 1/2 devices (CXL2_DEVICE).

I'll send a v4 out tomorrow.

Sounds good, feel free to keep the r-b tag.

Quoted 20 lines
Quoted 19 lines

Otherwise,

Quoted 15 lines
hw/cxl/cxl-component-utils.c +1 -1
     }
 }
 
@@ -239,7 +246,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