Commit 8330671c authored by Dave Jiang's avatar Dave Jiang
Browse files

cxl: Add helper to delete dport 



Refactor the code in reap_dports() out to provide a helper function that
reaps a single dport. This will be used later in the cleanup path for
allocating a dport. Renaming to del_port() and del_dports() to mirror
devm_cxl_add_dport().

[dj] Fixed up subject per Robert

Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Reviewed-by: default avatarLi Ming <ming.li@zohomail.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarRobert Richter <rrichter@amd.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 4fde8953

drivers/cxl/core/port.c

+14 −8
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ EXPORT_SYMBOL_NS_GPL(cxl_endpoint_autoremove, "CXL"); 
 * through ->remove(). This "bottom-up" removal selectively removes individual

 * child ports manually. This depends on devm_cxl_add_port() to not change is

 * devm action registration order, and for dports to have already been

 * destroyed by reap_dports().

 * destroyed by del_dports().

 */

static void delete_switch_port(struct cxl_port *port)

{
@@ -1441,18 +1441,24 @@ static void delete_switch_port(struct cxl_port *port) 
	devm_release_action(port->dev.parent, unregister_port, port);

}



static void reap_dports(struct cxl_port *port)

static void del_dport(struct cxl_dport *dport)

{

	struct cxl_dport *dport;

	unsigned long index;



	device_lock_assert(&port->dev);

	struct cxl_port *port = dport->port;



	xa_for_each(&port->dports, index, dport) {

	devm_release_action(&port->dev, cxl_dport_unlink, dport);

	devm_release_action(&port->dev, cxl_dport_remove, dport);

	devm_kfree(&port->dev, dport);

}



static void del_dports(struct cxl_port *port)

{

	struct cxl_dport *dport;

	unsigned long index;



	device_lock_assert(&port->dev);



	xa_for_each(&port->dports, index, dport)

		del_dport(dport);

}



struct detach_ctx {
@@ -1510,7 +1516,7 @@ static void cxl_detach_ep(void *data) 
			 */

			died = true;

			port->dead = true;

			reap_dports(port);

			del_dports(port);

		}

		device_unlock(&port->dev);