kernel: backport mtk_wed.h from 5.15 to 5.10
Fixes mt76 build error Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
		
							
								
								
									
										209
									
								
								target/linux/generic/hack-5.10/100-update-mtk_wed_h.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										209
									
								
								target/linux/generic/hack-5.10/100-update-mtk_wed_h.patch
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,209 @@ | ||||
| --- a/include/linux/soc/mediatek/mtk_wed.h | ||||
| +++ b/include/linux/soc/mediatek/mtk_wed.h | ||||
| @@ -5,21 +5,76 @@ | ||||
|  #include <linux/rcupdate.h> | ||||
|  #include <linux/regmap.h> | ||||
|  #include <linux/pci.h> | ||||
| +#include <linux/skbuff.h> | ||||
|   | ||||
|  #define MTK_WED_TX_QUEUES		2 | ||||
| +#define MTK_WED_RX_QUEUES		2 | ||||
| + | ||||
| +#define WED_WO_STA_REC			0x6 | ||||
|   | ||||
|  struct mtk_wed_hw; | ||||
|  struct mtk_wdma_desc; | ||||
|   | ||||
| +enum mtk_wed_wo_cmd { | ||||
| +	MTK_WED_WO_CMD_WED_CFG, | ||||
| +	MTK_WED_WO_CMD_WED_RX_STAT, | ||||
| +	MTK_WED_WO_CMD_RRO_SER, | ||||
| +	MTK_WED_WO_CMD_DBG_INFO, | ||||
| +	MTK_WED_WO_CMD_DEV_INFO, | ||||
| +	MTK_WED_WO_CMD_BSS_INFO, | ||||
| +	MTK_WED_WO_CMD_STA_REC, | ||||
| +	MTK_WED_WO_CMD_DEV_INFO_DUMP, | ||||
| +	MTK_WED_WO_CMD_BSS_INFO_DUMP, | ||||
| +	MTK_WED_WO_CMD_STA_REC_DUMP, | ||||
| +	MTK_WED_WO_CMD_BA_INFO_DUMP, | ||||
| +	MTK_WED_WO_CMD_FBCMD_Q_DUMP, | ||||
| +	MTK_WED_WO_CMD_FW_LOG_CTRL, | ||||
| +	MTK_WED_WO_CMD_LOG_FLUSH, | ||||
| +	MTK_WED_WO_CMD_CHANGE_STATE, | ||||
| +	MTK_WED_WO_CMD_CPU_STATS_ENABLE, | ||||
| +	MTK_WED_WO_CMD_CPU_STATS_DUMP, | ||||
| +	MTK_WED_WO_CMD_EXCEPTION_INIT, | ||||
| +	MTK_WED_WO_CMD_PROF_CTRL, | ||||
| +	MTK_WED_WO_CMD_STA_BA_DUMP, | ||||
| +	MTK_WED_WO_CMD_BA_CTRL_DUMP, | ||||
| +	MTK_WED_WO_CMD_RXCNT_CTRL, | ||||
| +	MTK_WED_WO_CMD_RXCNT_INFO, | ||||
| +	MTK_WED_WO_CMD_SET_CAP, | ||||
| +	MTK_WED_WO_CMD_CCIF_RING_DUMP, | ||||
| +	MTK_WED_WO_CMD_WED_END | ||||
| +}; | ||||
| + | ||||
| +struct mtk_rxbm_desc { | ||||
| +	__le32 buf0; | ||||
| +	__le32 token; | ||||
| +} __packed __aligned(4); | ||||
| + | ||||
| +enum mtk_wed_bus_tye { | ||||
| +	MTK_WED_BUS_PCIE, | ||||
| +	MTK_WED_BUS_AXI, | ||||
| +}; | ||||
| + | ||||
| +#define MTK_WED_RING_CONFIGURED		BIT(0) | ||||
|  struct mtk_wed_ring { | ||||
|  	struct mtk_wdma_desc *desc; | ||||
|  	dma_addr_t desc_phys; | ||||
| +	u32 desc_size; | ||||
|  	int size; | ||||
| +	u32 flags; | ||||
|   | ||||
|  	u32 reg_base; | ||||
|  	void __iomem *wpdma; | ||||
|  }; | ||||
|   | ||||
| +struct mtk_wed_wo_rx_stats { | ||||
| +	__le16 wlan_idx; | ||||
| +	__le16 tid; | ||||
| +	__le32 rx_pkt_cnt; | ||||
| +	__le32 rx_byte_cnt; | ||||
| +	__le32 rx_err_cnt; | ||||
| +	__le32 rx_drop_cnt; | ||||
| +}; | ||||
| + | ||||
|  struct mtk_wed_device { | ||||
|  #ifdef CONFIG_NET_MEDIATEK_SOC_WED | ||||
|  	const struct mtk_wed_ops *ops; | ||||
| @@ -28,30 +83,71 @@ struct mtk_wed_device { | ||||
|  	bool init_done, running; | ||||
|  	int wdma_idx; | ||||
|  	int irq; | ||||
| +	u8 version; | ||||
|   | ||||
|  	struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES]; | ||||
| +	struct mtk_wed_ring rx_ring[MTK_WED_RX_QUEUES]; | ||||
|  	struct mtk_wed_ring txfree_ring; | ||||
|  	struct mtk_wed_ring tx_wdma[MTK_WED_TX_QUEUES]; | ||||
| +	struct mtk_wed_ring rx_wdma[MTK_WED_RX_QUEUES]; | ||||
|   | ||||
|  	struct { | ||||
|  		int size; | ||||
|  		void **pages; | ||||
|  		struct mtk_wdma_desc *desc; | ||||
|  		dma_addr_t desc_phys; | ||||
| -	} buf_ring; | ||||
| +	} tx_buf_ring; | ||||
| + | ||||
| +	struct { | ||||
| +		int size; | ||||
| +		struct page_frag_cache rx_page; | ||||
| +		struct mtk_rxbm_desc *desc; | ||||
| +		dma_addr_t desc_phys; | ||||
| +	} rx_buf_ring; | ||||
| + | ||||
| +	struct { | ||||
| +		struct mtk_wed_ring ring; | ||||
| +		dma_addr_t miod_phys; | ||||
| +		dma_addr_t fdbk_phys; | ||||
| +	} rro; | ||||
|   | ||||
|  	/* filled by driver: */ | ||||
|  	struct { | ||||
| -		struct pci_dev *pci_dev; | ||||
| +		union { | ||||
| +			struct platform_device *platform_dev; | ||||
| +			struct pci_dev *pci_dev; | ||||
| +		}; | ||||
| +		enum mtk_wed_bus_tye bus_type; | ||||
| +		void __iomem *base; | ||||
| +		u32 phy_base; | ||||
|   | ||||
|  		u32 wpdma_phys; | ||||
| +		u32 wpdma_int; | ||||
| +		u32 wpdma_mask; | ||||
| +		u32 wpdma_tx; | ||||
| +		u32 wpdma_txfree; | ||||
| +		u32 wpdma_rx_glo; | ||||
| +		u32 wpdma_rx; | ||||
| + | ||||
| +		bool wcid_512; | ||||
|   | ||||
|  		u16 token_start; | ||||
|  		unsigned int nbuf; | ||||
| +		unsigned int rx_nbuf; | ||||
| +		unsigned int rx_npkt; | ||||
| +		unsigned int rx_size; | ||||
| + | ||||
| +		u8 tx_tbit[MTK_WED_TX_QUEUES]; | ||||
| +		u8 rx_tbit[MTK_WED_RX_QUEUES]; | ||||
| +		u8 txfree_tbit; | ||||
|   | ||||
|  		u32 (*init_buf)(void *ptr, dma_addr_t phys, int token_id); | ||||
|  		int (*offload_enable)(struct mtk_wed_device *wed); | ||||
|  		void (*offload_disable)(struct mtk_wed_device *wed); | ||||
| +		u32 (*init_rx_buf)(struct mtk_wed_device *wed, int size); | ||||
| +		void (*release_rx_buf)(struct mtk_wed_device *wed); | ||||
| +		void (*update_wo_rx_stats)(struct mtk_wed_device *wed, | ||||
| +					   struct mtk_wed_wo_rx_stats *stats); | ||||
|  	} wlan; | ||||
|  #endif | ||||
|  }; | ||||
| @@ -60,9 +156,15 @@ struct mtk_wed_ops { | ||||
|  	int (*attach)(struct mtk_wed_device *dev); | ||||
|  	int (*tx_ring_setup)(struct mtk_wed_device *dev, int ring, | ||||
|  			     void __iomem *regs); | ||||
| +	int (*rx_ring_setup)(struct mtk_wed_device *dev, int ring, | ||||
| +			     void __iomem *regs); | ||||
|  	int (*txfree_ring_setup)(struct mtk_wed_device *dev, | ||||
|  				 void __iomem *regs); | ||||
| +	int (*msg_update)(struct mtk_wed_device *dev, int cmd_id, | ||||
| +			  void *data, int len); | ||||
|  	void (*detach)(struct mtk_wed_device *dev); | ||||
| +	void (*ppe_check)(struct mtk_wed_device *dev, struct sk_buff *skb, | ||||
| +			  u32 reason, u32 hash); | ||||
|   | ||||
|  	void (*stop)(struct mtk_wed_device *dev); | ||||
|  	void (*start)(struct mtk_wed_device *dev, u32 irq_mask); | ||||
| @@ -97,6 +199,16 @@ mtk_wed_device_attach(struct mtk_wed_dev | ||||
|  	return ret; | ||||
|  } | ||||
|   | ||||
| +static inline bool | ||||
| +mtk_wed_get_rx_capa(struct mtk_wed_device *dev) | ||||
| +{ | ||||
| +#ifdef CONFIG_NET_MEDIATEK_SOC_WED | ||||
| +	return dev->version != 1; | ||||
| +#else | ||||
| +	return false; | ||||
| +#endif | ||||
| +} | ||||
| + | ||||
|  #ifdef CONFIG_NET_MEDIATEK_SOC_WED | ||||
|  #define mtk_wed_device_active(_dev) !!(_dev)->ops | ||||
|  #define mtk_wed_device_detach(_dev) (_dev)->ops->detach(_dev) | ||||
| @@ -113,6 +225,12 @@ mtk_wed_device_attach(struct mtk_wed_dev | ||||
|  	(_dev)->ops->irq_get(_dev, _mask) | ||||
|  #define mtk_wed_device_irq_set_mask(_dev, _mask) \ | ||||
|  	(_dev)->ops->irq_set_mask(_dev, _mask) | ||||
| +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) \ | ||||
| +	(_dev)->ops->rx_ring_setup(_dev, _ring, _regs) | ||||
| +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash) \ | ||||
| +	(_dev)->ops->ppe_check(_dev, _skb, _reason, _hash) | ||||
| +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) \ | ||||
| +	(_dev)->ops->msg_update(_dev, _id, _msg, _len) | ||||
|  #else | ||||
|  static inline bool mtk_wed_device_active(struct mtk_wed_device *dev) | ||||
|  { | ||||
| @@ -126,6 +244,9 @@ static inline bool mtk_wed_device_active | ||||
|  #define mtk_wed_device_reg_write(_dev, _reg, _val) do {} while (0) | ||||
|  #define mtk_wed_device_irq_get(_dev, _mask) 0 | ||||
|  #define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0) | ||||
| +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) -ENODEV | ||||
| +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash)  do {} while (0) | ||||
| +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV | ||||
|  #endif | ||||
|   | ||||
|  #endif | ||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau