developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 1 | From 4c8f0a38d9c2df3815ace32133bb63d8a4345856 Mon Sep 17 00:00:00 2001 |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 2 | From: Sujuan Chen <sujuan.chen@mediatek.com> |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 3 | Date: Tue, 27 Dec 2022 10:14:35 +0800 |
| 4 | Subject: [PATCH] mediatek: ethernet: add wifi2wifi offload support |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 5 | |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 6 | Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 7 | --- |
| 8 | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 ++ |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 9 | .../net/ethernet/mediatek/mtk_ppe_offload.c | 35 +++++++++++++------ |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 10 | drivers/net/ethernet/mediatek/mtk_wed.c | 13 +++++++ |
| 11 | include/linux/soc/mediatek/mtk_wed.h | 6 +++- |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 12 | 4 files changed, 45 insertions(+), 11 deletions(-) |
| 13 | mode change 100755 => 100644 drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 14 | |
| 15 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 16 | index b935de6..acefa48 100644 |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 17 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 18 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 19 | @@ -1767,6 +1767,8 @@ void ethsys_reset(struct mtk_eth *eth, u32 reset_bits); |
| 20 | int mtk_eth_offload_init(struct mtk_eth *eth, int id); |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 21 | int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| 22 | void *type_data); |
| 23 | +int mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f, |
| 24 | + struct mtk_eth *eth); |
| 25 | void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev); |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 26 | |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 27 | int mtk_ppe_debugfs_init(struct mtk_eth *eth); |
| 28 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 29 | old mode 100755 |
| 30 | new mode 100644 |
| 31 | index 2787a97..23d2048 |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 32 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 33 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 34 | @@ -546,10 +546,20 @@ static int |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 35 | mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv) |
| 36 | { |
| 37 | struct flow_cls_offload *cls = type_data; |
| 38 | - struct net_device *dev = cb_priv; |
| 39 | - struct mtk_mac *mac = netdev_priv(dev); |
| 40 | - struct mtk_eth *eth = mac->hw; |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 41 | - int err; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 42 | + struct mtk_eth *eth = cb_priv; |
| 43 | + struct net_device *dev = NULL; |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 44 | + int i, err; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 45 | + |
| 46 | + for (i = 0; i < MTK_MAC_COUNT; i++) { |
| 47 | + if (!eth->netdev[i]) |
| 48 | + continue; |
| 49 | + |
| 50 | + dev = eth->netdev[i]; |
| 51 | + break; |
| 52 | + } |
| 53 | + |
| 54 | + if (!dev) |
| 55 | + return -EOPNOTSUPP; |
| 56 | |
| 57 | if (!tc_can_offload(dev)) |
| 58 | return -EOPNOTSUPP; |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 59 | @@ -577,14 +587,19 @@ mtk_eth_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_pri |
| 60 | return err; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 61 | } |
| 62 | |
| 63 | -static int |
| 64 | -mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f) |
| 65 | +int |
| 66 | +mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f, |
| 67 | + struct mtk_eth *eth) |
| 68 | { |
| 69 | - struct mtk_mac *mac = netdev_priv(dev); |
| 70 | - struct mtk_eth *eth = mac->hw; |
| 71 | + struct mtk_mac *mac; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 72 | static LIST_HEAD(block_cb_list); |
| 73 | struct flow_block_cb *block_cb; |
| 74 | flow_setup_cb_t *cb; |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 75 | int i, err = 0; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 76 | |
| 77 | + if (!eth) { |
| 78 | + mac = netdev_priv(dev); |
| 79 | + eth = mac->hw; |
| 80 | + } |
| 81 | + |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 82 | for (i = 0; i < eth->ppe_num; i++) { |
| 83 | @@ -610,7 +625,7 @@ mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f) |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 84 | flow_block_cb_incref(block_cb); |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 85 | goto unlock; |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 86 | } |
| 87 | - block_cb = flow_block_cb_alloc(cb, dev, dev, NULL); |
| 88 | + block_cb = flow_block_cb_alloc(cb, dev, eth, NULL); |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 89 | if (IS_ERR(block_cb)) { |
| 90 | err = PTR_ERR(block_cb); |
| 91 | goto unlock; |
| 92 | @@ -647,7 +662,7 @@ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 93 | switch (type) { |
| 94 | case TC_SETUP_BLOCK: |
| 95 | case TC_SETUP_FT: |
| 96 | - return mtk_eth_setup_tc_block(dev, type_data); |
| 97 | + return mtk_eth_setup_tc_block(dev, type_data, NULL); |
| 98 | default: |
| 99 | return -EOPNOTSUPP; |
| 100 | } |
| 101 | diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 102 | index 1a615f2..37a86c3 100644 |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 103 | --- a/drivers/net/ethernet/mediatek/mtk_wed.c |
| 104 | +++ b/drivers/net/ethernet/mediatek/mtk_wed.c |
developer | ee39bcf | 2023-06-16 08:03:30 +0800 | [diff] [blame] | 105 | @@ -1731,6 +1731,18 @@ out: |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 106 | mutex_unlock(&hw_lock); |
| 107 | } |
| 108 | |
| 109 | +static int mtk_wed_eth_setup_tc(struct mtk_wed_device *wed, struct net_device *dev, |
| 110 | + int type, void *type_data) |
| 111 | +{ |
| 112 | + switch (type) { |
| 113 | + case TC_SETUP_BLOCK: |
| 114 | + case TC_SETUP_FT: |
| 115 | + return mtk_eth_setup_tc_block(dev, type_data, wed->hw->eth); |
| 116 | + default: |
| 117 | + return -EOPNOTSUPP; |
| 118 | + } |
| 119 | +} |
| 120 | + |
| 121 | void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, |
| 122 | void __iomem *wdma, u32 wdma_phy, int index) |
| 123 | |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 124 | @@ -1749,6 +1761,7 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 125 | .irq_get = mtk_wed_irq_get, |
| 126 | .irq_set_mask = mtk_wed_irq_set_mask, |
| 127 | .detach = mtk_wed_detach, |
| 128 | + .setup_tc = mtk_wed_eth_setup_tc, |
| 129 | .ppe_check = mtk_wed_ppe_check, |
| 130 | }; |
| 131 | struct device_node *eth_np = eth->dev->of_node; |
| 132 | diff --git a/include/linux/soc/mediatek/mtk_wed.h b/include/linux/soc/mediatek/mtk_wed.h |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 133 | index 98ed390..27cf284 100644 |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 134 | --- a/include/linux/soc/mediatek/mtk_wed.h |
| 135 | +++ b/include/linux/soc/mediatek/mtk_wed.h |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 136 | @@ -183,7 +183,8 @@ struct mtk_wed_ops { |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 137 | int (*msg_update)(struct mtk_wed_device *dev, int cmd_id, |
| 138 | void *data, int len); |
| 139 | void (*detach)(struct mtk_wed_device *dev); |
| 140 | - |
| 141 | + int (*setup_tc)(struct mtk_wed_device *wed, struct net_device *dev, |
| 142 | + int type, void *type_data); |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 143 | void (*stop)(struct mtk_wed_device *dev); |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 144 | void (*start)(struct mtk_wed_device *dev, u32 irq_mask); |
| 145 | void (*reset_dma)(struct mtk_wed_device *dev); |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 146 | @@ -232,6 +233,8 @@ mtk_wed_get_rx_capa(struct mtk_wed_device *dev) |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 147 | #ifdef CONFIG_NET_MEDIATEK_SOC_WED |
| 148 | #define mtk_wed_device_active(_dev) !!(_dev)->ops |
| 149 | #define mtk_wed_device_detach(_dev) (_dev)->ops->detach(_dev) |
| 150 | +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _data) \ |
| 151 | + (_dev)->ops->setup_tc(_dev, _ndev, _type, _data) |
| 152 | #define mtk_wed_device_start(_dev, _mask) (_dev)->ops->start(_dev, _mask) |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 153 | #define mtk_wed_device_stop(_dev) (_dev)->ops->stop(_dev) |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 154 | #define mtk_wed_device_tx_ring_setup(_dev, _ring, _regs, _reset) \ |
developer | fd8e115 | 2023-02-14 11:29:23 +0800 | [diff] [blame] | 155 | @@ -270,6 +273,7 @@ static inline bool mtk_wed_device_active(struct mtk_wed_device *dev) |
developer | feeda73 | 2022-12-27 10:19:39 +0800 | [diff] [blame] | 156 | #define mtk_wed_device_irq_get(_dev, _mask) 0 |
| 157 | #define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0) |
| 158 | #define mtk_wed_device_dma_reset(_dev) do {} while (0) |
| 159 | +#define mtk_wed_device_setup_tc(_dev, _ndev, _type, _data) do {} while (0) |
| 160 | #define mtk_wed_device_ppe_check(_dev, _hash) do {} while (0) |
| 161 | #endif |
| 162 | |
| 163 | -- |
| 164 | 2.18.0 |
| 165 | |