2
0

729-04-v6.1-net-ethernet-mtk_wed-add-configure-wed-wo-support.patch 44 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521
  1. From: Lorenzo Bianconi <[email protected]>
  2. Date: Sat, 5 Nov 2022 23:36:21 +0100
  3. Subject: [PATCH] net: ethernet: mtk_wed: add configure wed wo support
  4. Enable RX Wireless Ethernet Dispatch available on MT7986 Soc.
  5. Tested-by: Daniel Golle <[email protected]>
  6. Co-developed-by: Sujuan Chen <[email protected]>
  7. Signed-off-by: Sujuan Chen <[email protected]>
  8. Signed-off-by: Lorenzo Bianconi <[email protected]>
  9. Signed-off-by: David S. Miller <[email protected]>
  10. ---
  11. --- a/drivers/net/ethernet/mediatek/mtk_wed.c
  12. +++ b/drivers/net/ethernet/mediatek/mtk_wed.c
  13. @@ -9,6 +9,7 @@
  14. #include <linux/skbuff.h>
  15. #include <linux/of_platform.h>
  16. #include <linux/of_address.h>
  17. +#include <linux/of_reserved_mem.h>
  18. #include <linux/mfd/syscon.h>
  19. #include <linux/debugfs.h>
  20. #include <linux/soc/mediatek/mtk_wed.h>
  21. @@ -23,6 +24,7 @@
  22. #define MTK_WED_PKT_SIZE 1900
  23. #define MTK_WED_BUF_SIZE 2048
  24. #define MTK_WED_BUF_PER_PAGE (PAGE_SIZE / 2048)
  25. +#define MTK_WED_RX_RING_SIZE 1536
  26. #define MTK_WED_TX_RING_SIZE 2048
  27. #define MTK_WED_WDMA_RING_SIZE 1024
  28. @@ -31,6 +33,10 @@
  29. #define MTK_WED_PER_GROUP_PKT 128
  30. #define MTK_WED_FBUF_SIZE 128
  31. +#define MTK_WED_MIOD_CNT 16
  32. +#define MTK_WED_FB_CMD_CNT 1024
  33. +#define MTK_WED_RRO_QUE_CNT 8192
  34. +#define MTK_WED_MIOD_ENTRY_CNT 128
  35. static struct mtk_wed_hw *hw_list[2];
  36. static DEFINE_MUTEX(hw_lock);
  37. @@ -65,12 +71,76 @@ wdma_set(struct mtk_wed_device *dev, u32
  38. wdma_m32(dev, reg, 0, mask);
  39. }
  40. +static void
  41. +wdma_clr(struct mtk_wed_device *dev, u32 reg, u32 mask)
  42. +{
  43. + wdma_m32(dev, reg, mask, 0);
  44. +}
  45. +
  46. +static u32
  47. +wifi_r32(struct mtk_wed_device *dev, u32 reg)
  48. +{
  49. + return readl(dev->wlan.base + reg);
  50. +}
  51. +
  52. +static void
  53. +wifi_w32(struct mtk_wed_device *dev, u32 reg, u32 val)
  54. +{
  55. + writel(val, dev->wlan.base + reg);
  56. +}
  57. +
  58. static u32
  59. mtk_wed_read_reset(struct mtk_wed_device *dev)
  60. {
  61. return wed_r32(dev, MTK_WED_RESET);
  62. }
  63. +static u32
  64. +mtk_wdma_read_reset(struct mtk_wed_device *dev)
  65. +{
  66. + return wdma_r32(dev, MTK_WDMA_GLO_CFG);
  67. +}
  68. +
  69. +static void
  70. +mtk_wdma_rx_reset(struct mtk_wed_device *dev)
  71. +{
  72. + u32 status, mask = MTK_WDMA_GLO_CFG_RX_DMA_BUSY;
  73. + int i;
  74. +
  75. + wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_RX_DMA_EN);
  76. + if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,
  77. + !(status & mask), 0, 1000))
  78. + dev_err(dev->hw->dev, "rx reset failed\n");
  79. +
  80. + for (i = 0; i < ARRAY_SIZE(dev->rx_wdma); i++) {
  81. + if (dev->rx_wdma[i].desc)
  82. + continue;
  83. +
  84. + wdma_w32(dev,
  85. + MTK_WDMA_RING_RX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);
  86. + }
  87. +}
  88. +
  89. +static void
  90. +mtk_wdma_tx_reset(struct mtk_wed_device *dev)
  91. +{
  92. + u32 status, mask = MTK_WDMA_GLO_CFG_TX_DMA_BUSY;
  93. + int i;
  94. +
  95. + wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);
  96. + if (readx_poll_timeout(mtk_wdma_read_reset, dev, status,
  97. + !(status & mask), 0, 1000))
  98. + dev_err(dev->hw->dev, "tx reset failed\n");
  99. +
  100. + for (i = 0; i < ARRAY_SIZE(dev->tx_wdma); i++) {
  101. + if (dev->tx_wdma[i].desc)
  102. + continue;
  103. +
  104. + wdma_w32(dev,
  105. + MTK_WDMA_RING_TX(i) + MTK_WED_RING_OFS_CPU_IDX, 0);
  106. + }
  107. +}
  108. +
  109. static void
  110. mtk_wed_reset(struct mtk_wed_device *dev, u32 mask)
  111. {
  112. @@ -82,6 +152,54 @@ mtk_wed_reset(struct mtk_wed_device *dev
  113. WARN_ON_ONCE(1);
  114. }
  115. +static u32
  116. +mtk_wed_wo_read_status(struct mtk_wed_device *dev)
  117. +{
  118. + return wed_r32(dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_WO_STATUS);
  119. +}
  120. +
  121. +static void
  122. +mtk_wed_wo_reset(struct mtk_wed_device *dev)
  123. +{
  124. + struct mtk_wed_wo *wo = dev->hw->wed_wo;
  125. + u8 state = MTK_WED_WO_STATE_DISABLE;
  126. + void __iomem *reg;
  127. + u32 val;
  128. +
  129. + mtk_wdma_tx_reset(dev);
  130. + mtk_wed_reset(dev, MTK_WED_RESET_WED);
  131. +
  132. + mtk_wed_mcu_send_msg(wo, MTK_WED_MODULE_ID_WO,
  133. + MTK_WED_WO_CMD_CHANGE_STATE, &state,
  134. + sizeof(state), false);
  135. +
  136. + if (readx_poll_timeout(mtk_wed_wo_read_status, dev, val,
  137. + val == MTK_WED_WOIF_DISABLE_DONE,
  138. + 100, MTK_WOCPU_TIMEOUT))
  139. + dev_err(dev->hw->dev, "failed to disable wed-wo\n");
  140. +
  141. + reg = ioremap(MTK_WED_WO_CPU_MCUSYS_RESET_ADDR, 4);
  142. +
  143. + val = readl(reg);
  144. + switch (dev->hw->index) {
  145. + case 0:
  146. + val |= MTK_WED_WO_CPU_WO0_MCUSYS_RESET_MASK;
  147. + writel(val, reg);
  148. + val &= ~MTK_WED_WO_CPU_WO0_MCUSYS_RESET_MASK;
  149. + writel(val, reg);
  150. + break;
  151. + case 1:
  152. + val |= MTK_WED_WO_CPU_WO1_MCUSYS_RESET_MASK;
  153. + writel(val, reg);
  154. + val &= ~MTK_WED_WO_CPU_WO1_MCUSYS_RESET_MASK;
  155. + writel(val, reg);
  156. + break;
  157. + default:
  158. + break;
  159. + }
  160. + iounmap(reg);
  161. +}
  162. +
  163. static struct mtk_wed_hw *
  164. mtk_wed_assign(struct mtk_wed_device *dev)
  165. {
  166. @@ -116,7 +234,7 @@ out:
  167. }
  168. static int
  169. -mtk_wed_buffer_alloc(struct mtk_wed_device *dev)
  170. +mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
  171. {
  172. struct mtk_wdma_desc *desc;
  173. dma_addr_t desc_phys;
  174. @@ -133,16 +251,16 @@ mtk_wed_buffer_alloc(struct mtk_wed_devi
  175. if (!page_list)
  176. return -ENOMEM;
  177. - dev->buf_ring.size = ring_size;
  178. - dev->buf_ring.pages = page_list;
  179. + dev->tx_buf_ring.size = ring_size;
  180. + dev->tx_buf_ring.pages = page_list;
  181. desc = dma_alloc_coherent(dev->hw->dev, ring_size * sizeof(*desc),
  182. &desc_phys, GFP_KERNEL);
  183. if (!desc)
  184. return -ENOMEM;
  185. - dev->buf_ring.desc = desc;
  186. - dev->buf_ring.desc_phys = desc_phys;
  187. + dev->tx_buf_ring.desc = desc;
  188. + dev->tx_buf_ring.desc_phys = desc_phys;
  189. for (i = 0, page_idx = 0; i < ring_size; i += MTK_WED_BUF_PER_PAGE) {
  190. dma_addr_t page_phys, buf_phys;
  191. @@ -203,10 +321,10 @@ mtk_wed_buffer_alloc(struct mtk_wed_devi
  192. }
  193. static void
  194. -mtk_wed_free_buffer(struct mtk_wed_device *dev)
  195. +mtk_wed_free_tx_buffer(struct mtk_wed_device *dev)
  196. {
  197. - struct mtk_wdma_desc *desc = dev->buf_ring.desc;
  198. - void **page_list = dev->buf_ring.pages;
  199. + struct mtk_wdma_desc *desc = dev->tx_buf_ring.desc;
  200. + void **page_list = dev->tx_buf_ring.pages;
  201. int page_idx;
  202. int i;
  203. @@ -216,7 +334,8 @@ mtk_wed_free_buffer(struct mtk_wed_devic
  204. if (!desc)
  205. goto free_pagelist;
  206. - for (i = 0, page_idx = 0; i < dev->buf_ring.size; i += MTK_WED_BUF_PER_PAGE) {
  207. + for (i = 0, page_idx = 0; i < dev->tx_buf_ring.size;
  208. + i += MTK_WED_BUF_PER_PAGE) {
  209. void *page = page_list[page_idx++];
  210. dma_addr_t buf_addr;
  211. @@ -229,13 +348,59 @@ mtk_wed_free_buffer(struct mtk_wed_devic
  212. __free_page(page);
  213. }
  214. - dma_free_coherent(dev->hw->dev, dev->buf_ring.size * sizeof(*desc),
  215. - desc, dev->buf_ring.desc_phys);
  216. + dma_free_coherent(dev->hw->dev, dev->tx_buf_ring.size * sizeof(*desc),
  217. + desc, dev->tx_buf_ring.desc_phys);
  218. free_pagelist:
  219. kfree(page_list);
  220. }
  221. +static int
  222. +mtk_wed_rx_buffer_alloc(struct mtk_wed_device *dev)
  223. +{
  224. + struct mtk_rxbm_desc *desc;
  225. + dma_addr_t desc_phys;
  226. +
  227. + dev->rx_buf_ring.size = dev->wlan.rx_nbuf;
  228. + desc = dma_alloc_coherent(dev->hw->dev,
  229. + dev->wlan.rx_nbuf * sizeof(*desc),
  230. + &desc_phys, GFP_KERNEL);
  231. + if (!desc)
  232. + return -ENOMEM;
  233. +
  234. + dev->rx_buf_ring.desc = desc;
  235. + dev->rx_buf_ring.desc_phys = desc_phys;
  236. + dev->wlan.init_rx_buf(dev, dev->wlan.rx_npkt);
  237. +
  238. + return 0;
  239. +}
  240. +
  241. +static void
  242. +mtk_wed_free_rx_buffer(struct mtk_wed_device *dev)
  243. +{
  244. + struct mtk_rxbm_desc *desc = dev->rx_buf_ring.desc;
  245. +
  246. + if (!desc)
  247. + return;
  248. +
  249. + dev->wlan.release_rx_buf(dev);
  250. + dma_free_coherent(dev->hw->dev, dev->rx_buf_ring.size * sizeof(*desc),
  251. + desc, dev->rx_buf_ring.desc_phys);
  252. +}
  253. +
  254. +static void
  255. +mtk_wed_rx_buffer_hw_init(struct mtk_wed_device *dev)
  256. +{
  257. + wed_w32(dev, MTK_WED_RX_BM_RX_DMAD,
  258. + FIELD_PREP(MTK_WED_RX_BM_RX_DMAD_SDL0, dev->wlan.rx_size));
  259. + wed_w32(dev, MTK_WED_RX_BM_BASE, dev->rx_buf_ring.desc_phys);
  260. + wed_w32(dev, MTK_WED_RX_BM_INIT_PTR, MTK_WED_RX_BM_INIT_SW_TAIL |
  261. + FIELD_PREP(MTK_WED_RX_BM_SW_TAIL, dev->wlan.rx_npkt));
  262. + wed_w32(dev, MTK_WED_RX_BM_DYN_ALLOC_TH,
  263. + FIELD_PREP(MTK_WED_RX_BM_DYN_ALLOC_TH_H, 0xffff));
  264. + wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_BM_EN);
  265. +}
  266. +
  267. static void
  268. mtk_wed_free_ring(struct mtk_wed_device *dev, struct mtk_wed_ring *ring)
  269. {
  270. @@ -247,6 +412,13 @@ mtk_wed_free_ring(struct mtk_wed_device
  271. }
  272. static void
  273. +mtk_wed_free_rx_rings(struct mtk_wed_device *dev)
  274. +{
  275. + mtk_wed_free_rx_buffer(dev);
  276. + mtk_wed_free_ring(dev, &dev->rro.ring);
  277. +}
  278. +
  279. +static void
  280. mtk_wed_free_tx_rings(struct mtk_wed_device *dev)
  281. {
  282. int i;
  283. @@ -291,6 +463,38 @@ mtk_wed_set_512_support(struct mtk_wed_d
  284. }
  285. }
  286. +#define MTK_WFMDA_RX_DMA_EN BIT(2)
  287. +static void
  288. +mtk_wed_check_wfdma_rx_fill(struct mtk_wed_device *dev, int idx)
  289. +{
  290. + u32 val;
  291. + int i;
  292. +
  293. + if (!(dev->rx_ring[idx].flags & MTK_WED_RING_CONFIGURED))
  294. + return; /* queue is not configured by mt76 */
  295. +
  296. + for (i = 0; i < 3; i++) {
  297. + u32 cur_idx;
  298. +
  299. + cur_idx = wed_r32(dev,
  300. + MTK_WED_WPDMA_RING_RX_DATA(idx) +
  301. + MTK_WED_RING_OFS_CPU_IDX);
  302. + if (cur_idx == MTK_WED_RX_RING_SIZE - 1)
  303. + break;
  304. +
  305. + usleep_range(100000, 200000);
  306. + }
  307. +
  308. + if (i == 3) {
  309. + dev_err(dev->hw->dev, "rx dma enable failed\n");
  310. + return;
  311. + }
  312. +
  313. + val = wifi_r32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base) |
  314. + MTK_WFMDA_RX_DMA_EN;
  315. + wifi_w32(dev, dev->wlan.wpdma_rx_glo - dev->wlan.phy_base, val);
  316. +}
  317. +
  318. static void
  319. mtk_wed_dma_disable(struct mtk_wed_device *dev)
  320. {
  321. @@ -304,20 +508,25 @@ mtk_wed_dma_disable(struct mtk_wed_devic
  322. MTK_WED_GLO_CFG_TX_DMA_EN |
  323. MTK_WED_GLO_CFG_RX_DMA_EN);
  324. - wdma_m32(dev, MTK_WDMA_GLO_CFG,
  325. + wdma_clr(dev, MTK_WDMA_GLO_CFG,
  326. MTK_WDMA_GLO_CFG_TX_DMA_EN |
  327. MTK_WDMA_GLO_CFG_RX_INFO1_PRERES |
  328. - MTK_WDMA_GLO_CFG_RX_INFO2_PRERES, 0);
  329. + MTK_WDMA_GLO_CFG_RX_INFO2_PRERES);
  330. if (dev->hw->version == 1) {
  331. regmap_write(dev->hw->mirror, dev->hw->index * 4, 0);
  332. - wdma_m32(dev, MTK_WDMA_GLO_CFG,
  333. - MTK_WDMA_GLO_CFG_RX_INFO3_PRERES, 0);
  334. + wdma_clr(dev, MTK_WDMA_GLO_CFG,
  335. + MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);
  336. } else {
  337. wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,
  338. MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_PKT_PROC |
  339. MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_CRX_SYNC);
  340. + wed_clr(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,
  341. + MTK_WED_WPDMA_RX_D_RX_DRV_EN);
  342. + wed_clr(dev, MTK_WED_WDMA_GLO_CFG,
  343. + MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);
  344. +
  345. mtk_wed_set_512_support(dev, false);
  346. }
  347. }
  348. @@ -338,6 +547,13 @@ mtk_wed_stop(struct mtk_wed_device *dev)
  349. wdma_w32(dev, MTK_WDMA_INT_MASK, 0);
  350. wdma_w32(dev, MTK_WDMA_INT_GRP2, 0);
  351. wed_w32(dev, MTK_WED_WPDMA_INT_MASK, 0);
  352. +
  353. + if (dev->hw->version == 1)
  354. + return;
  355. +
  356. + wed_w32(dev, MTK_WED_EXT_INT_MASK1, 0);
  357. + wed_w32(dev, MTK_WED_EXT_INT_MASK2, 0);
  358. + wed_clr(dev, MTK_WED_CTRL, MTK_WED_CTRL_WED_RX_BM_EN);
  359. }
  360. static void
  361. @@ -353,11 +569,21 @@ mtk_wed_detach(struct mtk_wed_device *de
  362. wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
  363. mtk_wed_reset(dev, MTK_WED_RESET_WED);
  364. + if (mtk_wed_get_rx_capa(dev)) {
  365. + wdma_clr(dev, MTK_WDMA_GLO_CFG, MTK_WDMA_GLO_CFG_TX_DMA_EN);
  366. + wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_TX);
  367. + wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
  368. + }
  369. - mtk_wed_free_buffer(dev);
  370. + mtk_wed_free_tx_buffer(dev);
  371. mtk_wed_free_tx_rings(dev);
  372. - if (hw->version != 1)
  373. +
  374. + if (mtk_wed_get_rx_capa(dev)) {
  375. + mtk_wed_wo_reset(dev);
  376. + mtk_wed_free_rx_rings(dev);
  377. mtk_wed_wo_deinit(hw);
  378. + mtk_wdma_rx_reset(dev);
  379. + }
  380. if (dev->wlan.bus_type == MTK_WED_BUS_PCIE) {
  381. struct device_node *wlan_node;
  382. @@ -441,10 +667,12 @@ mtk_wed_set_wpdma(struct mtk_wed_device
  383. } else {
  384. mtk_wed_bus_init(dev);
  385. - wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_int);
  386. - wed_w32(dev, MTK_WED_WPDMA_CFG_INT_MASK, dev->wlan.wpdma_mask);
  387. - wed_w32(dev, MTK_WED_WPDMA_CFG_TX, dev->wlan.wpdma_tx);
  388. - wed_w32(dev, MTK_WED_WPDMA_CFG_TX_FREE, dev->wlan.wpdma_txfree);
  389. + wed_w32(dev, MTK_WED_WPDMA_CFG_BASE, dev->wlan.wpdma_int);
  390. + wed_w32(dev, MTK_WED_WPDMA_CFG_INT_MASK, dev->wlan.wpdma_mask);
  391. + wed_w32(dev, MTK_WED_WPDMA_CFG_TX, dev->wlan.wpdma_tx);
  392. + wed_w32(dev, MTK_WED_WPDMA_CFG_TX_FREE, dev->wlan.wpdma_txfree);
  393. + wed_w32(dev, MTK_WED_WPDMA_RX_GLO_CFG, dev->wlan.wpdma_rx_glo);
  394. + wed_w32(dev, MTK_WED_WPDMA_RX_RING, dev->wlan.wpdma_rx);
  395. }
  396. }
  397. @@ -494,6 +722,132 @@ mtk_wed_hw_init_early(struct mtk_wed_dev
  398. }
  399. }
  400. +static int
  401. +mtk_wed_rro_ring_alloc(struct mtk_wed_device *dev, struct mtk_wed_ring *ring,
  402. + int size)
  403. +{
  404. + ring->desc = dma_alloc_coherent(dev->hw->dev,
  405. + size * sizeof(*ring->desc),
  406. + &ring->desc_phys, GFP_KERNEL);
  407. + if (!ring->desc)
  408. + return -ENOMEM;
  409. +
  410. + ring->desc_size = sizeof(*ring->desc);
  411. + ring->size = size;
  412. + memset(ring->desc, 0, size);
  413. +
  414. + return 0;
  415. +}
  416. +
  417. +#define MTK_WED_MIOD_COUNT (MTK_WED_MIOD_ENTRY_CNT * MTK_WED_MIOD_CNT)
  418. +static int
  419. +mtk_wed_rro_alloc(struct mtk_wed_device *dev)
  420. +{
  421. + struct reserved_mem *rmem;
  422. + struct device_node *np;
  423. + int index;
  424. +
  425. + index = of_property_match_string(dev->hw->node, "memory-region-names",
  426. + "wo-dlm");
  427. + if (index < 0)
  428. + return index;
  429. +
  430. + np = of_parse_phandle(dev->hw->node, "memory-region", index);
  431. + if (!np)
  432. + return -ENODEV;
  433. +
  434. + rmem = of_reserved_mem_lookup(np);
  435. + of_node_put(np);
  436. +
  437. + if (!rmem)
  438. + return -ENODEV;
  439. +
  440. + dev->rro.miod_phys = rmem->base;
  441. + dev->rro.fdbk_phys = MTK_WED_MIOD_COUNT + dev->rro.miod_phys;
  442. +
  443. + return mtk_wed_rro_ring_alloc(dev, &dev->rro.ring,
  444. + MTK_WED_RRO_QUE_CNT);
  445. +}
  446. +
  447. +static int
  448. +mtk_wed_rro_cfg(struct mtk_wed_device *dev)
  449. +{
  450. + struct mtk_wed_wo *wo = dev->hw->wed_wo;
  451. + struct {
  452. + struct {
  453. + __le32 base;
  454. + __le32 cnt;
  455. + __le32 unit;
  456. + } ring[2];
  457. + __le32 wed;
  458. + u8 version;
  459. + } req = {
  460. + .ring[0] = {
  461. + .base = cpu_to_le32(MTK_WED_WOCPU_VIEW_MIOD_BASE),
  462. + .cnt = cpu_to_le32(MTK_WED_MIOD_CNT),
  463. + .unit = cpu_to_le32(MTK_WED_MIOD_ENTRY_CNT),
  464. + },
  465. + .ring[1] = {
  466. + .base = cpu_to_le32(MTK_WED_WOCPU_VIEW_MIOD_BASE +
  467. + MTK_WED_MIOD_COUNT),
  468. + .cnt = cpu_to_le32(MTK_WED_FB_CMD_CNT),
  469. + .unit = cpu_to_le32(4),
  470. + },
  471. + };
  472. +
  473. + return mtk_wed_mcu_send_msg(wo, MTK_WED_MODULE_ID_WO,
  474. + MTK_WED_WO_CMD_WED_CFG,
  475. + &req, sizeof(req), true);
  476. +}
  477. +
  478. +static void
  479. +mtk_wed_rro_hw_init(struct mtk_wed_device *dev)
  480. +{
  481. + wed_w32(dev, MTK_WED_RROQM_MIOD_CFG,
  482. + FIELD_PREP(MTK_WED_RROQM_MIOD_MID_DW, 0x70 >> 2) |
  483. + FIELD_PREP(MTK_WED_RROQM_MIOD_MOD_DW, 0x10 >> 2) |
  484. + FIELD_PREP(MTK_WED_RROQM_MIOD_ENTRY_DW,
  485. + MTK_WED_MIOD_ENTRY_CNT >> 2));
  486. +
  487. + wed_w32(dev, MTK_WED_RROQM_MIOD_CTRL0, dev->rro.miod_phys);
  488. + wed_w32(dev, MTK_WED_RROQM_MIOD_CTRL1,
  489. + FIELD_PREP(MTK_WED_RROQM_MIOD_CNT, MTK_WED_MIOD_CNT));
  490. + wed_w32(dev, MTK_WED_RROQM_FDBK_CTRL0, dev->rro.fdbk_phys);
  491. + wed_w32(dev, MTK_WED_RROQM_FDBK_CTRL1,
  492. + FIELD_PREP(MTK_WED_RROQM_FDBK_CNT, MTK_WED_FB_CMD_CNT));
  493. + wed_w32(dev, MTK_WED_RROQM_FDBK_CTRL2, 0);
  494. + wed_w32(dev, MTK_WED_RROQ_BASE_L, dev->rro.ring.desc_phys);
  495. +
  496. + wed_set(dev, MTK_WED_RROQM_RST_IDX,
  497. + MTK_WED_RROQM_RST_IDX_MIOD |
  498. + MTK_WED_RROQM_RST_IDX_FDBK);
  499. +
  500. + wed_w32(dev, MTK_WED_RROQM_RST_IDX, 0);
  501. + wed_w32(dev, MTK_WED_RROQM_MIOD_CTRL2, MTK_WED_MIOD_CNT - 1);
  502. + wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_RX_RRO_QM_EN);
  503. +}
  504. +
  505. +static void
  506. +mtk_wed_route_qm_hw_init(struct mtk_wed_device *dev)
  507. +{
  508. + wed_w32(dev, MTK_WED_RESET, MTK_WED_RESET_RX_ROUTE_QM);
  509. +
  510. + for (;;) {
  511. + usleep_range(100, 200);
  512. + if (!(wed_r32(dev, MTK_WED_RESET) & MTK_WED_RESET_RX_ROUTE_QM))
  513. + break;
  514. + }
  515. +
  516. + /* configure RX_ROUTE_QM */
  517. + wed_clr(dev, MTK_WED_RTQM_GLO_CFG, MTK_WED_RTQM_Q_RST);
  518. + wed_clr(dev, MTK_WED_RTQM_GLO_CFG, MTK_WED_RTQM_TXDMAD_FPORT);
  519. + wed_set(dev, MTK_WED_RTQM_GLO_CFG,
  520. + FIELD_PREP(MTK_WED_RTQM_TXDMAD_FPORT, 0x3 + dev->hw->index));
  521. + wed_clr(dev, MTK_WED_RTQM_GLO_CFG, MTK_WED_RTQM_Q_RST);
  522. + /* enable RX_ROUTE_QM */
  523. + wed_set(dev, MTK_WED_CTRL, MTK_WED_CTRL_RX_ROUTE_QM_EN);
  524. +}
  525. +
  526. static void
  527. mtk_wed_hw_init(struct mtk_wed_device *dev)
  528. {
  529. @@ -505,11 +859,11 @@ mtk_wed_hw_init(struct mtk_wed_device *d
  530. wed_w32(dev, MTK_WED_TX_BM_CTRL,
  531. MTK_WED_TX_BM_CTRL_PAUSE |
  532. FIELD_PREP(MTK_WED_TX_BM_CTRL_VLD_GRP_NUM,
  533. - dev->buf_ring.size / 128) |
  534. + dev->tx_buf_ring.size / 128) |
  535. FIELD_PREP(MTK_WED_TX_BM_CTRL_RSV_GRP_NUM,
  536. MTK_WED_TX_RING_SIZE / 256));
  537. - wed_w32(dev, MTK_WED_TX_BM_BASE, dev->buf_ring.desc_phys);
  538. + wed_w32(dev, MTK_WED_TX_BM_BASE, dev->tx_buf_ring.desc_phys);
  539. wed_w32(dev, MTK_WED_TX_BM_BUF_LEN, MTK_WED_PKT_SIZE);
  540. @@ -536,9 +890,9 @@ mtk_wed_hw_init(struct mtk_wed_device *d
  541. wed_w32(dev, MTK_WED_TX_TKID_CTRL,
  542. MTK_WED_TX_TKID_CTRL_PAUSE |
  543. FIELD_PREP(MTK_WED_TX_TKID_CTRL_VLD_GRP_NUM,
  544. - dev->buf_ring.size / 128) |
  545. + dev->tx_buf_ring.size / 128) |
  546. FIELD_PREP(MTK_WED_TX_TKID_CTRL_RSV_GRP_NUM,
  547. - dev->buf_ring.size / 128));
  548. + dev->tx_buf_ring.size / 128));
  549. wed_w32(dev, MTK_WED_TX_TKID_DYN_THR,
  550. FIELD_PREP(MTK_WED_TX_TKID_DYN_THR_LO, 0) |
  551. MTK_WED_TX_TKID_DYN_THR_HI);
  552. @@ -546,18 +900,28 @@ mtk_wed_hw_init(struct mtk_wed_device *d
  553. mtk_wed_reset(dev, MTK_WED_RESET_TX_BM);
  554. - if (dev->hw->version == 1)
  555. + if (dev->hw->version == 1) {
  556. wed_set(dev, MTK_WED_CTRL,
  557. MTK_WED_CTRL_WED_TX_BM_EN |
  558. MTK_WED_CTRL_WED_TX_FREE_AGENT_EN);
  559. - else
  560. + } else {
  561. wed_clr(dev, MTK_WED_TX_TKID_CTRL, MTK_WED_TX_TKID_CTRL_PAUSE);
  562. + /* rx hw init */
  563. + wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX,
  564. + MTK_WED_WPDMA_RX_D_RST_CRX_IDX |
  565. + MTK_WED_WPDMA_RX_D_RST_DRV_IDX);
  566. + wed_w32(dev, MTK_WED_WPDMA_RX_D_RST_IDX, 0);
  567. +
  568. + mtk_wed_rx_buffer_hw_init(dev);
  569. + mtk_wed_rro_hw_init(dev);
  570. + mtk_wed_route_qm_hw_init(dev);
  571. + }
  572. wed_clr(dev, MTK_WED_TX_BM_CTRL, MTK_WED_TX_BM_CTRL_PAUSE);
  573. }
  574. static void
  575. -mtk_wed_ring_reset(struct mtk_wed_ring *ring, int size)
  576. +mtk_wed_ring_reset(struct mtk_wed_ring *ring, int size, bool tx)
  577. {
  578. void *head = (void *)ring->desc;
  579. int i;
  580. @@ -567,7 +931,10 @@ mtk_wed_ring_reset(struct mtk_wed_ring *
  581. desc = (struct mtk_wdma_desc *)(head + i * ring->desc_size);
  582. desc->buf0 = 0;
  583. - desc->ctrl = cpu_to_le32(MTK_WDMA_DESC_CTRL_DMA_DONE);
  584. + if (tx)
  585. + desc->ctrl = cpu_to_le32(MTK_WDMA_DESC_CTRL_DMA_DONE);
  586. + else
  587. + desc->ctrl = cpu_to_le32(MTK_WFDMA_DESC_CTRL_TO_HOST);
  588. desc->buf1 = 0;
  589. desc->info = 0;
  590. }
  591. @@ -623,7 +990,8 @@ mtk_wed_reset_dma(struct mtk_wed_device
  592. if (!dev->tx_ring[i].desc)
  593. continue;
  594. - mtk_wed_ring_reset(&dev->tx_ring[i], MTK_WED_TX_RING_SIZE);
  595. + mtk_wed_ring_reset(&dev->tx_ring[i], MTK_WED_TX_RING_SIZE,
  596. + true);
  597. }
  598. if (mtk_wed_poll_busy(dev))
  599. @@ -641,6 +1009,9 @@ mtk_wed_reset_dma(struct mtk_wed_device
  600. wdma_w32(dev, MTK_WDMA_RESET_IDX, MTK_WDMA_RESET_IDX_RX);
  601. wdma_w32(dev, MTK_WDMA_RESET_IDX, 0);
  602. + if (mtk_wed_get_rx_capa(dev))
  603. + mtk_wdma_rx_reset(dev);
  604. +
  605. if (busy) {
  606. mtk_wed_reset(dev, MTK_WED_RESET_WDMA_INT_AGENT);
  607. mtk_wed_reset(dev, MTK_WED_RESET_WDMA_RX_DRV);
  608. @@ -675,12 +1046,11 @@ mtk_wed_reset_dma(struct mtk_wed_device
  609. MTK_WED_WPDMA_RESET_IDX_RX);
  610. wed_w32(dev, MTK_WED_WPDMA_RESET_IDX, 0);
  611. }
  612. -
  613. }
  614. static int
  615. mtk_wed_ring_alloc(struct mtk_wed_device *dev, struct mtk_wed_ring *ring,
  616. - int size, u32 desc_size)
  617. + int size, u32 desc_size, bool tx)
  618. {
  619. ring->desc = dma_alloc_coherent(dev->hw->dev, size * desc_size,
  620. &ring->desc_phys, GFP_KERNEL);
  621. @@ -689,7 +1059,7 @@ mtk_wed_ring_alloc(struct mtk_wed_device
  622. ring->desc_size = desc_size;
  623. ring->size = size;
  624. - mtk_wed_ring_reset(ring, size);
  625. + mtk_wed_ring_reset(ring, size, tx);
  626. return 0;
  627. }
  628. @@ -698,9 +1068,14 @@ static int
  629. mtk_wed_wdma_rx_ring_setup(struct mtk_wed_device *dev, int idx, int size)
  630. {
  631. u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;
  632. - struct mtk_wed_ring *wdma = &dev->rx_wdma[idx];
  633. + struct mtk_wed_ring *wdma;
  634. - if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size))
  635. + if (idx >= ARRAY_SIZE(dev->rx_wdma))
  636. + return -EINVAL;
  637. +
  638. + wdma = &dev->rx_wdma[idx];
  639. + if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size,
  640. + true))
  641. return -ENOMEM;
  642. wdma_w32(dev, MTK_WDMA_RING_RX(idx) + MTK_WED_RING_OFS_BASE,
  643. @@ -717,6 +1092,60 @@ mtk_wed_wdma_rx_ring_setup(struct mtk_we
  644. return 0;
  645. }
  646. +static int
  647. +mtk_wed_wdma_tx_ring_setup(struct mtk_wed_device *dev, int idx, int size)
  648. +{
  649. + u32 desc_size = sizeof(struct mtk_wdma_desc) * dev->hw->version;
  650. + struct mtk_wed_ring *wdma;
  651. +
  652. + if (idx >= ARRAY_SIZE(dev->tx_wdma))
  653. + return -EINVAL;
  654. +
  655. + wdma = &dev->tx_wdma[idx];
  656. + if (mtk_wed_ring_alloc(dev, wdma, MTK_WED_WDMA_RING_SIZE, desc_size,
  657. + true))
  658. + return -ENOMEM;
  659. +
  660. + wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE,
  661. + wdma->desc_phys);
  662. + wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_COUNT,
  663. + size);
  664. + wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_CPU_IDX, 0);
  665. + wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_DMA_IDX, 0);
  666. +
  667. + if (!idx) {
  668. + wed_w32(dev, MTK_WED_WDMA_RING_TX + MTK_WED_RING_OFS_BASE,
  669. + wdma->desc_phys);
  670. + wed_w32(dev, MTK_WED_WDMA_RING_TX + MTK_WED_RING_OFS_COUNT,
  671. + size);
  672. + wed_w32(dev, MTK_WED_WDMA_RING_TX + MTK_WED_RING_OFS_CPU_IDX,
  673. + 0);
  674. + wed_w32(dev, MTK_WED_WDMA_RING_TX + MTK_WED_RING_OFS_DMA_IDX,
  675. + 0);
  676. + }
  677. +
  678. + return 0;
  679. +}
  680. +
  681. +static void
  682. +mtk_wed_ppe_check(struct mtk_wed_device *dev, struct sk_buff *skb,
  683. + u32 reason, u32 hash)
  684. +{
  685. + struct mtk_eth *eth = dev->hw->eth;
  686. + struct ethhdr *eh;
  687. +
  688. + if (!skb)
  689. + return;
  690. +
  691. + if (reason != MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
  692. + return;
  693. +
  694. + skb_set_mac_header(skb, 0);
  695. + eh = eth_hdr(skb);
  696. + skb->protocol = eh->h_proto;
  697. + mtk_ppe_check_skb(eth->ppe[dev->hw->index], skb, hash);
  698. +}
  699. +
  700. static void
  701. mtk_wed_configure_irq(struct mtk_wed_device *dev, u32 irq_mask)
  702. {
  703. @@ -739,6 +1168,8 @@ mtk_wed_configure_irq(struct mtk_wed_dev
  704. wed_clr(dev, MTK_WED_WDMA_INT_CTRL, wdma_mask);
  705. } else {
  706. + wdma_mask |= FIELD_PREP(MTK_WDMA_INT_MASK_TX_DONE,
  707. + GENMASK(1, 0));
  708. /* initail tx interrupt trigger */
  709. wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_TX,
  710. MTK_WED_WPDMA_INT_CTRL_TX0_DONE_EN |
  711. @@ -757,6 +1188,16 @@ mtk_wed_configure_irq(struct mtk_wed_dev
  712. FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_TX_FREE_DONE_TRIG,
  713. dev->wlan.txfree_tbit));
  714. + wed_w32(dev, MTK_WED_WPDMA_INT_CTRL_RX,
  715. + MTK_WED_WPDMA_INT_CTRL_RX0_EN |
  716. + MTK_WED_WPDMA_INT_CTRL_RX0_CLR |
  717. + MTK_WED_WPDMA_INT_CTRL_RX1_EN |
  718. + MTK_WED_WPDMA_INT_CTRL_RX1_CLR |
  719. + FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX0_DONE_TRIG,
  720. + dev->wlan.rx_tbit[0]) |
  721. + FIELD_PREP(MTK_WED_WPDMA_INT_CTRL_RX1_DONE_TRIG,
  722. + dev->wlan.rx_tbit[1]));
  723. +
  724. wed_w32(dev, MTK_WED_WDMA_INT_CLR, wdma_mask);
  725. wed_set(dev, MTK_WED_WDMA_INT_CTRL,
  726. FIELD_PREP(MTK_WED_WDMA_INT_CTRL_POLL_SRC_SEL,
  727. @@ -794,9 +1235,15 @@ mtk_wed_dma_enable(struct mtk_wed_device
  728. wdma_set(dev, MTK_WDMA_GLO_CFG,
  729. MTK_WDMA_GLO_CFG_RX_INFO3_PRERES);
  730. } else {
  731. + int i;
  732. +
  733. wed_set(dev, MTK_WED_WPDMA_CTRL,
  734. MTK_WED_WPDMA_CTRL_SDL1_FIXED);
  735. + wed_set(dev, MTK_WED_WDMA_GLO_CFG,
  736. + MTK_WED_WDMA_GLO_CFG_TX_DRV_EN |
  737. + MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);
  738. +
  739. wed_set(dev, MTK_WED_WPDMA_GLO_CFG,
  740. MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_PKT_PROC |
  741. MTK_WED_WPDMA_GLO_CFG_RX_DRV_R0_CRX_SYNC);
  742. @@ -804,6 +1251,15 @@ mtk_wed_dma_enable(struct mtk_wed_device
  743. wed_clr(dev, MTK_WED_WPDMA_GLO_CFG,
  744. MTK_WED_WPDMA_GLO_CFG_TX_TKID_KEEP |
  745. MTK_WED_WPDMA_GLO_CFG_TX_DMAD_DW3_PREV);
  746. +
  747. + wed_set(dev, MTK_WED_WPDMA_RX_D_GLO_CFG,
  748. + MTK_WED_WPDMA_RX_D_RX_DRV_EN |
  749. + FIELD_PREP(MTK_WED_WPDMA_RX_D_RXD_READ_LEN, 0x18) |
  750. + FIELD_PREP(MTK_WED_WPDMA_RX_D_INIT_PHASE_RXEN_SEL,
  751. + 0x2));
  752. +
  753. + for (i = 0; i < MTK_WED_RX_QUEUES; i++)
  754. + mtk_wed_check_wfdma_rx_fill(dev, i);
  755. }
  756. }
  757. @@ -829,7 +1285,19 @@ mtk_wed_start(struct mtk_wed_device *dev
  758. val |= BIT(0) | (BIT(1) * !!dev->hw->index);
  759. regmap_write(dev->hw->mirror, dev->hw->index * 4, val);
  760. } else {
  761. - mtk_wed_set_512_support(dev, true);
  762. + /* driver set mid ready and only once */
  763. + wed_w32(dev, MTK_WED_EXT_INT_MASK1,
  764. + MTK_WED_EXT_INT_STATUS_WPDMA_MID_RDY);
  765. + wed_w32(dev, MTK_WED_EXT_INT_MASK2,
  766. + MTK_WED_EXT_INT_STATUS_WPDMA_MID_RDY);
  767. +
  768. + wed_r32(dev, MTK_WED_EXT_INT_MASK1);
  769. + wed_r32(dev, MTK_WED_EXT_INT_MASK2);
  770. +
  771. + if (mtk_wed_rro_cfg(dev))
  772. + return;
  773. +
  774. + mtk_wed_set_512_support(dev, dev->wlan.wcid_512);
  775. }
  776. mtk_wed_dma_enable(dev);
  777. @@ -863,7 +1331,7 @@ mtk_wed_attach(struct mtk_wed_device *de
  778. if (!hw) {
  779. module_put(THIS_MODULE);
  780. ret = -ENODEV;
  781. - goto out;
  782. + goto unlock;
  783. }
  784. device = dev->wlan.bus_type == MTK_WED_BUS_PCIE
  785. @@ -876,15 +1344,24 @@ mtk_wed_attach(struct mtk_wed_device *de
  786. dev->dev = hw->dev;
  787. dev->irq = hw->irq;
  788. dev->wdma_idx = hw->index;
  789. + dev->version = hw->version;
  790. if (hw->eth->dma_dev == hw->eth->dev &&
  791. of_dma_is_coherent(hw->eth->dev->of_node))
  792. mtk_eth_set_dma_device(hw->eth, hw->dev);
  793. - ret = mtk_wed_buffer_alloc(dev);
  794. - if (ret) {
  795. - mtk_wed_detach(dev);
  796. + ret = mtk_wed_tx_buffer_alloc(dev);
  797. + if (ret)
  798. goto out;
  799. +
  800. + if (mtk_wed_get_rx_capa(dev)) {
  801. + ret = mtk_wed_rx_buffer_alloc(dev);
  802. + if (ret)
  803. + goto out;
  804. +
  805. + ret = mtk_wed_rro_alloc(dev);
  806. + if (ret)
  807. + goto out;
  808. }
  809. mtk_wed_hw_init_early(dev);
  810. @@ -893,8 +1370,10 @@ mtk_wed_attach(struct mtk_wed_device *de
  811. BIT(hw->index), 0);
  812. else
  813. ret = mtk_wed_wo_init(hw);
  814. -
  815. out:
  816. + if (ret)
  817. + mtk_wed_detach(dev);
  818. +unlock:
  819. mutex_unlock(&hw_lock);
  820. return ret;
  821. @@ -917,10 +1396,11 @@ mtk_wed_tx_ring_setup(struct mtk_wed_dev
  822. * WDMA RX.
  823. */
  824. - BUG_ON(idx >= ARRAY_SIZE(dev->tx_ring));
  825. + if (WARN_ON(idx >= ARRAY_SIZE(dev->tx_ring)))
  826. + return -EINVAL;
  827. if (mtk_wed_ring_alloc(dev, ring, MTK_WED_TX_RING_SIZE,
  828. - sizeof(*ring->desc)))
  829. + sizeof(*ring->desc), true))
  830. return -ENOMEM;
  831. if (mtk_wed_wdma_rx_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE))
  832. @@ -967,6 +1447,37 @@ mtk_wed_txfree_ring_setup(struct mtk_wed
  833. return 0;
  834. }
  835. +static int
  836. +mtk_wed_rx_ring_setup(struct mtk_wed_device *dev, int idx, void __iomem *regs)
  837. +{
  838. + struct mtk_wed_ring *ring = &dev->rx_ring[idx];
  839. +
  840. + if (WARN_ON(idx >= ARRAY_SIZE(dev->rx_ring)))
  841. + return -EINVAL;
  842. +
  843. + if (mtk_wed_ring_alloc(dev, ring, MTK_WED_RX_RING_SIZE,
  844. + sizeof(*ring->desc), false))
  845. + return -ENOMEM;
  846. +
  847. + if (mtk_wed_wdma_tx_ring_setup(dev, idx, MTK_WED_WDMA_RING_SIZE))
  848. + return -ENOMEM;
  849. +
  850. + ring->reg_base = MTK_WED_RING_RX_DATA(idx);
  851. + ring->wpdma = regs;
  852. + ring->flags |= MTK_WED_RING_CONFIGURED;
  853. +
  854. + /* WPDMA -> WED */
  855. + wpdma_rx_w32(dev, idx, MTK_WED_RING_OFS_BASE, ring->desc_phys);
  856. + wpdma_rx_w32(dev, idx, MTK_WED_RING_OFS_COUNT, MTK_WED_RX_RING_SIZE);
  857. +
  858. + wed_w32(dev, MTK_WED_WPDMA_RING_RX_DATA(idx) + MTK_WED_RING_OFS_BASE,
  859. + ring->desc_phys);
  860. + wed_w32(dev, MTK_WED_WPDMA_RING_RX_DATA(idx) + MTK_WED_RING_OFS_COUNT,
  861. + MTK_WED_RX_RING_SIZE);
  862. +
  863. + return 0;
  864. +}
  865. +
  866. static u32
  867. mtk_wed_irq_get(struct mtk_wed_device *dev, u32 mask)
  868. {
  869. @@ -1063,7 +1574,9 @@ void mtk_wed_add_hw(struct device_node *
  870. static const struct mtk_wed_ops wed_ops = {
  871. .attach = mtk_wed_attach,
  872. .tx_ring_setup = mtk_wed_tx_ring_setup,
  873. + .rx_ring_setup = mtk_wed_rx_ring_setup,
  874. .txfree_ring_setup = mtk_wed_txfree_ring_setup,
  875. + .msg_update = mtk_wed_mcu_msg_update,
  876. .start = mtk_wed_start,
  877. .stop = mtk_wed_stop,
  878. .reset_dma = mtk_wed_reset_dma,
  879. @@ -1072,6 +1585,7 @@ void mtk_wed_add_hw(struct device_node *
  880. .irq_get = mtk_wed_irq_get,
  881. .irq_set_mask = mtk_wed_irq_set_mask,
  882. .detach = mtk_wed_detach,
  883. + .ppe_check = mtk_wed_ppe_check,
  884. };
  885. struct device_node *eth_np = eth->dev->of_node;
  886. struct platform_device *pdev;
  887. --- a/drivers/net/ethernet/mediatek/mtk_wed.h
  888. +++ b/drivers/net/ethernet/mediatek/mtk_wed.h
  889. @@ -87,6 +87,24 @@ wpdma_tx_w32(struct mtk_wed_device *dev,
  890. }
  891. static inline u32
  892. +wpdma_rx_r32(struct mtk_wed_device *dev, int ring, u32 reg)
  893. +{
  894. + if (!dev->rx_ring[ring].wpdma)
  895. + return 0;
  896. +
  897. + return readl(dev->rx_ring[ring].wpdma + reg);
  898. +}
  899. +
  900. +static inline void
  901. +wpdma_rx_w32(struct mtk_wed_device *dev, int ring, u32 reg, u32 val)
  902. +{
  903. + if (!dev->rx_ring[ring].wpdma)
  904. + return;
  905. +
  906. + writel(val, dev->rx_ring[ring].wpdma + reg);
  907. +}
  908. +
  909. +static inline u32
  910. wpdma_txfree_r32(struct mtk_wed_device *dev, u32 reg)
  911. {
  912. if (!dev->txfree_ring.wpdma)
  913. @@ -128,6 +146,7 @@ static inline int mtk_wed_flow_add(int i
  914. static inline void mtk_wed_flow_remove(int index)
  915. {
  916. }
  917. +
  918. #endif
  919. #ifdef CONFIG_DEBUG_FS
  920. --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  921. +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  922. @@ -10,6 +10,7 @@
  923. #include <linux/of_reserved_mem.h>
  924. #include <linux/mfd/syscon.h>
  925. #include <linux/soc/mediatek/mtk_wed.h>
  926. +#include <asm/unaligned.h>
  927. #include "mtk_wed_regs.h"
  928. #include "mtk_wed_wo.h"
  929. @@ -60,24 +61,37 @@ void mtk_wed_mcu_rx_event(struct mtk_wed
  930. wake_up(&wo->mcu.wait);
  931. }
  932. +static void
  933. +mtk_wed_update_rx_stats(struct mtk_wed_device *wed, struct sk_buff *skb)
  934. +{
  935. + u32 count = get_unaligned_le32(skb->data);
  936. + struct mtk_wed_wo_rx_stats *stats;
  937. + int i;
  938. +
  939. + if (count * sizeof(*stats) > skb->len - sizeof(u32))
  940. + return;
  941. +
  942. + stats = (struct mtk_wed_wo_rx_stats *)(skb->data + sizeof(u32));
  943. + for (i = 0 ; i < count ; i++)
  944. + wed->wlan.update_wo_rx_stats(wed, &stats[i]);
  945. +}
  946. +
  947. void mtk_wed_mcu_rx_unsolicited_event(struct mtk_wed_wo *wo,
  948. struct sk_buff *skb)
  949. {
  950. struct mtk_wed_mcu_hdr *hdr = (struct mtk_wed_mcu_hdr *)skb->data;
  951. - switch (hdr->cmd) {
  952. - case MTK_WED_WO_EVT_LOG_DUMP: {
  953. - const char *msg = (const char *)(skb->data + sizeof(*hdr));
  954. + skb_pull(skb, sizeof(*hdr));
  955. - dev_notice(wo->hw->dev, "%s\n", msg);
  956. + switch (hdr->cmd) {
  957. + case MTK_WED_WO_EVT_LOG_DUMP:
  958. + dev_notice(wo->hw->dev, "%s\n", skb->data);
  959. break;
  960. - }
  961. case MTK_WED_WO_EVT_PROFILING: {
  962. - struct mtk_wed_wo_log_info *info;
  963. - u32 count = (skb->len - sizeof(*hdr)) / sizeof(*info);
  964. + struct mtk_wed_wo_log_info *info = (void *)skb->data;
  965. + u32 count = skb->len / sizeof(*info);
  966. int i;
  967. - info = (struct mtk_wed_wo_log_info *)(skb->data + sizeof(*hdr));
  968. for (i = 0 ; i < count ; i++)
  969. dev_notice(wo->hw->dev,
  970. "SN:%u latency: total=%u, rro:%u, mod:%u\n",
  971. @@ -88,6 +102,7 @@ void mtk_wed_mcu_rx_unsolicited_event(st
  972. break;
  973. }
  974. case MTK_WED_WO_EVT_RXCNT_INFO:
  975. + mtk_wed_update_rx_stats(wo->hw->wed_dev, skb);
  976. break;
  977. default:
  978. break;
  979. @@ -144,6 +159,8 @@ mtk_wed_mcu_parse_response(struct mtk_we
  980. skb_pull(skb, sizeof(*hdr));
  981. switch (cmd) {
  982. case MTK_WED_WO_CMD_RXCNT_INFO:
  983. + mtk_wed_update_rx_stats(wo->hw->wed_dev, skb);
  984. + break;
  985. default:
  986. break;
  987. }
  988. @@ -182,6 +199,18 @@ unlock:
  989. return ret;
  990. }
  991. +int mtk_wed_mcu_msg_update(struct mtk_wed_device *dev, int id, void *data,
  992. + int len)
  993. +{
  994. + struct mtk_wed_wo *wo = dev->hw->wed_wo;
  995. +
  996. + if (dev->hw->version == 1)
  997. + return 0;
  998. +
  999. + return mtk_wed_mcu_send_msg(wo, MTK_WED_MODULE_ID_WO, id, data, len,
  1000. + true);
  1001. +}
  1002. +
  1003. static int
  1004. mtk_wed_get_memory_region(struct mtk_wed_wo *wo,
  1005. struct mtk_wed_wo_memory_region *region)
  1006. --- a/drivers/net/ethernet/mediatek/mtk_wed_regs.h
  1007. +++ b/drivers/net/ethernet/mediatek/mtk_wed_regs.h
  1008. @@ -4,6 +4,7 @@
  1009. #ifndef __MTK_WED_REGS_H
  1010. #define __MTK_WED_REGS_H
  1011. +#define MTK_WFDMA_DESC_CTRL_TO_HOST BIT(8)
  1012. #define MTK_WDMA_DESC_CTRL_LEN1 GENMASK(14, 0)
  1013. #define MTK_WDMA_DESC_CTRL_LEN1_V2 GENMASK(13, 0)
  1014. #define MTK_WDMA_DESC_CTRL_LAST_SEG1 BIT(15)
  1015. @@ -28,6 +29,8 @@ struct mtk_wdma_desc {
  1016. #define MTK_WED_RESET_WED_TX_DMA BIT(12)
  1017. #define MTK_WED_RESET_WDMA_RX_DRV BIT(17)
  1018. #define MTK_WED_RESET_WDMA_INT_AGENT BIT(19)
  1019. +#define MTK_WED_RESET_RX_RRO_QM BIT(20)
  1020. +#define MTK_WED_RESET_RX_ROUTE_QM BIT(21)
  1021. #define MTK_WED_RESET_WED BIT(31)
  1022. #define MTK_WED_CTRL 0x00c
  1023. @@ -39,8 +42,12 @@ struct mtk_wdma_desc {
  1024. #define MTK_WED_CTRL_WED_TX_BM_BUSY BIT(9)
  1025. #define MTK_WED_CTRL_WED_TX_FREE_AGENT_EN BIT(10)
  1026. #define MTK_WED_CTRL_WED_TX_FREE_AGENT_BUSY BIT(11)
  1027. -#define MTK_WED_CTRL_RESERVE_EN BIT(12)
  1028. -#define MTK_WED_CTRL_RESERVE_BUSY BIT(13)
  1029. +#define MTK_WED_CTRL_WED_RX_BM_EN BIT(12)
  1030. +#define MTK_WED_CTRL_WED_RX_BM_BUSY BIT(13)
  1031. +#define MTK_WED_CTRL_RX_RRO_QM_EN BIT(14)
  1032. +#define MTK_WED_CTRL_RX_RRO_QM_BUSY BIT(15)
  1033. +#define MTK_WED_CTRL_RX_ROUTE_QM_EN BIT(16)
  1034. +#define MTK_WED_CTRL_RX_ROUTE_QM_BUSY BIT(17)
  1035. #define MTK_WED_CTRL_FINAL_DIDX_READ BIT(24)
  1036. #define MTK_WED_CTRL_ETH_DMAD_FMT BIT(25)
  1037. #define MTK_WED_CTRL_MIB_READ_CLEAR BIT(28)
  1038. @@ -62,6 +69,9 @@ struct mtk_wdma_desc {
  1039. #define MTK_WED_EXT_INT_STATUS_TX_DMA_R_RESP_ERR BIT(22)
  1040. #define MTK_WED_EXT_INT_STATUS_TX_DMA_W_RESP_ERR BIT(23)
  1041. #define MTK_WED_EXT_INT_STATUS_RX_DRV_DMA_RECYCLE BIT(24)
  1042. +#define MTK_WED_EXT_INT_STATUS_RX_DRV_GET_BM_DMAD_SKIP BIT(25)
  1043. +#define MTK_WED_EXT_INT_STATUS_WPDMA_RX_D_DRV_ERR BIT(26)
  1044. +#define MTK_WED_EXT_INT_STATUS_WPDMA_MID_RDY BIT(27)
  1045. #define MTK_WED_EXT_INT_STATUS_ERROR_MASK (MTK_WED_EXT_INT_STATUS_TF_LEN_ERR | \
  1046. MTK_WED_EXT_INT_STATUS_TKID_WO_PYLD | \
  1047. MTK_WED_EXT_INT_STATUS_TKID_TITO_INVALID | \
  1048. @@ -71,6 +81,8 @@ struct mtk_wdma_desc {
  1049. MTK_WED_EXT_INT_STATUS_TX_DMA_R_RESP_ERR)
  1050. #define MTK_WED_EXT_INT_MASK 0x028
  1051. +#define MTK_WED_EXT_INT_MASK1 0x02c
  1052. +#define MTK_WED_EXT_INT_MASK2 0x030
  1053. #define MTK_WED_STATUS 0x060
  1054. #define MTK_WED_STATUS_TX GENMASK(15, 8)
  1055. @@ -151,6 +163,7 @@ struct mtk_wdma_desc {
  1056. #define MTK_WED_RING_TX(_n) (0x300 + (_n) * 0x10)
  1057. #define MTK_WED_RING_RX(_n) (0x400 + (_n) * 0x10)
  1058. +#define MTK_WED_RING_RX_DATA(_n) (0x420 + (_n) * 0x10)
  1059. #define MTK_WED_SCR0 0x3c0
  1060. #define MTK_WED_WPDMA_INT_TRIGGER 0x504
  1061. @@ -213,6 +226,12 @@ struct mtk_wdma_desc {
  1062. #define MTK_WED_WPDMA_INT_CTRL_TX1_DONE_TRIG GENMASK(14, 10)
  1063. #define MTK_WED_WPDMA_INT_CTRL_RX 0x534
  1064. +#define MTK_WED_WPDMA_INT_CTRL_RX0_EN BIT(0)
  1065. +#define MTK_WED_WPDMA_INT_CTRL_RX0_CLR BIT(1)
  1066. +#define MTK_WED_WPDMA_INT_CTRL_RX0_DONE_TRIG GENMASK(6, 2)
  1067. +#define MTK_WED_WPDMA_INT_CTRL_RX1_EN BIT(8)
  1068. +#define MTK_WED_WPDMA_INT_CTRL_RX1_CLR BIT(9)
  1069. +#define MTK_WED_WPDMA_INT_CTRL_RX1_DONE_TRIG GENMASK(14, 10)
  1070. #define MTK_WED_WPDMA_INT_CTRL_TX_FREE 0x538
  1071. #define MTK_WED_WPDMA_INT_CTRL_TX_FREE_DONE_EN BIT(0)
  1072. @@ -242,11 +261,34 @@ struct mtk_wdma_desc {
  1073. #define MTK_WED_WPDMA_RING_TX(_n) (0x600 + (_n) * 0x10)
  1074. #define MTK_WED_WPDMA_RING_RX(_n) (0x700 + (_n) * 0x10)
  1075. +#define MTK_WED_WPDMA_RING_RX_DATA(_n) (0x730 + (_n) * 0x10)
  1076. +
  1077. +#define MTK_WED_WPDMA_RX_D_GLO_CFG 0x75c
  1078. +#define MTK_WED_WPDMA_RX_D_RX_DRV_EN BIT(0)
  1079. +#define MTK_WED_WPDMA_RX_D_INIT_PHASE_RXEN_SEL GENMASK(11, 7)
  1080. +#define MTK_WED_WPDMA_RX_D_RXD_READ_LEN GENMASK(31, 24)
  1081. +
  1082. +#define MTK_WED_WPDMA_RX_D_RST_IDX 0x760
  1083. +#define MTK_WED_WPDMA_RX_D_RST_CRX_IDX GENMASK(17, 16)
  1084. +#define MTK_WED_WPDMA_RX_D_RST_DRV_IDX GENMASK(25, 24)
  1085. +
  1086. +#define MTK_WED_WPDMA_RX_GLO_CFG 0x76c
  1087. +#define MTK_WED_WPDMA_RX_RING 0x770
  1088. +
  1089. +#define MTK_WED_WPDMA_RX_D_MIB(_n) (0x774 + (_n) * 4)
  1090. +#define MTK_WED_WPDMA_RX_D_PROCESSED_MIB(_n) (0x784 + (_n) * 4)
  1091. +#define MTK_WED_WPDMA_RX_D_COHERENT_MIB 0x78c
  1092. +
  1093. +#define MTK_WED_WDMA_RING_TX 0x800
  1094. +
  1095. +#define MTK_WED_WDMA_TX_MIB 0x810
  1096. +
  1097. #define MTK_WED_WDMA_RING_RX(_n) (0x900 + (_n) * 0x10)
  1098. #define MTK_WED_WDMA_RX_THRES(_n) (0x940 + (_n) * 0x4)
  1099. #define MTK_WED_WDMA_GLO_CFG 0xa04
  1100. #define MTK_WED_WDMA_GLO_CFG_TX_DRV_EN BIT(0)
  1101. +#define MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK BIT(1)
  1102. #define MTK_WED_WDMA_GLO_CFG_RX_DRV_EN BIT(2)
  1103. #define MTK_WED_WDMA_GLO_CFG_RX_DRV_BUSY BIT(3)
  1104. #define MTK_WED_WDMA_GLO_CFG_BT_SIZE GENMASK(5, 4)
  1105. @@ -291,6 +333,20 @@ struct mtk_wdma_desc {
  1106. #define MTK_WED_WDMA_RX_RECYCLE_MIB(_n) (0xae8 + (_n) * 4)
  1107. #define MTK_WED_WDMA_RX_PROCESSED_MIB(_n) (0xaf0 + (_n) * 4)
  1108. +#define MTK_WED_RX_BM_RX_DMAD 0xd80
  1109. +#define MTK_WED_RX_BM_RX_DMAD_SDL0 GENMASK(13, 0)
  1110. +
  1111. +#define MTK_WED_RX_BM_BASE 0xd84
  1112. +#define MTK_WED_RX_BM_INIT_PTR 0xd88
  1113. +#define MTK_WED_RX_BM_SW_TAIL GENMASK(15, 0)
  1114. +#define MTK_WED_RX_BM_INIT_SW_TAIL BIT(16)
  1115. +
  1116. +#define MTK_WED_RX_PTR 0xd8c
  1117. +
  1118. +#define MTK_WED_RX_BM_DYN_ALLOC_TH 0xdb4
  1119. +#define MTK_WED_RX_BM_DYN_ALLOC_TH_H GENMASK(31, 16)
  1120. +#define MTK_WED_RX_BM_DYN_ALLOC_TH_L GENMASK(15, 0)
  1121. +
  1122. #define MTK_WED_RING_OFS_BASE 0x00
  1123. #define MTK_WED_RING_OFS_COUNT 0x04
  1124. #define MTK_WED_RING_OFS_CPU_IDX 0x08
  1125. @@ -301,7 +357,9 @@ struct mtk_wdma_desc {
  1126. #define MTK_WDMA_GLO_CFG 0x204
  1127. #define MTK_WDMA_GLO_CFG_TX_DMA_EN BIT(0)
  1128. +#define MTK_WDMA_GLO_CFG_TX_DMA_BUSY BIT(1)
  1129. #define MTK_WDMA_GLO_CFG_RX_DMA_EN BIT(2)
  1130. +#define MTK_WDMA_GLO_CFG_RX_DMA_BUSY BIT(3)
  1131. #define MTK_WDMA_GLO_CFG_RX_INFO3_PRERES BIT(26)
  1132. #define MTK_WDMA_GLO_CFG_RX_INFO2_PRERES BIT(27)
  1133. #define MTK_WDMA_GLO_CFG_RX_INFO1_PRERES BIT(28)
  1134. @@ -330,4 +388,70 @@ struct mtk_wdma_desc {
  1135. /* DMA channel mapping */
  1136. #define HIFSYS_DMA_AG_MAP 0x008
  1137. +#define MTK_WED_RTQM_GLO_CFG 0xb00
  1138. +#define MTK_WED_RTQM_BUSY BIT(1)
  1139. +#define MTK_WED_RTQM_Q_RST BIT(2)
  1140. +#define MTK_WED_RTQM_Q_DBG_BYPASS BIT(5)
  1141. +#define MTK_WED_RTQM_TXDMAD_FPORT GENMASK(23, 20)
  1142. +
  1143. +#define MTK_WED_RTQM_R2H_MIB(_n) (0xb70 + (_n) * 0x4)
  1144. +#define MTK_WED_RTQM_R2Q_MIB(_n) (0xb78 + (_n) * 0x4)
  1145. +#define MTK_WED_RTQM_Q2N_MIB 0xb80
  1146. +#define MTK_WED_RTQM_Q2H_MIB(_n) (0xb84 + (_n) * 0x4)
  1147. +
  1148. +#define MTK_WED_RTQM_Q2B_MIB 0xb8c
  1149. +#define MTK_WED_RTQM_PFDBK_MIB 0xb90
  1150. +
  1151. +#define MTK_WED_RROQM_GLO_CFG 0xc04
  1152. +#define MTK_WED_RROQM_RST_IDX 0xc08
  1153. +#define MTK_WED_RROQM_RST_IDX_MIOD BIT(0)
  1154. +#define MTK_WED_RROQM_RST_IDX_FDBK BIT(4)
  1155. +
  1156. +#define MTK_WED_RROQM_MIOD_CTRL0 0xc40
  1157. +#define MTK_WED_RROQM_MIOD_CTRL1 0xc44
  1158. +#define MTK_WED_RROQM_MIOD_CNT GENMASK(11, 0)
  1159. +
  1160. +#define MTK_WED_RROQM_MIOD_CTRL2 0xc48
  1161. +#define MTK_WED_RROQM_MIOD_CTRL3 0xc4c
  1162. +
  1163. +#define MTK_WED_RROQM_FDBK_CTRL0 0xc50
  1164. +#define MTK_WED_RROQM_FDBK_CTRL1 0xc54
  1165. +#define MTK_WED_RROQM_FDBK_CNT GENMASK(11, 0)
  1166. +
  1167. +#define MTK_WED_RROQM_FDBK_CTRL2 0xc58
  1168. +
  1169. +#define MTK_WED_RROQ_BASE_L 0xc80
  1170. +#define MTK_WED_RROQ_BASE_H 0xc84
  1171. +
  1172. +#define MTK_WED_RROQM_MIOD_CFG 0xc8c
  1173. +#define MTK_WED_RROQM_MIOD_MID_DW GENMASK(5, 0)
  1174. +#define MTK_WED_RROQM_MIOD_MOD_DW GENMASK(13, 8)
  1175. +#define MTK_WED_RROQM_MIOD_ENTRY_DW GENMASK(22, 16)
  1176. +
  1177. +#define MTK_WED_RROQM_MID_MIB 0xcc0
  1178. +#define MTK_WED_RROQM_MOD_MIB 0xcc4
  1179. +#define MTK_WED_RROQM_MOD_COHERENT_MIB 0xcc8
  1180. +#define MTK_WED_RROQM_FDBK_MIB 0xcd0
  1181. +#define MTK_WED_RROQM_FDBK_COHERENT_MIB 0xcd4
  1182. +#define MTK_WED_RROQM_FDBK_IND_MIB 0xce0
  1183. +#define MTK_WED_RROQM_FDBK_ENQ_MIB 0xce4
  1184. +#define MTK_WED_RROQM_FDBK_ANC_MIB 0xce8
  1185. +#define MTK_WED_RROQM_FDBK_ANC2H_MIB 0xcec
  1186. +
  1187. +#define MTK_WED_RX_BM_RX_DMAD 0xd80
  1188. +#define MTK_WED_RX_BM_BASE 0xd84
  1189. +#define MTK_WED_RX_BM_INIT_PTR 0xd88
  1190. +#define MTK_WED_RX_BM_PTR 0xd8c
  1191. +#define MTK_WED_RX_BM_PTR_HEAD GENMASK(32, 16)
  1192. +#define MTK_WED_RX_BM_PTR_TAIL GENMASK(15, 0)
  1193. +
  1194. +#define MTK_WED_RX_BM_BLEN 0xd90
  1195. +#define MTK_WED_RX_BM_STS 0xd94
  1196. +#define MTK_WED_RX_BM_INTF2 0xd98
  1197. +#define MTK_WED_RX_BM_INTF 0xd9c
  1198. +#define MTK_WED_RX_BM_ERR_STS 0xda8
  1199. +
  1200. +#define MTK_WED_WOCPU_VIEW_MIOD_BASE 0x8000
  1201. +#define MTK_WED_PCIE_INT_MASK 0x0
  1202. +
  1203. #endif
  1204. --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  1205. +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  1206. @@ -49,6 +49,10 @@ enum {
  1207. MTK_WED_WARP_CMD_FLAG_FROM_TO_WO = BIT(2),
  1208. };
  1209. +#define MTK_WED_WO_CPU_MCUSYS_RESET_ADDR 0x15194050
  1210. +#define MTK_WED_WO_CPU_WO0_MCUSYS_RESET_MASK 0x20
  1211. +#define MTK_WED_WO_CPU_WO1_MCUSYS_RESET_MASK 0x1
  1212. +
  1213. enum {
  1214. MTK_WED_WO_REGION_EMI,
  1215. MTK_WED_WO_REGION_ILM,
  1216. @@ -57,6 +61,28 @@ enum {
  1217. __MTK_WED_WO_REGION_MAX,
  1218. };
  1219. +enum mtk_wed_wo_state {
  1220. + MTK_WED_WO_STATE_UNDEFINED,
  1221. + MTK_WED_WO_STATE_INIT,
  1222. + MTK_WED_WO_STATE_ENABLE,
  1223. + MTK_WED_WO_STATE_DISABLE,
  1224. + MTK_WED_WO_STATE_HALT,
  1225. + MTK_WED_WO_STATE_GATING,
  1226. + MTK_WED_WO_STATE_SER_RESET,
  1227. + MTK_WED_WO_STATE_WF_RESET,
  1228. +};
  1229. +
  1230. +enum mtk_wed_wo_done_state {
  1231. + MTK_WED_WOIF_UNDEFINED,
  1232. + MTK_WED_WOIF_DISABLE_DONE,
  1233. + MTK_WED_WOIF_TRIGGER_ENABLE,
  1234. + MTK_WED_WOIF_ENABLE_DONE,
  1235. + MTK_WED_WOIF_TRIGGER_GATING,
  1236. + MTK_WED_WOIF_GATING_DONE,
  1237. + MTK_WED_WOIF_TRIGGER_HALT,
  1238. + MTK_WED_WOIF_HALT_DONE,
  1239. +};
  1240. +
  1241. enum mtk_wed_dummy_cr_idx {
  1242. MTK_WED_DUMMY_CR_FWDL,
  1243. MTK_WED_DUMMY_CR_WO_STATUS,
  1244. @@ -245,6 +271,8 @@ void mtk_wed_mcu_rx_unsolicited_event(st
  1245. struct sk_buff *skb);
  1246. int mtk_wed_mcu_send_msg(struct mtk_wed_wo *wo, int id, int cmd,
  1247. const void *data, int len, bool wait_resp);
  1248. +int mtk_wed_mcu_msg_update(struct mtk_wed_device *dev, int id, void *data,
  1249. + int len);
  1250. int mtk_wed_mcu_init(struct mtk_wed_wo *wo);
  1251. int mtk_wed_wo_init(struct mtk_wed_hw *hw);
  1252. void mtk_wed_wo_deinit(struct mtk_wed_hw *hw);
  1253. --- a/include/linux/soc/mediatek/mtk_wed.h
  1254. +++ b/include/linux/soc/mediatek/mtk_wed.h
  1255. @@ -5,10 +5,13 @@
  1256. #include <linux/rcupdate.h>
  1257. #include <linux/regmap.h>
  1258. #include <linux/pci.h>
  1259. +#include <linux/skbuff.h>
  1260. #define MTK_WED_TX_QUEUES 2
  1261. #define MTK_WED_RX_QUEUES 2
  1262. +#define WED_WO_STA_REC 0x6
  1263. +
  1264. struct mtk_wed_hw;
  1265. struct mtk_wdma_desc;
  1266. @@ -41,21 +44,37 @@ enum mtk_wed_wo_cmd {
  1267. MTK_WED_WO_CMD_WED_END
  1268. };
  1269. +struct mtk_rxbm_desc {
  1270. + __le32 buf0;
  1271. + __le32 token;
  1272. +} __packed __aligned(4);
  1273. +
  1274. enum mtk_wed_bus_tye {
  1275. MTK_WED_BUS_PCIE,
  1276. MTK_WED_BUS_AXI,
  1277. };
  1278. +#define MTK_WED_RING_CONFIGURED BIT(0)
  1279. struct mtk_wed_ring {
  1280. struct mtk_wdma_desc *desc;
  1281. dma_addr_t desc_phys;
  1282. u32 desc_size;
  1283. int size;
  1284. + u32 flags;
  1285. u32 reg_base;
  1286. void __iomem *wpdma;
  1287. };
  1288. +struct mtk_wed_wo_rx_stats {
  1289. + __le16 wlan_idx;
  1290. + __le16 tid;
  1291. + __le32 rx_pkt_cnt;
  1292. + __le32 rx_byte_cnt;
  1293. + __le32 rx_err_cnt;
  1294. + __le32 rx_drop_cnt;
  1295. +};
  1296. +
  1297. struct mtk_wed_device {
  1298. #ifdef CONFIG_NET_MEDIATEK_SOC_WED
  1299. const struct mtk_wed_ops *ops;
  1300. @@ -64,9 +83,12 @@ struct mtk_wed_device {
  1301. bool init_done, running;
  1302. int wdma_idx;
  1303. int irq;
  1304. + u8 version;
  1305. struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES];
  1306. + struct mtk_wed_ring rx_ring[MTK_WED_RX_QUEUES];
  1307. struct mtk_wed_ring txfree_ring;
  1308. + struct mtk_wed_ring tx_wdma[MTK_WED_TX_QUEUES];
  1309. struct mtk_wed_ring rx_wdma[MTK_WED_RX_QUEUES];
  1310. struct {
  1311. @@ -74,7 +96,20 @@ struct mtk_wed_device {
  1312. void **pages;
  1313. struct mtk_wdma_desc *desc;
  1314. dma_addr_t desc_phys;
  1315. - } buf_ring;
  1316. + } tx_buf_ring;
  1317. +
  1318. + struct {
  1319. + int size;
  1320. + struct page_frag_cache rx_page;
  1321. + struct mtk_rxbm_desc *desc;
  1322. + dma_addr_t desc_phys;
  1323. + } rx_buf_ring;
  1324. +
  1325. + struct {
  1326. + struct mtk_wed_ring ring;
  1327. + dma_addr_t miod_phys;
  1328. + dma_addr_t fdbk_phys;
  1329. + } rro;
  1330. /* filled by driver: */
  1331. struct {
  1332. @@ -83,22 +118,36 @@ struct mtk_wed_device {
  1333. struct pci_dev *pci_dev;
  1334. };
  1335. enum mtk_wed_bus_tye bus_type;
  1336. + void __iomem *base;
  1337. + u32 phy_base;
  1338. u32 wpdma_phys;
  1339. u32 wpdma_int;
  1340. u32 wpdma_mask;
  1341. u32 wpdma_tx;
  1342. u32 wpdma_txfree;
  1343. + u32 wpdma_rx_glo;
  1344. + u32 wpdma_rx;
  1345. +
  1346. + bool wcid_512;
  1347. u16 token_start;
  1348. unsigned int nbuf;
  1349. + unsigned int rx_nbuf;
  1350. + unsigned int rx_npkt;
  1351. + unsigned int rx_size;
  1352. u8 tx_tbit[MTK_WED_TX_QUEUES];
  1353. + u8 rx_tbit[MTK_WED_RX_QUEUES];
  1354. u8 txfree_tbit;
  1355. u32 (*init_buf)(void *ptr, dma_addr_t phys, int token_id);
  1356. int (*offload_enable)(struct mtk_wed_device *wed);
  1357. void (*offload_disable)(struct mtk_wed_device *wed);
  1358. + u32 (*init_rx_buf)(struct mtk_wed_device *wed, int size);
  1359. + void (*release_rx_buf)(struct mtk_wed_device *wed);
  1360. + void (*update_wo_rx_stats)(struct mtk_wed_device *wed,
  1361. + struct mtk_wed_wo_rx_stats *stats);
  1362. } wlan;
  1363. #endif
  1364. };
  1365. @@ -107,9 +156,15 @@ struct mtk_wed_ops {
  1366. int (*attach)(struct mtk_wed_device *dev);
  1367. int (*tx_ring_setup)(struct mtk_wed_device *dev, int ring,
  1368. void __iomem *regs);
  1369. + int (*rx_ring_setup)(struct mtk_wed_device *dev, int ring,
  1370. + void __iomem *regs);
  1371. int (*txfree_ring_setup)(struct mtk_wed_device *dev,
  1372. void __iomem *regs);
  1373. + int (*msg_update)(struct mtk_wed_device *dev, int cmd_id,
  1374. + void *data, int len);
  1375. void (*detach)(struct mtk_wed_device *dev);
  1376. + void (*ppe_check)(struct mtk_wed_device *dev, struct sk_buff *skb,
  1377. + u32 reason, u32 hash);
  1378. void (*stop)(struct mtk_wed_device *dev);
  1379. void (*start)(struct mtk_wed_device *dev, u32 irq_mask);
  1380. @@ -144,6 +199,16 @@ mtk_wed_device_attach(struct mtk_wed_dev
  1381. return ret;
  1382. }
  1383. +static inline bool
  1384. +mtk_wed_get_rx_capa(struct mtk_wed_device *dev)
  1385. +{
  1386. +#ifdef CONFIG_NET_MEDIATEK_SOC_WED
  1387. + return dev->version != 1;
  1388. +#else
  1389. + return false;
  1390. +#endif
  1391. +}
  1392. +
  1393. #ifdef CONFIG_NET_MEDIATEK_SOC_WED
  1394. #define mtk_wed_device_active(_dev) !!(_dev)->ops
  1395. #define mtk_wed_device_detach(_dev) (_dev)->ops->detach(_dev)
  1396. @@ -160,6 +225,12 @@ mtk_wed_device_attach(struct mtk_wed_dev
  1397. (_dev)->ops->irq_get(_dev, _mask)
  1398. #define mtk_wed_device_irq_set_mask(_dev, _mask) \
  1399. (_dev)->ops->irq_set_mask(_dev, _mask)
  1400. +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) \
  1401. + (_dev)->ops->rx_ring_setup(_dev, _ring, _regs)
  1402. +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash) \
  1403. + (_dev)->ops->ppe_check(_dev, _skb, _reason, _hash)
  1404. +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) \
  1405. + (_dev)->ops->msg_update(_dev, _id, _msg, _len)
  1406. #else
  1407. static inline bool mtk_wed_device_active(struct mtk_wed_device *dev)
  1408. {
  1409. @@ -173,6 +244,9 @@ static inline bool mtk_wed_device_active
  1410. #define mtk_wed_device_reg_write(_dev, _reg, _val) do {} while (0)
  1411. #define mtk_wed_device_irq_get(_dev, _mask) 0
  1412. #define mtk_wed_device_irq_set_mask(_dev, _mask) do {} while (0)
  1413. +#define mtk_wed_device_rx_ring_setup(_dev, _ring, _regs) -ENODEV
  1414. +#define mtk_wed_device_ppe_check(_dev, _skb, _reason, _hash) do {} while (0)
  1415. +#define mtk_wed_device_update_msg(_dev, _id, _msg, _len) -ENODEV
  1416. #endif
  1417. #endif