Skip to content

Commit fa59c35

Browse files
committed
cxl/test: Standardize CXL auto region size
Create a global define for the size of the mock CXL auto region used in cxl_test. Remove the declared size in mock_init_hdm_decoder() function. Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Tested-by: Alison Schofield <alison.schofield@intel.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> Reviewed-by: Fabio M. De Francesco <fabio.m.de.francesco@linux.intel.com> Link: https://patch.msgid.link/20251117144611.903692-2-dave.jiang@intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
1 parent e9a6fb0 commit fa59c35

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

  • tools/testing/cxl/test

tools/testing/cxl/test/cxl.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ static int interleave_arithmetic;
2626
#define NR_CXL_PORT_DECODERS 8
2727
#define NR_BRIDGES (NR_CXL_HOST_BRIDGES + NR_CXL_SINGLE_HOST + NR_CXL_RCH)
2828

29+
#define MOCK_AUTO_REGION_SIZE_DEFAULT SZ_512M
30+
static int mock_auto_region_size = MOCK_AUTO_REGION_SIZE_DEFAULT;
31+
2932
static struct platform_device *cxl_acpi;
3033
static struct platform_device *cxl_host_bridge[NR_CXL_HOST_BRIDGES];
3134
#define NR_MULTI_ROOT (NR_CXL_HOST_BRIDGES * NR_CXL_ROOT_PORTS)
@@ -738,7 +741,6 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)
738741
struct cxl_endpoint_decoder *cxled;
739742
struct cxl_switch_decoder *cxlsd;
740743
struct cxl_port *port, *iter;
741-
const int size = SZ_512M;
742744
struct cxl_memdev *cxlmd;
743745
struct cxl_dport *dport;
744746
struct device *dev;
@@ -783,7 +785,7 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)
783785
base = window->base_hpa;
784786
cxld->hpa_range = (struct range) {
785787
.start = base,
786-
.end = base + size - 1,
788+
.end = base + mock_auto_region_size - 1,
787789
};
788790

789791
cxld->interleave_ways = 2;
@@ -792,7 +794,8 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)
792794
cxld->flags = CXL_DECODER_F_ENABLE;
793795
cxled->state = CXL_DECODER_STATE_AUTO;
794796
port->commit_end = cxld->id;
795-
devm_cxl_dpa_reserve(cxled, 0, size / cxld->interleave_ways, 0);
797+
devm_cxl_dpa_reserve(cxled, 0,
798+
mock_auto_region_size / cxld->interleave_ways, 0);
796799
cxld->commit = mock_decoder_commit;
797800
cxld->reset = mock_decoder_reset;
798801

@@ -841,7 +844,7 @@ static void mock_init_hdm_decoder(struct cxl_decoder *cxld)
841844
cxld->interleave_granularity = 4096;
842845
cxld->hpa_range = (struct range) {
843846
.start = base,
844-
.end = base + size - 1,
847+
.end = base + mock_auto_region_size - 1,
845848
};
846849
put_device(dev);
847850
}

0 commit comments

Comments
 (0)