Skip to content

Commit 27cfdad

Browse files
IoanaCiorneidavem330
authored andcommitted
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: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 2b24ffd commit 27cfdad

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,8 @@ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev)
914914
}
915915
EXPORT_SYMBOL_GPL(fsl_mc_device_remove);
916916

917-
struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev)
917+
struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,
918+
u16 if_id)
918919
{
919920
struct fsl_mc_device *mc_bus_dev, *endpoint;
920921
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)
925926
mc_bus_dev = to_fsl_mc_device(mc_dev->dev.parent);
926927
strcpy(endpoint1.type, mc_dev->obj_desc.type);
927928
endpoint1.id = mc_dev->obj_desc.id;
929+
endpoint1.if_id = if_id;
928930

929931
err = dprc_get_connection(mc_bus_dev->mc_io, 0,
930932
mc_bus_dev->mc_handle,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4138,7 +4138,7 @@ static int dpaa2_eth_connect_mac(struct dpaa2_eth_priv *priv)
41384138
int err;
41394139

41404140
dpni_dev = to_fsl_mc_device(priv->net_dev->dev.parent);
4141-
dpmac_dev = fsl_mc_get_endpoint(dpni_dev);
4141+
dpmac_dev = fsl_mc_get_endpoint(dpni_dev, 0);
41424142

41434143
if (PTR_ERR(dpmac_dev) == -EPROBE_DEFER)
41444144
return PTR_ERR(dpmac_dev);

include/linux/fsl/mc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ int __must_check fsl_mc_allocate_irqs(struct fsl_mc_device *mc_dev);
423423

424424
void fsl_mc_free_irqs(struct fsl_mc_device *mc_dev);
425425

426-
struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev);
426+
struct fsl_mc_device *fsl_mc_get_endpoint(struct fsl_mc_device *mc_dev,
427+
u16 if_id);
427428

428429
extern struct bus_type fsl_mc_bus_type;
429430

0 commit comments

Comments
 (0)