From: Nagadheeraj Rottela The endpoint MAC is the DSA conduit for the three-port TSN switch. DSA selects an RX frame's user port from the port metadata on the skb, so a frame from either MAC needs that metadata to reach its swpN netdev. Allocate a METADATA_HW_PORT_MUX entry per MAC port at probe and attach it to each RX frame by its TUSER port_id (1 for MAC1, 2 for MAC2), guarded by netdev_uses_dsa() so it runs only while a switch is bound as the conduit. The RX callback runs in softirq and hands the frame to __netif_rx(), which queues it on the backlog, so the attached dst must be a counted reference (dst_hold() + skb_dst_set()) to survive the handoff. Signed-off-by: Nagadheeraj Rottela Co-developed-by: Srinivas Neeli Signed-off-by: Srinivas Neeli --- drivers/net/ethernet/xilinx/tsn/xilinx_tsn_ep.c | 55 ++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/tsn/xilinx_tsn_ep.c b/drivers/net/ethernet/xilinx/tsn/xilinx_tsn_ep.c index bd8cd504cefb..5103a3b4b018 100644 --- a/drivers/net/ethernet/xilinx/tsn/xilinx_tsn_ep.c +++ b/drivers/net/ethernet/xilinx/tsn/xilinx_tsn_ep.c @@ -28,6 +28,8 @@ #include #include +#include +#include #include #include "xilinx_tsn.h" @@ -57,6 +59,9 @@ #define TSN_TUSER_PORT_MAC1 0x1 #define TSN_TUSER_PORT_MAC2 0x2 +/* Sized to index port_md[] by TUSER port_id (1 or 2, slot 0 unused) */ +#define XLNX_TSN_EP_PORT_MD_SLOTS (TSN_TUSER_PORT_MAC2 + 1) + /** * struct skbuf_dma_descriptor - skb container for each in-flight DMA descriptor * @sgl: scatter-gather list backing the DMA mapping @@ -115,6 +120,8 @@ struct xlnx_tsn_ep_dma_chan { * @tx_chans: array of TX channels (size @num_tx_queues) * @rx_chans: array of RX channels (size @num_rx_queues) * @closing: set in ndo_stop so the RX completion callback stops re-arming + * @port_md: per-TUSER-port METADATA_HW_PORT_MUX entries attached on RX, + * indexed by port_id (1 for MAC1, 2 for MAC2) */ struct xlnx_tsn_ep { struct net_device *ndev; @@ -131,6 +138,8 @@ struct xlnx_tsn_ep { struct xlnx_tsn_ep_dma_chan **rx_chans; bool closing; + + struct metadata_dst *port_md[XLNX_TSN_EP_PORT_MD_SLOTS]; }; static inline struct skbuf_dma_descriptor * @@ -302,6 +311,10 @@ static void ep_dma_rx_cb(void *data, const struct dmaengine_result *result) } skb_put(skb, rx_len); + if (netdev_uses_dsa(ndev)) { + dst_hold(&ep->port_md[port_id]->dst); + skb_dst_set(skb, &ep->port_md[port_id]->dst); + } skb->dev = ndev; skb->protocol = eth_type_trans(skb, ndev); skb->ip_summed = CHECKSUM_NONE; @@ -900,6 +913,37 @@ static int ep_count_dma_channels(struct device *dev, u32 *out_tx, u32 *out_rx, return 0; } +static void ep_free_port_md(struct xlnx_tsn_ep *ep) +{ + int i; + + for (i = 0; i < XLNX_TSN_EP_PORT_MD_SLOTS; i++) { + if (ep->port_md[i]) { + dst_release(&ep->port_md[i]->dst); + ep->port_md[i] = NULL; + } + } +} + +static int ep_alloc_port_md(struct xlnx_tsn_ep *ep) +{ + int i; + + for (i = TSN_TUSER_PORT_MAC1; i <= TSN_TUSER_PORT_MAC2; i++) { + struct metadata_dst *md; + + md = metadata_dst_alloc(0, METADATA_HW_PORT_MUX, GFP_KERNEL); + if (!md) { + ep_free_port_md(ep); + return -ENOMEM; + } + md->u.port_info.port_id = i; + ep->port_md[i] = md; + } + + return 0; +} + static int xlnx_tsn_ep_probe(struct platform_device *pdev) { u32 num_tx_dma_channels, num_rx_dma_channels, num_prio; @@ -985,16 +1029,24 @@ static int xlnx_tsn_ep_probe(struct platform_device *pdev) ndev->dev_addr); } + ret = ep_alloc_port_md(ep); + if (ret) { + dev_err_probe(dev, ret, "failed to allocate per-port metadata\n"); + goto err_release_chans; + } + platform_set_drvdata(pdev, ep); ret = register_netdev(ndev); if (ret) { dev_err_probe(dev, ret, "failed to register net device\n"); - goto err_release_chans; + goto err_free_md; } return 0; +err_free_md: + ep_free_port_md(ep); err_release_chans: ep_release_dma_chans(ep); err_free_ndev: @@ -1010,6 +1062,7 @@ static void xlnx_tsn_ep_remove(struct platform_device *pdev) return; unregister_netdev(ep->ndev); + ep_free_port_md(ep); ep_release_dma_chans(ep); free_netdev(ep->ndev); } -- 2.44.4