| Message ID | 20220831081603.3415-15-rrichter@amd.com |
|---|---|
| State | Superseded |
| Delegated to: | Dan Williams |
| Headers | show |
| Series | cxl: Add support for Restricted CXL hosts (RCD mode) | expand |
On Wed, 31 Aug 2022 10:16:02 +0200 Robert Richter <rrichter@amd.com> wrote: > Do the plumbing of ports to enable RCD/RCH pairs. > > Do this by enumerating all necessary ports an endpoint needs to > connect to. This includes: > > 1) A CXL root port with dport links to the RCHs. The port links to > the CXL root platform device for RCH mode. > > 2) RCH ports with dport links to its endpoints. Port connects to the > pci host bridge device. > > 3) CXL device endpoint connected to the RCH. > > The port creation for the endpoint (3) is already implemented and > works in RCD mode too. Thus, it is not scope of this patch. Only the > endpoints must be registered at the host bridge port. > > Implement this by introducing the function cxl_enumerate_rch_ports(). > It registers a CXL host at the CXL root device, creates the host's > port and registers the existing CXL memory device endpoint at it. The > port of the CXL root device is created with the first CXL host being > registered. > > Once enumerated, CXL restricted hosts show up in sysfs with CXL > devices connected as endpoints to it. > > Signed-off-by: Robert Richter <rrichter@amd.com> Hi Robert, A few things inline. Jonathan > --- > drivers/cxl/acpi.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c > index 88bbd2bb61fc..56b2d222afcc 100644 > --- a/drivers/cxl/acpi.c > +++ b/drivers/cxl/acpi.c > @@ -471,13 +471,52 @@ static int cxl_setup_component_reg(struct device *parent, > return 0; > } > > +static int cxl_enumerate_rch_ports(struct device *root_dev, > + struct cxl_port *cxl_root, > + struct pci_host_bridge *host, > + resource_size_t component_reg_phys, > + int port_id) > +{ > + struct cxl_dport *dport; > + struct cxl_port *port; > + struct pci_dev *pdev; > + > + dport = devm_cxl_add_dport(cxl_root, &host->dev, port_id, > + component_reg_phys); > + if (IS_ERR(dport)) > + return PTR_ERR(dport); > + > + port = devm_cxl_add_port(root_dev, &host->dev, > + component_reg_phys, dport); > + if (IS_ERR(port)) > + return PTR_ERR(port); > + > + pdev = pci_get_slot(host->bus, PCI_DEVFN(0, 0)); > + if (!pdev) > + return -ENXIO; > + > + /* Note: The endpoint provides the component reg base. */ I'm not sure what this comment means. Which component reg base? > + dport = devm_cxl_add_dport(port, &pdev->dev, 0, > + CXL_RESOURCE_NONE); Trivial: No need to wrap the above. > + > + pci_dev_put(pdev); > + > + if (IS_ERR(dport)) > + return PTR_ERR(dport); > + > + return 0; > +} > + > static int __init cxl_restricted_host_probe(struct platform_device *pdev) > { > + struct device *root_dev = &pdev->dev; > struct pci_host_bridge *host = NULL; > struct acpi_device *adev; > + struct cxl_port *cxl_root = NULL; > unsigned long long uid = ~0; > resource_size_t rcrb; > resource_size_t component_reg_phys; > + int port_id = 0; > int rc; > > while ((host = cxl_find_next_rch(host)) != NULL) { > @@ -497,11 +536,30 @@ static int __init cxl_restricted_host_probe(struct platform_device *pdev) > > dev_dbg(&host->dev, "RCRB found: 0x%08llx\n", (u64)rcrb); > > + /* > + * For CXL 1.1 hosts we create a root device other > + * than the ACPI0017 device to hold the devm data and > + * the uport ref. > + */ > + if (!cxl_root) { > + cxl_root = devm_cxl_add_port(root_dev, root_dev, > + CXL_RESOURCE_NONE, NULL); > + if (IS_ERR(cxl_root)) { > + rc = PTR_ERR(cxl_root); > + goto fail; > + } > + } > + > component_reg_phys = cxl_get_component_reg_phys(rcrb); > rc = cxl_setup_component_reg(&host->dev, component_reg_phys); > if (rc) > goto fail; > > + rc = cxl_enumerate_rch_ports(root_dev, cxl_root, host, > + component_reg_phys, port_id++); > + if (rc) > + goto fail; > + > dev_info(&host->dev, "host supports CXL\n"); > } >
On 31.08.22 13:16:34, Jonathan Cameron wrote: > On Wed, 31 Aug 2022 10:16:02 +0200 > Robert Richter <rrichter@amd.com> wrote: > > diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c > > index 88bbd2bb61fc..56b2d222afcc 100644 > > --- a/drivers/cxl/acpi.c > > +++ b/drivers/cxl/acpi.c > > @@ -471,13 +471,52 @@ static int cxl_setup_component_reg(struct device *parent, > > return 0; > > } > > > > +static int cxl_enumerate_rch_ports(struct device *root_dev, > > + struct cxl_port *cxl_root, > > + struct pci_host_bridge *host, > > + resource_size_t component_reg_phys, > > + int port_id) > > +{ > > + struct cxl_dport *dport; > > + struct cxl_port *port; > > + struct pci_dev *pdev; > > + > > + dport = devm_cxl_add_dport(cxl_root, &host->dev, port_id, > > + component_reg_phys); > > + if (IS_ERR(dport)) > > + return PTR_ERR(dport); > > + > > + port = devm_cxl_add_port(root_dev, &host->dev, > > + component_reg_phys, dport); > > + if (IS_ERR(port)) > > + return PTR_ERR(port); > > + > > + pdev = pci_get_slot(host->bus, PCI_DEVFN(0, 0)); > > + if (!pdev) > > + return -ENXIO; > > + > > + /* Note: The endpoint provides the component reg base. */ > > I'm not sure what this comment means. Which component reg base? There is no component_reg_phys provided here, so the addr is CXL_RESOURCE_NONE. Will improve the comment. > > > + dport = devm_cxl_add_dport(port, &pdev->dev, 0, > > + CXL_RESOURCE_NONE); > > Trivial: No need to wrap the above. Right. Thanks, -Robert
diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 88bbd2bb61fc..56b2d222afcc 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -471,13 +471,52 @@ static int cxl_setup_component_reg(struct device *parent, return 0; } +static int cxl_enumerate_rch_ports(struct device *root_dev, + struct cxl_port *cxl_root, + struct pci_host_bridge *host, + resource_size_t component_reg_phys, + int port_id) +{ + struct cxl_dport *dport; + struct cxl_port *port; + struct pci_dev *pdev; + + dport = devm_cxl_add_dport(cxl_root, &host->dev, port_id, + component_reg_phys); + if (IS_ERR(dport)) + return PTR_ERR(dport); + + port = devm_cxl_add_port(root_dev, &host->dev, + component_reg_phys, dport); + if (IS_ERR(port)) + return PTR_ERR(port); + + pdev = pci_get_slot(host->bus, PCI_DEVFN(0, 0)); + if (!pdev) + return -ENXIO; + + /* Note: The endpoint provides the component reg base. */ + dport = devm_cxl_add_dport(port, &pdev->dev, 0, + CXL_RESOURCE_NONE); + + pci_dev_put(pdev); + + if (IS_ERR(dport)) + return PTR_ERR(dport); + + return 0; +} + static int __init cxl_restricted_host_probe(struct platform_device *pdev) { + struct device *root_dev = &pdev->dev; struct pci_host_bridge *host = NULL; struct acpi_device *adev; + struct cxl_port *cxl_root = NULL; unsigned long long uid = ~0; resource_size_t rcrb; resource_size_t component_reg_phys; + int port_id = 0; int rc; while ((host = cxl_find_next_rch(host)) != NULL) { @@ -497,11 +536,30 @@ static int __init cxl_restricted_host_probe(struct platform_device *pdev) dev_dbg(&host->dev, "RCRB found: 0x%08llx\n", (u64)rcrb); + /* + * For CXL 1.1 hosts we create a root device other + * than the ACPI0017 device to hold the devm data and + * the uport ref. + */ + if (!cxl_root) { + cxl_root = devm_cxl_add_port(root_dev, root_dev, + CXL_RESOURCE_NONE, NULL); + if (IS_ERR(cxl_root)) { + rc = PTR_ERR(cxl_root); + goto fail; + } + } + component_reg_phys = cxl_get_component_reg_phys(rcrb); rc = cxl_setup_component_reg(&host->dev, component_reg_phys); if (rc) goto fail; + rc = cxl_enumerate_rch_ports(root_dev, cxl_root, host, + component_reg_phys, port_id++); + if (rc) + goto fail; + dev_info(&host->dev, "host supports CXL\n"); }
Do the plumbing of ports to enable RCD/RCH pairs. Do this by enumerating all necessary ports an endpoint needs to connect to. This includes: 1) A CXL root port with dport links to the RCHs. The port links to the CXL root platform device for RCH mode. 2) RCH ports with dport links to its endpoints. Port connects to the pci host bridge device. 3) CXL device endpoint connected to the RCH. The port creation for the endpoint (3) is already implemented and works in RCD mode too. Thus, it is not scope of this patch. Only the endpoints must be registered at the host bridge port. Implement this by introducing the function cxl_enumerate_rch_ports(). It registers a CXL host at the CXL root device, creates the host's port and registers the existing CXL memory device endpoint at it. The port of the CXL root device is created with the first CXL host being registered. Once enumerated, CXL restricted hosts show up in sysfs with CXL devices connected as endpoints to it. Signed-off-by: Robert Richter <rrichter@amd.com> --- drivers/cxl/acpi.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)