target/linux/generic/hack-5.10/100-update-mtk_wed_h.patch

   1 --- a/include/linux/soc/mediatek/mtk_wed.h
   2 +++ b/include/linux/soc/mediatek/mtk_wed.h
   3 @@ -5,21 +5,76 @@
   4  #include <linux/rcupdate.h>
   5  #include <linux/regmap.h>
   6  #include <linux/pci.h>
   7 +#include <linux/skbuff.h>
   8
   9  #define MTK_WED_TX_QUEUES              2
  10 +#define MTK_WED_RX_QUEUES              2
  11 +
  12 +#define WED_WO_STA_REC                 0x6
  13
  14  struct mtk_wed_hw;
  15  struct mtk_wdma_desc;
  16
  17 +enum mtk_wed_wo_cmd {
  18 +       MTK_WED_WO_CMD_WED_CFG,
  19 +       MTK_WED_WO_CMD_WED_RX_STAT,
  20 +       MTK_WED_WO_CMD_RRO_SER,
  21 +       MTK_WED_WO_CMD_DBG_INFO,
  22 +       MTK_WED_WO_CMD_DEV_INFO,
  23 +       MTK_WED_WO_CMD_BSS_INFO,
  24 +       MTK_WED_WO_CMD_STA_REC,
  25 +       MTK_WED_WO_CMD_DEV_INFO_DUMP,
  26 +       MTK_WED_WO_CMD_BSS_INFO_DUMP,
  27 +       MTK_WED_WO_CMD_STA_REC_DUMP,
  28 +       MTK_WED_WO_CMD_BA_INFO_DUMP,
  29 +       MTK_WED_WO_CMD_FBCMD_Q_DUMP,
  30 +       MTK_WED_WO_CMD_FW_LOG_CTRL,
  31 +       MTK_WED_WO_CMD_LOG_FLUSH,
  32 +       MTK_WED_WO_CMD_CHANGE_STATE,
  33 +       MTK_WED_WO_CMD_CPU_STATS_ENABLE,
  34 +       MTK_WED_WO_CMD_CPU_STATS_DUMP,
  35 +       MTK_WED_WO_CMD_EXCEPTION_INIT,
  36 +       MTK_WED_WO_CMD_PROF_CTRL,
  37 +       MTK_WED_WO_CMD_STA_BA_DUMP,
  38 +       MTK_WED_WO_CMD_BA_CTRL_DUMP,
  39 +       MTK_WED_WO_CMD_RXCNT_CTRL,
  40 +       MTK_WED_WO_CMD_RXCNT_INFO,
  41 +       MTK_WED_WO_CMD_SET_CAP,
  42 +       MTK_WED_WO_CMD_CCIF_RING_DUMP,
  43 +       MTK_WED_WO_CMD_WED_END
  44 +};
  45 +
  46 +struct mtk_rxbm_desc {
  47 +       __le32 buf0;
  48 +       __le32 token;
  49 +} __packed __aligned(4);
  50 +
  51 +enum mtk_wed_bus_tye {
  52 +       MTK_WED_BUS_PCIE,
  53 +       MTK_WED_BUS_AXI,
  54 +};
  55 +
  56 +#define MTK_WED_RING_CONFIGURED                BIT(0)
  57  struct mtk_wed_ring {
  58         struct mtk_wdma_desc *desc;
  59         dma_addr_t desc_phys;
  60 +       u32 desc_size;
  61         int size;
  62 +       u32 flags;
  63
  64         u32 reg_base;
  65         void __iomem *wpdma;
  66  };
  67
  68 +struct mtk_wed_wo_rx_stats {
  69 +       __le16 wlan_idx;
  70 +       __le16 tid;
  71 +       __le32 rx_pkt_cnt;
  72 +       __le32 rx_byte_cnt;
  73 +       __le32 rx_err_cnt;
  74 +       __le32 rx_drop_cnt;
  75 +};
  76 +
  77  struct mtk_wed_device {
  78  #ifdef CONFIG_NET_MEDIATEK_SOC_WED
  79         const struct mtk_wed_ops *ops;
  80 @@ -28,30 +83,76 @@ struct mtk_wed_device {
  81         bool init_done, running;
  82         int wdma_idx;
  83         int irq;
  84 +       u8 version;
  85 +
  86 +       /* used by wlan driver */
  87 +       u32 rev_id;
  88
  89         struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES];
  90 +       struct mtk_wed_ring rx_ring[MTK_WED_RX_QUEUES];
  91         struct mtk_wed_ring txfree_ring;
  92         struct mtk_wed_ring tx_wdma[MTK_WED_TX_QUEUES];
  93 +       struct mtk_wed_ring rx_wdma[MTK_WED_RX_QUEUES];
  94
  95         struct {
  96                 int size;
  97                 void **pages;
  98                 struct mtk_wdma_desc *desc;
  99                 dma_addr_t desc_phys;
 100 -       } buf_ring;
 101 +       } tx_buf_ring;
 102 +
 103 +       struct {
 104 +               int size;
 105 +               struct page_frag_cache rx_page;
 106 +               struct mtk_rxbm_desc *desc;
 107 +               dma_addr_t desc_phys;
 108 +       } rx_buf_ring;
 109 +
 110 +       struct {
 111 +               struct mtk_wed_ring ring;
 112 +               dma_addr_t miod_phys;
 113 +               dma_addr_t fdbk_phys;
 114 +       } rro;
 115
 116         /* filled by driver: */
 117         struct {
 118 -               struct pci_dev *pci_dev;
 119 +               union {
 120 +                       struct platform_device *platform_dev;
 121 +                       struct pci_dev *pci_dev;
 122 +               };
 123 +               enum mtk_wed_bus_tye bus_type;
 124 +               void __iomem *base;
 125 +               u32 phy_base;
 126
 127                 u32 wpdma_phys;
 128 +               u32 wpdma_int;
 129 +               u32 wpdma_mask;
 130 +               u32 wpdma_tx;
 131 +               u32 wpdma_txfree;
 132 +               u32 wpdma_rx_glo;
 133 +               u32 wpdma_rx;
 134 +
 135 +               bool wcid_512;
 136
 137                 u16 token_start;
 138                 unsigned int nbuf;
 139 +               unsigned int rx_nbuf;
 140 +               unsigned int rx_npkt;
 141 +               unsigned int rx_size;
 142 +
 143 +               u8 tx_tbit[MTK_WED_TX_QUEUES];
 144 +               u8 rx_tbit[MTK_WED_RX_QUEUES];
 145 +               u8 txfree_tbit;
 146
 147                 u32 (*init_buf)(void *ptr, dma_addr_t phys, int token_id);
 148                 int (*offload_enable)(struct mtk_wed_device *wed);
 149                 void (*offload_disable)(struct mtk_wed_device *wed);
 150 +               u32 (*init_rx_buf)(struct mtk_wed_device *wed, int size);
 151 +               void (*release_rx_buf)(struct mtk_wed_device *wed);
 152 +               void (*update_wo_rx_stats)(struct mtk_wed_device *wed,
 153 +                                          struct mtk_wed_wo_rx_stats *stats);
 154 +               int (*reset)(struct mtk_wed_device *wed);
 155 +               void (*reset_complete)(struct mtk_wed_device *wed);
 156         } wlan;
 157  #endif
 158  };
 159 @@ -59,10 +160,16 @@ struct mtk_wed_device {
 160  struct mtk_wed_ops {
 161         int (*attach)(struct mtk_wed_device *dev);
 162         int (*tx_ring_setup)(struct mtk_wed_device *dev, int ring,
 163 -                            void __iomem *regs);
 164 +                            void __iomem *regs, bool reset);
 165 +       int (*rx_ring_setup)(struct mtk_wed_device *dev, int ring,
 166 +                            void __iomem *regs, bool reset);
 167         int (*txfree_ring_setup)(struct mtk_wed_device *dev,
 168                                  void __iomem *regs);
 169 +       int (*msg_update)(struct mtk_wed_device *dev, int cmd_id,
 170 +                         void *data, int len);
 171         void (*detach)(struct mtk_wed_device *dev);
 172 +       void (*ppe_check)(struct mtk_wed_device *dev, struct sk_buff *skb,
 173 +                         u32 reason, u32 hash);
 174
 175         void (*stop)(struct mtk_wed_device *dev);
 176         void (*start)(struct mtk_wed_device *dev, u32 irq_mask);
 177 @@ -97,12 +204,22 @@ mtk_wed_device_attach(struct mtk_wed_dev
 178         return ret;
 179  }
 180
 181 +static inline bool
 182 +mtk_wed_get_rx_capa(struct mtk_wed_device *dev)
 183 +{
 184 +#ifdef CONFIG_NET_MEDIATEK_SOC_WED
 185 +       return dev->version != 1;
 186 +#else
 187 +       return false;
 188 +#endif
 189 +}
 190 +
 191  #ifdef CONFIG_NET_MEDIATEK_SOC_WED
 192  #define mtk_wed_device_active(_dev) !!(_dev)->ops
 193  #define mtk_wed_device_detach(_dev) (_dev)->ops->detach(_dev)
 194  #define mtk_wed_device_start(_dev, _mask) (_dev)->ops->start(_dev, _mask)
 195 -#define mtk_wed_device_tx_ring_setup(_dev, _ring, _regs) \
 196 -       (_dev)->ops->tx_ring_setup(_dev, _ring, _regs)
 197 +#define mtk_wed_device_tx_ring_setup(_dev, _ring, _regs, _reset) \
 198 +       (_dev)->ops->tx_ring_setup(_dev, _ring, _regs, _reset)
 199  #define mtk_wed_device_txfree_ring_setup(_dev, _regs) \
 200         (_dev)->ops->txfree_ring_setup(_dev, _regs)
 201  #define mtk_wed_device_reg_read(_dev, _reg) \
 202 @@ -113,6 +230,14 @@ mtk_wed_device_attach(struct mtk_wed_dev
 203         (_dev)->ops->irq_get(_dev, _mask)
 204  #define mtk_wed_device_irq_set_mask(_dev, _mask) \
 205         (_dev)->ops->irq_set_mask(_dev, _mask)
 206 +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs, _reset) \
 207 +       (_dev)->ops->rx_ring_setup(_dev, _ring, _regs, _reset)
 208 +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash) \
 209 +       (_dev)->ops->ppe_check(_dev, _skb, _reason, _hash)
 210 +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) \
 211 +       (_dev)->ops->msg_update(_dev, _id, _msg, _len)
 212 +#define mtk_wed_device_stop(_dev) (_dev)->ops->stop(_dev)
 213 +#define mtk_wed_device_dma_reset(_dev) (_dev)->ops->reset_dma(_dev)
 214  #else
 215  static inline bool mtk_wed_device_active(struct mtk_wed_device *dev)
 216  {
 217 @@ -120,12 +245,17 @@ static inline bool mtk_wed_device_active
 218  }
 219  #define mtk_wed_device_detach(_dev) do {} while (0)
 220  #define mtk_wed_device_start(_dev, _mask) do {} while (0)
 221 -#define mtk_wed_device_tx_ring_setup(_dev, _ring, _regs) -ENODEV
 222 +#define mtk_wed_device_tx_ring_setup(_dev, _ring, _regs, _reset) -ENODEV
 223  #define mtk_wed_device_txfree_ring_setup(_dev, _ring, _regs) -ENODEV
 224  #define mtk_wed_device_reg_read(_dev, _reg) 0
 225  #define mtk_wed_device_reg_write(_dev, _reg, _val) do {} while (0)
 226  #define mtk_wed_device_irq_get(_dev, _mask) 0
 227  #define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0)
 228 +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs, _reset) -ENODEV
 229 +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash)  do {} while (0)
 230 +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV
 231 +#define mtk_wed_device_stop(_dev) do {} while (0)
 232 +#define mtk_wed_device_dma_reset(_dev) do {} while (0)
 233  #endif
 234
 235  #endif