0600-4-6-net-dsa-mt7530-Add-the-support-of-MT7531-switch.patch 33 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798991001011021031041051061071081091101111121131141151161171181191201211221231241251261271281291301311321331341351361371381391401411421431441451461471481491501511521531541551561571581591601611621631641651661671681691701711721731741751761771781791801811821831841851861871881891901911921931941951961971981992002012022032042052062072082092102112122132142152162172182192202212222232242252262272282292302312322332342352362372382392402412422432442452462472482492502512522532542552562572582592602612622632642652662672682692702712722732742752762772782792802812822832842852862872882892902912922932942952962972982993003013023033043053063073083093103113123133143153163173183193203213223233243253263273283293303313323333343353363373383393403413423433443453463473483493503513523533543553563573583593603613623633643653663673683693703713723733743753763773783793803813823833843853863873883893903913923933943953963973983994004014024034044054064074084094104114124134144154164174184194204214224234244254264274284294304314324334344354364374384394404414424434444454464474484494504514524534544554564574584594604614624634644654664674684694704714724734744754764774784794804814824834844854864874884894904914924934944954964974984995005015025035045055065075085095105115125135145155165175185195205215225235245255265275285295305315325335345355365375385395405415425435445455465475485495505515525535545555565575585595605615625635645655665675685695705715725735745755765775785795805815825835845855865875885895905915925935945955965975985996006016026036046056066076086096106116126136146156166176186196206216226236246256266276286296306316326336346356366376386396406416426436446456466476486496506516526536546556566576586596606616626636646656666676686696706716726736746756766776786796806816826836846856866876886896906916926936946956966976986997007017027037047057067077087097107117127137147157167177187197207217227237247257267277287297307317327337347357367377387397407417427437447457467477487497507517527537547557567577587597607617627637647657667677687697707717727737747757767777787797807817827837847857867877887897907917927937947957967977987998008018028038048058068078088098108118128138148158168178188198208218228238248258268278288298308318328338348358368378388398408418428438448458468478488498508518528538548558568578588598608618628638648658668678688698708718728738748758768778788798808818828838848858868878888898908918928938948958968978988999009019029039049059069079089099109119129139149159169179189199209219229239249259269279289299309319329339349359369379389399409419429439449459469479489499509519529539549559569579589599609619629639649659669679689699709719729739749759769779789799809819829839849859869879889899909919929939949959969979989991000100110021003100410051006100710081009101010111012101310141015101610171018101910201021102210231024102510261027102810291030103110321033103410351036103710381039104010411042104310441045104610471048104910501051105210531054105510561057105810591060106110621063106410651066106710681069107010711072107310741075107610771078107910801081108210831084108510861087108810891090109110921093109410951096
  1. From patchwork Tue Dec 10 08:14:40 2019
  2. Content-Type: text/plain; charset="utf-8"
  3. MIME-Version: 1.0
  4. Content-Transfer-Encoding: 7bit
  5. X-Patchwork-Submitter: Landen Chao <[email protected]>
  6. X-Patchwork-Id: 1206959
  7. X-Patchwork-Delegate: [email protected]
  8. Return-Path: <[email protected]>
  9. X-Original-To: [email protected]
  10. Delivered-To: [email protected]
  11. Authentication-Results: ozlabs.org; spf=none (no SPF record)
  12. smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;
  13. helo=vger.kernel.org;
  14. [email protected];
  15. receiver=<UNKNOWN>)
  16. Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none)
  17. header.from=mediatek.com
  18. Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
  19. unprotected) header.d=mediatek.com [email protected]
  20. header.b="A6fsNqWU"; dkim-atps=neutral
  21. Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
  22. by ozlabs.org (Postfix) with ESMTP id 47XCXz2fDsz9sPh
  23. for <[email protected]>;
  24. Tue, 10 Dec 2019 19:15:15 +1100 (AEDT)
  25. Received: ([email protected]) by vger.kernel.org via listexpand
  26. id S1727198AbfLJIPC (ORCPT
  27. <rfc822;[email protected]>);
  28. Tue, 10 Dec 2019 03:15:02 -0500
  29. Received: from mailgw02.mediatek.com ([210.61.82.184]:39119 "EHLO
  30. mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by
  31. vger.kernel.org with ESMTP id S1726750AbfLJIPC (ORCPT
  32. <rfc822;[email protected]>); Tue, 10 Dec 2019 03:15:02 -0500
  33. X-UUID: 38155314c18e497aacbec5bc0f664b9a-20191210
  34. DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
  35. d=mediatek.com; s=dk;
  36. h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From;
  37. bh=sEkoMPWKI3m+K/8A3kC0uuYTNxZZaGCvfLKvnEmwQQ4=;
  38. b=A6fsNqWUmjxIiZPLPb43Hs36qwwvYXMLQ/LlU24IcsfBro20uMkDbzGq522r69u0071Qgekwc/zs4yujo0pz40jCfnAo38JIDP73w4ZyVGuOENM5gdE+qNNUednOVSi052hcMRhS7zpVD0Rfl7vKKOU42F7Tl+cadVzjUl0ow/s=;
  39. X-UUID: 38155314c18e497aacbec5bc0f664b9a-20191210
  40. Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by
  41. mailgw02.mediatek.com (envelope-from <[email protected]>)
  42. (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS)
  43. with ESMTP id 452927388; Tue, 10 Dec 2019 16:14:46 +0800
  44. Received: from mtkcas08.mediatek.inc (172.21.101.126) by
  45. mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server
  46. (TLS) id 15.0.1395.4; Tue, 10 Dec 2019 16:14:31 +0800
  47. Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc
  48. (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via
  49. Frontend Transport; Tue, 10 Dec 2019 16:14:26 +0800
  50. From: Landen Chao <[email protected]>
  51. To: <[email protected]>, <[email protected]>,
  52. <[email protected]>, <[email protected]>,
  53. <[email protected]>, <[email protected]>
  54. CC: <[email protected]>, <[email protected]>,
  55. <[email protected]>,
  56. <[email protected]>, <[email protected]>,
  57. <[email protected]>, <[email protected]>,
  58. <[email protected]>, Landen Chao <[email protected]>
  59. Subject: [PATCH net-next 4/6] net: dsa: mt7530: Add the support of MT7531
  60. switch
  61. Date: Tue, 10 Dec 2019 16:14:40 +0800
  62. Message-ID: <6d608dd024edc90b09ba4fe35417b693847f973c.1575914275.git.landen.chao@mediatek.com>
  63. X-Mailer: git-send-email 2.18.0
  64. In-Reply-To: <[email protected]>
  65. References: <[email protected]>
  66. MIME-Version: 1.0
  67. X-MTK: N
  68. Sender: [email protected]
  69. Precedence: bulk
  70. List-ID: <netdev.vger.kernel.org>
  71. X-Mailing-List: [email protected]
  72. Add new support for MT7531:
  73. MT7531 is the next generation of MT7530. It is also a 7-ports switch with
  74. 5 giga embedded phys, 2 cpu ports, and the same MAC logic of MT7530. Cpu
  75. port 6 only supports HSGMII interface. Cpu port 5 supports either RGMII
  76. or HSGMII in different HW sku. Due to HSGMII interface support, pll, and
  77. pad setting are different from MT7530. This patch adds different initial
  78. setting of MT7531.
  79. Signed-off-by: Landen Chao <[email protected]>
  80. Signed-off-by: Sean Wang <[email protected]>
  81. ---
  82. drivers/net/dsa/Kconfig | 6 +-
  83. drivers/net/dsa/mt7530.c | 643 ++++++++++++++++++++++++++++++++++++++-
  84. drivers/net/dsa/mt7530.h | 144 +++++++++
  85. 3 files changed, 784 insertions(+), 9 deletions(-)
  86. --- a/drivers/net/dsa/Kconfig
  87. +++ b/drivers/net/dsa/Kconfig
  88. @@ -33,12 +33,12 @@ config NET_DSA_LANTIQ_GSWIP
  89. the xrx200 / VR9 SoC.
  90. config NET_DSA_MT7530
  91. - tristate "MediaTek MT7530 and MT7621 Ethernet switch support"
  92. + tristate "MediaTek MT753x and MT7621 Ethernet switch support"
  93. depends on NET_DSA
  94. select NET_DSA_TAG_MTK
  95. ---help---
  96. - This enables support for the MediaTek MT7530 and MT7621 Ethernet
  97. - switch chip.
  98. + This enables support for the MediaTek MT7530, MT7531 and MT7621
  99. + Ethernet switch chip.
  100. config NET_DSA_MV88E6060
  101. tristate "Marvell 88E6060 ethernet switch chip support"
  102. --- a/drivers/net/dsa/mt7530.c
  103. +++ b/drivers/net/dsa/mt7530.c
  104. @@ -234,6 +234,12 @@ mt7530_write(struct mt7530_priv *priv, u
  105. }
  106. static u32
  107. +_mt7530_unlocked_read(struct mt7530_dummy_poll *p)
  108. +{
  109. + return mt7530_mii_read(p->priv, p->reg);
  110. +}
  111. +
  112. +static u32
  113. _mt7530_read(struct mt7530_dummy_poll *p)
  114. {
  115. struct mii_bus *bus = p->priv->bus;
  116. @@ -287,6 +293,102 @@ mt7530_clear(struct mt7530_priv *priv, u
  117. }
  118. static int
  119. +mt7531_ind_mmd_phy_read(struct mt7530_priv *priv, int port, int devad,
  120. + int regnum)
  121. +{
  122. + struct mii_bus *bus = priv->bus;
  123. + struct mt7530_dummy_poll p;
  124. + u32 reg, val;
  125. + int ret;
  126. +
  127. + INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
  128. +
  129. + mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  130. +
  131. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  132. + !(val & PHY_ACS_ST), 20, 100000);
  133. + if (ret < 0) {
  134. + dev_err(priv->dev, "poll timeout\n");
  135. + goto out;
  136. + }
  137. +
  138. + reg = MDIO_CL45_ADDR | MDIO_PHY_ADDR(port) | MDIO_DEV_ADDR(devad) |
  139. + regnum;
  140. + mt7530_mii_write(priv, MT7531_PHY_IAC, reg | PHY_ACS_ST);
  141. +
  142. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  143. + !(val & PHY_ACS_ST), 20, 100000);
  144. + if (ret < 0) {
  145. + dev_err(priv->dev, "poll timeout\n");
  146. + goto out;
  147. + }
  148. +
  149. + reg = MDIO_CL45_READ | MDIO_PHY_ADDR(port) | MDIO_DEV_ADDR(devad);
  150. + mt7530_mii_write(priv, MT7531_PHY_IAC, reg | PHY_ACS_ST);
  151. +
  152. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  153. + !(val & PHY_ACS_ST), 20, 100000);
  154. + if (ret < 0) {
  155. + dev_err(priv->dev, "poll timeout\n");
  156. + goto out;
  157. + }
  158. +
  159. + ret = val & MDIO_RW_DATA_MASK;
  160. +out:
  161. + mutex_unlock(&bus->mdio_lock);
  162. +
  163. + return ret;
  164. +}
  165. +
  166. +static int
  167. +mt7531_ind_mmd_phy_write(struct mt7530_priv *priv, int port, int devad,
  168. + int regnum, u32 data)
  169. +{
  170. + struct mii_bus *bus = priv->bus;
  171. + struct mt7530_dummy_poll p;
  172. + u32 val, reg;
  173. + int ret;
  174. +
  175. + INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
  176. +
  177. + mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  178. +
  179. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  180. + !(val & PHY_ACS_ST), 20, 100000);
  181. + if (ret < 0) {
  182. + dev_err(priv->dev, "poll timeout\n");
  183. + goto out;
  184. + }
  185. +
  186. + reg = MDIO_CL45_ADDR | MDIO_PHY_ADDR(port) | MDIO_DEV_ADDR(devad) |
  187. + regnum;
  188. + mt7530_mii_write(priv, MT7531_PHY_IAC, reg | PHY_ACS_ST);
  189. +
  190. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  191. + !(val & PHY_ACS_ST), 20, 100000);
  192. + if (ret < 0) {
  193. + dev_err(priv->dev, "poll timeout\n");
  194. + goto out;
  195. + }
  196. +
  197. + reg = MDIO_CL45_WRITE | MDIO_PHY_ADDR(port) | MDIO_DEV_ADDR(devad) |
  198. + data;
  199. + mt7530_mii_write(priv, MT7531_PHY_IAC, reg | PHY_ACS_ST);
  200. +
  201. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  202. + !(val & PHY_ACS_ST), 20, 100000);
  203. + if (ret < 0) {
  204. + dev_err(priv->dev, "poll timeout\n");
  205. + goto out;
  206. + }
  207. +
  208. +out:
  209. + mutex_unlock(&bus->mdio_lock);
  210. +
  211. + return ret;
  212. +}
  213. +
  214. +static int
  215. mt7530_fdb_cmd(struct mt7530_priv *priv, enum mt7530_fdb_cmd cmd, u32 *rsp)
  216. {
  217. u32 val;
  218. @@ -516,6 +618,83 @@ static int mt7530_phy_write(struct dsa_s
  219. return mdiobus_write_nested(priv->bus, port, regnum, val);
  220. }
  221. +static int
  222. +mt7531_ind_phy_read(struct dsa_switch *ds, int port, int regnum)
  223. +{
  224. + struct mt7530_priv *priv = ds->priv;
  225. + struct mii_bus *bus = priv->bus;
  226. + struct mt7530_dummy_poll p;
  227. + int ret;
  228. + u32 val;
  229. +
  230. + INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
  231. +
  232. + mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  233. +
  234. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  235. + !(val & PHY_ACS_ST), 20, 100000);
  236. + if (ret < 0) {
  237. + dev_err(priv->dev, "poll timeout\n");
  238. + goto out;
  239. + }
  240. +
  241. + val = MDIO_CL22_READ | MDIO_PHY_ADDR(port) | MDIO_REG_ADDR(regnum);
  242. +
  243. + mt7530_mii_write(priv, MT7531_PHY_IAC, val | PHY_ACS_ST);
  244. +
  245. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, val,
  246. + !(val & PHY_ACS_ST), 20, 100000);
  247. + if (ret < 0) {
  248. + dev_err(priv->dev, "poll timeout\n");
  249. + goto out;
  250. + }
  251. +
  252. + ret = val & MDIO_RW_DATA_MASK;
  253. +out:
  254. + mutex_unlock(&bus->mdio_lock);
  255. +
  256. + return ret;
  257. +}
  258. +
  259. +static int
  260. +mt7531_ind_phy_write(struct dsa_switch *ds, int port, int regnum,
  261. + u16 data)
  262. +{
  263. + struct mt7530_priv *priv = ds->priv;
  264. + struct mii_bus *bus = priv->bus;
  265. + struct mt7530_dummy_poll p;
  266. + int ret;
  267. + u32 reg;
  268. +
  269. + INIT_MT7530_DUMMY_POLL(&p, priv, MT7531_PHY_IAC);
  270. +
  271. + mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
  272. +
  273. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, reg,
  274. + !(reg & PHY_ACS_ST), 20, 100000);
  275. + if (ret < 0) {
  276. + dev_err(priv->dev, "poll timeout\n");
  277. + goto out;
  278. + }
  279. +
  280. + reg = MDIO_CL22_WRITE | MDIO_PHY_ADDR(port) | MDIO_REG_ADDR(regnum) |
  281. + data;
  282. +
  283. + mt7530_mii_write(priv, MT7531_PHY_IAC, reg | PHY_ACS_ST);
  284. +
  285. + ret = readx_poll_timeout(_mt7530_unlocked_read, &p, reg,
  286. + !(reg & PHY_ACS_ST), 20, 100000);
  287. + if (ret < 0) {
  288. + dev_err(priv->dev, "poll timeout\n");
  289. + goto out;
  290. + }
  291. +
  292. +out:
  293. + mutex_unlock(&bus->mdio_lock);
  294. +
  295. + return ret;
  296. +}
  297. +
  298. static void
  299. mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,
  300. uint8_t *data)
  301. @@ -1355,6 +1534,86 @@ mt7530_setup(struct dsa_switch *ds)
  302. return 0;
  303. }
  304. +static int mt7531_setup(struct dsa_switch *ds)
  305. +{
  306. + struct mt7530_priv *priv = ds->priv;
  307. + struct mt7530_dummy_poll p;
  308. + u32 val, id;
  309. + int ret, i;
  310. +
  311. + /* Reset whole chip through gpio pin or memory-mapped registers for
  312. + * different type of hardware
  313. + */
  314. + if (priv->mcm) {
  315. + reset_control_assert(priv->rstc);
  316. + usleep_range(1000, 1100);
  317. + reset_control_deassert(priv->rstc);
  318. + } else {
  319. + gpiod_set_value_cansleep(priv->reset, 0);
  320. + usleep_range(1000, 1100);
  321. + gpiod_set_value_cansleep(priv->reset, 1);
  322. + }
  323. +
  324. + /* Waiting for MT7530 got to stable */
  325. + INIT_MT7530_DUMMY_POLL(&p, priv, MT7530_HWTRAP);
  326. + ret = readx_poll_timeout(_mt7530_read, &p, val, val != 0,
  327. + 20, 1000000);
  328. + if (ret < 0) {
  329. + dev_err(priv->dev, "reset timeout\n");
  330. + return ret;
  331. + }
  332. +
  333. + id = mt7530_read(priv, MT7531_CREV);
  334. + id >>= CHIP_NAME_SHIFT;
  335. +
  336. + if (id != MT7531_ID) {
  337. + dev_err(priv->dev, "chip %x can't be supported\n", id);
  338. + return -ENODEV;
  339. + }
  340. +
  341. + /* Reset the switch through internal reset */
  342. + mt7530_write(priv, MT7530_SYS_CTRL,
  343. + SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |
  344. + SYS_CTRL_REG_RST);
  345. +
  346. + priv->p6_interface = PHY_INTERFACE_MODE_NA;
  347. +
  348. + /* Enable PHY power, since phy_device has not yet been created
  349. + * provided for phy_[read,write]_mmd_indirect is called, we provide
  350. + * our own mt7531_ind_mmd_phy_[read,write] to complete this
  351. + * function.
  352. + */
  353. + val = mt7531_ind_mmd_phy_read(priv, 0, PHY_DEV1F,
  354. + MT7531_PHY_DEV1F_REG_403);
  355. + val |= MT7531_PHY_EN_BYPASS_MODE;
  356. + val &= ~MT7531_PHY_POWER_OFF;
  357. + mt7531_ind_mmd_phy_write(priv, 0, PHY_DEV1F,
  358. + MT7531_PHY_DEV1F_REG_403, val);
  359. +
  360. + /* Enable and reset MIB counters */
  361. + mt7530_mib_reset(ds);
  362. +
  363. + mt7530_clear(priv, MT7530_MFC, UNU_FFP_MASK);
  364. +
  365. + for (i = 0; i < MT7530_NUM_PORTS; i++) {
  366. + /* Disable forwarding by default on all ports */
  367. + mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,
  368. + PCR_MATRIX_CLR);
  369. +
  370. + if (dsa_is_cpu_port(ds, i))
  371. + mt7530_cpu_port_enable(priv, i);
  372. + else
  373. + mt7530_port_disable(ds, i);
  374. + }
  375. +
  376. + /* Flush the FDB table */
  377. + ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);
  378. + if (ret < 0)
  379. + return ret;
  380. +
  381. + return 0;
  382. +}
  383. +
  384. static bool mt7530_phy_supported(struct dsa_switch *ds, int port,
  385. const struct phylink_link_state *state)
  386. {
  387. @@ -1392,6 +1651,49 @@ unsupported:
  388. return false;
  389. }
  390. +static bool mt7531_dual_sgmii_supported(struct mt7530_priv *priv)
  391. +{
  392. + u32 val;
  393. +
  394. + val = mt7530_read(priv, MT7531_TOP_SIG_SR);
  395. + return ((val & PAD_DUAL_SGMII_EN) != 0);
  396. +}
  397. +
  398. +static bool mt7531_phy_supported(struct dsa_switch *ds, int port,
  399. + const struct phylink_link_state *state)
  400. +{
  401. + struct mt7530_priv *priv = ds->priv;
  402. +
  403. + switch (port) {
  404. + case 0: /* Internal phy */
  405. + case 1:
  406. + case 2:
  407. + case 3:
  408. + case 4:
  409. + if (state->interface != PHY_INTERFACE_MODE_GMII)
  410. + goto unsupported;
  411. + break;
  412. + case 5: /* 2nd cpu port supports either rgmii or sgmii/8023z */
  413. + if (!mt7531_dual_sgmii_supported(priv))
  414. + return phy_interface_mode_is_rgmii(state->interface);
  415. + /* fall through */
  416. + case 6: /* 1st cpu port supports sgmii/8023z only */
  417. + if (state->interface != PHY_INTERFACE_MODE_SGMII &&
  418. + !phy_interface_mode_is_8023z(state->interface))
  419. + goto unsupported;
  420. + break;
  421. + default:
  422. + dev_err(priv->dev, "%s: unsupported port: %i\n", __func__,
  423. + port);
  424. + goto unsupported;
  425. + }
  426. +
  427. + return true;
  428. +
  429. +unsupported:
  430. + return false;
  431. +}
  432. +
  433. static bool mt753x_phy_supported(struct dsa_switch *ds, int port,
  434. const struct phylink_link_state *state)
  435. {
  436. @@ -1413,7 +1715,144 @@ mt7530_pad_setup(struct dsa_switch *ds,
  437. * host which must be placed after the setup on the
  438. * device side is all finished.
  439. */
  440. - mt7623_pad_clk_setup(ds);
  441. + //mt7623_pad_clk_setup(ds);
  442. + }
  443. +
  444. + return 0;
  445. +}
  446. +
  447. +static int
  448. +mt7531_pad_setup(struct dsa_switch *ds, const struct phylink_link_state *state)
  449. +{
  450. + struct mt7530_priv *priv = ds->priv;
  451. + u32 xtal, val;
  452. +
  453. + if (mt7531_dual_sgmii_supported(priv))
  454. + return 0;
  455. +
  456. + xtal = mt7530_read(priv, MT7531_HWTRAP) & HWTRAP_XTAL_FSEL_MASK;
  457. +
  458. + switch (xtal) {
  459. + case HWTRAP_XTAL_FSEL_25MHZ:
  460. + /* Step 1 : Disable MT7531 COREPLL */
  461. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  462. + val &= ~EN_COREPLL;
  463. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  464. +
  465. + /* Step 2: switch to XTAL output */
  466. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  467. + val |= SW_CLKSW;
  468. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  469. +
  470. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  471. + val &= ~RG_COREPLL_EN;
  472. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  473. +
  474. + /* Step 3: disable PLLGP and enable program PLLGP */
  475. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  476. + val |= SW_PLLGP;
  477. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  478. +
  479. + /* Step 4: program COREPLL output frequency to 500MHz */
  480. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  481. + val &= ~RG_COREPLL_POSDIV_M;
  482. + val |= 2 << RG_COREPLL_POSDIV_S;
  483. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  484. + usleep_range(25, 35);
  485. +
  486. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  487. + val &= ~RG_COREPLL_SDM_PCW_M;
  488. + val |= 0x140000 << RG_COREPLL_SDM_PCW_S;
  489. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  490. +
  491. + /* Set feedback divide ratio update signal to high */
  492. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  493. + val |= RG_COREPLL_SDM_PCW_CHG;
  494. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  495. + /* Wait for at least 16 XTAL clocks */
  496. + usleep_range(10, 20);
  497. +
  498. + /* Step 5: set feedback divide ratio update signal to low */
  499. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  500. + val &= ~RG_COREPLL_SDM_PCW_CHG;
  501. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  502. +
  503. + /* Enable 325M clock for SGMII */
  504. + mt7530_write(priv, MT7531_ANA_PLLGP_CR5, 0xad0000);
  505. +
  506. + /* Enable 250SSC clock for RGMII */
  507. + mt7530_write(priv, MT7531_ANA_PLLGP_CR2, 0x4f40000);
  508. +
  509. + /* Step 6: Enable MT7531 PLL */
  510. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  511. + val |= RG_COREPLL_EN;
  512. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  513. +
  514. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  515. + val |= EN_COREPLL;
  516. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  517. + usleep_range(25, 35);
  518. + break;
  519. + case HWTRAP_XTAL_FSEL_40MHZ:
  520. + /* Step 1 : Disable MT7531 COREPLL */
  521. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  522. + val &= ~EN_COREPLL;
  523. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  524. +
  525. + /* Step 2: switch to XTAL output */
  526. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  527. + val |= SW_CLKSW;
  528. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  529. +
  530. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  531. + val &= ~RG_COREPLL_EN;
  532. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  533. +
  534. + /* Step 3: disable PLLGP and enable program PLLGP */
  535. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  536. + val |= SW_PLLGP;
  537. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  538. +
  539. + /* Step 4: program COREPLL output frequency to 500MHz */
  540. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  541. + val &= ~RG_COREPLL_POSDIV_M;
  542. + val |= 2 << RG_COREPLL_POSDIV_S;
  543. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  544. + usleep_range(25, 35);
  545. +
  546. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  547. + val &= ~RG_COREPLL_SDM_PCW_M;
  548. + val |= 0x190000 << RG_COREPLL_SDM_PCW_S;
  549. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  550. +
  551. + /* Set feedback divide ratio update signal to high */
  552. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  553. + val |= RG_COREPLL_SDM_PCW_CHG;
  554. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  555. + /* Wait for at least 16 XTAL clocks */
  556. + usleep_range(10, 20);
  557. +
  558. + /* Step 5: set feedback divide ratio update signal to low */
  559. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  560. + val &= ~RG_COREPLL_SDM_PCW_CHG;
  561. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  562. +
  563. + /* Enable 325M clock for SGMII */
  564. + mt7530_write(priv, MT7531_ANA_PLLGP_CR5, 0xad0000);
  565. +
  566. + /* Enable 250SSC clock for RGMII */
  567. + mt7530_write(priv, MT7531_ANA_PLLGP_CR2, 0x4f40000);
  568. +
  569. + /* Step 6: Enable MT7531 PLL */
  570. + val = mt7530_read(priv, MT7531_PLLGP_CR0);
  571. + val |= RG_COREPLL_EN;
  572. + mt7530_write(priv, MT7531_PLLGP_CR0, val);
  573. +
  574. + val = mt7530_read(priv, MT7531_PLLGP_EN);
  575. + val |= EN_COREPLL;
  576. + mt7530_write(priv, MT7531_PLLGP_EN, val);
  577. + usleep_range(25, 35);
  578. + break;
  579. }
  580. return 0;
  581. @@ -1442,6 +1881,149 @@ mt7530_mac_setup(struct dsa_switch *ds,
  582. return 0;
  583. }
  584. +static int mt7531_rgmii_setup(struct mt7530_priv *priv, u32 port)
  585. +{
  586. + u32 val;
  587. +
  588. + if (port != 5) {
  589. + dev_err(priv->dev, "RGMII mode is not available for port %d\n",
  590. + port);
  591. + return -EINVAL;
  592. + }
  593. +
  594. + val = mt7530_read(priv, MT7531_CLKGEN_CTRL);
  595. + val |= GP_CLK_EN;
  596. + val &= ~GP_MODE_MASK;
  597. + val |= GP_MODE(MT7531_GP_MODE_RGMII);
  598. + val |= TXCLK_NO_REVERSE;
  599. + val |= RXCLK_NO_DELAY;
  600. + val &= ~CLK_SKEW_IN_MASK;
  601. + val |= CLK_SKEW_IN(MT7531_CLK_SKEW_NO_CHG);
  602. + val &= ~CLK_SKEW_OUT_MASK;
  603. + val |= CLK_SKEW_OUT(MT7531_CLK_SKEW_NO_CHG);
  604. + mt7530_write(priv, MT7531_CLKGEN_CTRL, val);
  605. +
  606. + return 0;
  607. +}
  608. +
  609. +static int mt7531_sgmii_setup_mode_force(struct mt7530_priv *priv, u32 port,
  610. + const struct phylink_link_state *state)
  611. +{
  612. + u32 val;
  613. +
  614. + if (port != 5 && port != 6)
  615. + return -EINVAL;
  616. +
  617. + val = mt7530_read(priv, MT7531_QPHY_PWR_STATE_CTRL(port));
  618. + val |= MT7531_SGMII_PHYA_PWD;
  619. + mt7530_write(priv, MT7531_QPHY_PWR_STATE_CTRL(port), val);
  620. +
  621. + val = mt7530_read(priv, MT7531_PHYA_CTRL_SIGNAL3(port));
  622. + val &= ~MT7531_RG_TPHY_SPEED_MASK;
  623. + if (state->interface == PHY_INTERFACE_MODE_2500BASEX)
  624. + val |= MT7531_RG_TPHY_SPEED_3_125G;
  625. + mt7530_write(priv, MT7531_PHYA_CTRL_SIGNAL3(port), val);
  626. +
  627. + val = mt7530_read(priv, MT7531_PCS_CONTROL_1(port));
  628. + val &= ~MT7531_SGMII_AN_ENABLE;
  629. + mt7530_write(priv, MT7531_PCS_CONTROL_1(port), val);
  630. +
  631. + val = mt7530_read(priv, MT7531_SGMII_MODE(port));
  632. + val &= ~MT7531_SGMII_IF_MODE_MASK;
  633. +
  634. + switch (state->speed) {
  635. + case SPEED_10:
  636. + val |= MT7531_SGMII_FORCE_SPEED_10;
  637. + break;
  638. + case SPEED_100:
  639. + val |= MT7531_SGMII_FORCE_SPEED_100;
  640. + break;
  641. + case SPEED_2500:
  642. + case SPEED_1000:
  643. + val |= MT7531_SGMII_FORCE_SPEED_1000;
  644. + break;
  645. + };
  646. +
  647. + val &= ~MT7531_SGMII_FORCE_DUPLEX;
  648. + /* For sgmii force mode, 0 is full duplex and 1 is half duplex */
  649. + if (state->duplex == DUPLEX_HALF)
  650. + val |= MT7531_SGMII_FORCE_DUPLEX;
  651. +
  652. + mt7530_write(priv, MT7531_SGMII_MODE(port), val);
  653. +
  654. + val = mt7530_read(priv, MT7531_QPHY_PWR_STATE_CTRL(port));
  655. + val &= ~MT7531_SGMII_PHYA_PWD;
  656. + mt7530_write(priv, MT7531_QPHY_PWR_STATE_CTRL(port), val);
  657. +
  658. + return 0;
  659. +}
  660. +
  661. +static int mt7531_sgmii_setup_mode_an(struct mt7530_priv *priv, int port,
  662. + const struct phylink_link_state *state)
  663. +{
  664. + u32 val;
  665. +
  666. + if (port != 5 && port != 6)
  667. + return -EINVAL;
  668. +
  669. + val = mt7530_read(priv, MT7531_QPHY_PWR_STATE_CTRL(port));
  670. + val |= MT7531_SGMII_PHYA_PWD;
  671. + mt7530_write(priv, MT7531_QPHY_PWR_STATE_CTRL(port), val);
  672. +
  673. + switch (state->speed) {
  674. + case SPEED_10:
  675. + case SPEED_100:
  676. + case SPEED_1000:
  677. + val = mt7530_read(priv, MT7531_PHYA_CTRL_SIGNAL3(port));
  678. + val &= ~MT7531_RG_TPHY_SPEED_MASK;
  679. + mt7530_write(priv, MT7531_PHYA_CTRL_SIGNAL3(port), val);
  680. + break;
  681. + default:
  682. + dev_info(priv->dev, "invalid SGMII speed idx %d for port %d\n",
  683. + state->speed, port);
  684. +
  685. + return -EINVAL;
  686. + }
  687. +
  688. + val = mt7530_read(priv, MT7531_SGMII_MODE(port));
  689. + val |= MT7531_SGMII_REMOTE_FAULT_DIS;
  690. + mt7530_write(priv, MT7531_SGMII_MODE(port), val);
  691. +
  692. + val = mt7530_read(priv, MT7531_PCS_CONTROL_1(port));
  693. + val |= MT7531_SGMII_AN_RESTART;
  694. + mt7530_write(priv, MT7531_PCS_CONTROL_1(port), val);
  695. +
  696. + val = mt7530_read(priv, MT7531_QPHY_PWR_STATE_CTRL(port));
  697. + val &= ~MT7531_SGMII_PHYA_PWD;
  698. + mt7530_write(priv, MT7531_QPHY_PWR_STATE_CTRL(port), val);
  699. +
  700. + return 0;
  701. +}
  702. +
  703. +static int
  704. +mt7531_mac_setup(struct dsa_switch *ds, int port, unsigned int mode,
  705. + const struct phylink_link_state *state)
  706. +{
  707. + struct mt7530_priv *priv = ds->priv;
  708. +
  709. + if (port < 5 || port >= MT7530_NUM_PORTS) {
  710. + dev_err(priv->dev, "port %d is not a MAC port\n", port);
  711. + return -EINVAL;
  712. + }
  713. +
  714. + switch (state->interface) {
  715. + case PHY_INTERFACE_MODE_RGMII:
  716. + return mt7531_rgmii_setup(priv, port);
  717. + case PHY_INTERFACE_MODE_1000BASEX:
  718. + case PHY_INTERFACE_MODE_2500BASEX:
  719. + return mt7531_sgmii_setup_mode_force(priv, port, state);
  720. + case PHY_INTERFACE_MODE_SGMII:
  721. + return mt7531_sgmii_setup_mode_an(priv, port, state);
  722. + default:
  723. + return -EINVAL;
  724. + }
  725. +}
  726. +
  727. static int mt753x_mac_setup(struct dsa_switch *ds, int port, unsigned int mode,
  728. const struct phylink_link_state *state)
  729. {
  730. @@ -1473,22 +2055,23 @@ static void mt753x_phylink_mac_config(st
  731. if (priv->p5_interface == state->interface)
  732. break;
  733. if (mt753x_mac_setup(ds, port, mode, state) < 0)
  734. - goto unsupported;
  735. + break;
  736. + priv->p5_interface = state->interface;
  737. break;
  738. case 6: /* 1st cpu port */
  739. if (priv->p6_interface == state->interface)
  740. break;
  741. mt753x_pad_setup(ds, state);
  742. if (mt753x_mac_setup(ds, port, mode, state) < 0)
  743. - goto unsupported;
  744. + break;
  745. priv->p6_interface = state->interface;
  746. break;
  747. default:
  748. - dev_err(ds->dev, "%s: unsupported port: %i\n", __func__, port);
  749. return;
  750. }
  751. - if (phylink_autoneg_inband(mode)) {
  752. + if (phylink_autoneg_inband(mode) &&
  753. + state->interface != PHY_INTERFACE_MODE_SGMII) {
  754. dev_err(ds->dev, "%s: in-band negotiation unsupported\n",
  755. __func__);
  756. return;
  757. @@ -1499,13 +2082,15 @@ static void mt753x_phylink_mac_config(st
  758. mcr_new &= ~(PMCR_FORCE_SPEED_1000 | PMCR_FORCE_SPEED_100 |
  759. PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN);
  760. mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
  761. - PMCR_BACKPR_EN | PMCR_FORCE_MODE;
  762. + PMCR_BACKPR_EN | PMCR_FORCE_MODE_ID(priv->id) |
  763. + PMCR_FORCE_LNK;
  764. /* Are we connected to external phy */
  765. if (port == 5 && dsa_is_user_port(ds, 5))
  766. mcr_new |= PMCR_EXT_PHY;
  767. switch (state->speed) {
  768. + case SPEED_2500:
  769. case SPEED_1000:
  770. mcr_new |= PMCR_FORCE_SPEED_1000;
  771. if (priv->eee_enable & BIT(port))
  772. @@ -1529,6 +2114,27 @@ static void mt753x_phylink_mac_config(st
  773. mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
  774. }
  775. +void mt7531_sgmii_restart_an(struct dsa_switch *ds, int port)
  776. +{
  777. + struct mt7530_priv *priv = ds->priv;
  778. + u32 val;
  779. +
  780. + val = mt7530_read(priv, MT7531_PCS_CONTROL_1(port));
  781. + val |= MT7531_SGMII_AN_RESTART;
  782. + mt7530_write(priv, MT7531_PCS_CONTROL_1(port), val);
  783. +}
  784. +
  785. +static void
  786. +mt753x_phylink_mac_an_restart(struct dsa_switch *ds, int port)
  787. +{
  788. + struct mt7530_priv *priv = ds->priv;
  789. +
  790. + if (!priv->info->port_an_restart)
  791. + return;
  792. +
  793. + priv->info->port_an_restart(ds, port);
  794. +}
  795. +
  796. static void mt7530_phylink_mac_link_down(struct dsa_switch *ds, int port,
  797. unsigned int mode,
  798. phy_interface_t interface)
  799. @@ -1563,9 +2169,20 @@ static void mt753x_phylink_validate(stru
  800. phylink_set_port_modes(mask);
  801. phylink_set(mask, Autoneg);
  802. - if (state->interface == PHY_INTERFACE_MODE_TRGMII) {
  803. + switch (state->interface) {
  804. + case PHY_INTERFACE_MODE_TRGMII:
  805. phylink_set(mask, 1000baseT_Full);
  806. - } else {
  807. + break;
  808. + case PHY_INTERFACE_MODE_1000BASEX:
  809. + case PHY_INTERFACE_MODE_2500BASEX:
  810. + phylink_set(mask, 1000baseX_Full);
  811. + phylink_set(mask, 2500baseX_Full);
  812. + break;
  813. + case PHY_INTERFACE_MODE_SGMII:
  814. + phylink_set(mask, 1000baseT_Full);
  815. + phylink_set(mask, 1000baseX_Full);
  816. + /* fall through */
  817. + default:
  818. phylink_set(mask, 10baseT_Half);
  819. phylink_set(mask, 10baseT_Full);
  820. phylink_set(mask, 100baseT_Half);
  821. @@ -1577,6 +2194,7 @@ static void mt753x_phylink_validate(stru
  822. if (port == 5)
  823. phylink_set(mask, 1000baseX_Full);
  824. }
  825. + break;
  826. }
  827. phylink_set(mask, Pause);
  828. @@ -1721,8 +2339,9 @@ static const struct dsa_switch_ops mt753
  829. .port_mirror_add = mt7530_port_mirror_add,
  830. .port_mirror_del = mt7530_port_mirror_del,
  831. .phylink_validate = mt753x_phylink_validate,
  832. - .phylink_mac_link_state = mt7530_phylink_mac_link_state,
  833. + .phylink_mac_link_state = mt7530_phylink_mac_link_state,
  834. .phylink_mac_config = mt753x_phylink_mac_config,
  835. + .phylink_mac_an_restart = mt753x_phylink_mac_an_restart,
  836. .phylink_mac_link_down = mt7530_phylink_mac_link_down,
  837. .phylink_mac_link_up = mt7530_phylink_mac_link_up,
  838. .get_mac_eee = mt7530_get_mac_eee,
  839. @@ -1748,11 +2367,22 @@ static const struct mt753x_info mt753x_t
  840. .pad_setup = mt7530_pad_setup,
  841. .mac_setup = mt7530_mac_setup,
  842. },
  843. + [ID_MT7531] = {
  844. + .id = ID_MT7531,
  845. + .setup = mt7531_setup,
  846. + .phy_read = mt7531_ind_phy_read,
  847. + .phy_write = mt7531_ind_phy_write,
  848. + .phy_supported = mt7531_phy_supported,
  849. + .pad_setup = mt7531_pad_setup,
  850. + .mac_setup = mt7531_mac_setup,
  851. + .port_an_restart = mt7531_sgmii_restart_an,
  852. + },
  853. };
  854. static const struct of_device_id mt7530_of_match[] = {
  855. { .compatible = "mediatek,mt7621", .data = &mt753x_table[ID_MT7621], },
  856. { .compatible = "mediatek,mt7530", .data = &mt753x_table[ID_MT7530], },
  857. + { .compatible = "mediatek,mt7531", .data = &mt753x_table[ID_MT7531], },
  858. { /* sentinel */ },
  859. };
  860. MODULE_DEVICE_TABLE(of, mt7530_of_match);
  861. --- a/drivers/net/dsa/mt7530.h
  862. +++ b/drivers/net/dsa/mt7530.h
  863. @@ -14,6 +14,7 @@
  864. enum mt753x_id {
  865. ID_MT7530 = 0,
  866. ID_MT7621 = 1,
  867. + ID_MT7531 = 2,
  868. };
  869. #define NUM_TRGMII_CTRL 5
  870. @@ -222,6 +223,19 @@ enum mt7530_vlan_port_attr {
  871. #define PMCR_FORCE_LNK BIT(0)
  872. #define PMCR_SPEED_MASK (PMCR_FORCE_SPEED_100 | \
  873. PMCR_FORCE_SPEED_1000)
  874. +#define MT7531_FORCE_LNK BIT(31)
  875. +#define MT7531_FORCE_SPD BIT(30)
  876. +#define MT7531_FORCE_DPX BIT(29)
  877. +#define MT7531_FORCE_RX_FC BIT(28)
  878. +#define MT7531_FORCE_TX_FC BIT(27)
  879. +#define MT7531_FORCE_MODE (MT7531_FORCE_LNK | \
  880. + MT7531_FORCE_SPD | \
  881. + MT7531_FORCE_DPX | \
  882. + MT7531_FORCE_RX_FC | \
  883. + MT7531_FORCE_TX_FC)
  884. +#define PMCR_FORCE_MODE_ID(id) (((id) == ID_MT7531) ? \
  885. + MT7531_FORCE_MODE : \
  886. + PMCR_FORCE_MODE)
  887. #define MT7530_PMSR_P(x) (0x3008 + (x) * 0x100)
  888. #define PMSR_EEE1G BIT(7)
  889. @@ -258,12 +272,111 @@ enum mt7530_vlan_port_attr {
  890. CCR_RX_OCT_CNT_BAD | \
  891. CCR_TX_OCT_CNT_GOOD | \
  892. CCR_TX_OCT_CNT_BAD)
  893. +
  894. +/* SGMII registers */
  895. +#define MT7531_SGMII_REG_BASE 0x5000
  896. +#define MT7531_SGMII_REG(p, r) (MT7531_SGMII_REG_BASE + \
  897. + ((p) - 5) * 0x1000 + (r))
  898. +
  899. +/* SGMII PCS_CONTROL_1 */
  900. +#define MT7531_PCS_CONTROL_1(p) MT7531_SGMII_REG(p, 0x00)
  901. +#define MT7531_SGMII_LINK_STATUS BIT(18)
  902. +#define MT7531_SGMII_AN_ENABLE BIT(12)
  903. +#define MT7531_SGMII_AN_RESTART BIT(9)
  904. +
  905. +/* Fields of SGMII_MODE */
  906. +#define MT7531_SGMII_MODE(p) MT7531_SGMII_REG(p, 0x20)
  907. +#define MT7531_SGMII_REMOTE_FAULT_DIS BIT(8)
  908. +#define MT7531_SGMII_FORCE_DUPLEX BIT(4)
  909. +#define MT7531_SGMII_IF_MODE_MASK GENMASK(5, 1)
  910. +#define MT7531_SGMII_FORCE_SPEED_10 0x0
  911. +#define MT7531_SGMII_FORCE_SPEED_100 BIT(2)
  912. +#define MT7531_SGMII_FORCE_SPEED_1000 BIT(3)
  913. +
  914. +/* Fields of QPHY_PWR_STATE_CTRL */
  915. +#define MT7531_QPHY_PWR_STATE_CTRL(p) MT7531_SGMII_REG(p, 0xe8)
  916. +#define MT7531_SGMII_PHYA_PWD BIT(4)
  917. +
  918. +/* Values of SGMII SPEED */
  919. +#define MT7531_PHYA_CTRL_SIGNAL3(p) MT7531_SGMII_REG(p, 0x128)
  920. +#define MT7531_RG_TPHY_SPEED_MASK (BIT(2) | BIT(3))
  921. +#define MT7531_RG_TPHY_SPEED_1_25G 0x0
  922. +#define MT7531_RG_TPHY_SPEED_3_125G BIT(2)
  923. +
  924. /* Register for system reset */
  925. #define MT7530_SYS_CTRL 0x7000
  926. #define SYS_CTRL_PHY_RST BIT(2)
  927. #define SYS_CTRL_SW_RST BIT(1)
  928. #define SYS_CTRL_REG_RST BIT(0)
  929. +/* Register for PHY Indirect Access Control */
  930. +#define MT7531_PHY_IAC 0x701C
  931. +#define PHY_ACS_ST BIT(31)
  932. +#define MDIO_REG_ADDR_MASK (0x1f << 25)
  933. +#define MDIO_PHY_ADDR_MASK (0x1f << 20)
  934. +#define MDIO_CMD_MASK (0x3 << 18)
  935. +#define MDIO_ST_MASK (0x3 << 16)
  936. +#define MDIO_RW_DATA_MASK (0xffff)
  937. +#define MDIO_REG_ADDR(x) (((x) & 0x1f) << 25)
  938. +#define MDIO_DEV_ADDR(x) (((x) & 0x1f) << 25)
  939. +#define MDIO_PHY_ADDR(x) (((x) & 0x1f) << 20)
  940. +#define MDIO_CMD(x) (((x) & 0x3) << 18)
  941. +#define MDIO_ST(x) (((x) & 0x3) << 16)
  942. +
  943. +enum mt7531_phy_iac_cmd {
  944. + MT7531_MDIO_ADDR = 0,
  945. + MT7531_MDIO_WRITE = 1,
  946. + MT7531_MDIO_READ = 2,
  947. + MT7531_MDIO_READ_CL45 = 3,
  948. +};
  949. +
  950. +/* MDIO_ST: MDIO start field */
  951. +enum mt7531_mdio_st {
  952. + MT7531_MDIO_ST_CL45 = 0,
  953. + MT7531_MDIO_ST_CL22 = 1,
  954. +};
  955. +
  956. +#define MDIO_CL22_READ (MDIO_ST(MT7531_MDIO_ST_CL22) | \
  957. + MDIO_CMD(MT7531_MDIO_READ))
  958. +#define MDIO_CL22_WRITE (MDIO_ST(MT7531_MDIO_ST_CL22) | \
  959. + MDIO_CMD(MT7531_MDIO_WRITE))
  960. +#define MDIO_CL45_ADDR (MDIO_ST(MT7531_MDIO_ST_CL45) | \
  961. + MDIO_CMD(MT7531_MDIO_ADDR))
  962. +#define MDIO_CL45_READ (MDIO_ST(MT7531_MDIO_ST_CL45) | \
  963. + MDIO_CMD(MT7531_MDIO_READ))
  964. +#define MDIO_CL45_WRITE (MDIO_ST(MT7531_MDIO_ST_CL45) | \
  965. + MDIO_CMD(MT7531_MDIO_WRITE))
  966. +
  967. +#define MT7531_CLKGEN_CTRL 0x7500
  968. +#define CLK_SKEW_OUT(x) (((x) & 0x3) << 8)
  969. +#define CLK_SKEW_OUT_MASK (0x3 << 8)
  970. +#define CLK_SKEW_IN(x) (((x) & 0x3) << 6)
  971. +#define CLK_SKEW_IN_MASK (0x3 << 6)
  972. +#define RXCLK_NO_DELAY BIT(5)
  973. +#define TXCLK_NO_REVERSE BIT(4)
  974. +#define GP_MODE(x) (((x) & 0x3) << 1)
  975. +#define GP_MODE_MASK (0x3 << 1)
  976. +#define GP_CLK_EN BIT(0)
  977. +
  978. +#define PHY_DEV1F 0x1f
  979. +#define MT7531_PHY_DEV1F_REG_403 0x403
  980. +
  981. +#define MT7531_PHY_EN_BYPASS_MODE BIT(4)
  982. +#define MT7531_PHY_POWER_OFF BIT(5)
  983. +
  984. +enum mt7531_gp_mode {
  985. + MT7531_GP_MODE_RGMII = 0,
  986. + MT7531_GP_MODE_MII = 1,
  987. + MT7531_GP_MODE_REV_MII = 2
  988. +};
  989. +
  990. +enum mt7531_clk_skew {
  991. + MT7531_CLK_SKEW_NO_CHG = 0,
  992. + MT7531_CLK_SKEW_DLY_100PPS = 1,
  993. + MT7531_CLK_SKEW_DLY_200PPS = 2,
  994. + MT7531_CLK_SKEW_REVERSE = 3,
  995. +};
  996. +
  997. /* Register for hw trap status */
  998. #define MT7530_HWTRAP 0x7800
  999. #define HWTRAP_XTAL_MASK (BIT(10) | BIT(9))
  1000. @@ -271,6 +384,11 @@ enum mt7530_vlan_port_attr {
  1001. #define HWTRAP_XTAL_40MHZ (BIT(10))
  1002. #define HWTRAP_XTAL_20MHZ (BIT(9))
  1003. +#define MT7531_HWTRAP 0x7800
  1004. +#define HWTRAP_XTAL_FSEL_MASK BIT(7)
  1005. +#define HWTRAP_XTAL_FSEL_25MHZ BIT(7)
  1006. +#define HWTRAP_XTAL_FSEL_40MHZ 0
  1007. +
  1008. /* Register for hw trap modification */
  1009. #define MT7530_MHWTRAP 0x7804
  1010. #define MHWTRAP_PHY0_SEL BIT(20)
  1011. @@ -285,14 +403,34 @@ enum mt7530_vlan_port_attr {
  1012. #define MT7530_TOP_SIG_CTRL 0x7808
  1013. #define TOP_SIG_CTRL_NORMAL (BIT(17) | BIT(16))
  1014. +#define MT7531_TOP_SIG_SR 0x780c
  1015. +#define PAD_DUAL_SGMII_EN BIT(1)
  1016. +
  1017. #define MT7530_IO_DRV_CR 0x7810
  1018. #define P5_IO_CLK_DRV(x) ((x) & 0x3)
  1019. #define P5_IO_DATA_DRV(x) (((x) & 0x3) << 4)
  1020. +#define MT7531_PLLGP_EN 0x7820
  1021. +#define EN_COREPLL BIT(2)
  1022. +#define SW_CLKSW BIT(1)
  1023. +#define SW_PLLGP BIT(0)
  1024. +
  1025. +#define MT7531_PLLGP_CR0 0x78a8
  1026. +#define RG_COREPLL_EN BIT(22)
  1027. +#define RG_COREPLL_POSDIV_S 23
  1028. +#define RG_COREPLL_POSDIV_M 0x3800000
  1029. +#define RG_COREPLL_SDM_PCW_S 1
  1030. +#define RG_COREPLL_SDM_PCW_M 0x3ffffe
  1031. +#define RG_COREPLL_SDM_PCW_CHG BIT(0)
  1032. +
  1033. #define MT7530_P6ECR 0x7830
  1034. #define P6_INTF_MODE_MASK 0x3
  1035. #define P6_INTF_MODE(x) ((x) & 0x3)
  1036. +/* RGMII and SGMII PLL clock */
  1037. +#define MT7531_ANA_PLLGP_CR2 0x78b0
  1038. +#define MT7531_ANA_PLLGP_CR5 0x78bc
  1039. +
  1040. /* Registers for TRGMII on the both side */
  1041. #define MT7530_TRGMII_RCK_CTRL 0x7a00
  1042. #define RX_RST BIT(31)
  1043. @@ -335,6 +473,9 @@ enum mt7530_vlan_port_attr {
  1044. #define CHIP_NAME_SHIFT 16
  1045. #define MT7530_ID 0x7530
  1046. +#define MT7531_CREV 0x781C
  1047. +#define MT7531_ID 0x7531
  1048. +
  1049. /* Registers for core PLL access through mmd indirect */
  1050. #define CORE_PLL_GROUP2 0x401
  1051. #define RG_SYSPLL_EN_NORMAL BIT(15)
  1052. @@ -458,6 +599,8 @@ static const char *p5_intf_modes(unsigne
  1053. * port
  1054. * @mac_setup: Holding the way setting up the PHY attribute for a
  1055. * certain MAC port
  1056. + * @port_an_restart Holding the way restarting 802.3z BaseX autonegotiation
  1057. + * for a certain MAC port
  1058. */
  1059. struct mt753x_info {
  1060. enum mt753x_id id;
  1061. @@ -471,6 +614,7 @@ struct mt753x_info {
  1062. const struct phylink_link_state *state);
  1063. int (*mac_setup)(struct dsa_switch *ds, int port, unsigned int mode,
  1064. const struct phylink_link_state *state);
  1065. + void (*port_an_restart)(struct dsa_switch *ds, int port);
  1066. };
  1067. /* struct mt7530_priv - This is the main data structure for holding the state