net: ethernet: mtk_eth_soc: add rxd_size to mtk_soc_data

Similar to tx counterpart, introduce rxd_size in mtk_soc_data data
structure.
This is a preliminary patch to add mt7986 ethernet support.

Tested-by: Sam Shih <sam.shih@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 1bf5edd9eb44c0e439f13982409ddf750cbef879..7c4e63cc7c2a0242af26ddde5d2a70efe2772c3a 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1740,7 +1740,7 @@ static int mtk_rx_alloc(struct mtk_eth *eth, int ring_no, int rx_flag)
        }
 
        ring->dma = dma_alloc_coherent(eth->dma_dev,
-                                      rx_dma_size * sizeof(*ring->dma),
+                                      rx_dma_size * eth->soc->txrx.rxd_size,
                                       &ring->phys, GFP_KERNEL);
        if (!ring->dma)
                return -ENOMEM;
@@ -1798,9 +1798,8 @@ static void mtk_rx_clean(struct mtk_eth *eth, struct mtk_rx_ring *ring)
 
        if (ring->dma) {
                dma_free_coherent(eth->dma_dev,
-                                 ring->dma_size * sizeof(*ring->dma),
-                                 ring->dma,
-                                 ring->phys);
+                                 ring->dma_size * eth->soc->txrx.rxd_size,
+                                 ring->dma, ring->phys);
                ring->dma = NULL;
        }
 }
@@ -3388,6 +3387,7 @@ static const struct mtk_soc_data mt2701_data = {
        .required_pctl = true,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 
@@ -3399,6 +3399,7 @@ static const struct mtk_soc_data mt7621_data = {
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 
@@ -3411,6 +3412,7 @@ static const struct mtk_soc_data mt7622_data = {
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 
@@ -3422,6 +3424,7 @@ static const struct mtk_soc_data mt7623_data = {
        .offload_version = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 
@@ -3433,6 +3436,7 @@ static const struct mtk_soc_data mt7629_data = {
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 
@@ -3443,6 +3447,7 @@ static const struct mtk_soc_data rt5350_data = {
        .required_pctl = false,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
+               .rxd_size = sizeof(struct mtk_rx_dma),
        },
 };
 

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 7a5ad14b8be63fd8df88e26cd5ea5714a413a287..dcbf4b5c70e053b8c7fa484ce40644d7ee1dc121 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -868,6 +868,7 @@ struct mtk_tx_dma_desc_info {
  * @required_pctl              A bool value to show whether the SoC requires
  *                             the extra setup for those pins used by GMAC.
  * @txd_size                   Tx DMA descriptor size.
+ * @rxd_size                   Rx DMA descriptor size.
  */
 struct mtk_soc_data {
        u32             ana_rgc3;
@@ -878,6 +879,7 @@ struct mtk_soc_data {
        netdev_features_t hw_features;
        struct {
                u32     txd_size;
+               u32     rxd_size;
        } txrx;
 };