]> Gentwo Git Trees - linux/.git/commitdiff
Merge branch 'for-6.19/cxl-elc-test' into cxl-for-next
authorDave Jiang <dave.jiang@intel.com>
Mon, 17 Nov 2025 18:05:47 +0000 (11:05 -0700)
committerDave Jiang <dave.jiang@intel.com>
Mon, 17 Nov 2025 18:05:47 +0000 (11:05 -0700)
Extended linear cache unit testing support
  - Standardize CXL auto region size
  - Add cxl_test CFMWS support for extended linear cache
  - Add support for acpi extended linear cache

1  2 
tools/testing/cxl/Kbuild
tools/testing/cxl/test/cxl.c
tools/testing/cxl/test/mock.c
tools/testing/cxl/test/mock.h

Simple merge
index 10f9b83a94437f7e930f3383b87d6eef72a84eb3,4d5714d077b25e6c32151008c560b5677ad408b7..81e2aef3627a44afbc861b34197d44267b06e3fe
@@@ -1083,8 -1156,11 +1125,10 @@@ static struct cxl_mock_ops cxl_mock_op
        .acpi_pci_find_root = mock_acpi_pci_find_root,
        .devm_cxl_switch_port_decoders_setup = mock_cxl_switch_port_decoders_setup,
        .devm_cxl_endpoint_decoders_setup = mock_cxl_endpoint_decoders_setup,
 -      .devm_cxl_port_enumerate_dports = mock_cxl_port_enumerate_dports,
        .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat,
        .devm_cxl_add_dport_by_dev = mock_cxl_add_dport_by_dev,
+       .hmat_get_extended_linear_cache_size =
+               mock_hmat_get_extended_linear_cache_size,
        .list = LIST_HEAD_INIT(cxl_mock_ops.list),
  };
  
Simple merge
Simple merge