net: ethernet: mtk_eth_soc: move ppe table hash offset to mtk_soc_data structure

This is a preliminary patch to introduce mt7986 hw packet engine.

Tested-by: Daniel Golle <daniel@makrotopia.org>
Co-developed-by: Bo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: Bo Jiao <Bo.Jiao@mediatek.com>
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index b2b92fe2a96a3cb82b9a67f34cc8064762b49edc..d09717d4f3bebd5b37d8b060b42bff6269c7adf4 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -4201,6 +4201,7 @@ static const struct mtk_soc_data mt7621_data = {
        .required_clks = MT7621_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
+       .hash_offset = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
@@ -4219,6 +4220,7 @@ static const struct mtk_soc_data mt7622_data = {
        .required_clks = MT7622_CLKS_BITMAP,
        .required_pctl = false,
        .offload_version = 2,
+       .hash_offset = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
@@ -4236,6 +4238,7 @@ static const struct mtk_soc_data mt7623_data = {
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,
        .offload_version = 2,
+       .hash_offset = 2,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
@@ -4269,6 +4272,7 @@ static const struct mtk_soc_data mt7986_data = {
        .caps = MT7986_CAPS,
        .required_clks = MT7986_CLKS_BITMAP,
        .required_pctl = false,
+       .hash_offset = 4,
        .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_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 2617cbecdfcabb1d5d25b16e5b56deb753b4bf66..6c5e144cb9f0ca3e25ed2d48036e64858b5ec246 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -969,6 +969,7 @@ struct mtk_reg_map {
  *                             the target SoC
  * @required_pctl              A bool value to show whether the SoC requires
  *                             the extra setup for those pins used by GMAC.
+ * @hash_offset                        Flow table hash offset.
  * @txd_size                   Tx DMA descriptor size.
  * @rxd_size                   Rx DMA descriptor size.
  * @rx_irq_done_mask           Rx irq done register mask.
@@ -983,6 +984,7 @@ struct mtk_soc_data {
        u32             required_clks;
        bool            required_pctl;
        u8              offload_version;
+       u8              hash_offset;
        netdev_features_t hw_features;
        struct {
                u32     txd_size;

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c
index cfe804bc8d2055ab8c1eeeff16b5c1b4f7fc2368..1cc7d8338722293b349c7e318010ec7ce9a8565a 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@ -88,7 +88,7 @@ static void mtk_ppe_cache_enable(struct mtk_ppe *ppe, bool enable)
                enable * MTK_PPE_CACHE_CTL_EN);
 }
 
-static u32 mtk_ppe_hash_entry(struct mtk_foe_entry *e)
+static u32 mtk_ppe_hash_entry(struct mtk_eth *eth, struct mtk_foe_entry *e)
 {
        u32 hv1, hv2, hv3;
        u32 hash;
@@ -122,7 +122,7 @@ static u32 mtk_ppe_hash_entry(struct mtk_foe_entry *e)
        hash = (hash >> 24) | ((hash & 0xffffff) << 8);
        hash ^= hv1 ^ hv2 ^ hv3;
        hash ^= hash >> 16;
-       hash <<= 1;
+       hash <<= (ffs(eth->soc->hash_offset) - 1);
        hash &= MTK_PPE_ENTRIES - 1;
 
        return hash;
@@ -540,15 +540,16 @@ mtk_foe_entry_commit_l2(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
 int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
 {
        int type = FIELD_GET(MTK_FOE_IB1_PACKET_TYPE, entry->data.ib1);
+       const struct mtk_soc_data *soc = ppe->eth->soc;
        u32 hash;
 
        if (type == MTK_PPE_PKT_TYPE_BRIDGE)
                return mtk_foe_entry_commit_l2(ppe, entry);
 
-       hash = mtk_ppe_hash_entry(&entry->data);
+       hash = mtk_ppe_hash_entry(ppe->eth, &entry->data);
        entry->hash = 0xffff;
        spin_lock_bh(&ppe_lock);
-       hlist_add_head(&entry->list, &ppe->foe_flow[hash / 2]);
+       hlist_add_head(&entry->list, &ppe->foe_flow[hash / soc->hash_offset]);
        spin_unlock_bh(&ppe_lock);
 
        return 0;
@@ -558,6 +559,7 @@ static void
 mtk_foe_entry_commit_subflow(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
                             u16 hash)
 {
+       const struct mtk_soc_data *soc = ppe->eth->soc;
        struct mtk_flow_entry *flow_info;
        struct mtk_foe_entry foe, *hwe;
        struct mtk_foe_mac_info *l2;
@@ -572,7 +574,8 @@ mtk_foe_entry_commit_subflow(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
        flow_info->l2_data.base_flow = entry;
        flow_info->type = MTK_FLOW_TYPE_L2_SUBFLOW;
        flow_info->hash = hash;
-       hlist_add_head(&flow_info->list, &ppe->foe_flow[hash / 2]);
+       hlist_add_head(&flow_info->list,
+                      &ppe->foe_flow[hash / soc->hash_offset]);
        hlist_add_head(&flow_info->l2_data.list, &entry->l2_flows);
 
        hwe = &ppe->foe_table[hash];
@@ -596,7 +599,8 @@ mtk_foe_entry_commit_subflow(struct mtk_ppe *ppe, struct mtk_flow_entry *entry,
 
 void __mtk_ppe_check_skb(struct mtk_ppe *ppe, struct sk_buff *skb, u16 hash)
 {
-       struct hlist_head *head = &ppe->foe_flow[hash / 2];
+       const struct mtk_soc_data *soc = ppe->eth->soc;
+       struct hlist_head *head = &ppe->foe_flow[hash / soc->hash_offset];
        struct mtk_foe_entry *hwe = &ppe->foe_table[hash];
        struct mtk_flow_entry *entry;
        struct mtk_foe_bridge key = {};
@@ -680,9 +684,11 @@ int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry)
 struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base,
                 int version)
 {
+       const struct mtk_soc_data *soc = eth->soc;
        struct device *dev = eth->dev;
        struct mtk_foe_entry *foe;
        struct mtk_ppe *ppe;
+       u32 foe_flow_size;
 
        ppe = devm_kzalloc(dev, sizeof(*ppe), GFP_KERNEL);
        if (!ppe)
@@ -705,6 +711,12 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base,
 
        ppe->foe_table = foe;
 
+       foe_flow_size = (MTK_PPE_ENTRIES / soc->hash_offset) *
+                       sizeof(*ppe->foe_flow);
+       ppe->foe_flow = devm_kzalloc(dev, foe_flow_size, GFP_KERNEL);
+       if (!ppe->foe_flow)
+               return NULL;
+
        mtk_ppe_debugfs_init(ppe);
 
        return ppe;

diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h
index bb079e3c04175fd1a28687ebe4615fe9aaeefac8..22efed6599c2be90b421cba6a7de869051d07c0f 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
@@ -270,7 +270,7 @@ struct mtk_ppe {
        dma_addr_t foe_phys;
 
        u16 foe_check_time[MTK_PPE_ENTRIES];
-       struct hlist_head foe_flow[MTK_PPE_ENTRIES / 2];
+       struct hlist_head *foe_flow;
 
        struct rhashtable l2_flows;