Commit 3d8f7cca authored by Dan Williams's avatar Dan Williams
Browse files

tools/testing/cxl: Define a fixed volatile configuration to parse 



Take two endpoints attached to the first switch on the first host-bridge
in the cxl_test topology and define a pre-initialized region. This is a
x2 interleave underneath a x1 CXL Window.

$ modprobe cxl_test
$ # cxl list -Ru
{
  "region":"region3",
  "resource":"0xf010000000",
  "size":"512.00 MiB (536.87 MB)",
  "interleave_ways":2,
  "interleave_granularity":4096,
  "decode_state":"commit"
}

Tested-by: default avatarFan Ni <fan.ni@samsung.com>
Reviewed-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/167602000547.1924368.11613151863880268868.stgit@dwillia2-xfh.jf.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent a32320b7

drivers/cxl/core/core.h

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); 
resource_size_t cxl_dpa_resource_start(struct cxl_endpoint_decoder *cxled);

extern struct rw_semaphore cxl_dpa_rwsem;



bool is_switch_decoder(struct device *dev);

struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev);



int cxl_memdev_init(void);

void cxl_memdev_exit(void);

void cxl_mbox_init(void);

drivers/cxl/core/hdm.c

+2 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, 
	return 0;

}



static int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled,

int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled,

				resource_size_t base, resource_size_t len,

				resource_size_t skipped)

{
@@ -295,6 +295,7 @@ static int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, 


	return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_dpa_reserve, CXL);



resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled)

{

drivers/cxl/core/port.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ bool is_switch_decoder(struct device *dev) 
{

	return is_root_decoder(dev) || dev->type == &cxl_decoder_switch_type;

}

EXPORT_SYMBOL_NS_GPL(is_switch_decoder, CXL);



struct cxl_decoder *to_cxl_decoder(struct device *dev)

{
@@ -485,6 +486,7 @@ struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) 
		return NULL;

	return container_of(dev, struct cxl_switch_decoder, cxld.dev);

}

EXPORT_SYMBOL_NS_GPL(to_cxl_switch_decoder, CXL);



static void cxl_ep_release(struct cxl_ep *ep)

{

drivers/cxl/cxl.h

+2 −0
Original line number Diff line number Diff line
@@ -653,8 +653,10 @@ struct cxl_dport *devm_cxl_add_rch_dport(struct cxl_port *port, 


struct cxl_decoder *to_cxl_decoder(struct device *dev);

struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev);

struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev);

struct cxl_endpoint_decoder *to_cxl_endpoint_decoder(struct device *dev);

bool is_root_decoder(struct device *dev);

bool is_switch_decoder(struct device *dev);

bool is_endpoint_decoder(struct device *dev);

struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port,

						unsigned int nr_targets,

drivers/cxl/cxlmem.h

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) 
}



struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds);

int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled,

			 resource_size_t base, resource_size_t len,

			 resource_size_t skipped);



static inline struct cxl_ep *cxl_ep_load(struct cxl_port *port,

					 struct cxl_memdev *cxlmd)