Commit cded2e0f authored by Daniel Machon's avatar Daniel Machon Committed by Jakub Kicinski
Browse files

net: sparx5: activate FDMA tx in start() 



The function sparx5_fdma_tx_activate() is responsible for configuring
the TX FDMA instance and activating the channel. TX activation has
previously been done in the xmit() function, when the first frame is
transmitted. Now that we have separate functions for starting and
stopping the FDMA, it seems reasonable to move the TX activation to the
start function. This change has no implications on the functionality.

Reviewed-by: default avatarSteen Hegelund <Steen.Hegelund@microchip.com>
Signed-off-by: default avatarDaniel Machon <daniel.machon@microchip.com>
Link: https://patch.msgid.link/20250113-sparx5-lan969x-switch-driver-5-v2-3-c468f02fd623@microchip.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b91dcb23

drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c

+4 −7
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ int sparx5_fdma_xmit(struct sparx5 *sparx5, u32 *ifh, struct sk_buff *skb) 
{

	struct sparx5_tx *tx = &sparx5->tx;

	struct fdma *fdma = &tx->fdma;

	static bool first_time = true;

	void *virt_addr;



	fdma_dcb_advance(fdma);
@@ -238,12 +237,8 @@ int sparx5_fdma_xmit(struct sparx5 *sparx5, u32 *ifh, struct sk_buff *skb) 
		     FDMA_DCB_STATUS_BLOCKO(0) |

		     FDMA_DCB_STATUS_BLOCKL(skb->len + IFH_LEN * 4 + 4));



	if (first_time) {

		sparx5_fdma_tx_activate(sparx5, tx);

		first_time = false;

	} else {

	sparx5_fdma_reload(sparx5, fdma);

	}



	return NETDEV_TX_OK;

}
@@ -456,6 +451,7 @@ static u32 sparx5_fdma_port_ctrl(struct sparx5 *sparx5) 
int sparx5_fdma_start(struct sparx5 *sparx5)

{

	struct sparx5_rx *rx = &sparx5->rx;

	struct sparx5_tx *tx = &sparx5->tx;



	netif_napi_add_weight(rx->ndev,

			      &rx->napi,
@@ -465,6 +461,7 @@ int sparx5_fdma_start(struct sparx5 *sparx5) 
	napi_enable(&rx->napi);



	sparx5_fdma_rx_activate(sparx5, rx);

	sparx5_fdma_tx_activate(sparx5, tx);



	return 0;

}