79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
From 5ea0e1312bcfebc06b5f91d1bb82b823d6395125 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 19 Jul 2023 12:29:49 +0200
|
|
Subject: [PATCH 095/250] net: ethernet: mtk_ppe: add MTK_FOE_ENTRY_V{1,2}_SIZE
|
|
macros
|
|
|
|
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>
|
|
Reviewed-by: Simon Horman <simon.horman@corigine.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 10 +++++-----
|
|
drivers/net/ethernet/mediatek/mtk_ppe.h | 3 +++
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -4764,7 +4764,7 @@ static const struct mtk_soc_data mt7621_
|
|
.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),
|
|
@@ -4785,7 +4785,7 @@ static const struct mtk_soc_data mt7622_
|
|
.offload_version = 2,
|
|
.hash_offset = 2,
|
|
.has_accounting = true,
|
|
- .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),
|
|
@@ -4804,7 +4804,7 @@ static const struct mtk_soc_data mt7623_
|
|
.required_pctl = true,
|
|
.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),
|
|
@@ -4842,8 +4842,8 @@ static const struct mtk_soc_data mt7981_
|
|
.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),
|
|
@@ -4863,8 +4863,8 @@ static const struct mtk_soc_data mt7986_
|
|
.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),
|
|
--- 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
|
|
+
|
|
struct mtk_foe_entry {
|
|
u32 ib1;
|
|
|