From: Antoine Tenart <antoine.tenart@free-electrons.com> To: davem@davemloft.net, kishon@ti.com, andrew@lunn.ch, jason@lakedaemon.net, sebastian.hesselbarth@gmail.com, gregory.clement@free-electrons.com, linux@armlinux.org.uk Cc: Antoine Tenart <antoine.tenart@free-electrons.com>, mw@semihalf.com, stefanc@marvell.com, ymarkman@marvell.com, thomas.petazzoni@free-electrons.com, miquel.raynal@free-electrons.com, nadavh@marvell.com, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/6] phy: cp110-comphy: 2.5G SGMII mode Date: Wed, 27 Dec 2017 23:14:42 +0100 [thread overview] Message-ID: <20171227221446.18459-3-antoine.tenart@free-electrons.com> (raw) In-Reply-To: <20171227221446.18459-1-antoine.tenart@free-electrons.com> This patch allow the CP100 comphy to configure some lanes in the 2.5G SGMII mode. This mode is quite close to SGMII and uses nearly the same code path. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c index a0d522154cdf..946a6ed7b66f 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c @@ -135,19 +135,25 @@ struct mvebu_comhy_conf { static const struct mvebu_comhy_conf mvebu_comphy_cp110_modes[] = { /* lane 0 */ MVEBU_COMPHY_CONF(0, 1, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(0, 1, PHY_MODE_SGMII_2_5G, 0x1), /* lane 1 */ MVEBU_COMPHY_CONF(1, 2, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(1, 2, PHY_MODE_SGMII_2_5G, 0x1), /* lane 2 */ MVEBU_COMPHY_CONF(2, 0, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(2, 0, PHY_MODE_SGMII_2_5G, 0x1), MVEBU_COMPHY_CONF(2, 0, PHY_MODE_10GKR, 0x1), /* lane 3 */ MVEBU_COMPHY_CONF(3, 1, PHY_MODE_SGMII, 0x2), + MVEBU_COMPHY_CONF(3, 1, PHY_MODE_SGMII_2_5G, 0x2), /* lane 4 */ MVEBU_COMPHY_CONF(4, 0, PHY_MODE_SGMII, 0x2), + MVEBU_COMPHY_CONF(4, 0, PHY_MODE_SGMII_2_5G, 0x2), MVEBU_COMPHY_CONF(4, 0, PHY_MODE_10GKR, 0x2), MVEBU_COMPHY_CONF(4, 1, PHY_MODE_SGMII, 0x1), /* lane 5 */ MVEBU_COMPHY_CONF(5, 2, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(5, 2, PHY_MODE_SGMII_2_5G, 0x1), }; struct mvebu_comphy_priv { @@ -206,6 +212,10 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane, if (mode == PHY_MODE_10GKR) val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0xe) | MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0xe); + else if (mode == PHY_MODE_SGMII_2_5G) + val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x8) | + MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x8) | + MVEBU_COMPHY_SERDES_CFG0_HALF_BUS; else if (mode == PHY_MODE_SGMII) val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x6) | MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x6) | @@ -296,13 +306,13 @@ static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane, return 0; } -static int mvebu_comphy_set_mode_sgmii(struct phy *phy) +static int mvebu_comphy_set_mode_sgmii(struct phy *phy, enum phy_mode mode) { struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); struct mvebu_comphy_priv *priv = lane->priv; u32 val; - mvebu_comphy_ethernet_init_reset(lane, PHY_MODE_SGMII); + mvebu_comphy_ethernet_init_reset(lane, mode); val = readl(priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); val &= ~MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; @@ -487,7 +497,8 @@ static int mvebu_comphy_power_on(struct phy *phy) switch (lane->mode) { case PHY_MODE_SGMII: - ret = mvebu_comphy_set_mode_sgmii(phy); + case PHY_MODE_SGMII_2_5G: + ret = mvebu_comphy_set_mode_sgmii(phy, lane->mode); break; case PHY_MODE_10GKR: ret = mvebu_comphy_set_mode_10gkr(phy); -- 2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: antoine.tenart@free-electrons.com (Antoine Tenart) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH net-next 2/6] phy: cp110-comphy: 2.5G SGMII mode Date: Wed, 27 Dec 2017 23:14:42 +0100 [thread overview] Message-ID: <20171227221446.18459-3-antoine.tenart@free-electrons.com> (raw) In-Reply-To: <20171227221446.18459-1-antoine.tenart@free-electrons.com> This patch allow the CP100 comphy to configure some lanes in the 2.5G SGMII mode. This mode is quite close to SGMII and uses nearly the same code path. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c index a0d522154cdf..946a6ed7b66f 100644 --- a/drivers/phy/marvell/phy-mvebu-cp110-comphy.c +++ b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c @@ -135,19 +135,25 @@ struct mvebu_comhy_conf { static const struct mvebu_comhy_conf mvebu_comphy_cp110_modes[] = { /* lane 0 */ MVEBU_COMPHY_CONF(0, 1, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(0, 1, PHY_MODE_SGMII_2_5G, 0x1), /* lane 1 */ MVEBU_COMPHY_CONF(1, 2, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(1, 2, PHY_MODE_SGMII_2_5G, 0x1), /* lane 2 */ MVEBU_COMPHY_CONF(2, 0, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(2, 0, PHY_MODE_SGMII_2_5G, 0x1), MVEBU_COMPHY_CONF(2, 0, PHY_MODE_10GKR, 0x1), /* lane 3 */ MVEBU_COMPHY_CONF(3, 1, PHY_MODE_SGMII, 0x2), + MVEBU_COMPHY_CONF(3, 1, PHY_MODE_SGMII_2_5G, 0x2), /* lane 4 */ MVEBU_COMPHY_CONF(4, 0, PHY_MODE_SGMII, 0x2), + MVEBU_COMPHY_CONF(4, 0, PHY_MODE_SGMII_2_5G, 0x2), MVEBU_COMPHY_CONF(4, 0, PHY_MODE_10GKR, 0x2), MVEBU_COMPHY_CONF(4, 1, PHY_MODE_SGMII, 0x1), /* lane 5 */ MVEBU_COMPHY_CONF(5, 2, PHY_MODE_SGMII, 0x1), + MVEBU_COMPHY_CONF(5, 2, PHY_MODE_SGMII_2_5G, 0x1), }; struct mvebu_comphy_priv { @@ -206,6 +212,10 @@ static void mvebu_comphy_ethernet_init_reset(struct mvebu_comphy_lane *lane, if (mode == PHY_MODE_10GKR) val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0xe) | MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0xe); + else if (mode == PHY_MODE_SGMII_2_5G) + val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x8) | + MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x8) | + MVEBU_COMPHY_SERDES_CFG0_HALF_BUS; else if (mode == PHY_MODE_SGMII) val |= MVEBU_COMPHY_SERDES_CFG0_GEN_RX(0x6) | MVEBU_COMPHY_SERDES_CFG0_GEN_TX(0x6) | @@ -296,13 +306,13 @@ static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane, return 0; } -static int mvebu_comphy_set_mode_sgmii(struct phy *phy) +static int mvebu_comphy_set_mode_sgmii(struct phy *phy, enum phy_mode mode) { struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); struct mvebu_comphy_priv *priv = lane->priv; u32 val; - mvebu_comphy_ethernet_init_reset(lane, PHY_MODE_SGMII); + mvebu_comphy_ethernet_init_reset(lane, mode); val = readl(priv->base + MVEBU_COMPHY_RX_CTRL1(lane->id)); val &= ~MVEBU_COMPHY_RX_CTRL1_CLK8T_EN; @@ -487,7 +497,8 @@ static int mvebu_comphy_power_on(struct phy *phy) switch (lane->mode) { case PHY_MODE_SGMII: - ret = mvebu_comphy_set_mode_sgmii(phy); + case PHY_MODE_SGMII_2_5G: + ret = mvebu_comphy_set_mode_sgmii(phy, lane->mode); break; case PHY_MODE_10GKR: ret = mvebu_comphy_set_mode_10gkr(phy); -- 2.14.3
next prev parent reply other threads:[~2017-12-27 22:16 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-27 22:14 [PATCH net-next 0/6] net: mvpp2: 1000BaseX and 2000BaseX support Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart 2017-12-27 22:14 ` [PATCH net-next 1/6] phy: add 2.5G SGMII mode to the phy_mode enum Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart 2017-12-28 7:20 ` Andrew Lunn 2017-12-28 7:20 ` Andrew Lunn 2017-12-28 10:06 ` Antoine Tenart 2017-12-28 10:06 ` Antoine Tenart 2017-12-28 14:16 ` Florian Fainelli 2017-12-28 14:16 ` Florian Fainelli 2017-12-28 18:24 ` Antoine Tenart 2017-12-28 18:24 ` Antoine Tenart 2018-01-03 14:35 ` Antoine Tenart 2018-01-03 14:35 ` Antoine Tenart 2018-01-03 15:08 ` Andrew Lunn 2018-01-03 15:08 ` Andrew Lunn 2018-01-03 17:29 ` Russell King - ARM Linux 2018-01-03 17:29 ` Russell King - ARM Linux 2017-12-27 22:14 ` Antoine Tenart [this message] 2017-12-27 22:14 ` [PATCH net-next 2/6] phy: cp110-comphy: 2.5G SGMII mode Antoine Tenart 2017-12-27 22:14 ` [PATCH net-next 3/6] net: mvpp2: 1000baseX support Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart 2017-12-27 22:14 ` [PATCH net-next 4/6] net: mvpp2: 2500baseX support Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart 2017-12-27 22:14 ` [PATCH net-next 5/6] arm64: dts: marvell: mcbin: enable the fourth network interface Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart 2017-12-27 22:24 ` Russell King - ARM Linux 2017-12-27 22:24 ` Russell King - ARM Linux 2017-12-27 22:42 ` Antoine Tenart 2017-12-27 22:42 ` Antoine Tenart 2017-12-27 23:20 ` Russell King - ARM Linux 2017-12-27 23:20 ` Russell King - ARM Linux 2017-12-28 10:04 ` Antoine Tenart 2017-12-28 10:04 ` Antoine Tenart 2017-12-28 18:59 ` Russell King - ARM Linux 2017-12-28 18:59 ` Russell King - ARM Linux 2017-12-29 21:41 ` Antoine Tenart 2017-12-29 21:41 ` Antoine Tenart 2017-12-28 7:46 ` Andrew Lunn 2017-12-28 7:46 ` Andrew Lunn 2017-12-28 7:46 ` Andrew Lunn 2017-12-28 10:05 ` Antoine Tenart 2017-12-28 10:05 ` Antoine Tenart 2017-12-28 15:02 ` Florian Fainelli 2017-12-28 15:02 ` Florian Fainelli 2017-12-28 18:27 ` Antoine Tenart 2017-12-28 18:27 ` Antoine Tenart 2017-12-28 18:46 ` Russell King - ARM Linux 2017-12-28 18:46 ` Russell King - ARM Linux 2017-12-29 11:12 ` Marcin Wojtas 2017-12-29 11:12 ` Marcin Wojtas 2017-12-29 11:38 ` Russell King - ARM Linux 2017-12-29 11:38 ` Russell King - ARM Linux 2017-12-30 16:34 ` Marcin Wojtas 2017-12-30 16:34 ` Marcin Wojtas 2017-12-30 17:31 ` Russell King - ARM Linux 2017-12-30 17:31 ` Russell King - ARM Linux 2018-01-01 10:18 ` Marcin Wojtas 2018-01-01 10:18 ` Marcin Wojtas 2018-01-01 10:35 ` [EXT] " Stefan Chulski 2018-01-01 10:35 ` Stefan Chulski 2018-01-01 13:25 ` Russell King - ARM Linux 2018-01-01 13:25 ` Russell King - ARM Linux 2018-01-01 13:25 ` Russell King - ARM Linux 2018-01-03 17:00 ` Stefan Chulski 2018-01-03 17:00 ` Stefan Chulski 2018-01-03 17:00 ` Stefan Chulski 2018-01-03 17:54 ` Russell King - ARM Linux 2018-01-03 17:54 ` Russell King - ARM Linux 2018-01-03 17:54 ` Russell King - ARM Linux 2018-01-03 18:17 ` Marcin Wojtas 2018-01-03 18:17 ` Marcin Wojtas 2018-01-03 18:26 ` Stefan Chulski 2018-01-03 18:26 ` Stefan Chulski 2018-01-03 18:26 ` Stefan Chulski 2017-12-27 22:14 ` [PATCH net-next 6/6] arm64: dts: marvell: add Ethernet aliases Antoine Tenart 2017-12-27 22:14 ` Antoine Tenart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171227221446.18459-3-antoine.tenart@free-electrons.com \ --to=antoine.tenart@free-electrons.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=kishon@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=miquel.raynal@free-electrons.com \ --cc=mw@semihalf.com \ --cc=nadavh@marvell.com \ --cc=netdev@vger.kernel.org \ --cc=sebastian.hesselbarth@gmail.com \ --cc=stefanc@marvell.com \ --cc=thomas.petazzoni@free-electrons.com \ --cc=ymarkman@marvell.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.