bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291690612.1426646.7866084245521113414.stgit@dwillia2-xfh
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2022-05-18 16:35:06 -07:00
parent a12562bb70
commit 92804edb11
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/cxl/core/pci.c
View file

@ -234,14 +234,13 @@ out:
/** /**
* cxl_hdm_decode_init() - Setup HDM decoding for the endpoint * cxl_hdm_decode_init() - Setup HDM decoding for the endpoint
* @cxlds: Device state * @cxlds: Device state
* @info: DVSEC Range cached enumeration
* *
* Try to enable the endpoint's HDM Decoder Capability * Try to enable the endpoint's HDM Decoder Capability
*/ */
int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, int cxl_hdm_decode_init(struct cxl_dev_state *cxlds)
struct cxl_endpoint_dvsec_info *info)
{ {
struct pci_dev *pdev = to_pci_dev(cxlds->dev); struct pci_dev *pdev = to_pci_dev(cxlds->dev);
struct cxl_endpoint_dvsec_info info = { 0 };
int hdm_count, rc, i, ranges = 0; int hdm_count, rc, i, ranges = 0;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int d = cxlds->cxl_dvsec; int d = cxlds->cxl_dvsec;
@ -281,8 +280,8 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds,
return rc; return rc;
} }
info->mem_enabled = FIELD_GET(CXL_DVSEC_MEM_ENABLE, ctrl); info.mem_enabled = FIELD_GET(CXL_DVSEC_MEM_ENABLE, ctrl);
if (!info->mem_enabled) if (!info.mem_enabled)
return 0; return 0;
for (i = 0; i < hdm_count; i++) { 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; base |= temp & CXL_DVSEC_MEM_BASE_LOW_MASK;
info->dvsec_range[i] = (struct range) { info.dvsec_range[i] = (struct range) {
.start = base, .start = base,
.end = base + size - 1 .end = base + size - 1
}; };
@ -326,13 +325,13 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds,
ranges++; ranges++;
} }
info->ranges = ranges; info.ranges = ranges;
/* /*
* If DVSEC ranges are being used instead of HDM decoder registers there * If DVSEC ranges are being used instead of HDM decoder registers there
* is no use in trying to manage those. * 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, dev_err(dev,
"Legacy range registers configuration prevents HDM operation.\n"); "Legacy range registers configuration prevents HDM operation.\n");
return -EBUSY; return -EBUSY;

4
drivers/cxl/cxlpci.h
View file

@ -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); int devm_cxl_port_enumerate_dports(struct cxl_port *port);
struct cxl_dev_state; struct cxl_dev_state;
struct cxl_endpoint_dvsec_info; int cxl_hdm_decode_init(struct cxl_dev_state *cxlds);
int cxl_hdm_decode_init(struct cxl_dev_state *cxlds,
struct cxl_endpoint_dvsec_info *info);
#endif /* __CXL_PCI_H__ */ #endif /* __CXL_PCI_H__ */

3
drivers/cxl/mem.c
View file

@ -54,7 +54,6 @@ static void enable_suspend(void *data)
static int cxl_mem_probe(struct device *dev) static int cxl_mem_probe(struct device *dev)
{ {
struct cxl_memdev *cxlmd = to_cxl_memdev(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_dev_state *cxlds = cxlmd->cxlds;
struct cxl_port *parent_port; struct cxl_port *parent_port;
int rc; int rc;
@ -95,7 +94,7 @@ unlock:
if (rc) if (rc)
return rc; return rc;
rc = cxl_hdm_decode_init(cxlds, &info); rc = cxl_hdm_decode_init(cxlds);
if (rc) if (rc)
return rc; return rc;

9
tools/testing/cxl/test/mock.c
View file

@ -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); EXPORT_SYMBOL_NS_GPL(__wrap_cxl_await_media_ready, CXL);
int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds)
struct cxl_endpoint_dvsec_info *info)
{ {
int rc = 0, index; int rc = 0, index;
struct cxl_mock_ops *ops = get_cxl_mock_ops(&index); struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);
if (ops && ops->is_mock_dev(cxlds->dev)) if (!ops || !ops->is_mock_dev(cxlds->dev))
info->mem_enabled = 1; rc = cxl_hdm_decode_init(cxlds);
else
rc = cxl_hdm_decode_init(cxlds, info);
put_cxl_mock_ops(index); put_cxl_mock_ops(index);
return rc; return rc;