[PATCH 2/2] cxl/test: Replace an illegal CFMWS definition with a useful x3 CFMWS

[alison.schofield@intel.com]

From: Alison Schofield <alison.schofield@intel.com>

cxl/test has a small set (3) of CFMWS's that become available when
cxl_test is loaded with this module option: interleave_arithmetic=1.
That gives users of cxl_test access to root decoders that use XOR Math
for interleave arithmetic rather than the default Modulo.

The existing x4 CFMWS definition is an invalid configuration because
it repeats Host Bridges in the interleave set. A patch to remove its
usage in the CXL unit test cxl-xor-region.sh is in flight.

Coincidentally, there is another CFMWS definition queued for addition
here and a patch to use it in the CXL unit test is also in flight.
Rather than tear this CFMWS out and adjust the indexes only to follow
it with another patch to introduce a new CFMWS, do a switch in place.

Transform the illegal x4 CFMWS definition into a useful x3 version.

Fixes: 7a7e6edfca85 ("tools/testing/cxl: Add XOR Math support to cxl_test")
Signed-off-by: Alison Schofield <alison.schofield@intel.com>
---

I realize this switcheroo is atypical for a patch. It seemed to be a
cleaner repair, especially when trying to push this cxl/test change
with the acpi driver patch in this set. Say the word and I'll split.

Also, I'm not looking to put back a 4-way HB interleave at the moment,
because it's not a unique case (similar to 2-way in the calc) and also
because I have a patchset in the works that supports all the HB interleave
configs. This sets focus is repairing, not enhancing.


 tools/testing/cxl/test/cxl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c
index a3cdbb2be038..e7e4afabc97a 100644
--- a/tools/testing/cxl/test/cxl.c
+++ b/tools/testing/cxl/test/cxl.c
@@ -329,14 +329,14 @@ static struct {
 				.length = sizeof(mock_cedt.cfmws8),
 			},
 			.interleave_arithmetic = ACPI_CEDT_CFMWS_ARITHMETIC_XOR,
-			.interleave_ways = 2,
+			.interleave_ways = 8,
 			.granularity = 0,
 			.restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 |
 					ACPI_CEDT_CFMWS_RESTRICT_PMEM,
 			.qtg_id = 0,
-			.window_size = SZ_256M * 16UL,
+			.window_size = SZ_256M * 12UL,
 		},
-		.target = { 0, 1, 0, 1, },
+		.target = { 0, 1, 2 },
 	},
 	.cxims0 = {
 		.cxims = {
-- 
2.37.3