101-25-net-mediatek-add-support-for-NETSYS-v3.patch 7.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221
  1. From 7d201749cc49a58fb5e791d1e099ec3e3489e16d Mon Sep 17 00:00:00 2001
  2. From: Weijie Gao <[email protected]>
  3. Date: Wed, 19 Jul 2023 17:17:37 +0800
  4. Subject: [PATCH 25/29] net: mediatek: add support for NETSYS v3
  5. This patch adds support for NETSYS v3 hardware.
  6. Comparing to NETSYS v2, NETSYS v3 has three GMACs.
  7. Signed-off-by: Weijie Gao <[email protected]>
  8. ---
  9. drivers/net/mtk_eth.c | 49 ++++++++++++++++++++++++++++++++-----------
  10. drivers/net/mtk_eth.h | 7 +++++++
  11. 2 files changed, 44 insertions(+), 12 deletions(-)
  12. --- a/drivers/net/mtk_eth.c
  13. +++ b/drivers/net/mtk_eth.c
  14. @@ -76,6 +76,7 @@ enum mtk_switch {
  15. * @caps Flags shown the extra capability for the SoC
  16. * @ana_rgc3: The offset for register ANA_RGC3 related to
  17. * sgmiisys syscon
  18. + * @gdma_count: Number of GDMAs
  19. * @pdma_base: Register base of PDMA block
  20. * @txd_size: Tx DMA descriptor size.
  21. * @rxd_size: Rx DMA descriptor size.
  22. @@ -83,6 +84,7 @@ enum mtk_switch {
  23. struct mtk_soc_data {
  24. u32 caps;
  25. u32 ana_rgc3;
  26. + u32 gdma_count;
  27. u32 pdma_base;
  28. u32 txd_size;
  29. u32 rxd_size;
  30. @@ -159,7 +161,9 @@ static void mtk_gdma_write(struct mtk_et
  31. {
  32. u32 gdma_base;
  33. - if (no == 1)
  34. + if (no == 2)
  35. + gdma_base = GDMA3_BASE;
  36. + else if (no == 1)
  37. gdma_base = GDMA2_BASE;
  38. else
  39. gdma_base = GDMA1_BASE;
  40. @@ -1429,7 +1433,10 @@ static void mtk_eth_fifo_init(struct mtk
  41. txd->txd1 = virt_to_phys(pkt_base);
  42. txd->txd2 = PDMA_TXD2_DDONE | PDMA_TXD2_LS0;
  43. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  44. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  45. + txd->txd5 = PDMA_V2_TXD5_FPORT_SET(priv->gmac_id == 2 ?
  46. + 15 : priv->gmac_id + 1);
  47. + else if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  48. txd->txd5 = PDMA_V2_TXD5_FPORT_SET(priv->gmac_id + 1);
  49. else
  50. txd->txd4 = PDMA_V1_TXD4_FPORT_SET(priv->gmac_id + 1);
  51. @@ -1442,7 +1449,8 @@ static void mtk_eth_fifo_init(struct mtk
  52. rxd->rxd1 = virt_to_phys(pkt_base);
  53. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  54. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
  55. + MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  56. rxd->rxd2 = PDMA_V2_RXD2_PLEN0_SET(PKTSIZE_ALIGN);
  57. else
  58. rxd->rxd2 = PDMA_V1_RXD2_PLEN0_SET(PKTSIZE_ALIGN);
  59. @@ -1466,7 +1474,7 @@ static void mtk_eth_fifo_init(struct mtk
  60. static int mtk_eth_start(struct udevice *dev)
  61. {
  62. struct mtk_eth_priv *priv = dev_get_priv(dev);
  63. - int ret;
  64. + int i, ret;
  65. /* Reset FE */
  66. reset_assert(&priv->rst_fe);
  67. @@ -1474,16 +1482,24 @@ static int mtk_eth_start(struct udevice
  68. reset_deassert(&priv->rst_fe);
  69. mdelay(10);
  70. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  71. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
  72. + MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  73. setbits_le32(priv->fe_base + FE_GLO_MISC_REG, PDMA_VER_V2);
  74. /* Packets forward to PDMA */
  75. mtk_gdma_write(priv, priv->gmac_id, GDMA_IG_CTRL_REG, GDMA_FWD_TO_CPU);
  76. - if (priv->gmac_id == 0)
  77. - mtk_gdma_write(priv, 1, GDMA_IG_CTRL_REG, GDMA_FWD_DISCARD);
  78. - else
  79. - mtk_gdma_write(priv, 0, GDMA_IG_CTRL_REG, GDMA_FWD_DISCARD);
  80. + for (i = 0; i < priv->soc->gdma_count; i++) {
  81. + if (i == priv->gmac_id)
  82. + continue;
  83. +
  84. + mtk_gdma_write(priv, i, GDMA_IG_CTRL_REG, GDMA_FWD_DISCARD);
  85. + }
  86. +
  87. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3)) {
  88. + mtk_gdma_write(priv, priv->gmac_id, GDMA_EG_CTRL_REG,
  89. + GDMA_CPU_BRIDGE_EN);
  90. + }
  91. udelay(500);
  92. @@ -1557,7 +1573,8 @@ static int mtk_eth_send(struct udevice *
  93. flush_dcache_range((ulong)pkt_base, (ulong)pkt_base +
  94. roundup(length, ARCH_DMA_MINALIGN));
  95. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  96. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
  97. + MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  98. txd->txd2 = PDMA_TXD2_LS0 | PDMA_V2_TXD2_SDL0_SET(length);
  99. else
  100. txd->txd2 = PDMA_TXD2_LS0 | PDMA_V1_TXD2_SDL0_SET(length);
  101. @@ -1583,7 +1600,8 @@ static int mtk_eth_recv(struct udevice *
  102. return -EAGAIN;
  103. }
  104. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  105. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
  106. + MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  107. length = PDMA_V2_RXD2_PLEN0_GET(rxd->rxd2);
  108. else
  109. length = PDMA_V1_RXD2_PLEN0_GET(rxd->rxd2);
  110. @@ -1606,7 +1624,8 @@ static int mtk_eth_free_pkt(struct udevi
  111. rxd = priv->rx_ring_noc + idx * priv->soc->rxd_size;
  112. - if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2))
  113. + if (MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V2) ||
  114. + MTK_HAS_CAPS(priv->soc->caps, MTK_NETSYS_V3))
  115. rxd->rxd2 = PDMA_V2_RXD2_PLEN0_SET(PKTSIZE_ALIGN);
  116. else
  117. rxd->rxd2 = PDMA_V1_RXD2_PLEN0_SET(PKTSIZE_ALIGN);
  118. @@ -1863,6 +1882,7 @@ static int mtk_eth_of_to_plat(struct ude
  119. static const struct mtk_soc_data mt7986_data = {
  120. .caps = MT7986_CAPS,
  121. .ana_rgc3 = 0x128,
  122. + .gdma_count = 2,
  123. .pdma_base = PDMA_V2_BASE,
  124. .txd_size = sizeof(struct mtk_tx_dma_v2),
  125. .rxd_size = sizeof(struct mtk_rx_dma_v2),
  126. @@ -1871,6 +1891,7 @@ static const struct mtk_soc_data mt7986_
  127. static const struct mtk_soc_data mt7981_data = {
  128. .caps = MT7981_CAPS,
  129. .ana_rgc3 = 0x128,
  130. + .gdma_count = 2,
  131. .pdma_base = PDMA_V2_BASE,
  132. .txd_size = sizeof(struct mtk_tx_dma_v2),
  133. .rxd_size = sizeof(struct mtk_rx_dma_v2),
  134. @@ -1878,6 +1899,7 @@ static const struct mtk_soc_data mt7981_
  135. static const struct mtk_soc_data mt7629_data = {
  136. .ana_rgc3 = 0x128,
  137. + .gdma_count = 2,
  138. .pdma_base = PDMA_V1_BASE,
  139. .txd_size = sizeof(struct mtk_tx_dma),
  140. .rxd_size = sizeof(struct mtk_rx_dma),
  141. @@ -1885,6 +1907,7 @@ static const struct mtk_soc_data mt7629_
  142. static const struct mtk_soc_data mt7623_data = {
  143. .caps = MT7623_CAPS,
  144. + .gdma_count = 2,
  145. .pdma_base = PDMA_V1_BASE,
  146. .txd_size = sizeof(struct mtk_tx_dma),
  147. .rxd_size = sizeof(struct mtk_rx_dma),
  148. @@ -1892,6 +1915,7 @@ static const struct mtk_soc_data mt7623_
  149. static const struct mtk_soc_data mt7622_data = {
  150. .ana_rgc3 = 0x2028,
  151. + .gdma_count = 2,
  152. .pdma_base = PDMA_V1_BASE,
  153. .txd_size = sizeof(struct mtk_tx_dma),
  154. .rxd_size = sizeof(struct mtk_rx_dma),
  155. @@ -1899,6 +1923,7 @@ static const struct mtk_soc_data mt7622_
  156. static const struct mtk_soc_data mt7621_data = {
  157. .caps = MT7621_CAPS,
  158. + .gdma_count = 2,
  159. .pdma_base = PDMA_V1_BASE,
  160. .txd_size = sizeof(struct mtk_tx_dma),
  161. .rxd_size = sizeof(struct mtk_rx_dma),
  162. --- a/drivers/net/mtk_eth.h
  163. +++ b/drivers/net/mtk_eth.h
  164. @@ -18,6 +18,7 @@ enum mkt_eth_capabilities {
  165. MTK_U3_COPHY_V2_BIT,
  166. MTK_INFRA_BIT,
  167. MTK_NETSYS_V2_BIT,
  168. + MTK_NETSYS_V3_BIT,
  169. /* PATH BITS */
  170. MTK_ETH_PATH_GMAC1_TRGMII_BIT,
  171. @@ -29,6 +30,7 @@ enum mkt_eth_capabilities {
  172. #define MTK_U3_COPHY_V2 BIT(MTK_U3_COPHY_V2_BIT)
  173. #define MTK_INFRA BIT(MTK_INFRA_BIT)
  174. #define MTK_NETSYS_V2 BIT(MTK_NETSYS_V2_BIT)
  175. +#define MTK_NETSYS_V3 BIT(MTK_NETSYS_V3_BIT)
  176. /* Supported path present on SoCs */
  177. #define MTK_ETH_PATH_GMAC1_TRGMII BIT(MTK_ETH_PATH_GMAC1_TRGMII_BIT)
  178. @@ -52,8 +54,10 @@ enum mkt_eth_capabilities {
  179. /* Frame Engine Register Bases */
  180. #define PDMA_V1_BASE 0x0800
  181. #define PDMA_V2_BASE 0x6000
  182. +#define PDMA_V3_BASE 0x6800
  183. #define GDMA1_BASE 0x0500
  184. #define GDMA2_BASE 0x1500
  185. +#define GDMA3_BASE 0x0540
  186. #define GMAC_BASE 0x10000
  187. /* Ethernet subsystem registers */
  188. @@ -153,6 +157,9 @@ enum mkt_eth_capabilities {
  189. #define UN_DP_S 0
  190. #define UN_DP_M 0x0f
  191. +#define GDMA_EG_CTRL_REG 0x004
  192. +#define GDMA_CPU_BRIDGE_EN BIT(31)
  193. +
  194. #define GDMA_MAC_LSB_REG 0x008
  195. #define GDMA_MAC_MSB_REG 0x00c