Commit 27cfdadd authored by Ioana Ciornei's avatar Ioana Ciornei Committed by David S. Miller
Browse files

bus: fsl-mc: extend fsl_mc_get_endpoint() to pass interface ID 



In case of a switch DPAA2 object, the interface ID is also needed when
querying for the object endpoint. Extend fsl_mc_get_endpoint() so that
users can also pass the interface ID that are interested in.

Signed-off-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b24ffd8

drivers/bus/fsl-mc/fsl-mc-bus.c

+3 −1
Original line number Diff line number Diff line
@@ -914,7 +914,8 @@ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev) 
}

EXPORT_SYMBOL_GPL(fsl_mc_device_remove);



struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev)

struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,

					  u16 if_id)

{

	struct fsl_mc_device *mc_bus_dev, *endpoint;

	struct fsl_mc_obj_desc endpoint_desc = {{ 0 }};
@@ -925,6 +926,7 @@ struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev) 
	mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);

	strcpy(endpoint1.type, mc_dev->obj_desc.type);

	endpoint1.id = mc_dev->obj_desc.id;

	endpoint1.if_id = if_id;



	err = dprc_get_connection(mc_bus_dev->mc_io, 0,

				  mc_bus_dev->mc_handle,

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+1 −1
Original line number Diff line number Diff line
@@ -4138,7 +4138,7 @@ static int dpaa2_eth_connect_mac(struct dpaa2_eth_priv *priv) 
	int err;



	dpni_dev = to_fsl_mc_device(priv->net_dev->dev.parent);

	dpmac_dev = fsl_mc_get_endpoint(dpni_dev);

	dpmac_dev = fsl_mc_get_endpoint(dpni_dev, 0);



	if (PTR_ERR(dpmac_dev) == -EPROBE_DEFER)

		return PTR_ERR(dpmac_dev);

include/linux/fsl/mc.h

+2 −1
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev); 


void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);



struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev);

struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,

					  u16 if_id);



extern struct bus_type fsl_mc_bus_type;