2022-02-04 18:18:31 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
/* Copyright(c) 2022 Intel Corporation. All rights reserved. */
|
2022-05-26 22:15:25 +03:00
|
|
|
#include <linux/debugfs.h>
|
2022-02-04 18:18:31 +03:00
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/pci.h>
|
|
|
|
|
|
|
|
#include "cxlmem.h"
|
|
|
|
#include "cxlpci.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* DOC: cxl mem
|
|
|
|
*
|
|
|
|
* CXL memory endpoint devices and switches are CXL capable devices that are
|
|
|
|
* participating in CXL.mem protocol. Their functionality builds on top of the
|
|
|
|
* CXL.io protocol that allows enumerating and configuring components via
|
|
|
|
* standard PCI mechanisms.
|
|
|
|
*
|
|
|
|
* The cxl_mem driver owns kicking off the enumeration of this CXL.mem
|
|
|
|
* capability. With the detection of a CXL capable endpoint, the driver will
|
|
|
|
* walk up to find the platform specific port it is connected to, and determine
|
|
|
|
* if there are intervening switches in the path. If there are switches, a
|
|
|
|
* secondary action is to enumerate those (implemented in cxl_core). Finally the
|
|
|
|
* cxl_mem driver adds the device it is bound to as a CXL endpoint-port for use
|
|
|
|
* in higher level operations.
|
|
|
|
*/
|
|
|
|
|
2022-04-23 01:58:11 +03:00
|
|
|
static void enable_suspend(void *data)
|
|
|
|
{
|
|
|
|
cxl_mem_active_dec();
|
|
|
|
}
|
|
|
|
|
2022-05-26 22:15:25 +03:00
|
|
|
static void remove_debugfs(void *dentry)
|
|
|
|
{
|
|
|
|
debugfs_remove_recursive(dentry);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cxl_mem_dpa_show(struct seq_file *file, void *data)
|
|
|
|
{
|
|
|
|
struct device *dev = file->private;
|
|
|
|
struct cxl_memdev *cxlmd = to_cxl_memdev(dev);
|
|
|
|
|
|
|
|
cxl_dpa_debug(file, cxlmd->cxlds);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-12-02 00:34:16 +03:00
|
|
|
static int devm_cxl_add_endpoint(struct device *host, struct cxl_memdev *cxlmd,
|
2022-12-02 00:34:10 +03:00
|
|
|
struct cxl_dport *parent_dport)
|
|
|
|
{
|
|
|
|
struct cxl_port *parent_port = parent_dport->port;
|
|
|
|
struct cxl_dev_state *cxlds = cxlmd->cxlds;
|
|
|
|
struct cxl_port *endpoint, *iter, *down;
|
2022-12-02 00:34:16 +03:00
|
|
|
resource_size_t component_reg_phys;
|
2022-12-02 00:34:10 +03:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now that the path to the root is established record all the
|
|
|
|
* intervening ports in the chain.
|
|
|
|
*/
|
|
|
|
for (iter = parent_port, down = NULL; !is_cxl_root(iter);
|
|
|
|
down = iter, iter = to_cxl_port(iter->dev.parent)) {
|
|
|
|
struct cxl_ep *ep;
|
|
|
|
|
|
|
|
ep = cxl_ep_load(iter, cxlmd);
|
|
|
|
ep->next = down;
|
|
|
|
}
|
|
|
|
|
2022-12-02 00:34:16 +03:00
|
|
|
/*
|
|
|
|
* The component registers for an RCD might come from the
|
|
|
|
* host-bridge RCRB if they are not already mapped via the
|
|
|
|
* typical register locator mechanism.
|
|
|
|
*/
|
|
|
|
if (parent_dport->rch && cxlds->component_reg_phys == CXL_RESOURCE_NONE)
|
|
|
|
component_reg_phys = cxl_rcrb_to_component(
|
|
|
|
&cxlmd->dev, parent_dport->rcrb, CXL_RCRB_UPSTREAM);
|
|
|
|
else
|
|
|
|
component_reg_phys = cxlds->component_reg_phys;
|
|
|
|
endpoint = devm_cxl_add_port(host, &cxlmd->dev, component_reg_phys,
|
|
|
|
parent_dport);
|
2022-12-02 00:34:10 +03:00
|
|
|
if (IS_ERR(endpoint))
|
|
|
|
return PTR_ERR(endpoint);
|
|
|
|
|
|
|
|
rc = cxl_endpoint_autoremove(cxlmd, endpoint);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
if (!endpoint->dev.driver) {
|
|
|
|
dev_err(&cxlmd->dev, "%s failed probe\n",
|
|
|
|
dev_name(&endpoint->dev));
|
|
|
|
return -ENXIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-02-04 18:18:31 +03:00
|
|
|
static int cxl_mem_probe(struct device *dev)
|
|
|
|
{
|
|
|
|
struct cxl_memdev *cxlmd = to_cxl_memdev(dev);
|
cxl/pmem: Refactor nvdimm device registration, delete the workqueue
The three objects 'struct cxl_nvdimm_bridge', 'struct cxl_nvdimm', and
'struct cxl_pmem_region' manage CXL persistent memory resources. The
bridge represents base platform resources, the nvdimm represents one or
more endpoints, and the region is a collection of nvdimms that
contribute to an assembled address range.
Their relationship is such that a region is torn down if any component
endpoints are removed. All regions and endpoints are torn down if the
foundational bridge device goes down.
A workqueue was deployed to manage these interdependencies, but it is
difficult to reason about, and fragile. A recent attempt to take the CXL
root device lock in the cxl_mem driver was reported by lockdep as
colliding with the flush_work() in the cxl_pmem flows.
Instead of the workqueue, arrange for all pmem/nvdimm devices to be torn
down immediately and hierarchically. A similar change is made to both
the 'cxl_nvdimm' and 'cxl_pmem_region' objects. For bisect-ability both
changes are made in the same patch which unfortunately makes the patch
bigger than desired.
Arrange for cxl_memdev and cxl_region to register a cxl_nvdimm and
cxl_pmem_region as a devres release action of the bridge device.
Additionally, include a devres release action of the cxl_memdev or
cxl_region device that triggers the bridge's release action if an endpoint
exits before the bridge. I.e. this allows either unplugging the bridge,
or unplugging and endpoint to result in the same cleanup actions.
To keep the patch smaller the cleanup of the now defunct workqueue
infrastructure is saved for a follow-on patch.
Tested-by: Robert Richter <rrichter@amd.com>
Link: https://lore.kernel.org/r/166993041773.1882361.16444301376147207609.stgit@dwillia2-xfh.jf.intel.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2022-12-02 00:33:37 +03:00
|
|
|
struct cxl_dev_state *cxlds = cxlmd->cxlds;
|
2022-12-02 00:34:16 +03:00
|
|
|
struct device *endpoint_parent;
|
2022-02-04 18:18:31 +03:00
|
|
|
struct cxl_port *parent_port;
|
2022-05-27 20:57:01 +03:00
|
|
|
struct cxl_dport *dport;
|
2022-05-26 22:15:25 +03:00
|
|
|
struct dentry *dentry;
|
2022-02-04 18:18:31 +03:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Someone is trying to reattach this device after it lost its port
|
|
|
|
* connection (an endpoint port previously registered by this memdev was
|
|
|
|
* disabled). This racy check is ok because if the port is still gone,
|
|
|
|
* no harm done, and if the port hierarchy comes back it will re-trigger
|
|
|
|
* this probe. Port rescan and memdev detach work share the same
|
|
|
|
* single-threaded workqueue.
|
|
|
|
*/
|
|
|
|
if (work_pending(&cxlmd->detach_work))
|
|
|
|
return -EBUSY;
|
|
|
|
|
2022-05-26 22:15:25 +03:00
|
|
|
dentry = cxl_debugfs_create_dir(dev_name(dev));
|
|
|
|
debugfs_create_devm_seqfile(dev, "dpamem", dentry, cxl_mem_dpa_show);
|
|
|
|
rc = devm_add_action_or_reset(dev, remove_debugfs, dentry);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2022-02-04 18:18:31 +03:00
|
|
|
rc = devm_cxl_enumerate_ports(cxlmd);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2022-05-27 20:57:01 +03:00
|
|
|
parent_port = cxl_mem_find_port(cxlmd, &dport);
|
2022-02-04 18:18:31 +03:00
|
|
|
if (!parent_port) {
|
|
|
|
dev_err(dev, "CXL port topology not found\n");
|
|
|
|
return -ENXIO;
|
|
|
|
}
|
|
|
|
|
2022-12-02 00:34:16 +03:00
|
|
|
if (dport->rch)
|
|
|
|
endpoint_parent = parent_port->uport;
|
|
|
|
else
|
|
|
|
endpoint_parent = &parent_port->dev;
|
|
|
|
|
|
|
|
device_lock(endpoint_parent);
|
|
|
|
if (!endpoint_parent->driver) {
|
2022-02-04 18:18:31 +03:00
|
|
|
dev_err(dev, "CXL port topology %s not enabled\n",
|
2022-12-02 00:34:16 +03:00
|
|
|
dev_name(endpoint_parent));
|
2022-02-04 18:18:31 +03:00
|
|
|
rc = -ENXIO;
|
2022-05-19 02:34:31 +03:00
|
|
|
goto unlock;
|
2022-02-04 18:18:31 +03:00
|
|
|
}
|
|
|
|
|
2022-12-02 00:34:16 +03:00
|
|
|
rc = devm_cxl_add_endpoint(endpoint_parent, cxlmd, dport);
|
2022-05-19 02:34:31 +03:00
|
|
|
unlock:
|
2022-12-02 00:34:16 +03:00
|
|
|
device_unlock(endpoint_parent);
|
2022-02-04 18:18:31 +03:00
|
|
|
put_device(&parent_port->dev);
|
2022-05-19 02:34:31 +03:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
2022-04-23 01:58:11 +03:00
|
|
|
|
cxl/pmem: Refactor nvdimm device registration, delete the workqueue
The three objects 'struct cxl_nvdimm_bridge', 'struct cxl_nvdimm', and
'struct cxl_pmem_region' manage CXL persistent memory resources. The
bridge represents base platform resources, the nvdimm represents one or
more endpoints, and the region is a collection of nvdimms that
contribute to an assembled address range.
Their relationship is such that a region is torn down if any component
endpoints are removed. All regions and endpoints are torn down if the
foundational bridge device goes down.
A workqueue was deployed to manage these interdependencies, but it is
difficult to reason about, and fragile. A recent attempt to take the CXL
root device lock in the cxl_mem driver was reported by lockdep as
colliding with the flush_work() in the cxl_pmem flows.
Instead of the workqueue, arrange for all pmem/nvdimm devices to be torn
down immediately and hierarchically. A similar change is made to both
the 'cxl_nvdimm' and 'cxl_pmem_region' objects. For bisect-ability both
changes are made in the same patch which unfortunately makes the patch
bigger than desired.
Arrange for cxl_memdev and cxl_region to register a cxl_nvdimm and
cxl_pmem_region as a devres release action of the bridge device.
Additionally, include a devres release action of the cxl_memdev or
cxl_region device that triggers the bridge's release action if an endpoint
exits before the bridge. I.e. this allows either unplugging the bridge,
or unplugging and endpoint to result in the same cleanup actions.
To keep the patch smaller the cleanup of the now defunct workqueue
infrastructure is saved for a follow-on patch.
Tested-by: Robert Richter <rrichter@amd.com>
Link: https://lore.kernel.org/r/166993041773.1882361.16444301376147207609.stgit@dwillia2-xfh.jf.intel.com
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
2022-12-02 00:33:37 +03:00
|
|
|
if (resource_size(&cxlds->pmem_res) && IS_ENABLED(CONFIG_CXL_PMEM)) {
|
|
|
|
rc = devm_cxl_add_nvdimm(cxlmd);
|
|
|
|
if (rc == -ENODEV)
|
|
|
|
dev_info(dev, "PMEM disabled by platform\n");
|
|
|
|
else
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2022-04-23 01:58:11 +03:00
|
|
|
/*
|
|
|
|
* The kernel may be operating out of CXL memory on this device,
|
|
|
|
* there is no spec defined way to determine whether this device
|
|
|
|
* preserves contents over suspend, and there is no simple way
|
|
|
|
* to arrange for the suspend image to avoid CXL memory which
|
|
|
|
* would setup a circular dependency between PCI resume and save
|
|
|
|
* state restoration.
|
|
|
|
*
|
|
|
|
* TODO: support suspend when all the regions this device is
|
|
|
|
* hosting are locked and covered by the system address map,
|
|
|
|
* i.e. platform firmware owns restoring the HDM configuration
|
|
|
|
* that it locked.
|
|
|
|
*/
|
|
|
|
cxl_mem_active_inc();
|
|
|
|
return devm_add_action_or_reset(dev, enable_suspend, NULL);
|
2022-02-04 18:18:31 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct cxl_driver cxl_mem_driver = {
|
|
|
|
.name = "cxl_mem",
|
|
|
|
.probe = cxl_mem_probe,
|
|
|
|
.id = CXL_DEVICE_MEMORY_EXPANDER,
|
|
|
|
};
|
|
|
|
|
|
|
|
module_cxl_driver(cxl_mem_driver);
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL v2");
|
|
|
|
MODULE_IMPORT_NS(CXL);
|
|
|
|
MODULE_ALIAS_CXL(CXL_DEVICE_MEMORY_EXPANDER);
|
|
|
|
/*
|
|
|
|
* create_endpoint() wants to validate port driver attach immediately after
|
|
|
|
* endpoint registration.
|
|
|
|
*/
|
|
|
|
MODULE_SOFTDEP("pre: cxl_port");
|