Commit f29a824b authored by Dan Williams's avatar Dan Williams
Browse files

cxl/pci: Clarify devm host for memdev relative setup 



It is all too easy to get confused about @dev usage in the CXL driver
stack. Before adding a new cxl_pci_probe() setup operation that has a
devm lifetime dependent on @cxlds->dev binding, but also references
@cxlmd->dev, and prints messages, rework the devm_cxl_add_memdev() and
cxl_memdev_setup_fw_upload() function signatures to make this
distinction explicit. I.e. pass in the devm context as an @host argument
rather than infer it from other objects.

This is in preparation for adding a devm_cxl_sanitize_setup_notifier().

Note the whitespace fixup near the change of the devm_cxl_add_memdev()
signature. That uncaught typo originated in the patch that added
cxl_memdev_security_init().

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 2627c995

drivers/cxl/core/memdev.c

+8 −8
Original line number Diff line number Diff line
@@ -960,12 +960,12 @@ static const struct fw_upload_ops cxl_memdev_fw_ops = { 
        .cleanup = cxl_fw_cleanup,

};



static void devm_cxl_remove_fw_upload(void *fwl)

static void cxl_remove_fw_upload(void *fwl)

{

	firmware_upload_unregister(fwl);

}



int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds)

int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds)

{

	struct cxl_dev_state *cxlds = &mds->cxlds;

	struct device *dev = &cxlds->cxlmd->dev;
@@ -978,10 +978,9 @@ int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds) 
				       &cxl_memdev_fw_ops, mds);

	if (IS_ERR(fwl))

		return PTR_ERR(fwl);



	return devm_add_action_or_reset(cxlds->dev, devm_cxl_remove_fw_upload, fwl);

	return devm_add_action_or_reset(host, cxl_remove_fw_upload, fwl);

}

EXPORT_SYMBOL_NS_GPL(cxl_memdev_setup_fw_upload, CXL);

EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_fw_upload, CXL);



static const struct file_operations cxl_memdev_fops = {

	.owner = THIS_MODULE,
@@ -1021,7 +1020,8 @@ static int cxl_memdev_security_init(struct cxl_memdev *cxlmd) 
	return devm_add_action_or_reset(cxlds->dev, put_sanitize, mds);

}



struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds)

struct cxl_memdev *devm_cxl_add_memdev(struct device *host,

				       struct cxl_dev_state *cxlds)

{

	struct cxl_memdev *cxlmd;

	struct device *dev;
@@ -1053,7 +1053,7 @@ struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds) 
	if (rc)

		goto err;



	rc = devm_add_action_or_reset(cxlds->dev, cxl_memdev_unregister, cxlmd);

	rc = devm_add_action_or_reset(host, cxl_memdev_unregister, cxlmd);

	if (rc)

		return ERR_PTR(rc);

	return cxlmd;

drivers/cxl/cxlmem.h

+3 −2
Original line number Diff line number Diff line
@@ -84,9 +84,10 @@ static inline bool is_cxl_endpoint(struct cxl_port *port) 
	return is_cxl_memdev(port->uport_dev);

}



struct cxl_memdev *devm_cxl_add_memdev(struct cxl_dev_state *cxlds);

struct cxl_memdev *devm_cxl_add_memdev(struct device *host,

				       struct cxl_dev_state *cxlds);

struct cxl_memdev_state;

int cxl_memdev_setup_fw_upload(struct cxl_memdev_state *mds);

int devm_cxl_setup_fw_upload(struct device *host, struct cxl_memdev_state *mds);

int devm_cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled,

			 resource_size_t base, resource_size_t len,

			 resource_size_t skipped);

drivers/cxl/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -867,11 +867,11 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (rc)

		return rc;



	cxlmd = devm_cxl_add_memdev(cxlds);

	cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);

	if (IS_ERR(cxlmd))

		return PTR_ERR(cxlmd);



	rc = cxl_memdev_setup_fw_upload(mds);

	rc = devm_cxl_setup_fw_upload(&pdev->dev, mds);

	if (rc)

		return rc;

tools/testing/cxl/test/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -1450,11 +1450,11 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) 
	mdata->mes.mds = mds;

	cxl_mock_add_event_logs(&mdata->mes);



	cxlmd = devm_cxl_add_memdev(cxlds);

	cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);

	if (IS_ERR(cxlmd))

		return PTR_ERR(cxlmd);



	rc = cxl_memdev_setup_fw_upload(mds);

	rc = devm_cxl_setup_fw_upload(&pdev->dev, mds);

	if (rc)

		return rc;