cxl/port: Fix @host confusion in cxl_dport_setup_regs()

commit 5d2ffbe4b81a ("cxl/port: Store the downstream port's Component Register mappings in struct cxl_dport")

...moved the dport component registers from a raw component_reg_phys
passed in at dport instantiation time to a 'struct cxl_register_map'
populated with both the component register data *and* the "host" device
for mapping operations.

While typical CXL switch dports are mapped by their associated 'struct
cxl_port', an RCH host bridge dport registered by cxl_acpi needs to wait
until the cxl_mem driver makes the attachment to map the registers. This
is because there are no intervening 'struct cxl_port' instances between
the root cxl_port and the endpoint port in an RCH topology.

For now just mark the host as NULL in the RCH dport case until code that
needs to map the dport registers arrives.

This patch is not flagged for -stable since nothing in the current
driver uses the dport->comp_map.

Now, I am slightly uneasy that cxl_setup_comp_regs() sets map->host to a
wrong value and then cxl_dport_setup_regs() fixes it up, but the
alternatives I came up with are more messy. For example, adding an
@logdev to 'struct cxl_register_map' that the dev_printk()s can fall
back to when @host is NULL. I settled on "post-fixup+comment" since it
is only RCH dports that have this special case where register probing is
split between a host-bridge RCRB lookup and when cxl_mem_probe() does
the association of the cxl_memdev and endpoint port.

[moved rename of @comp_map to @reg_map into next patch]

Fixes: 5d2ffbe4b81a ("cxl/port: Store the downstream port's Component Register mappings in struct cxl_dport")
Signed-off-by: Robert Richter <rrichter@amd.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20231018171713.1883517-4-rrichter@amd.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index a1da43f46ef88caf1a60f735bbbd87f6840aa889..03bbf36e6fb0fe0e984eae990209b7e45ac58357 100644 (file)
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -716,13 +716,23 @@ static int cxl_port_setup_regs(struct cxl_port *port,
                                   component_reg_phys);
 }
 
-static int cxl_dport_setup_regs(struct cxl_dport *dport,
+static int cxl_dport_setup_regs(struct device *host, struct cxl_dport *dport,
                                resource_size_t component_reg_phys)
 {
+       int rc;
+
        if (dev_is_platform(dport->dport_dev))
                return 0;
-       return cxl_setup_comp_regs(dport->dport_dev, &dport->comp_map,
-                                  component_reg_phys);
+
+       /*
+        * use @dport->dport_dev for the context for error messages during
+        * register probing, and fixup @host after the fact, since @host may be
+        * NULL.
+        */
+       rc = cxl_setup_comp_regs(dport->dport_dev, &dport->comp_map,
+                                component_reg_phys);
+       dport->comp_map.host = host;
+       return rc;
 }
 
 static struct cxl_port *__devm_cxl_add_port(struct device *host,
@@ -983,7 +993,16 @@ __devm_cxl_add_dport(struct cxl_port *port, struct device *dport_dev,
        if (!dport)
                return ERR_PTR(-ENOMEM);
 
-       if (rcrb != CXL_RESOURCE_NONE) {
+       dport->dport_dev = dport_dev;
+       dport->port_id = port_id;
+       dport->port = port;
+
+       if (rcrb == CXL_RESOURCE_NONE) {
+               rc = cxl_dport_setup_regs(&port->dev, dport,
+                                         component_reg_phys);
+               if (rc)
+                       return ERR_PTR(rc);
+       } else {
                dport->rcrb.base = rcrb;
                component_reg_phys = __rcrb_to_component(dport_dev, &dport->rcrb,
                                                         CXL_RCRB_DOWNSTREAM);
@@ -992,6 +1011,14 @@ __devm_cxl_add_dport(struct cxl_port *port, struct device *dport_dev,
                        return ERR_PTR(-ENXIO);
                }
 
+               /*
+                * RCH @dport is not ready to map until associated with its
+                * memdev
+                */
+               rc = cxl_dport_setup_regs(NULL, dport, component_reg_phys);
+               if (rc)
+                       return ERR_PTR(rc);
+
                dport->rch = true;
        }
 
@@ -999,14 +1026,6 @@ __devm_cxl_add_dport(struct cxl_port *port, struct device *dport_dev,
                dev_dbg(dport_dev, "Component Registers found for dport: %pa\n",
                        &component_reg_phys);
 
-       dport->dport_dev = dport_dev;
-       dport->port_id = port_id;
-       dport->port = port;
-
-       rc = cxl_dport_setup_regs(dport, component_reg_phys);
-       if (rc)
-               return ERR_PTR(rc);
-
        cond_cxl_root_lock(port);
        rc = add_dport(port, dport);
        cond_cxl_root_unlock(port);