Commit 664bf115 authored by Dan Williams's avatar Dan Williams
Browse files

cxl/core/port: Remove @host argument for dport + decoder enumeration 



Now that dport and decoder enumeration is centralized in the port
driver, the @host argument for these helpers can be made implicit. For
the root port the host is the port's uport device (ACPI0017 for
cxl_acpi), and for all other descendant ports the devm context is the
parent of @port.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarBen Widawsky <ben.widawsky@intel.com>
Link: https://lore.kernel.org/r/164375043390.484143.17617734732003230076.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 54cdbf84

drivers/cxl/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int add_host_bridge_dport(struct device *match, void *arg) 
		return 0;

	}



	dport = devm_cxl_add_dport(host, root_port, match, uid, ctx.chbcr);

	dport = devm_cxl_add_dport(root_port, match, uid, ctx.chbcr);

	if (IS_ERR(dport)) {

		dev_err(host, "failed to add downstream port: %s\n",

			dev_name(match));

drivers/cxl/core/hdm.c

+5 −7
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int add_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, 
 * are claimed and passed to the single dport. Disable the range until the first

 * CXL region is enumerated / activated.

 */

int devm_cxl_add_passthrough_decoder(struct device *host, struct cxl_port *port)

int devm_cxl_add_passthrough_decoder(struct cxl_port *port)

{

	struct cxl_decoder *cxld;

	struct cxl_dport *dport;
@@ -93,21 +93,20 @@ static void __iomem *map_hdm_decoder_regs(struct cxl_port *port, 


/**

 * devm_cxl_setup_hdm - map HDM decoder component registers

 * @host: devm context for allocations

 * @port: cxl_port to map

 */

struct cxl_hdm *devm_cxl_setup_hdm(struct device *host, struct cxl_port *port)

struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port)

{

	struct device *dev = &port->dev;

	void __iomem *crb, *hdm;

	struct cxl_hdm *cxlhdm;



	cxlhdm = devm_kzalloc(host, sizeof(*cxlhdm), GFP_KERNEL);

	cxlhdm = devm_kzalloc(dev, sizeof(*cxlhdm), GFP_KERNEL);

	if (!cxlhdm)

		return ERR_PTR(-ENOMEM);



	cxlhdm->port = port;

	crb = devm_cxl_iomap_block(host, port->component_reg_phys,

	crb = devm_cxl_iomap_block(dev, port->component_reg_phys,

				   CXL_COMPONENT_REG_BLOCK_SIZE);

	if (!crb) {

		dev_err(dev, "No component registers mapped\n");
@@ -195,10 +194,9 @@ static void init_hdm_decoder(struct cxl_decoder *cxld, int *target_map, 


/**

 * devm_cxl_enumerate_decoders - add decoder objects per HDM register set

 * @host: devm allocation context

 * @cxlhdm: Structure to populate with HDM capabilities

 */

int devm_cxl_enumerate_decoders(struct device *host, struct cxl_hdm *cxlhdm)

int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm)

{

	void __iomem *hdm = cxlhdm->regs.hdm_decoder;

	struct cxl_port *port = cxlhdm->port;

drivers/cxl/core/pci.c

+2 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


struct cxl_walk_context {

	struct pci_bus *bus;

	struct device *host;

	struct cxl_port *port;

	int type;

	int error;
@@ -47,7 +46,7 @@ static int match_add_dports(struct pci_dev *pdev, void *data) 
		dev_dbg(&port->dev, "failed to find component registers\n");



	port_num = FIELD_GET(PCI_EXP_LNKCAP_PN, lnkcap);

	dport = devm_cxl_add_dport(ctx->host, port, &pdev->dev, port_num,

	dport = devm_cxl_add_dport(port, &pdev->dev, port_num,

				   cxl_regmap_to_base(pdev, &map));

	if (IS_ERR(dport)) {

		ctx->error = PTR_ERR(dport);
@@ -62,13 +61,12 @@ static int match_add_dports(struct pci_dev *pdev, void *data) 


/**

 * devm_cxl_port_enumerate_dports - enumerate downstream ports of the upstream port

 * @host: devm context

 * @port: cxl_port whose ->uport is the upstream of dports to be enumerated

 *

 * Returns a positive number of dports enumerated or a negative error

 * code.

 */

int devm_cxl_port_enumerate_dports(struct device *host, struct cxl_port *port)

int devm_cxl_port_enumerate_dports(struct cxl_port *port)

{

	struct pci_bus *bus = cxl_port_to_pci_bus(port);

	struct cxl_walk_context ctx;
@@ -83,7 +81,6 @@ int devm_cxl_port_enumerate_dports(struct device *host, struct cxl_port *port) 
		type = PCI_EXP_TYPE_DOWNSTREAM;



	ctx = (struct cxl_walk_context) {

		.host = host,

		.port = port,

		.bus = bus,

		.type = type,

drivers/cxl/core/port.c

+7 −2
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ static void cxl_dport_unlink(void *data) 


/**

 * devm_cxl_add_dport - append downstream port data to a cxl_port

 * @host: devm context for allocations

 * @port: the cxl_port that references this dport

 * @dport_dev: firmware or PCI device representing the dport

 * @port_id: identifier for this dport in a decoder's target list
@@ -586,14 +585,20 @@ static void cxl_dport_unlink(void *data) 
 * either the port's host (for root ports), or the port itself (for

 * switch ports)

 */

struct cxl_dport *devm_cxl_add_dport(struct device *host, struct cxl_port *port,

struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port,

				     struct device *dport_dev, int port_id,

				     resource_size_t component_reg_phys)

{

	char link_name[CXL_TARGET_STRLEN];

	struct cxl_dport *dport;

	struct device *host;

	int rc;



	if (is_cxl_root(port))

		host = port->uport;

	else

		host = &port->dev;



	if (!host->driver) {

		dev_WARN_ONCE(&port->dev, 1, "dport:%s bad devm context\n",

			      dev_name(dport_dev));

drivers/cxl/cxl.h

+4 −4
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport, 
				   resource_size_t component_reg_phys,

				   struct cxl_port *parent_port);

struct cxl_port *find_cxl_root(struct device *dev);

struct cxl_dport *devm_cxl_add_dport(struct device *host, struct cxl_port *port,

struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port,

				     struct device *dport, int port_id,

				     resource_size_t component_reg_phys);

struct cxl_decoder *to_cxl_decoder(struct device *dev);
@@ -327,9 +327,9 @@ int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); 
int cxl_decoder_add_locked(struct cxl_decoder *cxld, int *target_map);

int cxl_decoder_autoremove(struct device *host, struct cxl_decoder *cxld);

struct cxl_hdm;

struct cxl_hdm *devm_cxl_setup_hdm(struct device *host, struct cxl_port *port);

int devm_cxl_enumerate_decoders(struct device *host, struct cxl_hdm *cxlhdm);

int devm_cxl_add_passthrough_decoder(struct device *host, struct cxl_port *port);

struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port);

int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm);

int devm_cxl_add_passthrough_decoder(struct cxl_port *port);



extern struct bus_type cxl_bus_type;