Skip to content

Commit 86e7567

Browse files
djbwdavejiang
authored andcommitted
cxl/port: Move decoder setup before dport creation
There are port setup actions that run on first dport arrival, and there are setup actions that run per dport. RAS register setup is a future additional setup action to run per-port (once the first dport arrives), and each dport also has RAS registers to map. Before adding that, flip the order of "first dport" and "per-dport" actions. This makes allocation symmetric with teardown, "first dport" actions unwind after last dport removed. It also allows for using a devres group to collect the unrelated decoder, RAS, and dport setup actions into one group release action. The new cxl_port_open_group() collects "first dport" and "per-dport" into one group that can be released on any failure. This group's lifetime only needs to span the short duration of cxl_port_add_dport() to cleanup all potential damage from failing to add a dport. Contrast that to the "dport" devres group that is called upon to destruct fully formed dport objects. Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Tested-by: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Link: https://patch.msgid.link/20260131000403.2135324-5-dan.j.williams@intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
1 parent afa2bdb commit 86e7567

1 file changed

Lines changed: 21 additions & 12 deletions

File tree

drivers/cxl/core/port.c

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,10 +1651,14 @@ static bool dport_exists(struct cxl_port *port, struct device *dport_dev)
16511651
return false;
16521652
}
16531653

1654-
DEFINE_FREE(del_cxl_dport, struct cxl_dport *, if (!IS_ERR_OR_NULL(_T)) del_dport(_T))
1654+
/* note this implicitly casts the group back to its @port */
1655+
DEFINE_FREE(cxl_port_release_dr_group, struct cxl_port *,
1656+
if (_T) devres_release_group(&_T->dev, _T))
1657+
16551658
static struct cxl_dport *cxl_port_add_dport(struct cxl_port *port,
16561659
struct device *dport_dev)
16571660
{
1661+
struct cxl_dport *dport;
16581662
int rc;
16591663

16601664
device_lock_assert(&port->dev);
@@ -1664,14 +1668,13 @@ static struct cxl_dport *cxl_port_add_dport(struct cxl_port *port,
16641668
if (dport_exists(port, dport_dev))
16651669
return ERR_PTR(-EBUSY);
16661670

1667-
struct cxl_dport *dport __free(del_cxl_dport) =
1668-
devm_cxl_add_dport_by_dev(port, dport_dev);
1669-
if (IS_ERR(dport))
1670-
return dport;
1671-
1672-
cxl_switch_parse_cdat(dport);
1671+
/* Temp group for all "first dport" and "per dport" setup actions */
1672+
void *port_dr_group __free(cxl_port_release_dr_group) =
1673+
devres_open_group(&port->dev, port, GFP_KERNEL);
1674+
if (!port_dr_group)
1675+
return ERR_PTR(-ENOMEM);
16731676

1674-
if (port->nr_dports == 1) {
1677+
if (port->nr_dports == 0) {
16751678
/*
16761679
* Some host bridges are known to not have component regsisters
16771680
* available until a root port has trained CXL. Perform that
@@ -1684,18 +1687,24 @@ static struct cxl_dport *cxl_port_add_dport(struct cxl_port *port,
16841687
rc = devm_cxl_switch_port_decoders_setup(port);
16851688
if (rc)
16861689
return ERR_PTR(rc);
1687-
dev_dbg(&port->dev, "first dport%d:%s added with decoders\n",
1688-
dport->port_id, dev_name(dport_dev));
1689-
return no_free_ptr(dport);
16901690
}
16911691

1692+
dport = devm_cxl_add_dport_by_dev(port, dport_dev);
1693+
if (IS_ERR(dport))
1694+
return dport;
1695+
1696+
/* This group was only needed for early exit above */
1697+
devres_remove_group(&port->dev, no_free_ptr(port_dr_group));
1698+
1699+
cxl_switch_parse_cdat(dport);
1700+
16921701
/* New dport added, update the decoder targets */
16931702
device_for_each_child(&port->dev, dport, update_decoder_targets);
16941703

16951704
dev_dbg(&port->dev, "dport%d:%s added\n", dport->port_id,
16961705
dev_name(dport_dev));
16971706

1698-
return no_free_ptr(dport);
1707+
return dport;
16991708
}
17001709

17011710
static struct cxl_dport *devm_cxl_create_port(struct device *ep_dev,

0 commit comments

Comments
 (0)