Commit 670ff7da authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by David S. Miller
Browse files

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: default avatarSam Shih <sam.shih@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e70a5634

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+9 −4
Original line number Diff line number Diff line
@@ -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),

	},

};

drivers/net/ethernet/mediatek/mtk_eth_soc.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

};