Robert Marko
0a82d6054c
Add the MTU change support ported from Microchip BSP kernel. It will be sent upstream as well. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
127 lines
4.0 KiB
Diff
127 lines
4.0 KiB
Diff
From b73c8d9fe87d3e35dc09faca85d5a5f9ee8e3f6c Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robert.marko@sartura.hr>
|
|
Date: Tue, 24 Mar 2026 12:30:45 +0100
|
|
Subject: [PATCH 129/130] net: lan969x: add MTU change
|
|
|
|
Add the LAN969x specific code for MTU change.
|
|
|
|
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
|
|
---
|
|
.../microchip/sparx5/lan969x/lan969x.c | 2 +
|
|
.../microchip/sparx5/lan969x/lan969x.h | 1 +
|
|
.../microchip/sparx5/lan969x/lan969x_fdma.c | 60 ++++++++++++++++++-
|
|
3 files changed, 61 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c
|
|
+++ b/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c
|
|
@@ -354,6 +354,8 @@ static const struct sparx5_ops lan969x_o
|
|
.fdma_deinit = &lan969x_fdma_deinit,
|
|
.fdma_poll = &lan969x_fdma_napi_poll,
|
|
.fdma_xmit = &lan969x_fdma_xmit,
|
|
+ .fdma_resize = lan969x_fdma_resize,
|
|
+ .get_mtu = &sparx5_mtu_max,
|
|
};
|
|
|
|
const struct sparx5_match_data lan969x_desc = {
|
|
--- a/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h
|
|
+++ b/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h
|
|
@@ -78,5 +78,6 @@ int lan969x_fdma_deinit(struct sparx5 *s
|
|
int lan969x_fdma_napi_poll(struct napi_struct *napi, int weight);
|
|
int lan969x_fdma_xmit(struct sparx5 *sparx5, u32 *ifh, struct sk_buff *skb,
|
|
struct net_device *dev);
|
|
+int lan969x_fdma_resize(struct sparx5 *sparx5);
|
|
|
|
#endif
|
|
--- a/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
|
|
+++ b/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c
|
|
@@ -154,7 +154,7 @@ static int lan969x_fdma_rx_alloc(struct
|
|
int err;
|
|
|
|
struct page_pool_params pp_params = {
|
|
- .order = 0,
|
|
+ .order = rx->page_order,
|
|
.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV,
|
|
.pool_size = fdma->n_dcbs * fdma->n_dbs,
|
|
.nid = NUMA_NO_NODE,
|
|
@@ -209,12 +209,14 @@ static void lan969x_fdma_rx_init(struct
|
|
{
|
|
struct fdma *fdma = &sparx5->rx.fdma;
|
|
|
|
+ sparx5->rx.page_order =
|
|
+ round_up(sparx5->tx.max_mtu, PAGE_SIZE) / PAGE_SIZE - 1;
|
|
fdma->channel_id = FDMA_XTR_CHANNEL;
|
|
fdma->n_dcbs = FDMA_DCB_MAX;
|
|
fdma->n_dbs = 1;
|
|
fdma->priv = sparx5;
|
|
fdma->size = fdma_get_size(fdma);
|
|
- fdma->db_size = PAGE_SIZE;
|
|
+ fdma->db_size = PAGE_SIZE << sparx5->rx.page_order;
|
|
fdma->ops.dataptr_cb = &lan969x_fdma_rx_dataptr_cb;
|
|
fdma->ops.nextptr_cb = &fdma_nextptr_cb;
|
|
|
|
@@ -359,6 +361,8 @@ int lan969x_fdma_init(struct sparx5 *spa
|
|
struct sparx5_rx *rx = &sparx5->rx;
|
|
int err;
|
|
|
|
+ sparx5->tx.max_mtu = sparx5->data->ops->get_mtu(sparx5);
|
|
+
|
|
lan969x_fdma_rx_init(sparx5);
|
|
lan969x_fdma_tx_init(sparx5);
|
|
sparx5_fdma_injection_mode(sparx5);
|
|
@@ -404,3 +408,55 @@ int lan969x_fdma_deinit(struct sparx5 *s
|
|
|
|
return 0;
|
|
}
|
|
+
|
|
+int lan969x_fdma_resize(struct sparx5 *sparx5)
|
|
+{
|
|
+ struct page_pool *page_pool_old = sparx5->rx.page_pool;
|
|
+ u32 old_mtu = sparx5->tx.max_mtu;
|
|
+ struct fdma tx_fdma_old = {0};
|
|
+ struct fdma rx_fdma_old = {0};
|
|
+ int err;
|
|
+
|
|
+ memcpy(&tx_fdma_old, &sparx5->tx.fdma, sizeof(struct fdma));
|
|
+ memcpy(&rx_fdma_old, &sparx5->rx.fdma, sizeof(struct fdma));
|
|
+
|
|
+ sparx5_fdma_stop(sparx5);
|
|
+ lan969x_fdma_free_pages(&sparx5->rx);
|
|
+
|
|
+ err = lan969x_fdma_init(sparx5);
|
|
+ if (err)
|
|
+ goto restore;
|
|
+
|
|
+ fdma_free_coherent(sparx5->dev, &rx_fdma_old);
|
|
+ fdma_free_coherent(sparx5->dev, &tx_fdma_old);
|
|
+ page_pool_destroy(page_pool_old);
|
|
+
|
|
+ goto start;
|
|
+
|
|
+restore:
|
|
+
|
|
+ /* At this point, the FDMA engine is stopped and the stack is not
|
|
+ * calling us for xmit. Restore the old MTU and rx,tx buffers and
|
|
+ * restart the engine.
|
|
+ */
|
|
+
|
|
+ sparx5->tx.max_mtu = old_mtu;
|
|
+ sparx5->rx.page_pool = page_pool_old;
|
|
+ memcpy(&sparx5->tx.fdma, &tx_fdma_old, sizeof(struct fdma));
|
|
+ memcpy(&sparx5->rx.fdma, &rx_fdma_old, sizeof(struct fdma));
|
|
+
|
|
+ /* Old buffers have to be re-initialized. */
|
|
+
|
|
+ fdma_dcbs_init(&sparx5->rx.fdma,
|
|
+ FDMA_DCB_INFO_DATAL(sparx5->rx.fdma.db_size),
|
|
+ FDMA_DCB_STATUS_INTR);
|
|
+
|
|
+ fdma_dcbs_init(&sparx5->tx.fdma,
|
|
+ FDMA_DCB_INFO_DATAL(sparx5->tx.fdma.db_size),
|
|
+ FDMA_DCB_STATUS_DONE);
|
|
+
|
|
+start:
|
|
+ sparx5_fdma_start(sparx5);
|
|
+
|
|
+ return err;
|
|
+}
|