Commit 5aa39a91 authored by Dan Williams's avatar Dan Williams
Browse files

cxl/port: Rename CXL_DECODER_{EXPANDER, ACCELERATOR} => {HOSTONLYMEM, DEVMEM} 



In preparation for support for HDM-D and HDM-DB configuration
(device-memory, and device-memory with back-invalidate). Rename the current
type designators to use HOSTONLYMEM and DEVMEM as a suffix.

HDM-DB can be supported by devices that are not accelerators, so DEVMEM is
a more generic term for that case.

Fixup one location where this type value was open coded.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/168679261369.3436160.7042443847605280593.stgit@dwillia2-xfh.jf.intel.com


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

drivers/cxl/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, 


	cxld = &cxlrd->cxlsd.cxld;

	cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions);

	cxld->target_type = CXL_DECODER_EXPANDER;

	cxld->target_type = CXL_DECODER_HOSTONLYMEM;

	cxld->hpa_range = (struct range) {

		.start = res->start,

		.end = res->end,

drivers/cxl/core/hdm.c

+6 −5
Original line number Diff line number Diff line
@@ -570,7 +570,8 @@ static void cxld_set_interleave(struct cxl_decoder *cxld, u32 *ctrl) 


static void cxld_set_type(struct cxl_decoder *cxld, u32 *ctrl)

{

	u32p_replace_bits(ctrl, !!(cxld->target_type == 3),

	u32p_replace_bits(ctrl,

			  !!(cxld->target_type == CXL_DECODER_HOSTONLYMEM),

			  CXL_HDM_DECODER0_CTRL_TYPE);

}
@@ -764,7 +765,7 @@ static int cxl_setup_hdm_decoder_from_dvsec( 
	if (!len)

		return -ENOENT;



	cxld->target_type = CXL_DECODER_EXPANDER;

	cxld->target_type = CXL_DECODER_HOSTONLYMEM;

	cxld->commit = NULL;

	cxld->reset = NULL;

	cxld->hpa_range = info->dvsec_range[which];
@@ -838,9 +839,9 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, 
		if (ctrl & CXL_HDM_DECODER0_CTRL_LOCK)

			cxld->flags |= CXL_DECODER_F_LOCK;

		if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl))

			cxld->target_type = CXL_DECODER_EXPANDER;

			cxld->target_type = CXL_DECODER_HOSTONLYMEM;

		else

			cxld->target_type = CXL_DECODER_ACCELERATOR;

			cxld->target_type = CXL_DECODER_DEVMEM;

		if (cxld->id != port->commit_end + 1) {

			dev_warn(&port->dev,

				 "decoder%d.%d: Committed out of order\n",
@@ -861,7 +862,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, 
			ctrl |= CXL_HDM_DECODER0_CTRL_TYPE;

			writel(ctrl, hdm + CXL_HDM_DECODER0_CTRL_OFFSET(which));

		}

		cxld->target_type = CXL_DECODER_EXPANDER;

		cxld->target_type = CXL_DECODER_HOSTONLYMEM;

	}

	rc = eiw_to_ways(FIELD_GET(CXL_HDM_DECODER0_CTRL_IW_MASK, ctrl),

			  &cxld->interleave_ways);

drivers/cxl/core/port.c

+3 −3
Original line number Diff line number Diff line
@@ -117,9 +117,9 @@ static ssize_t target_type_show(struct device *dev, 
	struct cxl_decoder *cxld = to_cxl_decoder(dev);



	switch (cxld->target_type) {

	case CXL_DECODER_ACCELERATOR:

	case CXL_DECODER_DEVMEM:

		return sysfs_emit(buf, "accelerator\n");

	case CXL_DECODER_EXPANDER:

	case CXL_DECODER_HOSTONLYMEM:

		return sysfs_emit(buf, "expander\n");

	}

	return -ENXIO;
@@ -1550,7 +1550,7 @@ static int cxl_decoder_init(struct cxl_port *port, struct cxl_decoder *cxld) 
	/* Pre initialize an "empty" decoder */

	cxld->interleave_ways = 1;

	cxld->interleave_granularity = PAGE_SIZE;

	cxld->target_type = CXL_DECODER_EXPANDER;

	cxld->target_type = CXL_DECODER_HOSTONLYMEM;

	cxld->hpa_range = (struct range) {

		.start = 0,

		.end = -1,

drivers/cxl/core/region.c

+1 −1
Original line number Diff line number Diff line
@@ -2103,7 +2103,7 @@ static struct cxl_region *__create_region(struct cxl_root_decoder *cxlrd, 
		return ERR_PTR(-EBUSY);

	}



	return devm_cxl_add_region(cxlrd, id, mode, CXL_DECODER_EXPANDER);

	return devm_cxl_add_region(cxlrd, id, mode, CXL_DECODER_HOSTONLYMEM);

}



static ssize_t create_pmem_region_store(struct device *dev,

drivers/cxl/cxl.h

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ resource_size_t cxl_rcrb_to_component(struct device *dev, 
#define CXL_DECODER_F_MASK  GENMASK(5, 0)



enum cxl_decoder_type {

       CXL_DECODER_ACCELERATOR = 2,

       CXL_DECODER_EXPANDER = 3,

	CXL_DECODER_DEVMEM = 2,

	CXL_DECODER_HOSTONLYMEM = 3,

};



/*