| Message ID | 20240210115420.27003-1-eladwf@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,v2] net: ethernet: mtk_eth_soc: ppe: add support for multiple PPEs | expand |
Hi Elad, Given that this is what we want to do (assign each PPE to one of the Ethernet MACs) the patch looks good in general, some minor details in-line below. On Sat, Feb 10, 2024 at 01:53:28PM +0200, Elad Yifee wrote: > Add the missing pieces to allow multiple PPEs units, one for each GMAC. > mtk_gdm_config has been modified to work on targted mac ID, > the inner loop moved outside of the function to allow unrelated > operations like setting the MAC's PPE index. > > Signed-off-by: Elad Yifee <eladwf@gmail.com> > --- > v2: fixed CI warnings > --- > drivers/net/ethernet/mediatek/mtk_eth_soc.c | 86 +++++++++++-------- > drivers/net/ethernet/mediatek/mtk_eth_soc.h | 15 +++- > .../net/ethernet/mediatek/mtk_ppe_offload.c | 6 +- > 3 files changed, 68 insertions(+), 39 deletions(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > index a6e91573f8da..5a50c22179af 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c > @@ -2175,9 +2175,11 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, > skb_dst_set_noref(skb, ð->dsa_meta[port]->dst); > } > > - if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) > - mtk_ppe_check_skb(eth->ppe[0], skb, hash); > + if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) { > + unsigned int ppe_index = eth->mac[mac]->ppe_idx; Variable declarations should only be at the top of the function. > > + mtk_ppe_check_skb(eth->ppe[ppe_index], skb, hash); > + } > skb_record_rx_queue(skb, 0); > napi_gro_receive(napi, skb); > > @@ -3267,37 +3269,27 @@ static int mtk_start_dma(struct mtk_eth *eth) > return 0; > } > > -static void mtk_gdm_config(struct mtk_eth *eth, u32 config) > +static void mtk_gdm_config(struct mtk_eth *eth, u32 id, u32 config) > { > - int i; > + u32 val; > > if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) > return; > > - for (i = 0; i < MTK_MAX_DEVS; i++) { > - u32 val; > - > - if (!eth->netdev[i]) > - continue; > - > - val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i)); > + val = mtk_r32(eth, MTK_GDMA_FWD_CFG(id)); > > - /* default setup the forward port to send frame to PDMA */ > - val &= ~0xffff; > + /* default setup the forward port to send frame to PDMA */ > + val &= ~0xffff; > > - /* Enable RX checksum */ > - val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN; > + /* Enable RX checksum */ > + val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN; > > - val |= config; > + val |= config; > > - if (netdev_uses_dsa(eth->netdev[i])) > - val |= MTK_GDMA_SPECIAL_TAG; > + if (eth->netdev[id] && netdev_uses_dsa(eth->netdev[id])) > + val |= MTK_GDMA_SPECIAL_TAG; > > - mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i)); > - } > - /* Reset and enable PSE */ > - mtk_w32(eth, RST_GL_PSE, MTK_RST_GL); > - mtk_w32(eth, 0, MTK_RST_GL); > + mtk_w32(eth, val, MTK_GDMA_FWD_CFG(id)); > } > > > @@ -3369,6 +3361,7 @@ static int mtk_open(struct net_device *dev) > /* we run 2 netdevs on the same dma ring so we only bring it up once */ > if (!refcount_read(ð->dma_refcnt)) { > const struct mtk_soc_data *soc = eth->soc; > + const u32 ppe_num = mtk_get_ppe_num(eth); > u32 gdm_config; > int i; > > @@ -3381,18 +3374,39 @@ static int mtk_open(struct net_device *dev) > for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) > mtk_ppe_start(eth->ppe[i]); > > - gdm_config = soc->offload_version ? soc->reg_map->gdma_to_ppe > - : MTK_GDMA_TO_PDMA; > - mtk_gdm_config(eth, gdm_config); > + for (i = 0; i < MTK_MAX_DEVS; i++) { > + if (!eth->netdev[i]) > + break; > + struct mtk_mac *target_mac; > + > + target_mac = netdev_priv(eth->netdev[i]); > + if (!soc->offload_version) { > + target_mac->ppe_idx = 0; > + gdm_config = MTK_GDMA_TO_PDMA; > + } else if (ppe_num >= 3 && target_mac->id == 2) { > + target_mac->ppe_idx = 2; > + gdm_config = MTK_GDMA_TO_PPE2; > + } else if (ppe_num >= 2 && target_mac->id == 1) { > + target_mac->ppe_idx = 1; > + gdm_config = MTK_GDMA_TO_PPE1; > + } else { > + target_mac->ppe_idx = 0; > + gdm_config = soc->reg_map->gdma_to_ppe; > + } > + mtk_gdm_config(eth, target_mac->id, gdm_config); > + } > + /* Reset and enable PSE */ > + mtk_w32(eth, RST_GL_PSE, MTK_RST_GL); > + mtk_w32(eth, 0, MTK_RST_GL); > > napi_enable(ð->tx_napi); > napi_enable(ð->rx_napi); > mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); > mtk_rx_irq_enable(eth, soc->txrx.rx_irq_done_mask); > refcount_set(ð->dma_refcnt, 1); > - } > - else > + } else { > refcount_inc(ð->dma_refcnt); > + } > > phylink_start(mac->phylink); > netif_tx_start_all_queues(dev); > @@ -3469,7 +3483,8 @@ static int mtk_stop(struct net_device *dev) > if (!refcount_dec_and_test(ð->dma_refcnt)) > return 0; > > - mtk_gdm_config(eth, MTK_GDMA_DROP_ALL); > + for (i = 0; i < MTK_MAX_DEVS; i++) > + mtk_gdm_config(eth, i, MTK_GDMA_DROP_ALL); > > mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); > mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask); > @@ -4945,23 +4960,24 @@ static int mtk_probe(struct platform_device *pdev) > } > > if (eth->soc->offload_version) { > - u32 num_ppe = mtk_is_netsys_v2_or_greater(eth) ? 2 : 1; > + u32 num_ppe = mtk_get_ppe_num(eth); > > num_ppe = min_t(u32, ARRAY_SIZE(eth->ppe), num_ppe); > for (i = 0; i < num_ppe; i++) { > - u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400; > + u32 ppe_addr = eth->soc->reg_map->ppe_base; > > + ppe_addr += (i == 2 ? 0xC00 : i * 0x400); Hex numbers in all small letter please. > eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, i); > > if (!eth->ppe[i]) { > err = -ENOMEM; > goto err_deinit_ppe; > } > - } > + err = mtk_eth_offload_init(eth, i); > > - err = mtk_eth_offload_init(eth); > - if (err) > - goto err_deinit_ppe; > + if (err) > + goto err_deinit_ppe; > + } > } > > for (i = 0; i < MTK_MAX_DEVS; i++) { > diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > index 9ae3b8a71d0e..7654fa74e7fc 100644 > --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h > +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h > @@ -124,6 +124,8 @@ > #define MTK_GDMA_UCS_EN BIT(20) > #define MTK_GDMA_STRP_CRC BIT(16) > #define MTK_GDMA_TO_PDMA 0x0 > +#define MTK_GDMA_TO_PPE1 0x4444 > +#define MTK_GDMA_TO_PPE2 0xcccc > #define MTK_GDMA_DROP_ALL 0x7777 > > /* GDM Egress Control Register */ > @@ -1286,7 +1288,7 @@ struct mtk_eth { > > struct metadata_dst *dsa_meta[MTK_MAX_DSA_PORTS]; > > - struct mtk_ppe *ppe[2]; > + struct mtk_ppe *ppe[3]; > struct rhashtable flow_table; > > struct bpf_prog __rcu *prog; > @@ -1311,6 +1313,7 @@ struct mtk_eth { > struct mtk_mac { > int id; > phy_interface_t interface; > + unsigned int ppe_idx; u8 would be large enough. > int speed; > struct device_node *of_node; > struct phylink *phylink; > @@ -1421,6 +1424,14 @@ static inline u32 mtk_get_ib2_multicast_mask(struct mtk_eth *eth) > return MTK_FOE_IB2_MULTICAST; > } > > +static inline u32 mtk_get_ppe_num(struct mtk_eth *eth) > +{ > + if (!eth->soc->offload_version) > + return 0; > + > + return eth->soc->version; > +} > + > /* read the hardware status register */ > void mtk_stats_update_mac(struct mtk_mac *mac); > > @@ -1432,7 +1443,7 @@ int mtk_gmac_sgmii_path_setup(struct mtk_eth *eth, int mac_id); > int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id); > int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id); > > -int mtk_eth_offload_init(struct mtk_eth *eth); > +int mtk_eth_offload_init(struct mtk_eth *eth, int id); > int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, > void *type_data); > int mtk_flow_offload_cmd(struct mtk_eth *eth, struct flow_cls_offload *cls, > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > index fbb5e9d5af13..220685f6daaa 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c > @@ -570,7 +570,7 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_pri > if (type != TC_SETUP_CLSFLOWER) > return -EOPNOTSUPP; > > - return mtk_flow_offload_cmd(eth, cls, 0); > + return mtk_flow_offload_cmd(eth, cls, mac->ppe_idx); > } > > static int > @@ -633,7 +633,9 @@ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, > } > } > > -int mtk_eth_offload_init(struct mtk_eth *eth) > +int mtk_eth_offload_init(struct mtk_eth *eth, int id) > { > + if (!eth->ppe[id] || !eth->ppe[id]->foe_table) > + return 0; > return rhashtable_init(ð->flow_table, &mtk_flow_ht_params); > } > -- > 2.43.0 > >
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index a6e91573f8da..5a50c22179af 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2175,9 +2175,11 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, skb_dst_set_noref(skb, ð->dsa_meta[port]->dst); } - if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) - mtk_ppe_check_skb(eth->ppe[0], skb, hash); + if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) { + unsigned int ppe_index = eth->mac[mac]->ppe_idx; + mtk_ppe_check_skb(eth->ppe[ppe_index], skb, hash); + } skb_record_rx_queue(skb, 0); napi_gro_receive(napi, skb); @@ -3267,37 +3269,27 @@ static int mtk_start_dma(struct mtk_eth *eth) return 0; } -static void mtk_gdm_config(struct mtk_eth *eth, u32 config) +static void mtk_gdm_config(struct mtk_eth *eth, u32 id, u32 config) { - int i; + u32 val; if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) return; - for (i = 0; i < MTK_MAX_DEVS; i++) { - u32 val; - - if (!eth->netdev[i]) - continue; - - val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i)); + val = mtk_r32(eth, MTK_GDMA_FWD_CFG(id)); - /* default setup the forward port to send frame to PDMA */ - val &= ~0xffff; + /* default setup the forward port to send frame to PDMA */ + val &= ~0xffff; - /* Enable RX checksum */ - val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN; + /* Enable RX checksum */ + val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN; - val |= config; + val |= config; - if (netdev_uses_dsa(eth->netdev[i])) - val |= MTK_GDMA_SPECIAL_TAG; + if (eth->netdev[id] && netdev_uses_dsa(eth->netdev[id])) + val |= MTK_GDMA_SPECIAL_TAG; - mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i)); - } - /* Reset and enable PSE */ - mtk_w32(eth, RST_GL_PSE, MTK_RST_GL); - mtk_w32(eth, 0, MTK_RST_GL); + mtk_w32(eth, val, MTK_GDMA_FWD_CFG(id)); } @@ -3369,6 +3361,7 @@ static int mtk_open(struct net_device *dev) /* we run 2 netdevs on the same dma ring so we only bring it up once */ if (!refcount_read(ð->dma_refcnt)) { const struct mtk_soc_data *soc = eth->soc; + const u32 ppe_num = mtk_get_ppe_num(eth); u32 gdm_config; int i; @@ -3381,18 +3374,39 @@ static int mtk_open(struct net_device *dev) for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) mtk_ppe_start(eth->ppe[i]); - gdm_config = soc->offload_version ? soc->reg_map->gdma_to_ppe - : MTK_GDMA_TO_PDMA; - mtk_gdm_config(eth, gdm_config); + for (i = 0; i < MTK_MAX_DEVS; i++) { + if (!eth->netdev[i]) + break; + struct mtk_mac *target_mac; + + target_mac = netdev_priv(eth->netdev[i]); + if (!soc->offload_version) { + target_mac->ppe_idx = 0; + gdm_config = MTK_GDMA_TO_PDMA; + } else if (ppe_num >= 3 && target_mac->id == 2) { + target_mac->ppe_idx = 2; + gdm_config = MTK_GDMA_TO_PPE2; + } else if (ppe_num >= 2 && target_mac->id == 1) { + target_mac->ppe_idx = 1; + gdm_config = MTK_GDMA_TO_PPE1; + } else { + target_mac->ppe_idx = 0; + gdm_config = soc->reg_map->gdma_to_ppe; + } + mtk_gdm_config(eth, target_mac->id, gdm_config); + } + /* Reset and enable PSE */ + mtk_w32(eth, RST_GL_PSE, MTK_RST_GL); + mtk_w32(eth, 0, MTK_RST_GL); napi_enable(ð->tx_napi); napi_enable(ð->rx_napi); mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, soc->txrx.rx_irq_done_mask); refcount_set(ð->dma_refcnt, 1); - } - else + } else { refcount_inc(ð->dma_refcnt); + } phylink_start(mac->phylink); netif_tx_start_all_queues(dev); @@ -3469,7 +3483,8 @@ static int mtk_stop(struct net_device *dev) if (!refcount_dec_and_test(ð->dma_refcnt)) return 0; - mtk_gdm_config(eth, MTK_GDMA_DROP_ALL); + for (i = 0; i < MTK_MAX_DEVS; i++) + mtk_gdm_config(eth, i, MTK_GDMA_DROP_ALL); mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask); @@ -4945,23 +4960,24 @@ static int mtk_probe(struct platform_device *pdev) } if (eth->soc->offload_version) { - u32 num_ppe = mtk_is_netsys_v2_or_greater(eth) ? 2 : 1; + u32 num_ppe = mtk_get_ppe_num(eth); num_ppe = min_t(u32, ARRAY_SIZE(eth->ppe), num_ppe); for (i = 0; i < num_ppe; i++) { - u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400; + u32 ppe_addr = eth->soc->reg_map->ppe_base; + ppe_addr += (i == 2 ? 0xC00 : i * 0x400); eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, i); if (!eth->ppe[i]) { err = -ENOMEM; goto err_deinit_ppe; } - } + err = mtk_eth_offload_init(eth, i); - err = mtk_eth_offload_init(eth); - if (err) - goto err_deinit_ppe; + if (err) + goto err_deinit_ppe; + } } for (i = 0; i < MTK_MAX_DEVS; i++) { diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 9ae3b8a71d0e..7654fa74e7fc 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -124,6 +124,8 @@ #define MTK_GDMA_UCS_EN BIT(20) #define MTK_GDMA_STRP_CRC BIT(16) #define MTK_GDMA_TO_PDMA 0x0 +#define MTK_GDMA_TO_PPE1 0x4444 +#define MTK_GDMA_TO_PPE2 0xcccc #define MTK_GDMA_DROP_ALL 0x7777 /* GDM Egress Control Register */ @@ -1286,7 +1288,7 @@ struct mtk_eth { struct metadata_dst *dsa_meta[MTK_MAX_DSA_PORTS]; - struct mtk_ppe *ppe[2]; + struct mtk_ppe *ppe[3]; struct rhashtable flow_table; struct bpf_prog __rcu *prog; @@ -1311,6 +1313,7 @@ struct mtk_eth { struct mtk_mac { int id; phy_interface_t interface; + unsigned int ppe_idx; int speed; struct device_node *of_node; struct phylink *phylink; @@ -1421,6 +1424,14 @@ static inline u32 mtk_get_ib2_multicast_mask(struct mtk_eth *eth) return MTK_FOE_IB2_MULTICAST; } +static inline u32 mtk_get_ppe_num(struct mtk_eth *eth) +{ + if (!eth->soc->offload_version) + return 0; + + return eth->soc->version; +} + /* read the hardware status register */ void mtk_stats_update_mac(struct mtk_mac *mac); @@ -1432,7 +1443,7 @@ int mtk_gmac_sgmii_path_setup(struct mtk_eth *eth, int mac_id); int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id); int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id); -int mtk_eth_offload_init(struct mtk_eth *eth); +int mtk_eth_offload_init(struct mtk_eth *eth, int id); int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data); int mtk_flow_offload_cmd(struct mtk_eth *eth, struct flow_cls_offload *cls, diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c index fbb5e9d5af13..220685f6daaa 100644 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c @@ -570,7 +570,7 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_pri if (type != TC_SETUP_CLSFLOWER) return -EOPNOTSUPP; - return mtk_flow_offload_cmd(eth, cls, 0); + return mtk_flow_offload_cmd(eth, cls, mac->ppe_idx); } static int @@ -633,7 +633,9 @@ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, } } -int mtk_eth_offload_init(struct mtk_eth *eth) +int mtk_eth_offload_init(struct mtk_eth *eth, int id) { + if (!eth->ppe[id] || !eth->ppe[id]->foe_table) + return 0; return rhashtable_init(ð->flow_table, &mtk_flow_ht_params); }
Add the missing pieces to allow multiple PPEs units, one for each GMAC. mtk_gdm_config has been modified to work on targted mac ID, the inner loop moved outside of the function to allow unrelated operations like setting the MAC's PPE index. Signed-off-by: Elad Yifee <eladwf@gmail.com> --- v2: fixed CI warnings --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 86 +++++++++++-------- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 15 +++- .../net/ethernet/mediatek/mtk_ppe_offload.c | 6 +- 3 files changed, 68 insertions(+), 39 deletions(-)