Commit 92804edb authored by Dan Williams's avatar Dan Williams
Browse files

cxl/pci: Drop @info argument to cxl_hdm_decode_init() 



Now that nothing external to cxl_hdm_decode_init() considers
'struct cxl_endpoint_dvec_info' move it internal to
cxl_hdm_decode_init().

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291690612.1426646.7866084245521113414.stgit@dwillia2-xfh


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

drivers/cxl/core/pci.c

+7 −8
Original line number Diff line number Diff line
@@ -234,14 +234,13 @@ static bool __cxl_hdm_decode_init(struct cxl_dev_state *cxlds, 
/**

 * cxl_hdm_decode_init() - Setup HDM decoding for the endpoint

 * @cxlds: Device state

 * @info: DVSEC Range cached enumeration

 *

 * Try to enable the endpoint's HDM Decoder Capability

 */

int cxl_hdm_decode_init(struct cxl_dev_state *cxlds,

			struct cxl_endpoint_dvsec_info *info)

int cxl_hdm_decode_init(struct cxl_dev_state *cxlds)

{

	struct pci_dev *pdev = to_pci_dev(cxlds->dev);

	struct cxl_endpoint_dvsec_info info = { 0 };

	int hdm_count, rc, i, ranges = 0;

	struct device *dev = &pdev->dev;

	int d = cxlds->cxl_dvsec;
@@ -281,8 +280,8 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, 
		return rc;

	}



	info->mem_enabled = FIELD_GET(CXL_DVSEC_MEM_ENABLE, ctrl);

	if (!info->mem_enabled)

	info.mem_enabled = FIELD_GET(CXL_DVSEC_MEM_ENABLE, ctrl);

	if (!info.mem_enabled)

		return 0;



	for (i = 0; i < hdm_count; i++) {
@@ -317,7 +316,7 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, 


		base |= temp & CXL_DVSEC_MEM_BASE_LOW_MASK;



		info->dvsec_range[i] = (struct range) {

		info.dvsec_range[i] = (struct range) {

			.start = base,

			.end = base + size - 1

		};
@@ -326,13 +325,13 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, 
			ranges++;

	}



	info->ranges = ranges;

	info.ranges = ranges;



	/*

	 * If DVSEC ranges are being used instead of HDM decoder registers there

	 * is no use in trying to manage those.

	 */

	if (!__cxl_hdm_decode_init(cxlds, info)) {

	if (!__cxl_hdm_decode_init(cxlds, &info)) {

		dev_err(dev,

			"Legacy range registers configuration prevents HDM operation.\n");

		return -EBUSY;

drivers/cxl/cxlpci.h

+1 −3
Original line number Diff line number Diff line
@@ -73,7 +73,5 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, 


int devm_cxl_port_enumerate_dports(struct cxl_port *port);

struct cxl_dev_state;

struct cxl_endpoint_dvsec_info;

int cxl_hdm_decode_init(struct cxl_dev_state *cxlds,

			struct cxl_endpoint_dvsec_info *info);

int cxl_hdm_decode_init(struct cxl_dev_state *cxlds);

#endif /* __CXL_PCI_H__ */

drivers/cxl/mem.c

+1 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static void enable_suspend(void *data) 
static int cxl_mem_probe(struct device *dev)

{

	struct cxl_memdev *cxlmd = to_cxl_memdev(dev);

	struct cxl_endpoint_dvsec_info info = { 0 };

	struct cxl_dev_state *cxlds = cxlmd->cxlds;

	struct cxl_port *parent_port;

	int rc;
@@ -95,7 +94,7 @@ static int cxl_mem_probe(struct device *dev) 
	if (rc)

		return rc;



	rc = cxl_hdm_decode_init(cxlds, &info);

	rc = cxl_hdm_decode_init(cxlds);

	if (rc)

		return rc;

tools/testing/cxl/test/mock.c

+3 −6
Original line number Diff line number Diff line
@@ -208,16 +208,13 @@ int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds) 
}

EXPORT_SYMBOL_NS_GPL(__wrap_cxl_await_media_ready, CXL);



int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds,

				struct cxl_endpoint_dvsec_info *info)

bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds)

{

	int rc = 0, index;

	struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);



	if (ops && ops->is_mock_dev(cxlds->dev))

		info->mem_enabled = 1;

	else

		rc = cxl_hdm_decode_init(cxlds, info);

	if (!ops || !ops->is_mock_dev(cxlds->dev))

		rc = cxl_hdm_decode_init(cxlds);

	put_cxl_mock_ops(index);



	return rc;