Commit 27fcfb41 authored by Ira Weiny's avatar Ira Weiny Committed by Dave Jiang
Browse files

cxl/hdm: Use guard() in cxl_dpa_set_mode() 



Additional DCD functionality is being added to this call which will be
simplified by the use of guard() with the cxl_dpa_rwsem.

Convert the function to use guard() prior to adding DCD functionality.

Suggested-by: default avatarJonathan Cameron <Jonathan.Cameron@Huawei.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://patch.msgid.link/20241107-dcd-type2-upstream-v7-5-56a84e66bc36@intel.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 0f6f0d68

drivers/cxl/core/hdm.c

+6 −15
Original line number Diff line number Diff line
@@ -424,7 +424,6 @@ int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled, 
	struct cxl_memdev *cxlmd = cxled_to_memdev(cxled);

	struct cxl_dev_state *cxlds = cxlmd->cxlds;

	struct device *dev = &cxled->cxld.dev;

	int rc;



	switch (mode) {

	case CXL_DECODER_RAM:
@@ -435,11 +434,9 @@ int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled, 
		return -EINVAL;

	}



	down_write(&cxl_dpa_rwsem);

	if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) {

		rc = -EBUSY;

		goto out;

	}

	guard(rwsem_write)(&cxl_dpa_rwsem);

	if (cxled->cxld.flags & CXL_DECODER_F_ENABLE)

		return -EBUSY;



	/*

	 * Only allow modes that are supported by the current partition
@@ -447,21 +444,15 @@ int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled, 
	 */

	if (mode == CXL_DECODER_PMEM && !resource_size(&cxlds->pmem_res)) {

		dev_dbg(dev, "no available pmem capacity\n");

		rc = -ENXIO;

		goto out;

		return -ENXIO;

	}

	if (mode == CXL_DECODER_RAM && !resource_size(&cxlds->ram_res)) {

		dev_dbg(dev, "no available ram capacity\n");

		rc = -ENXIO;

		goto out;

		return -ENXIO;

	}



	cxled->mode = mode;

	rc = 0;

out:

	up_write(&cxl_dpa_rwsem);



	return rc;

	return 0;

}



int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size)