Re: [PATCH net-next] net: ethernet: mtk_ppe: add MTK_FOE_ENTRY_V{1,2}_SIZE macros

[Simon Horman <simon.horman@corigine.com>]

On Wed, Jul 19, 2023 at 12:29:49PM +0200, Lorenzo Bianconi wrote:
> Introduce MTK_FOE_ENTRY_V{1,2}_SIZE macros in order to make more
> explicit foe_entry size for different chipset revisions.
> 
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
>  drivers/net/ethernet/mediatek/mtk_eth_soc.c | 10 +++++-----
>  drivers/net/ethernet/mediatek/mtk_ppe.h     |  3 +++
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> index 834c644b67db..7f9e23ddb3c4 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -4811,7 +4811,7 @@ static const struct mtk_soc_data mt7621_data = {
>  	.required_pctl = false,
>  	.offload_version = 1,
>  	.hash_offset = 2,
> -	.foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
> +	.foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
>  	.txrx = {
>  		.txd_size = sizeof(struct mtk_tx_dma),
>  		.rxd_size = sizeof(struct mtk_rx_dma),

...

> @@ -4889,8 +4889,8 @@ static const struct mtk_soc_data mt7981_data = {
>  	.required_pctl = false,
>  	.offload_version = 2,
>  	.hash_offset = 4,
> -	.foe_entry_size = sizeof(struct mtk_foe_entry),
>  	.has_accounting = true,
> +	.foe_entry_size = MTK_FOE_ENTRY_V2_SIZE,
>  	.txrx = {
>  		.txd_size = sizeof(struct mtk_tx_dma_v2),
>  		.rxd_size = sizeof(struct mtk_rx_dma_v2),

...

> diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h
> index e51de31a52ec..fb6bf58172d9 100644
> --- a/drivers/net/ethernet/mediatek/mtk_ppe.h
> +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
> @@ -216,6 +216,9 @@ struct mtk_foe_ipv6_6rd {
>  	struct mtk_foe_mac_info l2;
>  };
>  
> +#define MTK_FOE_ENTRY_V1_SIZE	80
> +#define MTK_FOE_ENTRY_V2_SIZE	96

Hi Lorenzo,

Would it make sense to define these in terms of sizeof(struct mtk_foe_entry) ?

...